[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 1617
Date       : Mon Jul 31 10:35:29 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/cxfile.cpp
   M /Trunk/XaraLX/xarlib/ExpandXar/expandxar.cpp

Fixed some XarLib/ExpandXar issues, more to follow


Diff:
Index: Trunk/XaraLX/Kernel/cxfile.cpp
===================================================================
--- Trunk/XaraLX/Kernel/cxfile.cpp	(revision 1616)
+++ Trunk/XaraLX/Kernel/cxfile.cpp	(revision 1617)
@@ -1493,7 +1493,9 @@
 	{
 		WriteToRecord = FALSE;
 
+#if !defined(EXCLUDE_FROM_XARLIB)
 		ERROR3IF(!pRecord->IsDataSectionFull(),"Data section of the record has not been filled");
+#endif
 
 		if (ok) ok = Write(pRecord->GetTag());
 		if (ok) ok = Write(pRecord->GetSize());
@@ -1629,7 +1631,9 @@
 
 	BOOL ok = EndRecord();
 
+#if !defined(EXCLUDE_FROM_XARLIB)
 	ERROR3IF(!pRecord->IsDataSectionFull(),"Data section of the record has not been filled");
+#endif
 
 	if (ok) ok = Write(pRecord->GetTag());
 	if (ok) ok = Write(pRecord->GetSize());
Index: Trunk/XaraLX/xarlib/ExpandXar/expandxar.cpp
===================================================================
--- Trunk/XaraLX/xarlib/ExpandXar/expandxar.cpp	(revision 1616)
+++ Trunk/XaraLX/xarlib/ExpandXar/expandxar.cpp	(revision 1617)
@@ -125,6 +125,8 @@
 	INT32 ThisNum = pRecord->GetRecordNumber();
 	INT32 ThisTag = pRecord->GetTag();
 
+	TRACE(_T("HandleRecord %d - %d"), ThisNum, ThisTag);
+
 	// While this record isn't the one we should be writing
 	while (pData->NextRecord < ThisNum)
 	{
@@ -164,7 +166,7 @@
 		(pData->NextRecord)++;
 	}
 
-	return(S_OK);
+	return(TRUE);
 }
 
 


Xara