diff -r b7447adddc9a -r 5522d1da7e37 branchobj.cpp
--- a/branchobj.cpp	Wed Jan 10 13:26:12 2007 +0000
+++ b/branchobj.cpp	Tue Jan 23 11:50:53 2007 +0000
@@ -16,6 +16,11 @@
 BranchObj* BranchObj::itFirst=NULL;
 
 
+HeadingObj* BranchObj::getHO()  //FIXME testing only
+{
+	return heading;
+}
+
 BranchObj::BranchObj () :OrnamentedObj()
 {
 //    cout << "Const BranchObj ()\n";
@@ -744,12 +749,6 @@
 	else
 		scrolledAttr="";
 
-	QString frameAttr;
-	if (frame->getFrameType()!=NoFrame)
-		frameAttr=attribut ("frameType",frame->getFrameTypeName());
-	else
-		frameAttr="";
-
 	// save area, if not scrolled
 	QString areaAttr;
 	if (!((BranchObj*)(parObj))->isScrolled() )
@@ -773,21 +772,19 @@
     s=beginElement ("branch" 
 		+getOrnAttr() 
 		+scrolledAttr 
-		+frameAttr 
 		+areaAttr 
 		+idAttr 
 		+getIncludeImageAttr() );
     incIndent();
 
-	/* Testing
-	for (int i=1; i<depth;i++) cout << "  ";
-	cout <<getHeading().ascii()<<endl;
-	*/
-
 	// save heading
     s+=valueElement("heading", getHeading(),
 		attribut ("textColor",QColor(heading->getColor()).name()));
 
+	// Save frame
+	if (frame->getFrameType()!=NoFrame) 
+		s+=frame->saveToDir ();
+
 	// save names of flags set
 	s+=standardFlags->saveToDir(tmpdir,prefix,0);
 	
@@ -1082,7 +1079,7 @@
 	int pos=borem->getNum();
 	while (bo)
 	{
-		bo->moveBranchTo (this,pos+1);
+		bo->linkTo (this,pos+1);
 		bo=borem->getLastBranch();
 	}	
 	removeBranch (borem);
@@ -1210,7 +1207,7 @@
 		return NULL;
 }
 
-BranchObj* BranchObj::moveBranchTo (BranchObj* dst, int pos)
+BranchObj* BranchObj::linkTo (BranchObj* dst, int pos)
 {
 	// Find current parent and 
 	// remove pointer to myself there