diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-02-13 21:26:40 +0900 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-05-22 12:17:00 +0200 |
| commit | 011ffe09647ef67c13380f12691c785902aed9a3 (patch) | |
| tree | 73be6107aad7d2e702857196de243be5e83f19ca /vcl | |
| parent | a5467f5f5c3d56290fce772ab58ffd1902fa60a7 (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 ff0dec72bfe5..b061774f1137 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(); }; @@ -1174,6 +1175,7 @@ bool ImpGraphic::ImplSwapOut() { mpSwapFile = o3tl::make_unique<ImpSwapFile>(); mpSwapFile->aSwapURL = aTmpURL; + mpSwapFile->maOriginURL = getOriginURL(); } else { @@ -1271,7 +1273,7 @@ bool ImpGraphic::ImplSwapIn() bRet = ImplSwapIn( xIStm.get() ); xIStm.reset(); - + setOriginURL(mpSwapFile->maOriginURL); mpSwapFile.reset(); } } |