Kaydet (Commit) 55605810 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror=duplicated-cond

...after cee2602d "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
üst a0e01e3a
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment