ooo-build r12678 - in trunk: . patches/emf+

[strba svn gnome org]

Author: strba
Date: Tue May 27 11:20:58 2008
New Revision: 12678
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12678&view=rev

Log:
fix build in cppcanvas

Modified:
   trunk/ChangeLog
   trunk/patches/emf+/emf+-multipart-objects.diff

Modified: trunk/patches/emf+/emf+-multipart-objects.diff
==============================================================================
--- trunk/patches/emf+/emf+-multipart-objects.diff	(original)
+++ trunk/patches/emf+/emf+-multipart-objects.diff	Tue May 27 11:20:58 2008
@@ -29,7 +29,7 @@
              {
                  sal_uInt32 header, unknown;
  
-+                dumpWords(s, 16);
++                EMFP_DEBUG (dumpWords(s, 16));
 +
                  s >> header >> type;
  
@@ -117,7 +117,7 @@
 +                        mMFlags = flags;
 +                        mMStream.Seek(0);
 +                    }
-+                    dumpWords(rMF, 16);
++                    EMFP_DEBUG (dumpWords(rMF, 16));
 +                    // 1st 4 bytes are unknown
 +                    mMStream.Write (((const char *)rMF.GetData()) + rMF.Tell() + 4, dataSize - 4);
 +                    EMFP_DEBUG (printf ("EMF+ read next object part size: %d type: %04hx flags: %04hx data size: %d\n", size, type, flags, dataSize));