diff options
| author | Armin Le Grand <alg@apache.org> | 2014-01-17 01:37:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-17 10:44:54 +0000 |
| commit | 87432aeecdfa7194bb5050f912656e03294cf6c7 (patch) | |
| tree | d7b46486fc883e3dade21784657dca9b43308a33 /sfx2 | |
| parent | ad1390b8c278ee43430296b35d748cb8cdd4625b (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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/fileobj.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 4ab7ec916a8b..13dbfc27354c 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -324,7 +324,9 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) else if( !pDownLoadData ) { pStream->Seek( STREAM_SEEK_TO_BEGIN ); - nRes = rGF.ImportGraphic( rGrf, aEmptyStr, *pStream, nFilter ); + + // #i123042# for e.g. SVG the path is needed, see same TaskID in svx for more info + nRes = rGF.ImportGraphic( rGrf, sFileNm, *pStream, nFilter ); } else { |