diff options
| author | Thorsten Behrens <tbehrens-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> | 2011-10-21 11:14:32 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-10-21 12:57:59 +0200 |
| commit | 1191c474bdf21fda5e8b8ced6b0b50286dea2391 (patch) | |
| tree | e91dd9b72e88870e96c4f94b7a370ffc99798b28 | |
| parent | 0f5a2ad6aca673c43abb7228df9e80e2eac3c372 (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.
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -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 e51a2680ce..56d0643bfc 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1299,8 +1299,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() ); |