[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 1400
Date       : Mon Jul  3 10:30:44 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmplist.cpp

Fixed IsUsedInDocument to not always return FALSE


Diff:
Index: Trunk/XaraLX/Kernel/bmplist.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmplist.cpp	(revision 1399)
+++ Trunk/XaraLX/Kernel/bmplist.cpp	(revision 1400)
@@ -559,8 +559,6 @@
 
 BOOL GlobalBitmapList::IsUsedInDocument(Document * pDoc, OILBitmap* pOILBmp)
 {
-	PORTNOTETRACE("other","GlobalBitmapList::IsUsedInDocument - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
 	ERROR2IF(pDoc == NULL || pOILBmp == NULL,FALSE,"GlobalBitmapList::IsUsedInDocument Bad params!");
 	
 	// Get the bitmap list for the specified document
@@ -579,6 +577,8 @@
 				return TRUE;
 			}
 
+PORTNOTETRACE("other","GlobalBitmapList::IsUsedInDocument - skip XPE master bit");
+#ifndef EXCLUDE_FROM_XARALX
 			// Check whether this bitmap is an XPE master
 			if (pBmp->ActualBitmap)
 			{
@@ -588,11 +588,11 @@
 				if (pMaster == pOILBmp)
 					return TRUE;
 			}
+#endif
 
 			pKBmp = pBitmaps->GetNext(pKBmp);
 		}
 	}
-#endif
 
 	// Bitmap not found and so return FALSE
 	return FALSE;


Xara