diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-01-31 23:00:24 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-03 12:34:06 +0100 |
| commit | 9b9eb2e4f619c63eabdc54b5d749ac55d8eaf333 (patch) | |
| tree | 7a4e1aa9e11fd992124bab4713db6bd2545fed74 | |
| parent | e034fa4607dfc732eaa82261755193fd781a2aad (diff) | |
fdo#73300: sw: don't swap in all images when loading files
(regression from bd55f05b332c1573bd410fd9e21ea7fcf977e1b0)
Change-Id: I55532ac0fe983461e961a61149479343d2b879a1
| -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 58688bc3c7c5..949898bf5bc0 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -321,6 +321,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 06a10dab51bf..5d217fb70c7e 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. |