[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - sfx2/source sw/source

[Michael Stahl (via logerrit)]

 sfx2/source/dialog/tabdlg.cxx    |    1 -
 sw/source/core/inc/rowfrm.hxx    |    2 +-
 sw/source/core/layout/tabfrm.cxx |   10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 955add820ecc160647657de308492a0650527221
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Jun 21 12:44:18 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jun 23 19:41:13 2019 +0200

    sw: fix SwUiWriterTest::testTdf114306_2
    
    sw/qa/extras/uiwriter/uiwriter.cxx:5908:SwUiWriterTest::testTdf114306_2
    equality assertion failed
    - Expected: 4
    - Actual  : 5
    
    Mysteriously this doesn't happen on master when running make sw.check
    but reproduces with
    make CppunitTest_sw_uiwriter CPPUNIT_TEST_NAME="testTdf114306_2"
    
    The problem is that the early-returns in SwTabFrame::RemoveFollowFlowLine()
    are too late: the SetFollowFlowLine( false ); was already executed and
    henceforth the SwTabFrame thinks it doesn't have a follow-flow-line, so
    it will never be merged again and new follow-flow-line may be created.
    
    (test fail is regression from 1e6dec4b4313212a3bdc6bb06155fd65e795368b)
    
    Change-Id: Ic5a2ef4219f212c8b4d34fd47d3d67f32de45f8e
    Reviewed-on: https://gerrit.libreoffice.org/74500
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 98e186a37388d35320b813142b4fc7f0071f5b43)
    Reviewed-on: https://gerrit.libreoffice.org/74521
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index 8b14b0793cb4..69177e697f70 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -33,7 +33,7 @@ class SwRowFrame: public SwLayoutFrame
     virtual SwTwips GrowFrame  ( SwTwips, bool bTst = false, bool bInfo = false ) override;
 
     const SwTableLine * m_pTabLine;
-    SwRowFrame * m_pFollowRow;
+    SwRowFrame * m_pFollowRow; ///< note: this is *only* set on old-style tables!
     // #i29550#
     sal_uInt16 mnTopMarginForLowers;
     sal_uInt16 mnBottomMarginForLowers;
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 75c0c7444d1e..694e1b70fb03 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -878,11 +878,6 @@ bool SwTabFrame::RemoveFollowFlowLine()
             pFollowFlowLine &&
             pLastLine, "There should be a flowline in the follow" );
 
-    // We have to reset the flag here, because lcl_MoveRowContent
-    // calls a GrowFrame(), which has a different behavior if
-    // this flag is set.
-    SetFollowFlowLine( false );
-
     // #140081# Make code robust.
     if ( !pFollowFlowLine || !pLastLine )
         return true;
@@ -892,6 +887,11 @@ bool SwTabFrame::RemoveFollowFlowLine()
         return false;
     }
 
+    // We have to reset the flag here, because lcl_MoveRowContent
+    // calls a GrowFrame(), which has a different behavior if
+    // this flag is set.
+    SetFollowFlowLine( false );
+
     // Move content
     lcl_MoveRowContent( *pFollowFlowLine, *static_cast<SwRowFrame*>(pLastLine) );
 
commit ad8207d648d480790b5b1f6974b61020813cb92e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jun 21 20:39:55 2019 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sun Jun 23 19:03:40 2019 +0200

    Related: tdf#126036 missing "reset" button
    
    removing 'standard' should not also hide 'reset'
    
    Change-Id: I0c12ea16c378a225052468d01e0f1a99a6d59846
    Reviewed-on: https://gerrit.libreoffice.org/74538
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 1d5b3ecc3e8e..41e438e5f6af 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -2196,7 +2196,6 @@ void SfxTabDialogController::RemoveResetButton()
 void SfxTabDialogController::RemoveStandardButton()
 {
     m_xBaseFmtBtn->hide();
-    m_pImpl->bHideResetBtn = true;
 }
 
 SfxTabPage* SfxTabDialogController::GetTabPage(const OString& rPageId) const