1.1 --- a/branchitem.cpp	Wed May 13 08:26:27 2009 +0000
     1.2 +++ b/branchitem.cpp	Thu May 14 12:42:58 2009 +0000
     1.3 @@ -54,9 +54,8 @@
     1.4      QString s,a;
     1.5  	BranchObj *bo=(BranchObj*)lmo;
     1.6  
     1.7 -	/* 
     1.8  	// Update of note is usually done while unselecting a branch
     1.9 -	if (isNoteInEditor) getNoteFromTextEditor();
    1.10 +	// if (isNoteInEditor) getNoteFromTextEditor();	// FIXME-0 check that this still works...
    1.11  	
    1.12  	QString scrolledAttr;
    1.13  	if (scrolled) 
    1.14 @@ -64,7 +63,9 @@
    1.15  	else
    1.16  		scrolledAttr="";
    1.17  
    1.18 -	// save area, if not scrolled
    1.19 +	/* 
    1.20 +	// save area, if not scrolled	// FIXME-3 not needed if HTML is rewritten...
    1.21 +									// also we should check if _any_ of parents is scrolled
    1.22  	QString areaAttr;
    1.23  	if (!((BranchObj*)(parObj))->isScrolled() )
    1.24  	{
    1.25 @@ -88,7 +89,7 @@
    1.26      s=beginElement ("branch" 
    1.27  		+getAttr()
    1.28  	//	+getOrnXMLAttr() 
    1.29 -	//	+scrolledAttr 
    1.30 +		+scrolledAttr 
    1.31  	//	+areaAttr 
    1.32  	//	+idAttr 
    1.33  	//	+getIncludeImageAttr() 
    1.34 @@ -103,10 +104,12 @@
    1.35  	// Save frame
    1.36  	if (frame->getFrameType()!=FrameObj::NoFrame) 
    1.37  		s+=frame->saveToDir ();
    1.38 +*/		
    1.39  
    1.40  	// save names of flags set
    1.41 -	s+=standardFlags->saveToDir(tmpdir,prefix,0);
    1.42 +	s+=standardFlags.saveToDir(tmpdir,prefix,0);
    1.43  	
    1.44 +/*	
    1.45  	// Save FloatImages
    1.46  	for (int i=0; i<floatimage.size(); ++i)
    1.47  		s+=floatimage.at(i)->saveToDir (tmpdir,prefix);