[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1118
Date       : Thu May 18 17:00:09 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/nodebev.cpp
   M /Trunk/XaraLX/Kernel/nodecntr.cpp
   M /Trunk/XaraLX/Kernel/nodecont.cpp
   M /Trunk/XaraLX/Kernel/nodeshad.cpp

Removed redundant PORTNOTE exclusions so that various AllowOps can check the legality of various operations.
Fixes BZ1014


Diff:
Index: Trunk/XaraLX/Kernel/nodeshad.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeshad.cpp	(revision 1117)
+++ Trunk/XaraLX/Kernel/nodeshad.cpp	(revision 1118)
@@ -127,7 +127,7 @@
 #include "bshadow.h"
 
 // necessary for special case with bevelling
-//#include "opbevel.h"
+#include "opbevel.h"
 #include "nodebev.h"
 
 // Save/load
@@ -145,7 +145,7 @@
 //#include "resource.h"
 //#include "shadres.h"
 
-//#include "moldtool.h"
+#include "moldtool.h"
 //#include "mario.h"
 #include "attrappl.h"
 #include "view.h"
@@ -172,7 +172,7 @@
 #include "fthrattr.h"	// for feather bodge.
 #include "quality.h"	// for quality setting info - used for caching.
 #include "brshattr.h"	// for AttrBrushType, which we don't want applied to us.
-//#include "opfeathr.h"	// for OpChangeFeatherSize, which we don't want operating on us.
+#include "opfeathr.h"	// for OpChangeFeatherSize, which we don't want operating on us.
 #include "nodeliveeffect.h"
 #include "ophist.h"
 #include "objchge.h"
@@ -2869,8 +2869,6 @@
 	{
 		if (pOp)
 		{
-PORTNOTE("other", "Removed use of sundry Ops from NodeShadow::AllowOp")
-#if !defined(EXCLUDE_FROM_XARALX)
 			// Shadows can't be moulded.
 			if ((pOp->IS_KIND_OF(OpCreateNewMould))				 ||
 				 pOp->IsKindOf(CC_RUNTIME_CLASS(OpPasteEnvelope)) ||
@@ -2883,7 +2881,6 @@
 			else if (pParam->GetChangeFlags().Attribute)
 				if (pOp->IS_KIND_OF(OpChangeFeatherSize))
 					allowed = FALSE;
-#endif
 		}
 	}
 
Index: Trunk/XaraLX/Kernel/nodebev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodebev.cpp	(revision 1117)
+++ Trunk/XaraLX/Kernel/nodebev.cpp	(revision 1118)
@@ -124,11 +124,11 @@
 #include "blobs.h"
 //#include "bevres.h"
 #include "lineattr.h"
-//#include "bevtool.h"
+#include "bevtool.h"
 #include "csrstack.h"
 #include "prntview.h"
-//#include "moldtool.h"
-//#include "opcntr.h"
+#include "moldtool.h"
+#include "opcntr.h"
 #include "nodecntr.h"	// for the 'becomeA' stuff
 #include "ndbldpth.h"
 #include "ncntrcnt.h"	// ContourNodePathProcessor
@@ -2320,6 +2320,7 @@
 				if(!pConvertedBMP)
 				{
 					ERROR3("Failed To Create Bevel Bitmap Copy!");
+					return FALSE;
 				}
 				else
 				{
@@ -2704,12 +2705,9 @@
 
 	IncludeChildrensBoundingRects(&br);
 	
-PORTNOTE("other","Removed BevelTool from NodeBevel::GetBlobBoundingRect");
-#ifndef EXCLUDE_FROM_XARALX
 	// is the bevel tool active ?
 	if (Tool::GetCurrentID() != TOOLID_BEVELTOOL || !BevelTool::AmActive())
 		return br;
-#endif
 
 	DocRect BlobRect;
 
@@ -3623,15 +3621,12 @@
 	if (allowed && pOp)
 	{
 		// disallow mould and contour Ops.
-PORTNOTE("other","Removed opCreateNewMould, OpPasteEnvelope, OpPastePerspective, OpCreateContour from NodeBevel::GetBlobBoundingRect");
-#ifndef EXCLUDE_FROM_XARALX
 		if ( pOp->IsKindOf(CC_RUNTIME_CLASS(OpCreateNewMould)) ||
 			 pOp->IsKindOf(CC_RUNTIME_CLASS(OpPasteEnvelope)) ||
 			 pOp->IsKindOf(CC_RUNTIME_CLASS(OpPastePerspective)) ||
 			 pOp->IsKindOf(CC_RUNTIME_CLASS(OpCreateContour))
 			)
 			allowed = FALSE;
-#endif
 
 		if( (pOp->IsKindOf(CC_RUNTIME_CLASS(OpEditFill)) ||
 			 pOp->IsKindOf(CC_RUNTIME_CLASS(OpApplyAttribToSelected))) &&
Index: Trunk/XaraLX/Kernel/nodecntr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecntr.cpp	(revision 1117)
+++ Trunk/XaraLX/Kernel/nodecntr.cpp	(revision 1118)
@@ -114,15 +114,15 @@
 #include "lineattr.h"
 #include "blobs.h"
 #include "objchge.h"
-//#include "opbevel.h"
+#include "opbevel.h"
 #include "ophist.h"
 #include "nodeblnd.h"
 #include "ndbldpth.h"
 #include "csrstack.h"
 #include "ppbevel.h"
-//#include "opcntr.h"
+#include "opcntr.h"
 #include "nodetxts.h"
-//#include "moldtool.h"
+#include "moldtool.h"
 #include "extender.h"
 //#include "mario.h"
 #include "rsmooth.h"
@@ -1923,14 +1923,11 @@
 		// ok, test for ops which we don't allow.
 		if(pOp != NULL)
 		{
-PORTNOTE("other","Removed OpCreateBevel, OpCreateNewMould, OpPasteEnvelope, OpPastePerspective usage")
 			if(
-#ifndef EXCLUDE_FROM_XARALX
 				pOp->IS_KIND_OF(OpCreateBevel) ||
 				pOp->IS_KIND_OF(OpCreateNewMould) ||
 				pOp->IS_KIND_OF(OpPasteEnvelope) ||
 				pOp->IS_KIND_OF(OpPastePerspective) ||
-#endif
 				false )
 			{
 				allowed = FALSE;
Index: Trunk/XaraLX/Kernel/nodecont.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecont.cpp	(revision 1117)
+++ Trunk/XaraLX/Kernel/nodecont.cpp	(revision 1118)
@@ -409,8 +409,6 @@
 	// ok, Shadows dislike certain types of Op.
 	if (pChangeOp != NULL)
 	{
-PORTNOTE("other", "Removed use of OpCreateNewMould and OpRemoveBlend from NodeShadowController::AllowOp")
-#if !defined(EXCLUDE_FROM_XARALX)
 		// no direct moulding, please.
 		if (pChangeOp->IS_KIND_OF(OpCreateNewMould))
 		{
@@ -429,7 +427,6 @@
 				allowed = FALSE;
 			}
 		}
-#endif
 	}
 
 	else if (	pParam->GetChangeFlags().MultiReplaceNode && 


Xara