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

[Libreoffice Gerrit user]

 svx/source/dialog/svxruler.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ca30a2032bc9ff078e3af6cc1fd3a6650580d1ea
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 5 16:41:50 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Dec 5 16:49:54 2018 +0200

    fix logic in SvxRuler::UpdateColumns
    
    after
        commit cee2602d14214ff44dbc995f790b4d72b764f800
        "remove unused RulerBorderStyle enum value"
    introduced a broken if-chain
    
    and
        commit 55605810942227350b59e7cb4c61703b8ba991cf
        -Werror=duplicated-cond
    fixed the chain but did not quite re-introduce the original logic.
    
    Change-Id: I868d8cfe6628192a19a923ebe86c2596fb347d86

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 3da42c451b5d..cea75dc33fe8 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -800,7 +800,11 @@ void SvxRuler::UpdateColumns()
                     mxRulerImpl->aProtectItem.IsPosProtected();
 
         if( !bProtectColumns )
-            nStyleFlags |= RulerBorderStyle::Moveable | RulerBorderStyle::Sizeable;
+        {
+            nStyleFlags |= RulerBorderStyle::Moveable;
+            if( !mxColumnItem->IsTable() )
+              nStyleFlags |= RulerBorderStyle::Sizeable;
+        }
 
         sal_uInt16 nBorders = mxColumnItem->Count();