diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-16 15:12:54 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-16 20:30:57 +0100 |
| commit | 286e2f5c6ec829bc0987b1be7016699f7ef03e5e (patch) | |
| tree | 2fc69714c8ed08cb0827b09b27585676d21ddd21 /sw/source | |
| parent | c454a0cd0cc7b315b1353b151a2e95654df72c69 (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.
Change-Id: I4e7d3490674c5f86bec5c7c6e1c975dcafd7c265
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index f9cbb9cf016b..c6013af64a99 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -581,6 +581,10 @@ bool SwGrfNode::SwapIn( bool bWaitForData ) { bRet = ImportGraphic( *pStrm ); delete pStrm; + if( bRet ) + { + maGrfObj.SetUserData(); + } } } catch (const uno::Exception&) |