diff -r 7b4e73ac247e -r 1fb50e79661c branchitem.cpp
--- a/branchitem.cpp	Mon Jun 29 10:28:28 2009 +0000
+++ b/branchitem.cpp	Tue Jul 07 09:34:24 2009 +0000
@@ -7,7 +7,7 @@
 
 using namespace std;
 
-BranchItem::BranchItem(const QList<QVariant> &data, TreeItem *parent):TreeItem (data,parent)
+BranchItem::BranchItem(const QList<QVariant> &data, TreeItem *parent):MapItem (data,parent)
 {
 	//cout << "Constr. BranchItem\n";
 
@@ -93,7 +93,8 @@
 		elementName="branch";
 
     s=beginElement (elementName
-		+getAttr()
+		+getMapAttr()
+		+getGeneralAttr()
 		+scrolledAttr 
 	//	+areaAttr 
 	//	+idAttr 
@@ -249,10 +250,11 @@
 	// find out, if we are scrolled at all.
 	// But ignore myself, just look at parents.
 
+	//cout << "BI::hasScrolledParent this="<<this<<"  "<<getHeadingStd()<<endl;
 	if (this !=start && scrolled) return true;
 
 	BranchItem* bi=(BranchItem*)parentItem;
-	if (bi && bi->isBranchLikeType() ) 
+	if (bi && bi!=rootItem && bi->isBranchLikeType() ) 
 		return bi->hasScrolledParent(start);
 	else
 		return false;
@@ -350,9 +352,9 @@
 {
 	// FIXME-5 compare also MapItem::initLMO...
 
-	if (lmo)
+	if (lmo && parentItem != rootItem)
 	{
-		lmo->setParObj ( parentItem->getLMO() );
+		lmo->setParObj ( ((MapItem*)parentItem)->getLMO() );
 	}
 }
 
@@ -374,9 +376,9 @@
 		newbo->setFrameType (FrameObj::Rectangle);
 	} else
 	{
-		newbo->setParObj( parentItem->getLMO() );
+		newbo->setParObj( ((MapItem*)parentItem)->getLMO() );
 		// Set visibility depending on parents
-		if (((BranchItem*)parentItem)->scrolled || !parentItem->getLMO()->isVisibleObj() )
+		if (((BranchItem*)parentItem)->scrolled || !((MapItem*)parentItem)->getLMO()->isVisibleObj() )
 			newbo->setVisibility (false);
 	}
 	newbo->setDefAttr(BranchObj::NewBranch);
@@ -388,7 +390,7 @@
 		newbo->setColor (headingColor);
 	}	
 		
-	//newbo->updateLink();	//FIXME-3
+	//newbo->updateLinkGeometry();	//FIXME-3
 
 	return newbo;
 }