summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-02 15:29:16 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-10-08 12:53:10 +0000
commite450bd6ebde3892850c5fcf5590122a2f10ac8ae (patch)
treef2847b8c663e7a01c19bf53c237d6876a958132e /sw
parentf98d09c8325c642f0463f2e65ff57be0498e9c23 (diff)
Related: tdf#93461 relax loop detection some more
original tdf#66141 continues to not fail with this modification, but original reporter of the follow up problem has verified that relaxing this more fixes the continued misplacement of caption text in a private RH document (cherry picked from commit a6e6eb8b37ba431df575be4799114bb821f54b0d) Change-Id: Ic1a339619912127009e760aa2ade9f29a545f7ec Reviewed-on: https://gerrit.libreoffice.org/19173 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/frmform.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 7f863c6c2995..09de3d878dc3 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1919,7 +1919,7 @@ bool SwTextFrm::FormatQuick( bool bForceQuickFormat )
else
nLoopProtection = 0;
nStart = nNewStart;
- const bool bWillEndlessInsert = nLoopProtection > 2;
+ const bool bWillEndlessInsert = nLoopProtection > 250;
SAL_WARN_IF(bWillEndlessInsert, "sw", "loop detection triggered");
if ((!bWillEndlessInsert) // Check for special case: line is invisible,
// like in too thin table cell: tdf#66141