1.1 --- a/xml-vym.cpp	Thu Apr 23 12:15:31 2009 +0000
     1.2 +++ b/xml-vym.cpp	Mon Apr 27 12:07:15 2009 +0000
     1.3 @@ -356,8 +356,8 @@
     1.4  	//lastOO=lastBranch;
     1.5  	//lastBranchItem=(BranchItem*)(lastBranch->getTreeItem());
     1.6  
     1.7 +	if (!readOOAttr(a)) return false;
     1.8  /*
     1.9 -	if (!readOOAttr(a)) return false;
    1.10  
    1.11  	if (!a.value( "scrolled").isEmpty() )
    1.12  		lastBranchItem->toggleScroll();
    1.13 @@ -410,7 +410,8 @@
    1.14  
    1.15  bool parseVYMHandler::readOOAttr (const QXmlAttributes& a)
    1.16  {
    1.17 -	if (lastOO)
    1.18 +	BranchObj *bo=(BranchObj*)lastBranchItem->getLMO();
    1.19 +	if (bo)
    1.20  	{
    1.21  		bool okx,oky;
    1.22  		float x,y;
    1.23 @@ -422,8 +423,8 @@
    1.24  				y=a.value("relPosY").toFloat (&oky);
    1.25  				if (okx && oky  )
    1.26  				{
    1.27 -					lastOO->setUseRelPos (true);
    1.28 -					lastOO->move2RelPos (x,y);
    1.29 +					bo->setUseRelPos (true);
    1.30 +					bo->move2RelPos (x,y);
    1.31  				}	
    1.32  				else
    1.33  					return false;   // Couldn't read relPos
    1.34 @@ -436,11 +437,12 @@
    1.35  				x=a.value("absPosX").toFloat (&okx);
    1.36  				y=a.value("absPosY").toFloat (&oky);
    1.37  				if (okx && oky  )
    1.38 -					lastOO->move(x,y);
    1.39 +					bo->move(x,y);
    1.40  				else
    1.41  					return false;   // Couldn't read absPos
    1.42  			}           
    1.43  		}           
    1.44 +		/* FIXME-2
    1.45  		if (!a.value( "id").isEmpty() ) 
    1.46  			lastBranchItem->setID (a.value ("id"));
    1.47  		if (!a.value( "url").isEmpty() ) 
    1.48 @@ -458,6 +460,7 @@
    1.49  			else	
    1.50  				lastOO->setHideLinkUnselected(false);
    1.51  		}	
    1.52 +		*/
    1.53  	}
    1.54  	return true;	
    1.55  }