branchobj.cpp
changeset 723 11f9124c1cca
parent 722 462d39502273
child 730 0594d7b7099d
     1.1 --- a/branchobj.cpp	Wed Jul 16 11:56:44 2008 +0000
     1.2 +++ b/branchobj.cpp	Mon Aug 04 10:43:06 2008 +0000
     1.3 @@ -813,7 +813,7 @@
     1.4  	// Providing an ID for a branch makes export to XHTML easier
     1.5  	QString idAttr;
     1.6  	if (countXLinks()>0)
     1.7 -		idAttr=attribut ("id",mapEditor->getModel()->getSelectString(this)); //TODO directly access model
     1.8 +		idAttr=attribut ("id",model->getSelectString(this)); //TODO directly access model
     1.9  	else
    1.10  		idAttr="";
    1.11  
    1.12 @@ -1611,7 +1611,7 @@
    1.13  
    1.14  QString BranchObj::getSelectString()
    1.15  {
    1.16 -	return mapEditor->getModel()->getSelectString (this);
    1.17 +	return model->getSelectString (this);
    1.18  }
    1.19  
    1.20  void BranchObj::setAnimation(const AnimPoint &ap)
    1.21 @@ -1627,6 +1627,7 @@
    1.22  		setRelPos (anim);
    1.23  		return true;
    1.24  	}
    1.25 +	parObj->reposition();	// we might have been relinked meanwhile
    1.26  	return false;
    1.27  }
    1.28