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>

20 files changed, 2 insertions, 183 deletions

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index f137729540b1..17bbcf3d9229 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -94,7 +94,6 @@ enum class SfxShellFeature
     FormShowFilterNavigator = 0x0100,
     FormShowTextControlBar  = 0x0200,
     FormTBControls          = 0x0400,
-    FormTBMoreControls      = 0x0800,
     FormTBDesign            = 0x1000,
     FormShowDataNavigator   = 0x2000,
     // masks to make sure modules don't use flags from another
diff --git a/include/sfx2/toolbarids.hxx b/include/sfx2/toolbarids.hxx
index bf02ce14634c..1aedb4eda32f 100644
--- a/include/sfx2/toolbarids.hxx
+++ b/include/sfx2/toolbarids.hxx
@@ -26,7 +26,6 @@ enum class ToolbarId : sal_uInt32
     SvxTbx_Form_Filter = 18002,
     SvxTbx_Text_Control_Attributes = 18003,
     SvxTbx_Controls = 18004,
-    SvxTbx_MoreControls = 18005,
     SvxTbx_FormDesign = 18006,
     Math_Toolbox = 20050,
     Webtools_Toolbox = 20402,
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 78bedb98a75e..4c40a79a94de 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -829,7 +829,6 @@ class SfxStringItem;
 #define SID_SHRINK_FONT_SIZE                            ( SID_SVX_START + 1043 )
 // color subtoolbar on graphictoolbar
 #define SID_COLOR_SETTINGS                              ( SID_SVX_START + 1044 )
-#define SID_FM_MORE_CONTROLS                            ( SID_SVX_START + 1045 )
 #define SID_FM_FORM_DESIGN_TOOLS                        ( SID_SVX_START + 1046 )
 #define SID_DRAWTBX_CS_BASIC                            ( SID_SVX_START + 1047 )
 #define SID_DRAWTBX_CS_SYMBOL                           ( SID_SVX_START + 1048 )
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 254d52c07e20..7dd89f6989ec 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -326,20 +326,6 @@
           <value>false</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Docked" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 9f33993748a6..5b316f1a61be 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -519,20 +519,6 @@
           <value>false</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Docked" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 29b0400caf6e..ea10db2477d2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5324,14 +5324,6 @@
           <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:MoreControls" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>9</value>
-        </prop>
-      </node>
       <node oor:name=".uno:FormDesignTools" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 7cac22a8264e..c3d21928fc1c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -402,20 +402,6 @@
           <value>false</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Docked" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index 62546760b8c5..c0c6afeb0f1b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -366,20 +366,6 @@
           <value>true</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Docked" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index a8e4e8ee0bae..ce94fe093942 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -360,20 +360,6 @@
           <value>false</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Docked" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index 4cc23c366173..b7238b5d7b3d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -363,20 +363,6 @@
           <value>true</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Docked" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 87c4c864132f..321eda4617cb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -407,20 +407,6 @@
           <value>false</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Docked" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 28d178091f7c..7cceb8669a38 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -438,20 +438,6 @@
           <value>false</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Docked" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index 09f3c1613306..24a1964cf37d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -357,20 +357,6 @@
           <value>true</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">More Controls</value>
-        </prop>
-        <prop oor:name="Docked" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Design</value>
diff --git a/postprocess/packimages/image-sort.lst b/postprocess/packimages/image-sort.lst
index 0ec2d33877d1..d0b226c2be64 100644
--- a/postprocess/packimages/image-sort.lst
+++ b/postprocess/packimages/image-sort.lst
@@ -111,7 +111,6 @@ modules/scalc/toolbar/graphicobjectbar.xml
 modules/scalc/toolbar/insertbar.xml
 modules/scalc/toolbar/insertcellsbar.xml
 modules/scalc/toolbar/mediaobjectbar.xml
-modules/scalc/toolbar/moreformcontrols.xml
 modules/scalc/toolbar/previewbar.xml
 modules/scalc/toolbar/standardbar.xml
 modules/scalc/toolbar/starshapes.xml
