[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/wmf-mm-text.diff |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8d90fa86ed66bbdd4dd1be9beb30bf2f32e9f21c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 14:45:33 2011 +0300

    Make wmf-mm-text.diff apply again

diff --git a/patches/dev300/wmf-mm-text.diff b/patches/dev300/wmf-mm-text.diff
index 6f997b3..5d5d356 100644
--- a/patches/dev300/wmf-mm-text.diff
+++ b/patches/dev300/wmf-mm-text.diff
@@ -65,7 +65,7 @@ index 51ec483..541fbef 100644
  
          sal_uInt32			mnGfxMode;
          sal_uInt32          mnMapMode;
-+    UINT16			mnUnitsPerInch;
++    sal_uInt16			mnUnitsPerInch;
 +
          XForm				maXForm;
          sal_Int32			mnDevOrgX, mnDevOrgY;
@@ -74,9 +74,9 @@ index 51ec483..541fbef 100644
  
          sal_uInt32			GetMapMode() const { return mnMapMode; };
          void                SetMapMode( sal_uInt32 mnMapMode );
-+    void SetUnitsPerInch( UINT16 nUnitsPerInch );
++    void SetUnitsPerInch( sal_uInt16 nUnitsPerInch );
          void				SetWorldTransform( const XForm& rXForm );
-         void				ModifyWorldTransform( const XForm& rXForm, UINT32 nMode );
+         void				ModifyWorldTransform( const XForm& rXForm, sal_uInt32 nMode );
  
 diff --git svtools/source/filter.vcl/wmf/winwmf.cxx svtools/source/filter.vcl/wmf/winwmf.cxx
 index 1a70555..9f86995 100644