summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-06-06 17:37:04 +0200
committerMichael Stahl <mstahl@redhat.com>2014-06-06 17:51:09 +0200
commit26f76e859761b5fa39196edff454644d7fb36a02 (patch)
tree9de8e0181eeba5fac54e1c32a4055e572f4896ac /sw
parentb181a3cdf8fc0206c4c71fa7d29d3a04b0caa46b (diff)
revert sw part of "don't swap in all images when loading files"
Half of commit 9b9eb2e4f619c63eabdc54b5d749ac55d8eaf333 is obsoleted by orw's fix for i#124999; not sure about the other half. Change-Id: I337a4bbf79912c02be7c7c56c5705253b3d7b125
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/graphic/ndgrf.cxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index ed025f51dc61..329df90a4181 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -345,9 +345,6 @@ 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.