tdf#115131 made a common submenu for toolbars and notebookbars

Also added the submenu in base, maths and draw

Change-Id: I94850c09c08fd3848eabe2597679634f30fbc735
Reviewed-on: https://gerrit.libreoffice.org/49575
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>

8 files changed, 463 insertions, 275 deletions

diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index aea750cb5b90..20c7e0a2be2a 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -164,7 +164,6 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d
 	org/openoffice/Office/UI/DrawWindowState.xcu \
 	org/openoffice/Office/UI/ImpressWindowState.xcu \
 	org/openoffice/Office/UI/MathWindowState.xcu \
-	org/openoffice/Office/UI/Notebookbar.xcu \
 	org/openoffice/Office/UI/ReportCommands.xcu \
 	org/openoffice/Office/UI/Sidebar.xcu \
 	org/openoffice/Office/UI/StartModuleWindowState.xcu \
diff --git a/officecfg/files.mk b/officecfg/files.mk
index 1e364ade8c98..3d3a5079f622 100644
--- a/officecfg/files.mk
+++ b/officecfg/files.mk
@@ -79,7 +79,6 @@ officecfg_XCSFILES := \
     Office/UI/ImpressWindowState \
     Office/UI/MathCommands \
     Office/UI/MathWindowState \
-    Office/UI/Notebookbar \
     Office/UI/ReportCommands \
     Office/UI/Sidebar \
     Office/UI/StartModuleCommands \
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 12d7ccd3de91..9f82a294fb3b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -355,7 +355,7 @@
           <value/>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.comp.framework.NotebookbarMenuController</value>
+          <value>com.sun.star.comp.framework.ToolbarModeMenuController</value>
         </prop>
       </node>
       <node oor:name="c30" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c55e8687f7e2..74215c11eb89 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5937,7 +5937,7 @@
       </node>
       <node oor:name=".uno:ToolbarMode" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Toolbar ~Layout</value>
+          <value xml:lang="en-US">User ~Interface</value>
         </prop>
       </node>
       <node oor:name=".uno:AvailableToolbars" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
deleted file mode 100644
index 4ca9a78f9687..000000000000
--- a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="Notebookbar" oor:package="org.openoffice.Office.UI">
-  <prop oor:name="ActiveWriter">
-    <value>notebookbar.ui</value>
-  </prop>
-  <prop oor:name="ActiveCalc">
-    <value>notebookbar.ui</value>
-  </prop>
-  <prop oor:name="ActiveImpress">
-    <value>notebookbar.ui</value>
-  </prop>
-  <node oor:name="Applications">
-    <node oor:name="Writer" oor:op="replace">
-      <node oor:name="Implementations">
-        <node oor:name="Tabbed" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Tabbed</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-        <node oor:name="TabbedCompact" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Tabbed Compact</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_compact.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-        <node oor:name="GroupedbarCompact" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Groupedbar Compact</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_groupedbar_compact.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-        <node oor:name="GroupedbarFull" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Groupedbar Full</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_groupedbar_full.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-        <node oor:name="Groups" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Contextual groups</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_groups.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>true</value>
-          </prop>
-        </node>
-        <node oor:name="Single" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Contextual single</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_single.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>true</value>
-          </prop>
-        </node>
-      </node>
-    </node>
-    <node oor:name="Calc" oor:op="replace">
-      <node oor:name="Implementations">
-        <node oor:name="Tabbed" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Tabbed</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-        <node oor:name="GroupedbarCompact" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Groupedbar Compact</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_groupedbar_compact.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-        <node oor:name="GroupedbarFull" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Groupedbar Full</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_groupedbar_full.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-        <node oor:name="Groups" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Contextual groups</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_groups.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>true</value>
-          </prop>
-        </node>
-      </node>
-    </node>
-    <node oor:name="Impress" oor:op="replace">
-      <node oor:name="Implementations">
-        <node oor:name="Tabbed" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Tabbed</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-        <node oor:name="Groups" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Contextual groups</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_groups.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>true</value>
-          </prop>
-        </node>
-        <node oor:name="GroupedbarCompact" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Groupedbar Compact</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_groupedbar_compact.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-        <node oor:name="GroupedbarFull" oor:op="replace">
-          <prop oor:name="Label">
-            <value xml:lang="en-US">Groupedbar Full</value>
-          </prop>
-          <prop oor:name="File">
-            <value>notebookbar_groupedbar_full.ui</value>
-          </prop>
-          <prop oor:name="HasMenubar">
-            <value>false</value>
-          </prop>
-        </node>
-      </node>
-    </node>
-  </node>
-</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
index 4ee4b4fbcb44..64959d508520 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="ToolbarMode" oor:package="org.openoffice.Office.UI">
+  <prop oor:name="ActiveWriter">
+    <value>notebookbar.ui</value>
+  </prop>
+  <prop oor:name="ActiveCalc">
+    <value>notebookbar.ui</value>
+  </prop>
+  <prop oor:name="ActiveImpress">
+    <value>notebookbar.ui</value>
+  </prop>
   <node oor:name="Applications">
     <node oor:name="Writer" oor:op="replace">
       <prop oor:name="Active">
@@ -9,7 +18,7 @@
       <node oor:name="Modes">
         <node oor:name="Default" oor:op="replace">
           <prop oor:name="Label">
-            <value xml:lang="en-US">Default</value>
+            <value xml:lang="en-US">Standard Toolbar</value>
           </prop>
           <prop oor:name="CommandArg">
             <value>Default</value>
@@ -86,9 +95,9 @@
             <value>Opened</value>
           </prop>
         </node>
-        <node oor:name="Notebookbar" oor:op="replace">
+        <node oor:name="ContextualGroups" oor:op="replace">
           <prop oor:name="Label">
-            <value xml:lang="en-US">Notebookbar</value>
+            <value xml:lang="en-US">Contextual groups</value>
           </prop>
           <prop oor:name="HasNotebookbar">
             <value>true</value>
@@ -100,7 +109,153 @@
             <value>3</value>
           </prop>
           <prop oor:name="CommandArg">
-            <value>Notebookbar</value>
+            <value>notebookbar_groups.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+          <prop oor:name="HasMenubar">
+            <value>true</value>
+          </prop>
+        </node>
+        <node oor:name="ContextualSingle" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Contextual Single</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>4</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar_single.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+          <prop oor:name="HasMenubar">
+            <value>true</value>
+          </prop>
+        </node>
+        <node oor:name="Tabbed" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Tabbed</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>5</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+        <node oor:name="TabbedCompact" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Tabbed Compact</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>6</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar_compact.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+        <node oor:name="GroupedbarCompact" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Groupedbar Compact</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>8</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar_groupedbar_compact.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+        <node oor:name="GroupedbarFull" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Groupedbar</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>7</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar_groupedbar_full.ui</value>
           </prop>
           <prop oor:name="Toolbars">
             <value>
@@ -123,7 +278,7 @@
       <node oor:name="Modes">
         <node oor:name="Default" oor:op="replace">
           <prop oor:name="Label">
-            <value xml:lang="en-US">Default</value>
+            <value xml:lang="en-US">Standard Toolbar</value>
           </prop>
           <prop oor:name="CommandArg">
             <value>Default</value>
@@ -200,9 +355,9 @@
             <value>Opened</value>
           </prop>
         </node>
-        <node oor:name="Notebookbar" oor:op="replace">
+        <node oor:name="ContextualGroups" oor:op="replace">
           <prop oor:name="Label">
-            <value xml:lang="en-US">Notebookbar</value>
+            <value xml:lang="en-US">Contextual groups</value>
           </prop>
           <prop oor:name="HasNotebookbar">
             <value>true</value>
@@ -214,7 +369,94 @@
             <value>3</value>
           </prop>
           <prop oor:name="CommandArg">
-            <value>Notebookbar</value>
+            <value>notebookbar_groups.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+          <prop oor:name="HasMenubar">
+            <value>true</value>
+          </prop>
+        </node>
+        <node oor:name="Tabbed" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Tabbed</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>4</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+        <node oor:name="GroupedbarCompact" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Groupedbar Compact</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>6</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar_groupedbar_compact.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+        <node oor:name="GroupedbarFull" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Groupedbar</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>5</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar_groupedbar_full.ui</value>
           </prop>
           <prop oor:name="Toolbars">
             <value>
@@ -237,7 +479,7 @@
       <node oor:name="Modes">
         <node oor:name="Default" oor:op="replace">
           <prop oor:name="Label">
-            <value xml:lang="en-US">Default</value>
+            <value xml:lang="en-US">Standard Toolbar</value>
           </prop>
           <prop oor:name="CommandArg">
             <value>Default</value>
@@ -289,9 +531,40 @@
             <value>Arrow</value>
           </prop>
         </node>
-        <node oor:name="Notebookbar" oor:op="replace">
+        <node oor:name="ContextualGroups" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Contextual groups</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>2</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar_groups.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+          <prop oor:name="HasMenubar">
+            <value>true</value>
+          </prop>
+        </node>
+        <node oor:name="Tabbed" oor:op="replace">
           <prop oor:name="Label">
-            <value xml:lang="en-US">Notebookbar</value>
+            <value xml:lang="en-US">Tabbed</value>
           </prop>
           <prop oor:name="HasNotebookbar">
             <value>true</value>
@@ -303,10 +576,165 @@
             <value>3</value>
           </prop>
           <prop oor:name="CommandArg">
-            <value>Notebookbar</value>
+            <value>notebookbar.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+        <node oor:name="GroupedbarCompact" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Groupedbar Compact</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>5</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar_groupedbar_compact.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+        <node oor:name="GroupedbarFull" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Groupedbar</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>true</value>
+          </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>4</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>notebookbar_groupedbar_full.ui</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+      </node>
+    </node>
+    <node oor:name="Draw" oor:op="replace">
+      <prop oor:name="Active">
+        <value>Default</value>
+      </prop>
+      <node oor:name="Modes">
+        <node oor:name="Default" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Standard Toolbar</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>Default</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>0</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>false</value>
           </prop>
           <prop oor:name="Toolbars">
             <value>
