summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2014-01-17 01:37:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-17 10:44:54 +0000
commit87432aeecdfa7194bb5050f912656e03294cf6c7 (patch)
treed7b46486fc883e3dade21784657dca9b43308a33 /svx/source/svdraw
parentad1390b8c278ee43430296b35d748cb8cdd4625b (diff)
Resolves: #i123042# corrected reload of linked content...
to have access to its own path (cherry picked from commit bc89d402b3df00c2402ac86896eb2ce4c3f7b7d0) Conflicts: sfx2/source/appl/fileobj.cxx svgio/source/svgreader/svgimagenode.cxx svx/source/svdraw/svdograf.cxx Change-Id: I4f3e98588f17b4271465359a7f56f9845029e012
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svdograf.cxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index ff644a5f0276..58955ef4b738 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -119,7 +119,6 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a
? rGF.GetImportFormatNumber( aFilterName )
: GRFILTER_FORMAT_DONTKNOW;
- OUString aEmptyStr;
css::uno::Sequence< css::beans::PropertyValue > aFilterData( 1 );
// TODO: Room for improvement:
@@ -127,8 +126,15 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a
// But this link is required by some filters to access the native graphic (PDF export/MS export),
// there we should create a new service to provide this data if needed
aFilterData[ 0 ].Name = "CreateNativeLink";
- aFilterData[ 0 ].Value = Any( true );
- rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData );
+ aFilterData[ 0 ].Value = Any( sal_True );
+
+ // #i123042# for e.g SVG the path is needed, so hand it over here. I have no real idea
+ // what consequences this may have; maybe this is not handed over by purpose here. Not
+ // handing it over means that any GraphicFormat that internallv needs a path as base
+ // to interpret included links may fail.
+ // Alternatively the path may be set at the result after this call when it is known
+ // that it is a SVG graphic, but only because noone yet tried to interpret it.
+ rGF.ImportGraphic( aGraphic, aFileName, *pInStrm, nFilter, NULL, 0, &aFilterData );
}
return aGraphic;
}