@@ -148,7 +147,6 @@ modules/sdraw/toolbar/insertbar.xml
 modules/sdraw/toolbar/linesbar.xml
 modules/sdraw/toolbar/masterviewtoolbar.xml
 modules/sdraw/toolbar/mediaobjectbar.xml
-modules/sdraw/toolbar/moreformcontrols.xml
 modules/sdraw/toolbar/optionsbar.xml
 modules/sdraw/toolbar/positionbar.xml
 modules/sdraw/toolbar/standardbar.xml
@@ -189,7 +187,6 @@ modules/simpress/toolbar/insertbar.xml
 modules/simpress/toolbar/linesbar.xml
 modules/simpress/toolbar/masterviewtoolbar.xml
 modules/simpress/toolbar/mediaobjectbar.xml
-modules/simpress/toolbar/moreformcontrols.xml
 modules/simpress/toolbar/optionsbar.xml
 modules/simpress/toolbar/outlinetoolbar.xml
 modules/simpress/toolbar/positionbar.xml
@@ -230,7 +227,6 @@ modules/sglobal/toolbar/graffilterbar.xml
 modules/sglobal/toolbar/graphicobjectbar.xml
 modules/sglobal/toolbar/insertbar.xml
 modules/sglobal/toolbar/mediaobjectbar.xml
-modules/sglobal/toolbar/moreformcontrols.xml
 modules/sglobal/toolbar/numobjectbar.xml
 modules/sglobal/toolbar/oleobjectbar.xml
 modules/sglobal/toolbar/optimizetablebar.xml
@@ -299,7 +295,6 @@ modules/swriter/toolbar/graffilterbar.xml
 modules/swriter/toolbar/graphicobjectbar.xml
 modules/swriter/toolbar/insertbar.xml
 modules/swriter/toolbar/mediaobjectbar.xml
-modules/swriter/toolbar/moreformcontrols.xml
 modules/swriter/toolbar/navigationobjectbar.xml
 modules/swriter/toolbar/numobjectbar.xml
 modules/swriter/toolbar/oleobjectbar.xml
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index a349a8084984..529451920676 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -74,7 +74,6 @@ static const ResIdToResName pToolBarResToName[] =
     { ToolbarId::SvxTbx_Form_Filter,      "formsfilterbar"       },
     { ToolbarId::SvxTbx_Text_Control_Attributes, "formtextobjectbar"    },
     { ToolbarId::SvxTbx_Controls,         "formcontrols"         },
-    { ToolbarId::SvxTbx_MoreControls,     "moreformcontrols"     },
     { ToolbarId::SvxTbx_FormDesign,       "formdesign"           },
     { ToolbarId::Math_Toolbox,            "toolbar"              },      //math
     { ToolbarId::Text_Toolbox_Sc,         "textobjectbar"        },      //calc
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";
     }
 
 
diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba
index 588a170dc62f..a54bc05a6b92 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -1672,7 +1672,6 @@ Const cstUnoPrefix = &quot;.uno:&quot;
 		Case UCase(sOOCommand) = &quot;LISTBOX&quot; : sDispatch = &quot;ListBox&quot;
 		Case UCase(sOOCommand) = &quot;MACRODIALOG&quot; : sDispatch = &quot;MacroDialog&quot;
 		Case UCase(sOOCommand) = &quot;MACROORGANIZER&quot; : sDispatch = &quot;MacroOrganizer&quot;
-		Case UCase(sOOCommand) = &quot;MORECONTROLS&quot; : sDispatch = &quot;MoreControls&quot;
 		Case UCase(sOOCommand) = &quot;NAVIGATIONBAR&quot; : sDispatch = &quot;NavigationBar&quot;
 		Case iVBACommand = acCmdObjectBrowser  Or UCase(sOOCommand) = &quot;NAVIGATOR&quot; : sDispatch = &quot;Navigator&quot;
 		Case UCase(sOOCommand) = &quot;NEWDOC&quot; : sDispatch = &quot;NewDoc&quot;