xml-vym.cpp
changeset 659 b582bba9e312
parent 647 bef71af3f6ab
child 660 d0e047b8d412
     1.1 --- a/xml-vym.cpp	Mon Jan 14 16:27:00 2008 +0000
     1.2 +++ b/xml-vym.cpp	Wed Jan 16 15:45:19 2008 +0000
     1.3 @@ -34,7 +34,6 @@
     1.4      laststate = StateInit;
     1.5  	stateStack.clear();
     1.6  	stateStack.append(StateInit);
     1.7 -    branchDepth=0;
     1.8  	htmldata="";
     1.9  	isVymPart=false;
    1.10      return true;
    1.11 @@ -221,7 +220,6 @@
    1.12  					
    1.13  				} else
    1.14  					lastBranch->clear();
    1.15 -				branchDepth=1;
    1.16  				readBranchAttr (atts);
    1.17  			} else if (eName=="floatimage")
    1.18  			{
    1.19 @@ -234,7 +232,6 @@
    1.20  	} else if ( eName == "branch" && state == StateMapCenter) 
    1.21  	{
    1.22  		state=StateBranch;
    1.23 -		branchDepth=1;
    1.24  		lastBranch->addBranch();
    1.25  		lastBranch=lastBranch->getLastBranch();
    1.26  		readBranchAttr (atts);
    1.27 @@ -258,7 +255,6 @@
    1.28  	{
    1.29          lastBranch->addBranch();
    1.30  		lastBranch=lastBranch->getLastBranch();		
    1.31 -        branchDepth++;
    1.32  		readBranchAttr (atts);
    1.33      } else if ( eName == "html" && state == StateHtmlNote ) 
    1.34  	{
    1.35 @@ -425,7 +421,7 @@
    1.36  					return false;   // Couldn't read relPos
    1.37  			}           
    1.38  		}           
    1.39 -		if (!a.value( "absPosX").isEmpty() && loadMode==NewMap && branchDepth<2) 
    1.40 +		if (!a.value( "absPosX").isEmpty() && loadMode==NewMap ) 
    1.41  		{
    1.42  			if (!a.value( "absPosY").isEmpty() ) 
    1.43  			{