[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 1405
Date       : Tue Jul  4 20:58:05 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/nodetxtl.cpp
   M /Trunk/XaraLX/Kernel/nodetxtl.h
   M /Trunk/XaraLX/Kernel/nodetxts.h

Fixed IsCompound functions and removed a spurious PORTNOTE


Diff:
Index: Trunk/XaraLX/Kernel/nodetxtl.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodetxtl.cpp	(revision 1404)
+++ Trunk/XaraLX/Kernel/nodetxtl.cpp	(revision 1405)
@@ -416,7 +416,6 @@
 
 BOOL TextLine::CreateNodeGroup(NodeGroup** ppNodeGroup, FormatRegion* pFormatRegion, BecomeA* pBecomeA)
 {
-	PORTNOTETRACE("text","TextLine::CreateNodeGroup - do nothing");
 #ifndef DISABLE_TEXT_RENDERING
 	ERROR2IF(pFormatRegion==NULL,FALSE,"TextChar::CreateNodeGroup() - pFormatRegion==NULL");
 	ERROR2IF(     pBecomeA==NULL,FALSE,"TextChar::CreateNodeGroup() - pBecomeA==NULL");
Index: Trunk/XaraLX/Kernel/nodetxts.h
===================================================================
--- Trunk/XaraLX/Kernel/nodetxts.h	(revision 1404)
+++ Trunk/XaraLX/Kernel/nodetxts.h	(revision 1405)
@@ -138,7 +138,6 @@
 
 	virtual BOOL IsABaseTextClass() const		{ return TRUE; }
 	virtual BOOL IsSetCandidate() const			{ return FALSE; }
-	virtual BOOL IsCompound() const				{ return TRUE; }		// See also NodeCompound
 
 	// All text objects need to be associated with the BaseTextClass current attribute group
 	virtual CCRuntimeClass* GetCurrentAttribGroup(); 
@@ -275,6 +274,7 @@
 	String_256 GetStoryAsString();
 
 	virtual BOOL IsSetCandidate() const		{ return TRUE; }
+	virtual BOOL IsCompound() const				{ return TRUE; }		// See also NodeCompound
 
 	virtual Node* SimpleCopy();
 	void CopyNodeContents(TextStory* NodeCopy);
Index: Trunk/XaraLX/Kernel/nodetxtl.h
===================================================================
--- Trunk/XaraLX/Kernel/nodetxtl.h	(revision 1404)
+++ Trunk/XaraLX/Kernel/nodetxtl.h	(revision 1405)
@@ -239,6 +239,7 @@
 	virtual INT32 ComplexHide(UndoableOperation* pOp, Node* pNextNode);
 
 	virtual BOOL IsSetCandidate() const		{ return TRUE; }
+	virtual BOOL IsCompound() const			{ return TRUE; }		// See also NodeCompound
 
 	virtual UINT32 GetNodeSize() const; 	
 	virtual void GetDebugDetails(StringBase* Str); // Can be deleted before we ship


Xara