From 0035573ee7798cdf54ef44a54306a0515eeb90a7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 18 Apr 2018 12:14:37 +0200 Subject: convert SFXSTYLEBIT to scoped enum drop SFXSTYLEBIT_HIERARCHY because it has no overlap with these values, it's used an extra bit in SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter Change-Id: I8ee5ecb9b5f8d2087d8eedd1f5526260ec1e4018 Reviewed-on: https://gerrit.libreoffice.org/53089 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/tbxctrls/tbcontrl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svx') diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index abb6cb4fd225..bf283e4cb9ca 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2403,7 +2403,7 @@ void SvxStyleToolBoxControl::FillStyleBox() SfxStyleSheetBase* pStyle = nullptr; bool bDoFill = false; - pStyleSheetPool->SetSearchMask( eFamily, SFXSTYLEBIT_USED ); + pStyleSheetPool->SetSearchMask( eFamily, SfxStyleSearchBits::Used ); // Check whether fill is necessary pStyle = pStyleSheetPool->First(); @@ -2619,7 +2619,7 @@ void SvxStyleToolBoxControl::StateChanged( switch ( eState ) { case SfxItemState::DEFAULT: - eTri = static_cast(pState)->GetValue() + eTri = static_cast(pState)->GetValue() != SfxStyleSearchBits::Auto ? TRISTATE_TRUE : TRISTATE_FALSE; break; -- cgit