Kaydet (Commit) 9b9eb2e4 authored tarafından Michael Stahl's avatar Michael Stahl

fdo#73300: sw: don't swap in all images when loading files

(regression from bd55f05b)

Change-Id: I55532ac0fe983461e961a61149479343d2b879a1
üst e034fa46
...@@ -321,6 +321,9 @@ sdr::contact::ViewContact* SdrGrafObj::CreateObjectSpecificViewContact() ...@@ -321,6 +321,9 @@ sdr::contact::ViewContact* SdrGrafObj::CreateObjectSpecificViewContact()
void SdrGrafObj::onGraphicChanged() void SdrGrafObj::onGraphicChanged()
{ {
if (!pGraphic || pGraphic->IsSwappedOut()) // don't force swap-in for this
return;
OUString aName; OUString aName;
OUString aTitle; OUString aTitle;
OUString aDesc; OUString aDesc;
......
...@@ -339,6 +339,9 @@ SwGrfNode::~SwGrfNode() ...@@ -339,6 +339,9 @@ SwGrfNode::~SwGrfNode()
/// allow reaction on change of content of GraphicObject /// allow reaction on change of content of GraphicObject
void SwGrfNode::onGraphicChanged() 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 // 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() // use to continue if it is not yet set. If not yet set, call onGraphicChanged()
// when it is set. // when it is set.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment