summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-18 12:14:37 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-19 08:35:42 +0200
commit0035573ee7798cdf54ef44a54306a0515eeb90a7 (patch)
tree29f89470e725120dbb6378a64ab0bf01970ecf89 /svx
parent694f3ed0825d75bf855a74b2294ba0ff370afbb6 (diff)
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 <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx4
1 files changed, 2 insertions, 2 deletions
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<const SfxTemplateItem*>(pState)->GetValue()
+ eTri = static_cast<const SfxTemplateItem*>(pState)->GetValue() != SfxStyleSearchBits::Auto
? TRISTATE_TRUE
: TRISTATE_FALSE;
break;