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

[Libreoffice Gerrit user]

 svx/source/dialog/svxruler.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 55605810942227350b59e7cb4c61703b8ba991cf
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Dec 5 15:25:59 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Dec 5 15:25:59 2018 +0100

    -Werror=duplicated-cond
    
    ...after cee2602d14214ff44dbc995f790b4d72b764f800 "remove unused
    RulerBorderStyle enum value" apparently broke things by accident:
    
    > --- a/svx/source/dialog/svxruler.cxx
    > +++ b/svx/source/dialog/svxruler.cxx
    > @@ -802,8 +802,6 @@ void SvxRuler::UpdateColumns()
    >          if( !bProtectColumns )
    >              nStyleFlags |= RulerBorderStyle::Moveable;
    >
    > -        if( mxColumnItem->IsTable() )
    > -            nStyleFlags |= RulerBorderStyle::Table;
    >          else if ( !bProtectColumns )
    >              nStyleFlags |= RulerBorderStyle::Sizeable;
    >
    
    Change-Id: I898ccc9cdb12ee75f2e100d24027dfe74a99da90

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