summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svx/source/svdraw/svdograf.cxx3
-rw-r--r--sw/source/core/graphic/ndgrf.cxx3
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.