diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-26 10:52:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-26 11:42:49 +0200 |
| commit | f2964b9cdb04595e842de329222ffa2b63e5d7f7 (patch) | |
| tree | 20470a5ecb639d74fa260711583139bb4a6ad41e /sfx2/source/control/msgpool.cxx | |
| parent | 6f691e9c763e4c5f13a745a56fe4d889188187ed (diff) | |
convert SfxGroupId to scoped enum
in the process I had to teach the idl compiler to cope with identifiers
like SfxGroupID::Math, which has the side effect of requiring a space
before a ':' in some of the .sdi files.
Change-Id: If256599cb8aa1dfc0a33642c5070c5560702f3ba
Reviewed-on: https://gerrit.libreoffice.org/40441
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/control/msgpool.cxx')
| -rw-r--r-- | sfx2/source/control/msgpool.cxx | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index e1733d0f71d9..cc64353f72f1 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -52,57 +52,57 @@ namespace { const char* getGidResId(SfxGroupId nId) { - if (nId == GID_INTERN) + if (nId == SfxGroupId::Intern) return STR_GID_INTERN; - else if (nId == GID_APPLICATION) + else if (nId == SfxGroupId::Application) return STR_GID_APPLICATION; - else if (nId == GID_VIEW) + else if (nId == SfxGroupId::View) return STR_GID_VIEW; - else if (nId == GID_DOCUMENT) + else if (nId == SfxGroupId::Document) return STR_GID_DOCUMENT; - else if (nId == GID_EDIT) + else if (nId == SfxGroupId::Edit) return STR_GID_EDIT; - else if (nId == GID_MACRO) + else if (nId == SfxGroupId::Macro) return STR_GID_MACRO; - else if (nId == GID_OPTIONS) + else if (nId == SfxGroupId::Options) return STR_GID_OPTIONS; - else if (nId == GID_MATH) + else if (nId == SfxGroupId::Math) return STR_GID_MATH; - else if (nId == GID_NAVIGATOR) + else if (nId == SfxGroupId::Navigator) return STR_GID_NAVIGATOR; - else if (nId == GID_INSERT) + else if (nId == SfxGroupId::Insert) return STR_GID_INSERT; - else if (nId == GID_FORMAT) + else if (nId == SfxGroupId::Format) return STR_GID_FORMAT; - else if (nId == GID_TEMPLATE) + else if (nId == SfxGroupId::Template) return STR_GID_TEMPLATE; - else if (nId == GID_TEXT) + else if (nId == SfxGroupId::Text) return STR_GID_TEXT; - else if (nId == GID_FRAME) + else if (nId == SfxGroupId::Frame) return STR_GID_FRAME; - else if (nId == GID_GRAPHIC) + else if (nId == SfxGroupId::Graphic) return STR_GID_GRAPHIC; - else if (nId == GID_TABLE) + else if (nId == SfxGroupId::Table) return STR_GID_TABLE; - else if (nId == GID_ENUMERATION) + else if (nId == SfxGroupId::Enumeration) return STR_GID_ENUMERATION; - else if (nId == GID_DATA) + else if (nId == SfxGroupId::Data) return STR_GID_DATA; - else if (nId == GID_SPECIAL) + else if (nId == SfxGroupId::Special) return STR_GID_SPECIAL; - else if (nId == GID_IMAGE) + else if (nId == SfxGroupId::Image) return STR_GID_IMAGE; - else if (nId == GID_CHART) + else if (nId == SfxGroupId::Chart) return STR_GID_CHART; - else if (nId == GID_EXPLORER) + else if (nId == SfxGroupId::Explorer) return STR_GID_EXPLORER; - else if (nId == GID_CONNECTOR) + else if (nId == SfxGroupId::Connector) return STR_GID_CONNECTOR; - else if (nId == GID_MODIFY) + else if (nId == SfxGroupId::Modify) return STR_GID_MODIFY; - else if (nId == GID_DRAWING) + else if (nId == SfxGroupId::Drawing) return STR_GID_DRAWING; - else if (nId == GID_CONTROLS) + else if (nId == SfxGroupId::Controls) return STR_GID_CONTROLS; return nullptr; } @@ -130,10 +130,10 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface ) for ( size_t nFunc = 0; nFunc < rInterface.Count(); ++nFunc ) { SfxSlot &rDef = rInterface.pSlots[nFunc]; - if ( rDef.GetGroupId() && /* rDef.GetGroupId() != GID_INTERN && */ + if ( rDef.GetGroupId() != SfxGroupId::NONE && std::find(_vGroups.begin(), _vGroups.end(), rDef.GetGroupId()) == _vGroups.end() ) { - if (rDef.GetGroupId() == GID_INTERN) + if (rDef.GetGroupId() == SfxGroupId::Intern) _vGroups.insert(_vGroups.begin(), rDef.GetGroupId()); else _vGroups.push_back(rDef.GetGroupId()); |