diff options
Diffstat (limited to 'svtools/inc/svtools')
| -rw-r--r-- | svtools/inc/svtools/filter.hxx | 7 | ||||
| -rw-r--r-- | svtools/inc/svtools/wmf.hxx | 25 |
2 files changed, 29 insertions, 3 deletions
diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx index 105783013bdc..36211616dd4a 100644 --- a/svtools/inc/svtools/filter.hxx +++ b/svtools/inc/svtools/filter.hxx @@ -39,6 +39,7 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> +struct WMF_APMFILEHEADER; // ----------------------- // - GraphicFilter-Types - // ----------------------- @@ -341,13 +342,15 @@ public: sal_uInt16 ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rStream, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); + sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 + , WMF_APMFILEHEADER *pAPMHeader = 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 ); + com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData + , WMF_APMFILEHEADER *pAPMHeader = NULL); sal_Bool Setup( sal_uInt16 nFormat ); diff --git a/svtools/inc/svtools/wmf.hxx b/svtools/inc/svtools/wmf.hxx index be1852701f33..3c1f07774a45 100644 --- a/svtools/inc/svtools/wmf.hxx +++ b/svtools/inc/svtools/wmf.hxx @@ -32,7 +32,30 @@ #include "svtools/svtdllapi.h" #include <svtools/fltcall.hxx> -sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL ); +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; + + WMF_APMFILEHEADER() : key(0x9ac6cdd7L), + hmf(0), + left(0), + top(0), + right(0), + bottom(0), + inch(96), + reserved(0), + checksum(0) { + } +}; + +sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_APMFILEHEADER *pAPMHeader = NULL ); SVT_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); |