summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-01-31 23:00:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-04 12:27:29 +0000
commit39892ecb0db10ffa4a9803862264fd6e12d497aa (patch)
tree0cef429775c3cac74853bf7b19ecff8a79e734c8
parent5200d19a541b59141d15e3780f5197569b6b135e (diff)
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@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--svx/source/svdraw/svdograf.cxx3
-rw-r--r--sw/source/core/graphic/ndgrf.cxx3
2 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 46b88dae7de3..d918eaae7c4c 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 5cedf29e600d..97ff385c21e5 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.