diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-06-16 15:34:40 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2022-01-17 15:48:48 +0100 |
| commit | 38b51b53f025b1d76399b33ecf39746b820363d4 (patch) | |
| tree | 718a93557ea5eff81ccfed202572478e0d5673ba /sw/source/core/inc/layact.hxx | |
| parent | 182058bca63761ced9654e9ae767a718b33c669b (diff) | |
Revert "tdf#116501 fix freezing at embedded text tables"
This reverts commit 91b2239783dc716bd71ce7962bfd7e341dfe4175.
This breaks documents that have many nested tables.
For example Eclipse BIRT generates reports with tables nested 8 levels
deep, they run into the counter in no time and, ironically, one goes
into a layout loop because of this counter.
Change-Id: I7451d01787903bbc60b305da3dc72f8259175e97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117472
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit ee042a371e98cdcc59848f0b953f1ce545e18e31)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117601
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 0f026c6e7186ef57e5806348a320f8383dfb7dc7)
Diffstat (limited to 'sw/source/core/inc/layact.hxx')
| -rw-r--r-- | sw/source/core/inc/layact.hxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index 2b1b17a4afd2..50335077694c 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -97,11 +97,6 @@ class SwLayAction // OD 14.04.2003 #106346# - new flag for content formatting on interrupt. bool mbFormatContentOnInterrupt; - // for loop control by disabling in-row splitting within embedded tables - const SwPageFrame *m_pCurPage; - sal_uInt16 m_nTabLevel; // embedding level - sal_uInt32 m_nCallCount; // calling FormatLayoutTab on the same page - void PaintContent( const SwContentFrame *, const SwPageFrame *, const SwRect &rOldRect, long nOldBottom ); bool PaintWithoutFlys( const SwRect &, const SwContentFrame *, |