1.1 --- a/ornamentedobj.cpp	Wed May 20 15:40:14 2009 +0000
     1.2 +++ b/ornamentedobj.cpp	Tue May 26 11:23:44 2009 +0000
     1.3 @@ -62,6 +62,8 @@
     1.4  
     1.5  void OrnamentedObj::setLinkColor()
     1.6  {
     1.7 +	VymModel *model=treeItem->getModel();
     1.8 +	if (!model) return;
     1.9  	if (model->getMapLinkColorHint()==HeadingColor)
    1.10  		LinkableMapObj::setLinkColor (heading->getColor());
    1.11  	else	
    1.12 @@ -261,7 +263,7 @@
    1.13  }
    1.14  */
    1.15  
    1.16 -QString OrnamentedObj::getOrnXMLAttr()	//FIXME-2
    1.17 +QString OrnamentedObj::getOrnXMLAttr()	//FIXME-2 still needed?
    1.18  {
    1.19  	QString posAttr;
    1.20  
    1.21 @@ -271,7 +273,8 @@
    1.22  			attribut("absPosY",QString().setNum(absPos.y())); 
    1.23  	else
    1.24  	{
    1.25 -		if (treeItem->depth()==1 || typeid (*this)==typeid (FloatImageObj))
    1.26 +	/* FIXME-2
    1.27 +		if (treeItem->depth()==1 || typid (*this)==typid (FloatImageObj))
    1.28  		{
    1.29  			if (relPos.x()==0 && relPos.y()==0)
    1.30  				setRelPos();
    1.31 @@ -280,6 +283,7 @@
    1.32  				attribut("relPosY",QString().setNum(relPos.y())); 
    1.33  		} else
    1.34  			posAttr="";
    1.35 +	*/		
    1.36  	}	
    1.37  
    1.38  /* FIXME-2 QString hideExpAttr;