sw/source/core/text/frmform.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e450bd6ebde3892850c5fcf5590122a2f10ac8ae
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Oct 2 15:29:16 2015 +0100
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 <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 7f863c6..09de3d8 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
