diff -r ed5b407975b3 -r a8a5c7288f57 xml-vym.cpp --- a/xml-vym.cpp Thu Apr 23 12:15:31 2009 +0000 +++ b/xml-vym.cpp Mon Apr 27 12:07:15 2009 +0000 @@ -356,8 +356,8 @@ //lastOO=lastBranch; //lastBranchItem=(BranchItem*)(lastBranch->getTreeItem()); + if (!readOOAttr(a)) return false; /* - if (!readOOAttr(a)) return false; if (!a.value( "scrolled").isEmpty() ) lastBranchItem->toggleScroll(); @@ -410,7 +410,8 @@ bool parseVYMHandler::readOOAttr (const QXmlAttributes& a) { - if (lastOO) + BranchObj *bo=(BranchObj*)lastBranchItem->getLMO(); + if (bo) { bool okx,oky; float x,y; @@ -422,8 +423,8 @@ y=a.value("relPosY").toFloat (&oky); if (okx && oky ) { - lastOO->setUseRelPos (true); - lastOO->move2RelPos (x,y); + bo->setUseRelPos (true); + bo->move2RelPos (x,y); } else return false; // Couldn't read relPos @@ -436,11 +437,12 @@ x=a.value("absPosX").toFloat (&okx); y=a.value("absPosY").toFloat (&oky); if (okx && oky ) - lastOO->move(x,y); + bo->move(x,y); else return false; // Couldn't read absPos } } + /* FIXME-2 if (!a.value( "id").isEmpty() ) lastBranchItem->setID (a.value ("id")); if (!a.value( "url").isEmpty() ) @@ -458,6 +460,7 @@ else lastOO->setHideLinkUnselected(false); } + */ } return true; }