1.1 --- a/xml-vym.cpp	Tue Mar 31 15:36:10 2009 +0000
     1.2 +++ b/xml-vym.cpp	Wed Apr 01 15:06:57 2009 +0000
     1.3 @@ -6,13 +6,13 @@
     1.4  #include <iostream>
     1.5  #include <typeinfo>
     1.6  
     1.7 +#include "branchitem.h"
     1.8  #include "misc.h"
     1.9  #include "settings.h"
    1.10  #include "linkablemapobj.h"
    1.11  #include "mainwindow.h"
    1.12  #include "version.h"
    1.13  
    1.14 -static BranchObj *lastBranch;
    1.15  static FloatObj *lastFloat;
    1.16  static OrnamentedObj *lastOO;
    1.17  
    1.18 @@ -55,14 +55,15 @@
    1.19  			// Create mapCenter
    1.20  			model->clear();
    1.21  			lastBranch=NULL;
    1.22 +			lastBranchItem=NULL;
    1.23  
    1.24  			if (!atts.value( "author").isEmpty() )
    1.25  				model->setAuthor(atts.value( "author" ) );
    1.26  			if (!atts.value( "comment").isEmpty() )
    1.27  				model->setComment (atts.value( "comment" ) );
    1.28 -			if (!atts.value( "countBranches").isEmpty() )
    1.29 +			if (!atts.value( "branchCount").isEmpty() )
    1.30  			{
    1.31 -				branchesTotal=atts.value("countBranches").toInt();
    1.32 +				branchesTotal=atts.value("branchCount").toInt();
    1.33  				if (branchesTotal>10)
    1.34  				{
    1.35  					mainWindow->setProgressMinimum (0);
    1.36 @@ -356,10 +357,12 @@
    1.37  	branchesCurrent++;
    1.38  	mainWindow->setProgressValue (branchesCurrent);
    1.39  	lastOO=lastBranch;
    1.40 +	lastBranchItem=(BranchItem*)(lastBranch->getTreeItem());
    1.41 +
    1.42  	if (!readOOAttr(a)) return false;
    1.43  
    1.44  	if (!a.value( "scrolled").isEmpty() )
    1.45 -		lastBranch->toggleScroll();
    1.46 +		lastBranchItem->toggleScroll();
    1.47  	if (!a.value( "frameType").isEmpty() ) 
    1.48  		lastOO->setFrameType (a.value("frameType")); //Compatibility 1.8.1
    1.49