diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-10-21 11:10:29 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-10-21 12:06:17 +0200 |
| commit | f3c43171f8e9e04c4a6e6f5833fbe1a0ef098d2b (patch) | |
| tree | 946b513de52fe70d0b8351ee4563cd6afbe0debe /svx | |
| parent | 1d9c6bc38089dbb52931e54493c39e4e33309a90 (diff) | |
Fix fdo#41995 fallout - recognize .svg in odf container
Seems the graphic load code is stupid and not using the path name /
file extension to guess file type, but only "magic byte" detection.
Giving filter framework the path now, so that .svg actually loads.
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index ff24d2a0fc1b..d1eadd0481b0 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1286,8 +1286,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) mbIsPreview = sal_True; } - if( !GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *pStream, - GRFILTER_FORMAT_DONTKNOW, NULL, 0, pFilterData ) ) + if( !GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, + aStreamInfo.maUserData, + *pStream, + GRFILTER_FORMAT_DONTKNOW, + NULL, 0, pFilterData ) ) { const String aUserData( pGraphic->GetUserData() ); |