Fixed broken xLink handling
authorinsilmaril
Tue, 04 Sep 2007 13:53:33 +0000
changeset 593e46d634e071c
parent 592 48bf777defa8
child 594 88d558ce079d
Fixed broken xLink handling
branchobj.cpp
branchobj.h
     1.1 --- a/branchobj.cpp	Mon Aug 27 11:58:16 2007 +0000
     1.2 +++ b/branchobj.cpp	Tue Sep 04 13:53:33 2007 +0000
     1.3 @@ -682,6 +682,7 @@
     1.4  		if (lmo != NULL) return lmo;
     1.5      }
     1.6  	
     1.7 +
     1.8  	// Search myself
     1.9      if (inBox (p) && (this != excludeLMO) && isVisibleObj() ) 
    1.10  		return this;
    1.11 @@ -708,7 +709,8 @@
    1.12      }
    1.13  	
    1.14  	// Search myself
    1.15 -	if (sid==id) return this;
    1.16 +	if (sid==objID) return this;
    1.17 +
    1.18  
    1.19  /*
    1.20  	// Search float images
     2.1 --- a/branchobj.h	Mon Aug 27 11:58:16 2007 +0000
     2.2 +++ b/branchobj.h	Tue Sep 04 13:53:33 2007 +0000
     2.3 @@ -140,7 +140,6 @@
     2.4  	bool tmpUnscrolled;				// can only be true (temporary) for a scrolled subtree
     2.5  	bool includeImagesVer;			// include floatimages in bbox vertically
     2.6  	bool includeImagesHor;			// include floatimages in bbox horizontally
     2.7 -	QString id;						// IDstring, needed for xlinks (tomboy)
     2.8  
     2.9  };
    2.10