diff options
-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 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. |