1.1 --- a/xml-vym.cpp	Tue Jul 07 09:34:24 2009 +0000
     1.2 +++ b/xml-vym.cpp	Tue Jul 07 11:21:27 2009 +0000
     1.3 @@ -418,7 +418,7 @@
     1.4  
     1.5  bool parseVYMHandler::readOOAttr (const QXmlAttributes& a)
     1.6  {
     1.7 -	if (lastMI)	//FIXME-1  below lastBranch is used, not lastMI. So it might not work for images
     1.8 +	if (lastMI)
     1.9  	{
    1.10  		bool okx,oky;
    1.11  		float x,y;
    1.12 @@ -429,7 +429,7 @@
    1.13  				x=a.value("relPosX").toFloat (&okx);
    1.14  				y=a.value("relPosY").toFloat (&oky);
    1.15  				if (okx && oky  )
    1.16 -					lastBranch->setRelPos (QPointF(x,y));
    1.17 +					lastMI->setRelPos (QPointF(x,y));
    1.18  				else
    1.19  					return false;   // Couldn't read relPos
    1.20  			}           
    1.21 @@ -441,21 +441,21 @@
    1.22  				x=a.value("absPosX").toFloat (&okx);
    1.23  				y=a.value("absPosY").toFloat (&oky);
    1.24  				if (okx && oky  )
    1.25 -					lastBranch->setAbsPos (QPointF(x,y));
    1.26 +					lastMI->setAbsPos (QPointF(x,y));
    1.27  				else
    1.28  					return false;   // Couldn't read absPos
    1.29  			}           
    1.30  		}           
    1.31  		//if (!a.value( "id").isEmpty() ) 
    1.32 -		//	lastBranch->setID (a.value ("id"));
    1.33 +		//	lastMI->setID (a.value ("id"));		// FIXME-3
    1.34  			
    1.35  		if (!a.value( "url").isEmpty() ) 
    1.36 -			lastBranch->setURL (a.value ("url"));
    1.37 +			lastMI->setURL (a.value ("url"));
    1.38  		if (!a.value( "vymLink").isEmpty() ) 
    1.39 -			lastBranch->setVymLink (a.value ("vymLink"));
    1.40 +			lastMI->setVymLink (a.value ("vymLink"));
    1.41  		if (!a.value( "hideInExport").isEmpty() ) 
    1.42  			if (a.value("hideInExport")=="true")
    1.43 -				lastBranch->setHideInExport(true);
    1.44 +				lastMI->setHideInExport(true);
    1.45  
    1.46  		if (!a.value( "hideLink").isEmpty()) 
    1.47  		{
    1.48 @@ -504,16 +504,8 @@
    1.49  {
    1.50  	lastMI=lastImage;
    1.51  	
    1.52 -	//if (!readOOAttr(a)) return false;
    1.53 +	//if (!readOOAttr(a)) return false;   FIXME-3
    1.54  
    1.55 -	/* FIXME-1 if (!a.value( "useOrientation").isEmpty() ) 
    1.56 -	{
    1.57 -		if (a.value ("useOrientation") =="true")
    1.58 -			lastImage->setUseOrientation (true);
    1.59 -		else	
    1.60 -			lastImage->setUseOrientation (false);
    1.61 -	}	
    1.62 -	*/
    1.63  	if (!a.value( "href").isEmpty() )
    1.64  	{
    1.65  		// Load Image