diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-06-16 17:16:22 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-07-15 11:01:30 +0200 |
| commit | 783269e91e2166357a9fb095e64a1d48e6f0601a (patch) | |
| tree | a91bb0d9ee76564ed44415b62a606da7f0d24a8a /include/drawinglayer | |
| parent | emfplus: more streamlining of metafile importer (diff) | |
| download | core-783269e91e2166357a9fb095e64a1d48e6f0601a.tar.gz core-783269e91e2166357a9fb095e64a1d48e6f0601a.zip | |
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 'include/drawinglayer')
| -rw-r--r-- | include/drawinglayer/primitive2d/metafileprimitive2d.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index 0d1503809a81..e849e38b5752 100644 --- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -25,6 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/gdimtf.hxx> +#include <vcl/gdimetafiletools.hxx> // MetafilePrimitive2D class @@ -53,7 +54,7 @@ namespace drawinglayer have many advantages; Metafile would no longer have to be rendered by sub-systems and a standard way for converting Metafiles would exist. */ - class DRAWINGLAYER_DLLPUBLIC MetafilePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MetafilePrimitive2D : public BufferedDecompositionPrimitive2D, public MetafileAccessor { private: /// the geometry definition @@ -81,6 +82,9 @@ namespace drawinglayer /// get range virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; + /// from MetafileAccessor + virtual bool accessMetafile(GDIMetaFile& rTargetMetafile) const; + /// provide unique ID DeclPrimitive2DIDBlock() }; |