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>

2 files changed, 21 insertions, 78 deletions

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>