[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/tabsh.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 76c40b82e6a44539cd43f326c00246e759449571
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 5 12:01:01 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 5 14:45:02 2020 +0200

    tdf#134913 set table width after setting columns
    
    so "relative" mode sticks regardless of any rounding issues triggering
    the table out of relative mode.
    
    Change-Id: If0abbf2ef75feb6fc4a408966c2a3c350589023f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100161
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index cd38b92d1adf..3f1fca336f3a 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -422,9 +422,6 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
         if( SfxItemState::SET == rSet.GetItemState( *pIds, false, &pItem))
             aSet.Put( *pItem );
 
-    if( aSet.Count() )
-        rSh.SetTableAttr( aSet );
-
     if(bTabCols)
     {
         rSh.GetTabCols( aTabCols );
@@ -432,6 +429,9 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
         rSh.SetTabCols( aTabCols, bSingleLine );
     }
 
+    if( aSet.Count() )
+        rSh.SetTableAttr( aSet );
+
     rSh.EndUndo( SwUndoId::TABLE_ATTR );
     rSh.EndAllAction();
 }