diff -r 72cc3873306a -r 4244bcd9e6ea linkablemapobj.cpp
--- a/linkablemapobj.cpp	Mon Sep 05 11:56:31 2005 +0000
+++ b/linkablemapobj.cpp	Thu Sep 22 12:56:05 2005 +0000
@@ -62,6 +62,7 @@
 void LinkableMapObj::init ()
 {
     depth=-1;	
+	mapEditor=NULL;
     childObj=NULL;
     parObj=NULL;
     parObjTmpBuf=NULL;
@@ -126,8 +127,16 @@
 {
 }
 
+bool LinkableMapObj::hasParObjTmp()
+{
+	if (parObjTmpBuf) return true;
+	return false;
+}
+
 LinkStyle LinkableMapObj::getDefLinkStyle ()
 {
+	if (!mapEditor) return StyleUndef;
+
 	LinkStyle ls=mapEditor->getLinkStyle();
 	switch (ls)
 	{
@@ -204,8 +213,7 @@
 				else
 					p->hide();
 				pa0.resize (3);
-				// TODO
-				// a bit awkward: draw the lines additionally to polygon, to avoid
+				// TODO a bit awkward: draw the lines additionally to polygon, to avoid
 				// missing pixels, when polygon is extremly flat
 				l = new QCanvasLine(canvas);
 				l->setPen( QPen(linkcolor, 1) );
@@ -227,8 +235,7 @@
 				pa1.resize (arcsegs+1);
 				pa2.resize (arcsegs+1);
 
-				// TODO
-				// a bit awkward: draw the lines additionally 
+				// TODO a bit awkward: draw the lines additionally 
 				// to polygon, to avoid missing pixels, 
 				// if polygon is extremly flat
 				for (i=0;i<arcsegs;i++)
@@ -247,12 +254,7 @@
 			default: 
 				break;	
 		}	
-		// FIXME updateLink is usually called (multiple times) later:
-		//updateLink();
-	} else
-	{
-		qWarning ("Error: ChildObj or parObj == NULL in LinkableMapObj::setLinkStyle\n");
-	}
+	} 
 }
 
 LinkStyle LinkableMapObj::getLinkStyle()
@@ -287,7 +289,8 @@
 {
 	// Overloaded in BranchObj and childs
 	// here only set default color
-	setLinkColor (mapEditor->getDefLinkColor());
+	if (mapEditor)
+		setLinkColor (mapEditor->getDefLinkColor());
 }
 
 void LinkableMapObj::setLinkColor(QColor col)
@@ -650,8 +653,8 @@
 
 void LinkableMapObj::alignRelativeTo (QPoint ref)
 {
+	// TODO testing, seems not to be used right now...
 	cout << "LMO::alignRelTo   ref="<<ref<<endl;
-	//FIXME 
 }
 
 void LinkableMapObj::reposition()