diff -r 04039e47ac74 -r 59614eaf5fbb branchitem.cpp
--- a/branchitem.cpp	Tue Apr 28 09:51:48 2009 +0000
+++ b/branchitem.cpp	Wed Apr 29 18:46:31 2009 +0000
@@ -13,6 +13,7 @@
 
 	scrolled=false;
 	tmpUnscrolled=false;
+	type=Branch;
 }
 
 BranchItem::~BranchItem()
@@ -44,15 +45,16 @@
 	branchCounter++;
 }
 
-QString BranchItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset)
+QString BranchItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset) //FIXME-1
 {
+		cout << "BI::saveToDir: "<<getHeadingStd()<<endl;
 	// Cloudy stuff can be hidden during exports
 	if (hidden) return QString();
 
     QString s,a;
 	BranchObj *bo=(BranchObj*)lmo;
 
-	/* FIXME-1
+	/* 
 	// Update of note is usually done while unselecting a branch
 	if (isNoteInEditor) getNoteFromTextEditor();
 	
@@ -114,10 +116,14 @@
 		s+=note.saveToDir();
 	
 	// Save branches
-	TreeItem *ti=getFirstBranch();
-	TreeItem *last=getLastBranch();
-	while (ti && ti!=last) 
-		s+=ti->saveToDir(tmpdir,prefix,offset);
+	int i=0;
+	TreeItem *ti=getBranchNum(i);
+	while (ti)
+	{
+		s+=getBranchNum(i)->saveToDir(tmpdir,prefix,offset);
+		i++;
+		ti=getBranchNum(i);
+	}	
 
 	/*
 	// Save XLinks
@@ -334,10 +340,12 @@
 {
 	// Initialize BranchObj, order of things is important...
     BranchObj* newbo=new BranchObj(scene);
+	lmo=newbo;
     newbo->setParObj(parent()->getLMO() );
 	newbo->setTreeItem (this);
 	newbo->setDefAttr(BranchObj::NewBranch);
 	
+	initLMO();
 
 	if (!getHeading().isEmpty() ) 
 	{
@@ -348,7 +356,6 @@
 		
 	//newbo->updateLink();	//FIXME-3
 
-	lmo=newbo;
 	return newbo;
 }