diff -r 6d2b32f305f9 -r 382a444f5b0c branchitem.cpp
--- a/branchitem.cpp	Wed May 13 08:26:27 2009 +0000
+++ b/branchitem.cpp	Thu May 14 12:42:58 2009 +0000
@@ -54,9 +54,8 @@
     QString s,a;
 	BranchObj *bo=(BranchObj*)lmo;
 
-	/* 
 	// Update of note is usually done while unselecting a branch
-	if (isNoteInEditor) getNoteFromTextEditor();
+	// if (isNoteInEditor) getNoteFromTextEditor();	// FIXME-0 check that this still works...
 	
 	QString scrolledAttr;
 	if (scrolled) 
@@ -64,7 +63,9 @@
 	else
 		scrolledAttr="";
 
-	// save area, if not scrolled
+	/* 
+	// save area, if not scrolled	// FIXME-3 not needed if HTML is rewritten...
+									// also we should check if _any_ of parents is scrolled
 	QString areaAttr;
 	if (!((BranchObj*)(parObj))->isScrolled() )
 	{
@@ -88,7 +89,7 @@
     s=beginElement ("branch" 
 		+getAttr()
 	//	+getOrnXMLAttr() 
-	//	+scrolledAttr 
+		+scrolledAttr 
 	//	+areaAttr 
 	//	+idAttr 
 	//	+getIncludeImageAttr() 
@@ -103,10 +104,12 @@
 	// Save frame
 	if (frame->getFrameType()!=FrameObj::NoFrame) 
 		s+=frame->saveToDir ();
+*/		
 
 	// save names of flags set
-	s+=standardFlags->saveToDir(tmpdir,prefix,0);
+	s+=standardFlags.saveToDir(tmpdir,prefix,0);
 	
+/*	
 	// Save FloatImages
 	for (int i=0; i<floatimage.size(); ++i)
 		s+=floatimage.at(i)->saveToDir (tmpdir,prefix);