diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2020-03-06 16:12:59 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-03-12 08:51:15 +0100 |
| commit | ddd7277b218204dca539b3f93d36098df0349b38 (patch) | |
| tree | f5aa2f1d7e4f5442723770412e509b565c875851 | |
| parent | update credits (diff) | |
| download | core-ddd7277b218204dca539b3f93d36098df0349b38.tar.gz core-ddd7277b218204dca539b3f93d36098df0349b38.zip | |
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>
(cherry picked from commit 30b23d77c894bdf6f7ae0d18d594ea267a80f662)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90271
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -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 2faed3ec01e8..3621292cfa46 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. diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 1b32c727734b..3b7bc0ca5cfd 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -68,6 +68,7 @@ SwGrfNode::SwGrfNode( SwAttrSet const * pAutoAttr ) : SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), maGrfObj(), + bInBaseLinkSwapIn(true), // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( false ) @@ -84,6 +85,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, SwAttrSet const * pAutoAttr ) : SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), maGrfObj(rGrfObj), + bInBaseLinkSwapIn(true), // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( false ) @@ -105,6 +107,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, SwAttrSet const * pAutoAttr ) : SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), maGrfObj(), + bInBaseLinkSwapIn(true), // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( false ) @@ -449,13 +452,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()) && + bInBaseLinkSwapIn) { // link was not loaded yet if( pLink->SwapIn( bWaitForData ) ) { bRet = true; + bInBaseLinkSwapIn = false; } else if( GraphicType::Default == maGrfObj.GetType() ) { |