+              <it>private:resource/toolbar/standardbar</it>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+      </node>
+    </node>
+    <node oor:name="Formula" oor:op="replace">
+      <prop oor:name="Active">
+        <value>Default</value>
+      </prop>
+      <node oor:name="Modes">
+        <node oor:name="Default" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Standard Toolbar</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>Default</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>0</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value>false</value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+              <it>private:resource/toolbar/standardbar</it>
+            </value>
+          </prop>
+          <prop oor:name="UserToolbars">
+            <value>
+            </value>
+          </prop>
+          <prop oor:name="Sidebar">
+            <value>Arrow</value>
+          </prop>
+        </node>
+      </node>
+    </node>
+    <node oor:name="Base" oor:op="replace">
+      <prop oor:name="Active">
+        <value>Default</value>
+      </prop>
+      <node oor:name="Modes">
+        <node oor:name="Default" oor:op="replace">
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Standard Toolbar</value>
+          </prop>
+          <prop oor:name="CommandArg">
+            <value>Default</value>
+          </prop>
+          <prop oor:name="MenuPosition">
+            <value>0</value>
+          </prop>
+          <prop oor:name="HasNotebookbar">
+            <value> false </value>
+          </prop>
+          <prop oor:name="Toolbars">
+            <value>
+              <it>private:resource/toolbar/standardbar</it>
             </value>
           </prop>
           <prop oor:name="UserToolbars">
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs
deleted file mode 100644
index 658df995b3de..000000000000
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<!DOCTYPE oor:component-schema SYSTEM "../../../../../component-schema.dtd">
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Notebookbar" oor:package="org.openoffice.Office.UI" xml:lang="en-US">
-  <info>
-    <desc>Contains information about Notebookbar.</desc>
-  </info>
-  <templates>
-    <group oor:name="Implementation">
-      <info>
-        <desc>The implementation description container.</desc>
-      </info>
-      <prop oor:name="Label" oor:type="xs:string" oor:nillable="false" oor:localized="true">
-        <info>
-          <desc>The implementation name.</desc>
-       </info>
-      </prop>
-      <prop oor:name="File" oor:type="xs:string" oor:nillable="false">
-        <info>
-          <desc>The .ui file name.</desc>
-        </info>
-      </prop>
-      <prop oor:name="HasMenubar" oor:type="xs:boolean" oor:nillable="false">
-        <info>
-          <desc>Determines if menubar is visible.</desc>
-        </info>
-      </prop>
-    </group>
-    <group oor:name="Application">
-      <info>
-        <desc>Describes notebookbar settings for one application.</desc>
-      </info>
-      <set oor:name="Implementations" oor:node-type="Implementation">
-        <info>
-          <desc>List of implementations.</desc>
-        </info>
-      </set>
-    </group>
-  </templates>
-  <component>
-    <prop oor:name="ActiveWriter" oor:type="xs:string" oor:nillable="false">
-      <info>
-        <desc>Contains name of currently used implementation in the Writer module.</desc>
-      </info>
-    </prop>
-    <prop oor:name="ActiveCalc" oor:type="xs:string" oor:nillable="false">
-      <info>
-        <desc>Contains name of currently used implementation in the Calc module.</desc>
-      </info>
-    </prop>
-    <prop oor:name="ActiveImpress" oor:type="xs:string" oor:nillable="false">
-      <info>
-        <desc>Contains name of currently used implementation in the Impress module.</desc>
-      </info>
-    </prop>
-    <set oor:name="Applications" oor:node-type="Application">
-      <info>
-        <desc>List of implementations.</desc>
-      </info>
-    </set>
-  </component>
-</oor:component-schema>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
index 5d0f418abd2a..d641e80afb5e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
@@ -74,6 +74,12 @@
           </desc>
         </info>
       </prop>
+      <prop oor:name="HasMenubar" oor:type="xs:boolean" oor:nillable="false">
+        <info>
+          <desc>Determines if menubar is visible.</desc>
+        </info>
+        <value>false</value>
+      </prop>
     </group>
     <group oor:name="Application">
       <info>
@@ -92,6 +98,21 @@
     </group>
   </templates>
   <component>
+    <prop oor:name="ActiveWriter" oor:type="xs:string" oor:nillable="false">
+      <info>
+        <desc>Contains name of currently used implementation in the Writer module.</desc>
+      </info>
+    </prop>
+    <prop oor:name="ActiveCalc" oor:type="xs:string" oor:nillable="false">
+      <info>
+        <desc>Contains name of currently used implementation in the Calc module.</desc>
+      </info>
+    </prop>
+    <prop oor:name="ActiveImpress" oor:type="xs:string" oor:nillable="false">
+      <info>
+        <desc>Contains name of currently used implementation in the Impress module.</desc>
+      </info>
+    </prop>
     <set oor:name="Applications" oor:node-type="Application">
       <info>
         <desc>Contains list of toolbar mode settings for each application.</desc>