diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-06-16 12:09:22 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-07-15 11:01:30 +0200 |
| commit | cfe47d035822ab4a46e1d34e26e383a45b9adddd (patch) | |
| tree | 0d4f2974d8346eeb5345fca0d1f5f865b10eb627 /emfio/inc | |
| parent | a3f09ab5b0ad192d62a1df6126726e4c3ffa3e0a (diff) | |
emfplus: more streamlining of metafile importer
Change-Id: Ice0f779f8026983fd0884c2a02e9fd7220b498dc
Diffstat (limited to 'emfio/inc')
| -rw-r--r-- | emfio/inc/mtftools.hxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index 9565df89cfe1..e2dc6830e1dd 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -20,18 +20,12 @@ #ifndef INCLUDED_EMFIO_INC_MTFTOOLS_HXX #define INCLUDED_EMFIO_INC_MTFTOOLS_HXX -#include <memory> -#include <sal/config.h> - -//#include <vcl/graph.hxx> #include <basegfx/tools/b2dclipstate.hxx> #include <tools/poly.hxx> #include <vcl/font.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> -//#include <vcl/bitmapaccess.hxx> #include <vcl/lineinfo.hxx> -//#include <vcl/fltcall.hxx> #include <o3tl/make_unique.hxx> #include <vcl/outdevstate.hxx> #include <vcl/FilterConfigItem.hxx> @@ -239,15 +233,11 @@ namespace emfio #define BS_DIBPATTERN8X8 8 #define BS_MONOPATTERN 9 - -#define RDH_RECTANGLES 1 - +#define RDH_RECTANGLES 1 #define W_MFCOMMENT 15 - #define PRIVATE_ESCAPE_UNICODE 2 //Scalar constants - #define UNDOCUMENTED_WIN_RCL_RELATION 32 #define MS_FIXPOINT_BITCOUNT_28_4 4 #define HUNDREDTH_MILLIMETERS_PER_MILLIINCH 2.54 @@ -503,7 +493,7 @@ namespace emfio GDIMetaFile* mpGDIMetaFile; - SvStream* mpWMF; // the WMF/EMF file to be read + SvStream* mpInputStream; // the WMF/EMF file to be read sal_uInt32 mnStartPos; sal_uInt32 mnEndPos; std::vector<std::unique_ptr<BSaveStruct>> maBmpSaveList; |