diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-16 21:38:11 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-23 14:32:27 +0100 |
| commit | 621bf6f5fb606ece58057147683410d784afe954 (patch) | |
| tree | 40f05051dfaa12e9a5fd9563032bf7638963def2 /svx | |
| parent | a795971ed59fa742bd07e0adb7a7c6026a42d8fd (diff) | |
Related fdo#82953: Forget package URL of image after it is loaded
It causes problems if we handle those imported images differently which
are identified by a package URL, so after the first load remove
this URL and handle images on the same way as inserted images.
Some related bugs:
* #i44367#
* #i124946#
* #i114361#
* fdo#73270
The image in the test document has a special ID which is different
from that one which is generated by LO internally so after ODF export
the new generated image URL is different from the imported one.
(cherry picked from commit 286e2f5c6ec829bc0987b1be7016699f7ef03e5e)
Change-Id: Ic80adf76c72123af8e89ca3daa4dfa57d7c362a6
Reviewed-on: https://gerrit.libreoffice.org/12503
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5a9496f8e541..fcc9d14a1306 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1374,7 +1374,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) const OUString aNewUserData( pGraphic->GetUserData() ); pGraphic->SetGraphic( aGraphic ); - pGraphic->SetUserData( aNewUserData ); + pGraphic->SetUserData(); // Graphic successfully swapped in. pRet = GRFMGR_AUTOSWAPSTREAM_LOADED; |