[Libreoffice-commits] core.git: include/svtools svtools/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Apr 24 16:44:43 UTC 2020
include/svtools/brwbox.hxx | 3 +--
svtools/source/brwbox/brwbox1.cxx | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 4a6ea4ceeec99b27bfb06cde6d8fac3bea068eee
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Apr 24 11:31:12 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Apr 24 18:44:10 2020 +0200
loplugin:unusedenumconstants BrowserMode
Change-Id: Ida607fedc15062863f9de771fc7005f8c60cb0b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92842
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 49486aae972a..4c98102bdc07 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -61,7 +61,6 @@ enum class BrowserMode
NONE = 0x000000,
COLUMNSELECTION = 0x000001,
MULTISELECTION = 0x000002,
- THUMBDRAGGING = 0x000004,
KEEPHIGHLIGHT = 0x000008,
HLINES = 0x000010,
VLINES = 0x000020,
@@ -88,7 +87,7 @@ enum class BrowserMode
};
namespace o3tl
{
- template<> struct typed_flags<BrowserMode> : is_typed_flags<BrowserMode, 0x2cf73f> {};
+ template<> struct typed_flags<BrowserMode> : is_typed_flags<BrowserMode, 0x2cf73b> {};
}
#define BROWSER_NONE 0
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index cd62dff7c05a..ee3922582cda 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2131,8 +2131,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
bHLines = ( nMode & BrowserMode::HLINES ) == BrowserMode::HLINES;
bVLines = ( nMode & BrowserMode::VLINES ) == BrowserMode::VLINES;
- WinBits nVScrollWinBits =
- WB_VSCROLL | ( ( nMode & BrowserMode::THUMBDRAGGING ) ? WB_DRAG : 0 );
+ constexpr WinBits nVScrollWinBits = WB_VSCROLL;
pVScroll = ( nMode & BrowserMode::TRACKING_TIPS ) == BrowserMode::TRACKING_TIPS
? VclPtr<BrowserScrollBar>::Create( this, nVScrollWinBits, pDataWin.get() )
: VclPtr<ScrollBar>::Create( this, nVScrollWinBits );
More information about the Libreoffice-commits
mailing list