diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-30 16:50:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-31 15:07:00 +0200 |
| commit | 490e9dbade4f9d69cab4b1ec435944c9b4d2f6c2 (patch) | |
| tree | 9ee234da59e1ae7528efd45bb53d48d051697071 /svx | |
| parent | e0e12738449063abd9aad34ef78d26183ff11d6a (diff) | |
disambiguate dual use of toolbar ids
for toolbar title string resource and identifier (for config)
Change-Id: I2657c3cbb586a62d8075db7cb43cc064b2030f28
Reviewed-on: https://gerrit.libreoffice.org/38274
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmshell.cxx | 12 | ||||
| -rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 2 | ||||
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 63827dd3b7db..a0f119211fc5 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -159,15 +159,15 @@ SFX_IMPL_INTERFACE(FmFormShell, SfxShell) void FmFormShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_NAVIGATION, SfxVisibilityFlags::Standard|SfxVisibilityFlags::ReadonlyDoc, - RID_SVXTBX_FORM_NAVIGATION, + ToolbarId::SvxTbx_Form_Navigation, SfxShellFeature::FormShowDatabaseBar); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_NAVIGATION, SfxVisibilityFlags::Standard|SfxVisibilityFlags::ReadonlyDoc, - RID_SVXTBX_FORM_FILTER, + ToolbarId::SvxTbx_Form_Filter, SfxShellFeature::FormShowFilterBar); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Standard | SfxVisibilityFlags::ReadonlyDoc, - RID_SVXTBX_TEXT_CONTROL_ATTRIBUTES, + ToolbarId::SvxTbx_Text_Control_Attributes, SfxShellFeature::FormShowTextControlBar); GetStaticInterface()->RegisterChildWindow(SID_FM_ADD_FIELD, false, SfxShellFeature::FormShowField); @@ -177,15 +177,15 @@ void FmFormShell::InitInterface_Impl() GetStaticInterface()->RegisterChildWindow(SID_FM_SHOW_DATANAVIGATOR, false, SfxShellFeature::FormShowDataNavigator); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Standard, - RID_SVXTBX_CONTROLS, + ToolbarId::SvxTbx_Controls, SfxShellFeature::FormTBControls); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Standard, - RID_SVXTBX_MORECONTROLS, + ToolbarId::SvxTbx_MoreControls, SfxShellFeature::FormTBMoreControls); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Standard, - RID_SVXTBX_FORMDESIGN, + ToolbarId::SvxTbx_FormDesign, SfxShellFeature::FormTBDesign); } diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 89b2a0fa7a10..6e0d6aaefc89 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -58,7 +58,7 @@ SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell) void ExtrusionBar::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, RID_SVX_EXTRUSION_BAR); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Svx_Extrusion_Bar); } diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 2a0cdc451ac9..e92a65e9dfe1 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -179,7 +179,7 @@ SFX_IMPL_INTERFACE(FontworkBar, SfxShell) void FontworkBar::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, RID_SVX_FONTWORK_BAR); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Svx_Fontwork_Bar); } |