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/vcl/vectorgraphicdata.hxx | |
| parent | cfe47d035822ab4a46e1d34e26e383a45b9adddd (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 'include/vcl/vectorgraphicdata.hxx')
| -rw-r--r-- | include/vcl/vectorgraphicdata.hxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx index 6a259a5567e3..a045b01ee46e 100644 --- a/include/vcl/vectorgraphicdata.hxx +++ b/include/vcl/vectorgraphicdata.hxx @@ -23,6 +23,7 @@ #include <basegfx/range/b2drange.hxx> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <vcl/bitmapex.hxx> +#include <vcl/wmfexternal.hxx> #include <rtl/ustring.hxx> #include <deque> @@ -57,12 +58,14 @@ private: // on demand created content basegfx::B2DRange maRange; - std::deque< css::uno::Reference< css::graphic::XPrimitive2D > > - maSequence; + std::deque< css::uno::Reference< css::graphic::XPrimitive2D > > maSequence; BitmapEx maReplacement; size_t mNestedBitmapSize; VectorGraphicDataType meVectorGraphicDataType; + // extra: + WmfExternal* mpExternalHeader; + // on demand creators void ensureReplacement(); void ensureSequenceAndRange(); @@ -78,10 +81,14 @@ public: VectorGraphicData( const OUString& rPath, VectorGraphicDataType eVectorDataType); + ~VectorGraphicData(); /// compare op bool operator==(const VectorGraphicData& rCandidate) const; + /// special: needed for emf/wmf, maybe replaced by scaling the result later (?) + void setWmfExternalHeader(const WmfExternal& aExtHeader); + /// data read const VectorGraphicDataArray& getVectorGraphicDataArray() const { return maVectorGraphicDataArray; } sal_uInt32 getVectorGraphicDataArrayLength() const { return maVectorGraphicDataArray.getLength(); } |