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 /svtools/source | |
| 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 'svtools/source')
| -rw-r--r-- | svtools/source/graphic/provider.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 6e3e7e930ed5..44dc8de4981b 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -412,11 +412,11 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co ::Graphic aVCLGraphic; // Define APM Header if goal height and width are defined - WMF_EXTERNALHEADER aExtHeader; + WmfExternal aExtHeader; aExtHeader.xExt = nExtWidth; aExtHeader.yExt = nExtHeight; aExtHeader.mapMode = nExtMapMode; - WMF_EXTERNALHEADER *pExtHeader = nullptr; + WmfExternal *pExtHeader = nullptr; if ( nExtMapMode > 0 ) pExtHeader = &aExtHeader; |