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

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Tue Feb 13 19:30:12 UTC 2018


 svtools/source/graphic/grfcache.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 406004d3f58457a46107f84ec1f902e92364ba2e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue Feb 13 21:36:01 2018 +0900

    pass originURL to the substitue graphic - work-around
    
    We need to pretend that the substitue graphic has a originURL of
    the original for now. Once Graphic will handle all the swapping
    and substitution this won't be necessary anymore.
    
    Change-Id: I9590b741c94d06d1b484273cc4ba5517951b77ec
    Reviewed-on: https://gerrit.libreoffice.org/49647
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 91668a3956a4..430c2318888b 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -305,7 +305,9 @@ void GraphicCacheEntry::AddGraphicObjectReference( const GraphicObject& rObj, Gr
     if( mbSwappedAll )
         mbSwappedAll = !ImplInit( rObj );
 
+    OUString rOriginURL = rObj.GetGraphic().getOriginURL();
     ImplFillSubstitute( rSubstitute );
+    rSubstitute.setOriginURL(rOriginURL);
     maGraphicObjectList.push_back( const_cast<GraphicObject*>(&rObj) );
 }
 


More information about the Libreoffice-commits mailing list