summaryrefslogtreecommitdiff
path: root/emfio/inc/wmfreader.hxx
diff options
context:
space:
mode:
authorArmin Le Grand <Armin.Le.Grand@cib.de>2017-06-16 17:16:22 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-07-15 11:01:30 +0200
commit783269e91e2166357a9fb095e64a1d48e6f0601a (patch)
treea91bb0d9ee76564ed44415b62a606da7f0d24a8a /emfio/inc/wmfreader.hxx
parentcfe47d035822ab4a46e1d34e26e383a45b9adddd (diff)
emfplus: completed isolation/migration of Emf/Wmf
Decided to keep the migrated/isolated Emf/Wmf reader which are now hidden behind a Uno Api. Had to re-implement WMF_EXTERNALHEADER (now WmfExternal, own file/header) to not break anything. It *seems* to just scale something and could be done after import, but I could not be sure. Also needed a callback hook to allow getting the Metafile out of a MetafilePrimitive in a lower module (vcl relative to drawinglayer) which is needed as long as primitives are not completely on Uno Api. Deleted all Emf/Wmf reader stuff from vcl. Change-Id: Ic5540defa8ec770728280df4df3f12e1f48cfc3a
Diffstat (limited to 'emfio/inc/wmfreader.hxx')
-rw-r--r--emfio/inc/wmfreader.hxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/emfio/inc/wmfreader.hxx b/emfio/inc/wmfreader.hxx
index e0566bb95cfb..1cd6077b05d8 100644
--- a/emfio/inc/wmfreader.hxx
+++ b/emfio/inc/wmfreader.hxx
@@ -23,6 +23,9 @@
#include <mtftools.hxx>
#include <tools/stream.hxx>
+// predefines
+struct WmfExternal;
+
namespace emfio
{
class WmfReader : public MtfTools
@@ -46,6 +49,9 @@ namespace emfio
sal_uInt32 mnSkipActions;
sal_uInt32 mnCurrentAction;
+ // eventually handed over external header
+ const WmfExternal* mpExternalHeader;
+
// reads header of the WMF-Datei
bool ReadHeader();
@@ -59,7 +65,7 @@ namespace emfio
void GetPlaceableBound(tools::Rectangle& rSize, SvStream* pStrm);
public:
- WmfReader(SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile);
+ WmfReader(SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, const WmfExternal* pExternalHeader);
// read WMF file from stream and fill the GDIMetaFile
void ReadWMF();