diff -r 1fb50e79661c -r fe839bdfd10c xml-vym.cpp --- a/xml-vym.cpp Tue Jul 07 09:34:24 2009 +0000 +++ b/xml-vym.cpp Tue Jul 07 11:21:27 2009 +0000 @@ -418,7 +418,7 @@ bool parseVYMHandler::readOOAttr (const QXmlAttributes& a) { - if (lastMI) //FIXME-1 below lastBranch is used, not lastMI. So it might not work for images + if (lastMI) { bool okx,oky; float x,y; @@ -429,7 +429,7 @@ x=a.value("relPosX").toFloat (&okx); y=a.value("relPosY").toFloat (&oky); if (okx && oky ) - lastBranch->setRelPos (QPointF(x,y)); + lastMI->setRelPos (QPointF(x,y)); else return false; // Couldn't read relPos } @@ -441,21 +441,21 @@ x=a.value("absPosX").toFloat (&okx); y=a.value("absPosY").toFloat (&oky); if (okx && oky ) - lastBranch->setAbsPos (QPointF(x,y)); + lastMI->setAbsPos (QPointF(x,y)); else return false; // Couldn't read absPos } } //if (!a.value( "id").isEmpty() ) - // lastBranch->setID (a.value ("id")); + // lastMI->setID (a.value ("id")); // FIXME-3 if (!a.value( "url").isEmpty() ) - lastBranch->setURL (a.value ("url")); + lastMI->setURL (a.value ("url")); if (!a.value( "vymLink").isEmpty() ) - lastBranch->setVymLink (a.value ("vymLink")); + lastMI->setVymLink (a.value ("vymLink")); if (!a.value( "hideInExport").isEmpty() ) if (a.value("hideInExport")=="true") - lastBranch->setHideInExport(true); + lastMI->setHideInExport(true); if (!a.value( "hideLink").isEmpty()) { @@ -504,16 +504,8 @@ { lastMI=lastImage; - //if (!readOOAttr(a)) return false; + //if (!readOOAttr(a)) return false; FIXME-3 - /* FIXME-1 if (!a.value( "useOrientation").isEmpty() ) - { - if (a.value ("useOrientation") =="true") - lastImage->setUseOrientation (true); - else - lastImage->setUseOrientation (false); - } - */ if (!a.value( "href").isEmpty() ) { // Load Image