RTF import: partly fixed the WMF images scaling.

2 files changed, 30 insertions, 24 deletions

diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index da3a7cb036c8..7defa39b48a5 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.hxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-struct WMF_APMFILEHEADER;
+struct WMF_EXTERNALHEADER;
 // -----------------------
 // - GraphicFilter-Types -
 // -----------------------
@@ -347,14 +347,14 @@ public:
                                    SvStream& rStream,
                                    sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW,
                                    sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0,
-                                   WMF_APMFILEHEADER *pAPMHeader = NULL );
+                                   WMF_EXTERNALHEADER *pExtHeader = NULL );
 
     sal_uInt16          ImportGraphic( Graphic& rGraphic, const String& rPath,
                                    SvStream& rStream,
                                    sal_uInt16 nFormat,
                                    sal_uInt16 * pDeterminedFormat, sal_uInt32 nImportFlags,
                                    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData,
-                                   WMF_APMFILEHEADER *pAPMHeader = NULL );
+                                   WMF_EXTERNALHEADER *pExtHeader = NULL );
 
     sal_Bool            Setup( sal_uInt16 nFormat );
 
diff --git a/svtools/inc/svtools/wmf.hxx b/svtools/inc/svtools/wmf.hxx
index a455f443e26e..986ccfb0d785 100644
--- a/svtools/inc/svtools/wmf.hxx
+++ b/svtools/inc/svtools/wmf.hxx
@@ -32,30 +32,36 @@
 #include "svtools/svtdllapi.h"
 #include <svtools/fltcall.hxx>
 
-struct WMF_APMFILEHEADER {
-  sal_uInt32 key;
-  sal_uInt16 hmf;
-  sal_uInt16 left;
-  sal_uInt16 top;
-  sal_uInt16 right;
-  sal_uInt16 bottom;
-  sal_uInt16 inch;
-  sal_uInt32 reserved;
-  sal_uInt16 checksum;
+struct WMF_EXTERNALHEADER
+{
+    sal_uInt16 xExt;
+    sal_uInt16 yExt;
 
-  WMF_APMFILEHEADER() : key(0x9ac6cdd7L),
-            hmf(0),
-            left(0),
-            top(0),
-            right(0),
-            bottom(0),
-            inch(96),
-            reserved(0),
-            checksum(0) {
-  }
+    /** One of the following values:
+        <ul>
+            <li>MM_TEXT</li>
+            <li>MM_LOMETRIC</li>
+            <li>MM_HIMETRIC</li>
+            <li>MM_LOENGLISH</li>
+            <li>MM_HIENGLISH</li>
+            <li>MM_TWIPS</li>
+            <li>MM_ISOTROPIC</li>
+            <li>MM_ANISOTROPIC</li>
+        </ul>
+        If this value is 0, then no external mapmode has been defined,
+        the internal one should then be used.
+     */
+    sal_uInt16 mapMode;
+
+    WMF_EXTERNALHEADER() :
+        xExt( 0 ),
+        yExt( 0 ),
+        mapMode( 0 )
+    {
+    }
 };
 
-sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_APMFILEHEADER *pAPMHeader = NULL );
+sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_EXTERNALHEADER *pExtHeader = NULL );
 
 SVT_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem );