1.1 --- a/xml-vym.cpp	Thu Apr 30 11:52:49 2009 +0000
     1.2 +++ b/xml-vym.cpp	Fri May 01 10:30:29 2009 +0000
     1.3 @@ -229,8 +229,7 @@
     1.4  	} else if ( eName == "branch" && state == StateMapCenter) 
     1.5  	{
     1.6  		state=StateBranch;
     1.7 -		model->createBranch();
     1.8 -		lastBranchItem=model->getSelectedBranchItem();
     1.9 +		lastBranchItem=model->createBranch();
    1.10  		readBranchAttr (atts);
    1.11  	} else if ( eName == "htmlnote" && state == StateBranch) 
    1.12  	{
    1.13 @@ -250,8 +249,7 @@
    1.14  		if (!readXLinkAttr (atts)) return false;
    1.15      } else if ( eName == "branch" && state == StateBranch ) 
    1.16  	{
    1.17 -		model->createBranch();
    1.18 -		lastBranchItem=model->getSelectedBranchItem();
    1.19 +		lastBranchItem=model->createBranch();
    1.20  		readBranchAttr (atts);
    1.21      } else if ( eName == "html" && state == StateHtmlNote ) 
    1.22  	{
    1.23 @@ -353,14 +351,12 @@
    1.24  {
    1.25  	branchesCurrent++;
    1.26  	mainWindow->setProgressValue (branchesCurrent);
    1.27 -	//lastOO=lastBranch;
    1.28 -	//lastBranchItem=(BranchItem*)(lastBranch->getTreeItem());
    1.29  
    1.30  	if (!readOOAttr(a)) return false;
    1.31 -/*
    1.32  
    1.33  	if (!a.value( "scrolled").isEmpty() )
    1.34  		lastBranchItem->toggleScroll();
    1.35 +/*
    1.36  	if (!a.value( "frameType").isEmpty() ) 
    1.37  		lastOO->setFrameType (a.value("frameType")); //Compatibility 1.8.1
    1.38