diff -r 4244bcd9e6ea -r 325958acb69b branchobj.cpp
--- a/branchobj.cpp	Thu Sep 22 12:56:05 2005 +0000
+++ b/branchobj.cpp	Mon Oct 10 11:20:25 2005 +0000
@@ -569,18 +569,17 @@
 
 void BranchObj::positionBBox()
 {
-	// TODO testing (optimization)
-	/*
+	/*// TODO testing (optimization)
 	QString h=getHeading();
 	if (!h.isEmpty())
 		cout << "BO::positionBBox("<<h<<")\n";
 	else	
 		cout << "BO::positionBBox (noHeading)\n";
-	*/	
+*/		
 
-    heading->positionBBox();
-	systemFlags->positionBBox();
-	standardFlags->positionBBox();
+	// Position contents by moving OO
+	OrnamentedObj::move (absPos.x(),absPos.y());
+ 
 	// It seems that setting x,y also affects width,height
 	int w_old=bbox.width();
 	int h_old=bbox.height();
@@ -654,6 +653,11 @@
 
 void BranchObj::setHeading(QString s)
 {
+/* FIXME testing only
+	cout << "BO::setHeading ("<<s<<")\n";
+	cout << "   bo.pos="<<absPos<<endl;
+	cout << "   ho.pos="<<heading->getPos()<<endl;
+*/	
     heading->setText(s);	// set new heading
 	calcBBoxSize();			// recalculate bbox
     positionBBox();			// rearrange contents
@@ -779,7 +783,7 @@
 	// Save FloatImages
 	FloatImageObj *fio;
 	for (fio=floatimage.first(); fio; fio=floatimage.next() )
-		s+=fio->saveToDir (tmpdir,prefix);
+		s+=fio->saveToDir (tmpdir,prefix,offset);
 
 	// Save XLinks
 	XLinkObj *xlo;
@@ -1136,10 +1140,10 @@
 
 	// If I am the mapcenter or a mainbranch, reposition heading
 	if (depth<2)
-	{
-		move (absPos.x(),absPos.y());
+	{	//FIXME optimize this   move for MCO needed to initially position text in box...
 		if (depth==1)
 		{
+			move (absPos.x(),absPos.y());
 			// Calc angle to mapCenter if I am a mainbranch
 			// needed for reordering the mainbranches clockwise 
 			// around mapcenter