diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-10-19 13:25:35 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-10-21 12:05:07 +0200 |
| commit | 716c052a1c62d5acacab202e8f0ee88b4f70d8c2 (patch) | |
| tree | d5cb8d6e835720aad0bb64c684f34a8bdc9b706a /svtools | |
| parent | 8ee4e99a78a7a7f16bafa56e08ef9649cc69dbdb (diff) | |
Fix fdo#41995 - true embedding of svg images.
Previously, svg images were always wrapped as .svm metafiles with
a preview graphic. Sucks for interop - so now, we save true svgs
at least for bleeding edge extended odf1.2
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter/filter.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index 5c9edab78ea9..226b48d6b8d3 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -1501,17 +1501,14 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, GDIMetaFile aSVGMtf; if( 0 == aSVGReader.Read( aSVGMtf ).GetActionSize() ) + { nStatus = GRFILTER_FILTERERROR; + } else + { rGraphic = Graphic( aSVGMtf ); - - // Dont set any GfxLink here, since the MetaRenderGraphicAction - // inside the just read MetaFile contains excatly this native data; - // setting a ǴfxLink would also affect other program parts, since - // GfxLinks are preferably written to the file format in general, - // which would be a bad idea in case of SVG files, since earlier - // implementations are not able to handle native SVG data in any - // case. (KA 01/19/2011) + eLinkType = GFX_LINK_TYPE_NATIVE_SVG; + } } else if( aFilterName.EqualsIgnoreCaseAscii( IMP_XBM ) ) { |