[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1737
Date       : Mon Sep  4 16:17:05 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/fthrattr.cpp
   M /Trunk/XaraLX/Kernel/spread.cpp

The code that was reporting error in BZ #1596 was commenting in the Camelot source, so do likewise in LX (also re-enable so code that was disabled for no reason)


Diff:
Index: Trunk/XaraLX/Kernel/spread.cpp
===================================================================
--- Trunk/XaraLX/Kernel/spread.cpp	(revision 1736)
+++ Trunk/XaraLX/Kernel/spread.cpp	(revision 1737)
@@ -111,7 +111,7 @@
 #include "layer.h"
 //#include "convert.h" - in camtypes.h [AUTOMATICALLY REMOVED]
 //#include "view.h" - in camtypes.h [AUTOMATICALLY REMOVED]
-//#include "sglayer.h"
+#include "sglayer.h"
 #include "usercord.h"
 //#include "tim.h"
 
@@ -1118,11 +1118,8 @@
 	// as long as there is at least one layer in this spread.
 	// The MultipleActiveLayers added by Neville 12/6/96 so that multiple active layers
 	// are fixed, if found.
-	PORTNOTETRACE("other","Spread::CopyNodeContents - not yet calling EnsureActiveLayerIntegrity");
-#ifndef EXCLUDE_FROM_XARALX
 	if (pActiveLayer == NULL || MultipleActiveLayers)
 		LayerSGallery::EnsureActiveLayerIntegrity(this,&pActiveLayer);
-#endif
 	// Fail if the spread has no active layer 
 	return (pActiveLayer);
 } 
Index: Trunk/XaraLX/Kernel/fthrattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/fthrattr.cpp	(revision 1736)
+++ Trunk/XaraLX/Kernel/fthrattr.cpp	(revision 1737)
@@ -1555,8 +1555,7 @@
 
 			else
 			{
-				if (!Error::IsUserName("Gavin"))
-					ERROR3("AttrFeather::Render; No linked node and parent is not an ink-node!");
+//				ERROR3("AttrFeather::Render; No linked node and parent is not an ink-node!");
 				return;
 			}
 		}
@@ -2313,6 +2312,9 @@
 				pValue->SetFeatherProfile(Profile);
 				
 				if (ok) ok = InsertNode(pAttr);
+
+				TRACEUSER( "luke", _T("HFR %x %d %d"), pAttr->FindParent(), pBaseCamelotFilter->GetInsertMode() == INSERTMODE_ATTACHTOTREE, ok );
+
 				// Set the m_Node pointer (TODO remove)
 				if (ok && pBaseCamelotFilter->GetInsertMode()==INSERTMODE_ATTACHTOTREE)
 					pValue->SetLinkedNode((NodeRenderableBounded*)pAttr->FindParent());


Xara