[ooo-build-commit] .: patches/emf+

[Cédric Bosdonnat]

 patches/emf+/emf+-svtools.diff                  |    2 +-
 patches/emf+/emf+-use-canvas-only-for-emf+.diff |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ed67492d8b0a3c366811251bf7447053dd2cbdc4
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri May 21 16:07:56 2010 +0200

    Fixed SvMemoryStream::GetSize() being now private.
    
    * patches/emf+/emf+-svtools.diff:
    * patches/emf+/emf+-use-canvas-only-for-emf+.diff:

diff --git a/patches/emf+/emf+-svtools.diff b/patches/emf+/emf+-svtools.diff
index d737ed5..631fb6f 100644
--- a/patches/emf+/emf+-svtools.diff
+++ b/patches/emf+/emf+-svtools.diff
@@ -225,7 +225,7 @@ index 8416bb7..4a2fa7b 100644
 +    // rotate and scale operations
 +    mem << one << zero << zero << one << zero << zero;
 +
-+    mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS_HEADER_INFO", 0, (const BYTE*) mem.GetData(), mem.GetSize() ) );
++    mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS_HEADER_INFO", 0, (const BYTE*) mem.GetData(), mem.GetEndOfData() ) );
 +}
 +
 +void WinMtfOutput::PassEMFPlus( void* pBuffer, UINT32 nLength )
diff --git a/patches/emf+/emf+-use-canvas-only-for-emf+.diff b/patches/emf+/emf+-use-canvas-only-for-emf+.diff
index 5acd52e..667d297 100644
--- a/patches/emf+/emf+-use-canvas-only-for-emf+.diff
+++ b/patches/emf+/emf+-use-canvas-only-for-emf+.diff
@@ -16,7 +16,7 @@ index 4a2fa7b..ba8efff 100644
 @@ -2256,6 +2256,7 @@ void WinMtfOutput::PassEMFPlusHeaderInfo()
      mem << one << zero << zero << one << zero << zero;
  
-     mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS_HEADER_INFO", 0, (const BYTE*) mem.GetData(), mem.GetSize() ) );
+     mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS_HEADER_INFO", 0, (const BYTE*) mem.GetData(), mem.GetEndOfData() ) );
 +    mpGDIMetaFile->UseCanvas( TRUE );
  }