summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorGülşah Köse <gulsah.kose@collabora.com>2020-03-06 16:12:59 +0300
committerAndras Timar <andras.timar@collabora.com>2020-03-12 08:50:55 +0100
commitc5ecde36b8e980cc4a0ca88ccebd95ac3155bdd9 (patch)
treea09599d61d022733ee6f4283c05a155db77eb9b2 /sw/inc
parentf3106797c37e301b77c6bab3a61633c55a220dd9 (diff)
tdf#131185 Prevent unnecessary SwapIn calls.
When the http response is 404 or something like that we shouldn't retry the download embeded image constantly. This causes libreoffice to short freezes. Change-Id: I7381d04f12e9fbea961dd0e3333ea0d39aa93d14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90102 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90045 Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/ndgrf.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 65716602c16f..5434d301761a 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -39,7 +39,8 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
std::unique_ptr<GraphicObject> mpReplacementGraphic;
tools::SvRef<sfx2::SvBaseLink> refLink; ///< If graphics only as link then pointer is set.
Size nGrfSize;
- bool bInSwapIn :1;
+ bool bInSwapIn :1; // to avoid recursion in SwGrfNode::SwapIn
+ bool bInBaseLinkSwapIn :1; // to avoid recursion in SwBaseLink::SwapIn
bool bChgTwipSize :1;
bool bFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn.