diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-02-13 21:26:40 +0900 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-06-01 08:59:06 +0200 |
| commit | a106bcc2b3930a79d0105a38baf1ca03d9332afd (patch) | |
| tree | 22e531178c5729390fe382681e652ff67cbc43a3 /vcl | |
| parent | 3de02c93388edc8ecdaa92f8ed3b5c7225142a4c (diff) | |
graphic: Remember the origin URL after swap out - swap in
Change-Id: I3874fb43d1b545b334cb7e69fe119945d127f380
Reviewed-on: https://gerrit.libreoffice.org/49646
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 075e2d8b8d98b1c6daa430e9b9a396b15ba22837)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 471f15ebbce6..0408044a1d14 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -60,7 +60,8 @@ using namespace com::sun::star; struct ImpSwapFile { - INetURLObject aSwapURL; + INetURLObject aSwapURL; + OUString maOriginURL; ~ImpSwapFile(); }; @@ -1199,6 +1200,7 @@ bool ImpGraphic::ImplSwapOut() { mpSwapFile = o3tl::make_unique<ImpSwapFile>(); mpSwapFile->aSwapURL = aTmpURL; + mpSwapFile->maOriginURL = getOriginURL(); } else { @@ -1296,7 +1298,7 @@ bool ImpGraphic::ImplSwapIn() bRet = ImplSwapIn( xIStm.get() ); xIStm.reset(); - + setOriginURL(mpSwapFile->maOriginURL); mpSwapFile.reset(); } } |