diff -r 25e634a7e1dc -r 8acac4fade1b branchitem.cpp
--- a/branchitem.cpp	Mon Jun 08 11:36:56 2009 +0000
+++ b/branchitem.cpp	Mon Jun 29 10:27:42 2009 +0000
@@ -7,7 +7,7 @@
 
 using namespace std;
 
-BranchItem::BranchItem(const QList<QVariant> &data, MapItem *parent):MapItem (data,parent)
+BranchItem::BranchItem(const QList<QVariant> &data, TreeItem *parent):TreeItem (data,parent)
 {
 	//cout << "Constr. BranchItem\n";
 
@@ -105,11 +105,9 @@
     s+=valueElement("heading", getHeading(),
 		attribut ("textColor",QColor( bo->getColor()).name()));
 
-/*	
-	// Save frame  //FIXME-2
-	if (frame->getFrameType()!=FrameObj::NoFrame) 
-		s+=frame->saveToDir ();
-*/		
+	// Save frame  //FIXME-4 not saved if there is no LMO
+	if (lmo && ((OrnamentedObj*)lmo)->getFrame()->getFrameType()!=FrameObj::NoFrame) 
+		s+=((OrnamentedObj*)lmo)->getFrame()->saveToDir ();
 
 	// save names of flags set
 	s+=standardFlags.saveToDir(tmpdir,prefix,0);
@@ -354,7 +352,7 @@
 
 	if (lmo)
 	{
-		lmo->setParObj ( ((MapItem*)parentItem)->getLMO() );
+		lmo->setParObj ( parentItem->getLMO() );
 	}
 }
 
@@ -376,9 +374,9 @@
 		newbo->setFrameType (FrameObj::Rectangle);
 	} else
 	{
-		newbo->setParObj( ((MapItem*)parentItem)->getLMO() );
+		newbo->setParObj( parentItem->getLMO() );
 		// Set visibility depending on parents
-		if (((BranchItem*)parentItem)->scrolled || !((MapItem*)parentItem)->getLMO()->isVisibleObj() )
+		if (((BranchItem*)parentItem)->scrolled || !parentItem->getLMO()->isVisibleObj() )
 			newbo->setVisibility (false);
 	}
 	newbo->setDefAttr(BranchObj::NewBranch);