summaryrefslogtreecommitdiff
path: root/svx
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:33:26 +0000
commitd05a33018794f7ec63daf4232d521fd2adcc5921 (patch)
treeab738d166af7a16b4600a850064b2f05ca5c016b /svx
parenta054c52a6fc556ddf1383b676e7be533aed69420 (diff)
fdo#73300: sw: don't swap in all images when loading files
(regression from bd55f05b332c1573bd410fd9e21ea7fcf977e1b0) Change-Id: I55532ac0fe983461e961a61149479343d2b879a1 (cherry picked from commit 9b9eb2e4f619c63eabdc54b5d749ac55d8eaf333) Reviewed-on: https://gerrit.libreoffice.org/7809 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdograf.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index ff644a5f0276..5bb4b33c6042 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -314,6 +314,9 @@ sdr::contact::ViewContact* SdrGrafObj::CreateObjectSpecificViewContact()
void SdrGrafObj::onGraphicChanged()
{
+ if (!pGraphic || pGraphic->IsSwappedOut()) // don't force swap-in for this
+ return;
+
OUString aName;
OUString aTitle;
OUString aDesc;