diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-01-31 23:00:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-04 12:33:26 +0000 |
| commit | d05a33018794f7ec63daf4232d521fd2adcc5921 (patch) | |
| tree | ab738d166af7a16b4600a850064b2f05ca5c016b | |
| parent | a054c52a6fc556ddf1383b676e7be533aed69420 (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>
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 3 |
2 files changed, 6 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; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 87b81dee61ea..76644aabefe0 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -339,6 +339,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. |