diff options
| author | Roman Kuznetsov <antilibreoffice@gmail.com> | 2019-03-13 19:18:49 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-03-14 08:52:29 +0100 |
| commit | 00f96e88a7c6feea98d446e82a2718c5aae6256c (patch) | |
| tree | 9bff711b6e7b70ede72cd6a9f913a72ac237981e /svx | |
| parent | c196d70337f6b755cfc4c34beda05554c6fab114 (diff) | |
tdf#112411 Remove all that remains of the More controls toolbars
Change-Id: I82a348c7be067e777dced15dd014b8139cc9b1dc
Reviewed-on: https://gerrit.libreoffice.org/69224
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/sdi/fmslots.sdi | 5 | ||||
| -rw-r--r-- | svx/sdi/svx.sdi | 19 | ||||
| -rw-r--r-- | svx/source/form/fmshell.cxx | 7 | ||||
| -rw-r--r-- | svx/source/form/formtoolbars.cxx | 10 |
4 files changed, 2 insertions, 39 deletions
diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi index 8eda2c5d981d..d1dd4fdb4678 100644 --- a/svx/sdi/fmslots.sdi +++ b/svx/sdi/fmslots.sdi @@ -625,11 +625,6 @@ shell FmFormShell SID_FM_CONFIG // ole : no, status : ? [] - SID_FM_MORE_CONTROLS - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] SID_FM_FORM_DESIGN_TOOLS [ ExecMethod = Execute ; diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index c21c376b2db6..3aaf07b9bb5c 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -1634,25 +1634,6 @@ SfxVoidItem Config SID_FM_CONFIG ] -SfxBoolItem MoreControls SID_FM_MORE_CONTROLS - -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = FALSE, - Toggle = TRUE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = SfxGroupId::Controls; -] - - SfxBoolItem FormDesignTools SID_FM_FORM_DESIGN_TOOLS [ diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 67191161c8af..3b8187cba8f9 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -174,10 +174,6 @@ void FmFormShell::InitInterface_Impl() SfxShellFeature::FormTBControls); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Standard, - ToolbarId::SvxTbx_MoreControls, - SfxShellFeature::FormTBMoreControls); - - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Standard, ToolbarId::SvxTbx_FormDesign, SfxShellFeature::FormTBDesign); } @@ -331,7 +327,6 @@ bool FmFormShell::HasUIFeature(SfxShellFeature nFeature) const bResult = GetImpl()->isEnhancedForm_Lock(); } else if ( (nFeature & SfxShellFeature::FormTBControls) - || (nFeature & SfxShellFeature::FormTBMoreControls) || (nFeature & SfxShellFeature::FormTBDesign) ) { @@ -512,7 +507,6 @@ void FmFormShell::Execute(SfxRequest &rReq) // individual actions switch( nSlot ) { - case SID_FM_MORE_CONTROLS: case SID_FM_FORM_DESIGN_TOOLS: { FormToolboxes aToolboxAccess(GetImpl()->getHostFrame_Lock()); @@ -809,7 +803,6 @@ void FmFormShell::GetState(SfxItemSet &rSet) { switch( nWhich ) { - case SID_FM_MORE_CONTROLS: case SID_FM_FORM_DESIGN_TOOLS: { FormToolboxes aToolboxAccess(GetImpl()->getHostFrame_Lock()); diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index fdf299b5ac18..52ee51101681 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -79,16 +79,10 @@ namespace svxform OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) { - OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ), + OSL_ENSURE( _nSlotId == SID_FM_FORM_DESIGN_TOOLS , "FormToolboxes::getToolboxResourceName: unsupported slot!" ); - const sal_Char* pToolBarName = "moreformcontrols"; - if ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) - pToolBarName = "formdesign"; - - OUString aToolBarResStr( "private:resource/toolbar/" ); - aToolBarResStr += OUString::createFromAscii( pToolBarName ); - return aToolBarResStr; + return "private:resource/toolbar/formdesign"; } |