[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-5' - svx/source sw/source

[Michael Stahl]

 svx/source/svdraw/svdograf.cxx   |    3 +++
 sw/source/core/graphic/ndgrf.cxx |    3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 45618cc1549fd00d9d0155cbeaa50e04e8300c86
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 31 23:00:24 2014 +0100

    fdo#73300: sw: don't swap in all images when loading files
    
    (regression from bd55f05b332c1573bd410fd9e21ea7fcf977e1b0)
    
    (cherry picked from commit 9b9eb2e4f619c63eabdc54b5d749ac55d8eaf333)
    
    Conflicts:
    	svx/source/svdraw/svdograf.cxx
    
    Change-Id: I55532ac0fe983461e961a61149479343d2b879a1
    Reviewed-on: https://gerrit.libreoffice.org/7812
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 39892ecb0db10ffa4a9803862264fd6e12d497aa)
    Reviewed-on: https://gerrit.libreoffice.org/7845
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 46b88da..d918eaa 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -277,6 +277,9 @@ sdr::contact::ViewContact* SdrGrafObj::CreateObjectSpecificViewContact()
 
 void SdrGrafObj::onGraphicChanged()
 {
+    if (!pGraphic || pGraphic->IsSwappedOut()) // don't force swap-in for this
+        return;
+
     String aName;
     String aTitle;
     String aDesc;
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 5cedf29..97ff385 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -338,6 +338,9 @@ SwGrfNode::~SwGrfNode()
 /// allow reaction on change of content of GraphicObject
 void SwGrfNode::onGraphicChanged()
 {
+    if (GetGrfObj().IsSwappedOut()) // don't force swap-in for this
+        return;
+
     // try to access SwFlyFrmFmt; since title/desc/name are set there, there is no
     // use to continue if it is not yet set. If not yet set, call onGraphicChanged()
     // when it is set.