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/oox | |
| 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/oox')
| -rw-r--r-- | include/oox/helper/graphichelper.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index 651e9407b4ec..545bdd0fd938 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -33,7 +33,7 @@ #include <sal/types.h> #include <com/sun/star/graphic/XGraphicProvider2.hpp> -struct WMF_EXTERNALHEADER; +struct WmfExternal; namespace com { namespace sun { namespace star { namespace awt { struct Point; } @@ -113,7 +113,7 @@ public: css::uno::Reference< css::graphic::XGraphic > importGraphic( const css::uno::Reference< css::io::XInputStream >& rxInStrm, - const WMF_EXTERNALHEADER* pExtHeader = nullptr ) const; + const WmfExternal* pExtHeader = nullptr ) const; /** Imports graphics from the passed input streams. */ std::vector< css::uno::Reference<css::graphic::XGraphic> > @@ -127,7 +127,7 @@ public: css::uno::Reference< css::graphic::XGraphic > importEmbeddedGraphic( const OUString& rStreamName, - const WMF_EXTERNALHEADER* pExtHeader = nullptr ) const; + const WmfExternal* pExtHeader = nullptr ) const; /** Imports graphics from the storage with the passed stream names. */ void importEmbeddedGraphics(const std::vector<OUString>& rStreamNames) const; @@ -141,7 +141,7 @@ public: @return The URL of the created and internally cached graphic object. */ OUString importGraphicObject( const css::uno::Reference< css::io::XInputStream >& rxInStrm, - const WMF_EXTERNALHEADER* pExtHeader ) const; + const WmfExternal* pExtHeader ) const; /** Creates a persistent graphic object from the passed binary memory block. @return The URL of the created and internally cached graphic object. */ |