diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-18 12:14:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-19 08:35:42 +0200 |
| commit | 0035573ee7798cdf54ef44a54306a0515eeb90a7 (patch) | |
| tree | 29f89470e725120dbb6378a64ab0bf01970ecf89 /sc/inc/scstyles.hrc | |
| parent | 694f3ed0825d75bf855a74b2294ba0ff370afbb6 (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 'sc/inc/scstyles.hrc')
| -rw-r--r-- | sc/inc/scstyles.hrc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sc/inc/scstyles.hrc b/sc/inc/scstyles.hrc index 08919cfbc44f..fcc78b9258de 100644 --- a/sc/inc/scstyles.hrc +++ b/sc/inc/scstyles.hrc @@ -24,21 +24,21 @@ #define NC_(Context, String) (Context "\004" u8##String) -const std::pair<const char*, int> RID_CELLSTYLEFAMILY[] = +const std::pair<const char*, SfxStyleSearchBits> RID_CELLSTYLEFAMILY[] = { - { NC_("RID_CELLSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE }, - { NC_("RID_CELLSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN }, - { NC_("RID_CELLSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED }, - { NC_("RID_CELLSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF }, - { nullptr, 0 } + { NC_("RID_CELLSTYLEFAMILY", "All Styles") , SfxStyleSearchBits::AllVisible }, + { NC_("RID_CELLSTYLEFAMILY", "Hidden Styles") , SfxStyleSearchBits::Hidden }, + { NC_("RID_CELLSTYLEFAMILY", "Applied Styles") , SfxStyleSearchBits::Used }, + { NC_("RID_CELLSTYLEFAMILY", "Custom Styles") , SfxStyleSearchBits::UserDefined }, + { nullptr, SfxStyleSearchBits::Auto } }; -const std::pair<const char*, int> RID_PAGESTYLEFAMILY[] = +const std::pair<const char*, SfxStyleSearchBits> RID_PAGESTYLEFAMILY[] = { - { NC_("RID_PAGESTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL }, - { NC_("RID_PAGESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN }, - { NC_("RID_PAGESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF }, - { nullptr, 0 } + { NC_("RID_PAGESTYLEFAMILY", "All Styles") , SfxStyleSearchBits::All }, + { NC_("RID_PAGESTYLEFAMILY", "Hidden Styles") , SfxStyleSearchBits::Hidden }, + { NC_("RID_PAGESTYLEFAMILY", "Custom Styles") , SfxStyleSearchBits::UserDefined }, + { nullptr, SfxStyleSearchBits::Auto } }; #endif |