[Libreoffice-commits] core.git: vcl/source

[Tomaž Vajngerl]

 vcl/source/gdi/impgraph.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 075e2d8b8d98b1c6daa430e9b9a396b15ba22837
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue Feb 13 21:26:40 2018 +0900

    graphic: Remember the origin URL after swap out - swap in
    
    Change-Id: I3874fb43d1b545b334cb7e69fe119945d127f380
    Reviewed-on: https://gerrit.libreoffice.org/49646
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 0e4ecc354ed1..2f2d5956ae23 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -61,7 +61,8 @@ using namespace com::sun::star;
 
 struct ImpSwapFile
 {
-    INetURLObject   aSwapURL;
+    INetURLObject aSwapURL;
+    OUString maOriginURL;
     ~ImpSwapFile();
 };
 
@@ -1200,6 +1201,7 @@ bool ImpGraphic::ImplSwapOut()
                 {
                     mpSwapFile = o3tl::make_unique<ImpSwapFile>();
                     mpSwapFile->aSwapURL = aTmpURL;
+                    mpSwapFile->maOriginURL = getOriginURL();
                 }
                 else
                 {
@@ -1297,7 +1299,7 @@ bool ImpGraphic::ImplSwapIn()
 
                 bRet = ImplSwapIn( xIStm.get() );
                 xIStm.reset();
-
+                setOriginURL(mpSwapFile->maOriginURL);
                 mpSwapFile.reset();
             }
         }