diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2020-03-06 16:12:59 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2020-03-10 11:15:53 +0100 |
| commit | 30b23d77c894bdf6f7ae0d18d594ea267a80f662 (patch) | |
| tree | 88d6718be2533051297e472b0838389f3c12f58e /sw | |
| parent | 20c5a2abb61c4246c6001b7b6d5bd69cd5882cfd (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>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/ndgrf.hxx | 3 | ||||
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 4bc668049d4b..25b184cbd09f 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> mxLink; ///< If graphics only as link then pointer is set. Size mnGrfSize; - bool mbInSwapIn :1; + bool mbInSwapIn :1; // to avoid recursion in SwGrfNode::SwapIn + bool mbInBaseLinkSwapIn :1; // to avoid recursion in SwBaseLink::SwapIn bool mbChangeTwipSize :1; bool mbFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn. diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index b0c5a3111047..e73d19f3c923 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -59,6 +59,7 @@ SwGrfNode::SwGrfNode( SwAttrSet const * pAutoAttr ) : SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), maGrfObj(), + mbInBaseLinkSwapIn(true), // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( false ) @@ -75,6 +76,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, SwAttrSet const * pAutoAttr ) : SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), maGrfObj(rGrfObj), + mbInBaseLinkSwapIn(true), // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( false ) @@ -96,6 +98,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, SwAttrSet const * pAutoAttr ) : SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), maGrfObj(), + mbInBaseLinkSwapIn(true), // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( false ) @@ -440,13 +443,15 @@ bool SwGrfNode::SwapIn(bool bWaitForData) if( pLink ) { - if( GraphicType::NONE == maGrfObj.GetType() || - GraphicType::Default == maGrfObj.GetType() ) + if( (GraphicType::NONE == maGrfObj.GetType() || + GraphicType::Default == maGrfObj.GetType()) && + mbInBaseLinkSwapIn) { // link was not loaded yet if( pLink->SwapIn( bWaitForData ) ) { bRet = true; + mbInBaseLinkSwapIn = false; } else if( GraphicType::Default == maGrfObj.GetType() ) { |