include/svtools/ruler.hxx | 5 ++--- svx/source/dialog/svxruler.cxx | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-)
New commits: commit cee2602d14214ff44dbc995f790b4d72b764f800 Author: Noel Grandin <[email protected]> AuthorDate: Tue Dec 4 11:58:28 2018 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Dec 5 09:38:35 2018 +0100 remove unused RulerBorderStyle enum value Change-Id: I9f116ee6917da363bb7f23c039489d5683624582 Reviewed-on: https://gerrit.libreoffice.org/64568 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 26183807d4f8..8f042909bd2b 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -502,11 +502,10 @@ enum class RulerBorderStyle { Sizeable = 0x0001, Moveable = 0x0002, Variable = 0x0004, - Table = 0x0008, - Invisible = 0x0040 + Invisible = 0x0008 }; namespace o3tl { - template<> struct typed_flags<RulerBorderStyle> : is_typed_flags<RulerBorderStyle, 0x004f> {}; + template<> struct typed_flags<RulerBorderStyle> : is_typed_flags<RulerBorderStyle, 0x000f> {}; } struct RulerBorder diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 8fa6a67df992..a76c8901eedc 100644 --- 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; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
