tdf#101513 arrangement of customizeable items in NB groupedbar comp

Change-Id: I79f91f9b1f1fc5d91912061c004865a94f1371a6
Reviewed-on: https://gerrit.libreoffice.org/84563
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
(cherry picked from commit 5799555fbfe378b22b5b36e0e7f9573ec9b26a31)
Reviewed-on: https://gerrit.libreoffice.org/84586

1 files changed, 1009 insertions, 1009 deletions

diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index afaaa8840337..c4e90d0f3600 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -3,7 +3,7 @@
 <interface domain="sc">
   <requires lib="gtk+" version="3.18"/>
   <requires lib="LibreOffice" version="1.0"/>
-  <object class="GtkMenu" id="Menu3D">
+  <object class="GtkMenu" id="Menu 3d">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -61,7 +61,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuArrange">
+  <object class="GtkMenu" id="Menu Arrange">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -126,523 +126,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuColor">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSepia">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterSepia</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSobel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterSobel</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterInvert">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterInvert</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterMosaic">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterMosaic</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterPopart">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterPopart</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterPoster">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterPoster</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterRelief">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterRelief</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterRemoveNoise">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterRemoveNoise</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSharpen">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterSharpen</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSmooth">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterSmooth</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSolarize">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicFilterSolarize</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuColor-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuColor-GrafMode">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GrafMode</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="MenuComments">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuComments-InsertComment">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAnnotation</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuComments-ShowAnnotations">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowAnnotations</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuComments-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuComments-ReplyComment">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ReplyComment</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuComments-DeleteComment">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteComment</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuComments-DeleteAuthor">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteAuthor</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuComments-DeleteAllNotes">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteAllNotes</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="MenuCompare">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuCompare-ReplyComment">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ProtectTraceChangeMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuCompare-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuCompare-CompareDocuments">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CompareDocuments</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuCompare-MergeDocuments">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MergeDocuments</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="MenuData">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataSort">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataSort</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-SortAscending">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SortAscending</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-SortDescending">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SortDescending</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterAutoFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterAutoFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterStandardFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterStandardFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterSpecialFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterSpecialFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterRemoveFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterRemoveFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterHideAutoFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterHideAutoFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DefineDBName">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DefineDBName</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-SelectDB">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectDB</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataAreaRefresh">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataAreaRefresh</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-InsertPivotTable">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertPivotTable</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-RecalcPivotTable">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RecalcPivotTable</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DeletePivotTable">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeletePivotTable</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-Calculate">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Calculate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-Validation">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Validation</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataSubTotals">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataSubTotals</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataForm">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataForm</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataStreams">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataStreams</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator6">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-TableOperationDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TableOperationDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-TextToColumns">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TextToColumns</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataConsolidate">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataConsolidate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator7">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-Group">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Group</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-Ungroup">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Ungroup</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-AutoOutline">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AutoOutline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-ClearOutline">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ClearOutline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-HideDetail">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HideDetail</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-ShowDetail">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowDetail</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator8">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-SamplingDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SamplingDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DescriptiveStatisticsDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DescriptiveStatisticsDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-AnalysisOfVarianceDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AnalysisOfVarianceDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-CorrelationDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CorrelationDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-CovarianceDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CovarianceDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-ExponentialSmoothingDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExponentialSmoothingDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-MovingAverageDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MovingAverageDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-RegressionDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RegressionDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-TTestDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TTestDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-FTestDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FTestDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-ZTestDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ZTestDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-ChiSquareTestDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChiSquareTestDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-FourierAnalysisDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FourierAnalysisDialog</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="MenuDraw">
+  <object class="GtkMenu" id="Menu Draw">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -824,300 +308,300 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuDrawEdit">
+  <object class="GtkMenu" id="Menu Edit">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-SelectObject">
+      <object class="GtkMenuItem" id="MenuEdit-Repeat">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectObject</property>
+        <property name="action_name">.uno:Repeat</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-ToggleObjectRotateMode">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToggleObjectRotateMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-ToggleObjectBezierMode">
+      <object class="GtkMenuItem" id="MenuEdit-Cut">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToggleObjectBezierMode</property>
+        <property name="action_name">.uno:Cut</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator1">
+      <object class="GtkMenuItem" id="MenuEdit-Copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Copy</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-FlipVerticald">
+      <object class="GtkMenuItem" id="MenuEdit-Paste">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlipVertical</property>
+        <property name="action_name">.uno:Paste</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-FlipHorizontal">
+      <object class="GtkMenuItem" id="MenuEdit-PasteUnformatted">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlipHorizontal</property>
+        <property name="action_name">.uno:PasteUnformatted</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator2">
+      <object class="GtkMenuItem" id="MenuEdit-PasteSpecial">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:PasteSpecial</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-TransformDialog">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:TransformDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-FormatLine">
+      <object class="GtkMenuItem" id="MenuEdit-SelectAll">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FormatLine</property>
+        <property name="action_name">.uno:SelectAll</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-FormatArea">
+      <object class="GtkMenuItem" id="MenuEdit-SelectRow">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FormatArea</property>
+        <property name="action_name">.uno:SelectRow</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-TextAttributes">
+      <object class="GtkMenuItem" id="MenuEdit-SelectColumn">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:TextAttributes</property>
+        <property name="action_name">.uno:SelectColumn</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-FontWork">
+      <object class="GtkMenuItem" id="MenuEdit-SelectData">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FontWork</property>
+        <property name="action_name">.uno:SelectData</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator3">
+      <object class="GtkMenuItem" id="MenuEdit-SelectTables">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:SelectTables</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-AddTextBox">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddTextBox</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDrawEdit-RemoveTextBox">
+      <object class="GtkMenuItem" id="MenuEdit-FocusToFindbar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:RemoveTextBox</property>
+        <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property>
       </object>
     </child>
-  </object>
-  <object class="GtkMenu" id="MenuEdit">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-Repeat">
+      <object class="GtkMenuItem" id="MenuEdit-SearchDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Repeat</property>
+        <property name="action_name">.uno:SearchDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-Cut">
+      <object class="GtkMenuItem" id="MenuEdit-DefinePrintArea">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Cut</property>
+        <property name="action_name">.uno:DefinePrintArea</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-Copy">
+      <object class="GtkMenuItem" id="MenuEdit-AddPrintArea">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Copy</property>
+        <property name="action_name">.uno:AddPrintArea</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-Paste">
+      <object class="GtkMenuItem" id="MenuEdit-EditPrintArea">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Paste</property>
+        <property name="action_name">.uno:EditPrintArea</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-PasteUnformatted">
+      <object class="GtkMenuItem" id="MenuEdit-DeletePrintArea">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:PasteUnformatted</property>
+        <property name="action_name">.uno:DeletePrintArea</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-PasteSpecial">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:PasteSpecial</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator2">
+      <object class="GtkMenuItem" id="MenuEdit-EditLinks">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:EditLinks</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-SelectAll">
+      <object class="GtkMenuItem" id="MenuEdit-ImageMapDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectAll</property>
+        <property name="action_name">.uno:ImageMapDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-SelectRow">
+      <object class="GtkMenuItem" id="MenuEdit-ObjectMenue">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectRow</property>
+        <property name="action_name">.uno:ObjectMenue</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-SelectColumn">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectColumn</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-SelectData">
+      <object class="GtkMenuItem" id="MenuEdit-PageFormatDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectData</property>
+        <property name="action_name">.uno:PageFormatDialog</property>
       </object>
     </child>
+  </object>
+  <object class="GtkMenu" id="Menu Edit Draw">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-SelectTables">
+      <object class="GtkMenuItem" id="MenuDrawEdit-SelectObject">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectTables</property>
+        <property name="action_name">.uno:SelectObject</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator3">
+      <object class="GtkMenuItem" id="MenuDrawEdit-ToggleObjectRotateMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ToggleObjectRotateMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-FocusToFindbar">
+      <object class="GtkMenuItem" id="MenuDrawEdit-ToggleObjectBezierMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property>
+        <property name="action_name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-SearchDialog">
+      <object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SearchDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator4">
+      <object class="GtkMenuItem" id="MenuDrawEdit-FlipVerticald">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:FlipVertical</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-DefinePrintArea">
+      <object class="GtkMenuItem" id="MenuDrawEdit-FlipHorizontal">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:DefinePrintArea</property>
+        <property name="action_name">.uno:FlipHorizontal</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-AddPrintArea">
+      <object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddPrintArea</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-EditPrintArea">
+      <object class="GtkMenuItem" id="MenuDrawEdit-TransformDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditPrintArea</property>
+        <property name="action_name">.uno:TransformDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-DeletePrintArea">
+      <object class="GtkMenuItem" id="MenuDrawEdit-FormatLine">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeletePrintArea</property>
+        <property name="action_name">.uno:FormatLine</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator5">
+      <object class="GtkMenuItem" id="MenuDrawEdit-FormatArea">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:FormatArea</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-EditLinks">
+      <object class="GtkMenuItem" id="MenuDrawEdit-TextAttributes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditLinks</property>
+        <property name="action_name">.uno:TextAttributes</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-ImageMapDialog">
+      <object class="GtkMenuItem" id="MenuDrawEdit-FontWork">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImageMapDialog</property>
+        <property name="action_name">.uno:FontWork</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-ObjectMenue">
+      <object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectMenue</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator6">
+      <object class="GtkMenuItem" id="MenuDrawEdit-AddTextBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:AddTextBox</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuEdit-PageFormatDialog">
+      <object class="GtkMenuItem" id="MenuDrawEdit-RemoveTextBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:PageFormatDialog</property>
+        <property name="action_name">.uno:RemoveTextBox</property>
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuFile">
+  <object class="GtkMenu" id="Menu File">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -1297,7 +781,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuFontwork">
+  <object class="GtkMenu" id="Menu Fontwork">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -1308,7 +792,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuForm">
+  <object class="GtkMenu" id="Menu Form">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -1468,7 +952,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuFormat">
+  <object class="GtkMenu" id="Menu Format">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -1655,223 +1139,223 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuGraphic">
+  <object class="GtkMenu" id="Menu Grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-Crop">
+      <object class="GtkMenuItem" id="MenuGrid-GridVisible">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Crop</property>
+        <property name="action_name">.uno:GridVisible</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-ExternalEdit">
+      <object class="GtkMenuItem" id="MenuGrid-GridUse">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExternalEdit</property>
+        <property name="action_name">.uno:GridUse</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-ChangePicture">
+      <object class="GtkMenuItem" id="MenuGrid-HelplinesMove">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangePicture</property>
+        <property name="action_name">.uno:HelplinesMove</property>
       </object>
     </child>
+  </object>
+  <object class="GtkMenu" id="Menu Group">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-CompressGraphic">
+      <object class="GtkMenuItem" id="MenuGroup-GroupBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CompressGraphic</property>
+        <property name="action_name">.uno:GroupBox</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-SaveGraphic">
+      <object class="GtkSeparatorMenuItem" id="MenuGroup-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator1">
+      <object class="GtkMenuItem" id="MenuGroup-FormatGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:FormatGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-ObjectMirrorVertical">
+      <object class="GtkMenuItem" id="MenuGroup-FormatUngroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectMirrorVertical</property>
+        <property name="action_name">.uno:FormatUngroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-ObjectMirrorHorizontal">
+      <object class="GtkMenuItem" id="MenuGroup-EnterGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectMirrorHorizontal</property>
+        <property name="action_name">.uno:EnterGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator2">
+      <object class="GtkMenuItem" id="MenuGroup-LeaveGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:LeaveGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-EditShapeHyperlink">
+      <object class="GtkSeparatorMenuItem" id="MenuGroup-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditShapeHyperlink</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-DeleteShapeHyperlink">
+      <object class="GtkMenuItem" id="MenuGroup-NameGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteShapeHyperlink</property>
+        <property name="action_name">.uno:NameGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-OpenHyperlinkOnCursor">
+      <object class="GtkMenuItem" id="MenuGroup-ObjectTitleDescription">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenHyperlinkOnCursor</property>
+        <property name="action_name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
+  </object>
+  <object class="GtkMenu" id="Menu Image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator3">
+      <object class="GtkMenuItem" id="MenuGraphic-Crop">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Crop</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-ImageMapDialog">
+      <object class="GtkMenuItem" id="MenuGraphic-ExternalEdit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImageMapDialog</property>
+        <property name="action_name">.uno:ExternalEdit</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-AssignMacro">
+      <object class="GtkMenuItem" id="MenuGraphic-ChangePicture">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignMacro</property>
+        <property name="action_name">.uno:ChangePicture</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator4">
+      <object class="GtkMenuItem" id="MenuGraphic-CompressGraphic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:CompressGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-ObjectTitleDescription">
+      <object class="GtkMenuItem" id="MenuGraphic-SaveGraphic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
+        <property name="action_name">.uno:SaveGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGraphic-RenameObject">
+      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:RenameObject</property>
       </object>
     </child>
-  </object>
-  <object class="GtkMenu" id="MenuGrid">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuGrid-GridVisible">
+      <object class="GtkMenuItem" id="MenuGraphic-ObjectMirrorVertical">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:GridVisible</property>
+        <property name="action_name">.uno:ObjectMirrorVertical</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGrid-GridUse">
+      <object class="GtkMenuItem" id="MenuGraphic-ObjectMirrorHorizontal">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:GridUse</property>
+        <property name="action_name">.uno:ObjectMirrorHorizontal</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGrid-HelplinesMove">
+      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelplinesMove</property>
       </object>
     </child>
-  </object>
-  <object class="GtkMenu" id="MenuGroup">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuGroup-GroupBox">
+      <object class="GtkMenuItem" id="MenuGraphic-EditShapeHyperlink">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:GroupBox</property>
+        <property name="action_name">.uno:EditShapeHyperlink</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuGroup-separator1">
+      <object class="GtkMenuItem" id="MenuGraphic-DeleteShapeHyperlink">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:DeleteShapeHyperlink</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGroup-FormatGroup">
+      <object class="GtkMenuItem" id="MenuGraphic-OpenHyperlinkOnCursor">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FormatGroup</property>
+        <property name="action_name">.uno:OpenHyperlinkOnCursor</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGroup-FormatUngroup">
+      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FormatUngroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGroup-EnterGroup">
+      <object class="GtkMenuItem" id="MenuGraphic-ImageMapDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:EnterGroup</property>
+        <property name="action_name">.uno:ImageMapDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGroup-LeaveGroup">
+      <object class="GtkMenuItem" id="MenuGraphic-AssignMacro">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:LeaveGroup</property>
+        <property name="action_name">.uno:AssignMacro</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuGroup-separator2">
+      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGroup-NameGroup">
+      <object class="GtkMenuItem" id="MenuGraphic-ObjectTitleDescription">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:NameGroup</property>
+        <property name="action_name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuGroup-ObjectTitleDescription">
+      <object class="GtkMenuItem" id="MenuGraphic-RenameObject">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
+        <property name="action_name">.uno:RenameObject</property>
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuInsert">
+  <object class="GtkMenu" id="Menu Insert">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -2024,106 +1508,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuLanguage">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-SpellingAndGrammarDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SpellingAndGrammarDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-SpellOnline">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SpellOnline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-ThesaurusDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ThesaurusDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-MoreDictionaries">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MoreDictionaries</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuLanguage-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-SetLanguageSelectionMenu">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetLanguageSelectionMenu</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-SetLanguageParagraphMenu">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetLanguageParagraphMenu</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-SetLanguageAllTextMenu">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetLanguageAllTextMenu</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuLanguage-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-ChineseConversion">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChineseConversion</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-HangulHanjaConversion">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HangulHanjaConversion</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuLanguage-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-Hyphenate">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Hyphenate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuLanguage-WordCountDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WordCountDialog</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="MenuMedia">
+  <object class="GtkMenu" id="Menu Media">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -2154,73 +1539,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuNumber">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuNumber-NumberFormatDecimal">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NumberFormatDecimal</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuNumber-NumberFormatScientific">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NumberFormatScientific</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuNumber-NumberFormatDate">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NumberFormatDate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuNumber-NumberFormatCurrency">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NumberFormatCurrency</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuNumber-NumberFormatPercent">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NumberFormatPercent</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuNumber-NumberFormatStandard">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NumberFormatStandard</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuNumber-NumberFormatTime">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NumberFormatTime</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuNumber-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuNumber-FormatCellDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FormatCellDialog</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="MenuOLE">
+  <object class="GtkMenu" id="Menu Object">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -2244,7 +1563,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuParagraph">
+  <object class="GtkMenu" id="Menu Paragraph">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -2322,7 +1641,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuPrint">
+  <object class="GtkMenu" id="Menu Print">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -2373,7 +1692,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuReview">
+  <object class="GtkMenu" id="Menu Review">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -2563,7 +1882,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuSettings">
+  <object class="GtkMenu" id="Menu Settings">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -2661,7 +1980,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuStyle">
+  <object class="GtkMenu" id="Menu Style">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -2813,7 +2132,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuTable">
+  <object class="GtkMenu" id="Menu Table">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -2925,7 +2244,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuTools">
+  <object class="GtkMenu" id="Menu Tools">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -3038,7 +2357,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuView">
+  <object class="GtkMenu" id="Menu View">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -3184,6 +2503,687 @@
       </object>
     </child>
   </object>
+  <object class="GtkMenu" id="MenuColor">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSepia">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterSepia</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSobel">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterSobel</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterInvert">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterInvert</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterMosaic">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterMosaic</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterPopart">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterPopart</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterPoster">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterPoster</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterRelief">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterRelief</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterRemoveNoise">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterRemoveNoise</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSharpen">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterSharpen</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSmooth">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterSmooth</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSolarize">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GraphicFilterSolarize</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuColor-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GrafMode">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GrafMode</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="MenuComments">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="MenuComments-InsertComment">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertAnnotation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuComments-ShowAnnotations">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ShowAnnotations</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuComments-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuComments-ReplyComment">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ReplyComment</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuComments-DeleteComment">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DeleteComment</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuComments-DeleteAuthor">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DeleteAuthor</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuComments-DeleteAllNotes">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DeleteAllNotes</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="MenuCompare">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="MenuCompare-ReplyComment">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ProtectTraceChangeMode</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuCompare-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuCompare-CompareDocuments">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:CompareDocuments</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuCompare-MergeDocuments">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:MergeDocuments</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="MenuData">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataSort">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataSort</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-SortAscending">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SortAscending</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-SortDescending">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SortDescending</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataFilterAutoFilter">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataFilterAutoFilter</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataFilterStandardFilter">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataFilterStandardFilter</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataFilterSpecialFilter">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataFilterSpecialFilter</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataFilterRemoveFilter">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataFilterRemoveFilter</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataFilterHideAutoFilter">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataFilterHideAutoFilter</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DefineDBName">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DefineDBName</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-SelectDB">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SelectDB</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataAreaRefresh">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataAreaRefresh</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-InsertPivotTable">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertPivotTable</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-RecalcPivotTable">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:RecalcPivotTable</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DeletePivotTable">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DeletePivotTable</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-Calculate">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Calculate</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator5">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-Validation">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Validation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataSubTotals">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataSubTotals</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataForm">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataForm</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataStreams">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataStreams</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator6">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-TableOperationDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:TableOperationDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-TextToColumns">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:TextToColumns</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DataConsolidate">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DataConsolidate</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator7">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-Group">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Group</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-Ungroup">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Ungroup</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-AutoOutline">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:AutoOutline</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-ClearOutline">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ClearOutline</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-HideDetail">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:HideDetail</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-ShowDetail">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ShowDetail</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator8">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-SamplingDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SamplingDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-DescriptiveStatisticsDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DescriptiveStatisticsDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-AnalysisOfVarianceDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:AnalysisOfVarianceDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-CorrelationDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:CorrelationDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-CovarianceDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:CovarianceDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-ExponentialSmoothingDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ExponentialSmoothingDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-MovingAverageDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:MovingAverageDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-RegressionDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:RegressionDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-TTestDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:TTestDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-FTestDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:FTestDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-ZTestDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ZTestDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-ChiSquareTestDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ChiSquareTestDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuData-FourierAnalysisDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:FourierAnalysisDialog</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="MenuLanguage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-SpellingAndGrammarDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SpellingAndGrammarDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-SpellOnline">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SpellOnline</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-ThesaurusDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ThesaurusDialog</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-MoreDictionaries">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:MoreDictionaries</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuLanguage-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-SetLanguageSelectionMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SetLanguageSelectionMenu</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-SetLanguageParagraphMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SetLanguageParagraphMenu</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-SetLanguageAllTextMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SetLanguageAllTextMenu</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuLanguage-separator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-ChineseConversion">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ChineseConversion</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-HangulHanjaConversion">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:HangulHanjaConversion</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuLanguage-separator3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-Hyphenate">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Hyphenate</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-WordCountDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:WordCountDialog</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="MenuNumber">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="MenuNumber-NumberFormatDecimal">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:NumberFormatDecimal</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuNumber-NumberFormatScientific">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:NumberFormatScientific</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuNumber-NumberFormatDate">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:NumberFormatDate</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuNumber-NumberFormatCurrency">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:NumberFormatCurrency</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuNumber-NumberFormatPercent">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:NumberFormatPercent</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuNumber-NumberFormatStandard">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:NumberFormatStandard</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuNumber-NumberFormatTime">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:NumberFormatTime</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuNumber-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuNumber-FormatCellDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:FormatCellDialog</property>
+      </object>
+    </child>
+  </object>
   <object class="GtkGrid" id="NotebookBar">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -3193,132 +3193,13 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="sfxlo-PriorityHBox" id="DefaultBox">
+          <object class="sfxlo-PriorityHBox" id="Toolbar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">5</property>
             <property name="margin_right">5</property>
             <child>
-              <object class="sfxlo-DropdownBox" id="ToolsSection">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkBox" id="Ext2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="toolbar_style">icons</property>
-                        <property name="show_arrow">False</property>
-                        <child>
-                          <object class="GtkToolButton" id="Tools-SearchDialog">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="action_name">.uno:SearchDialog</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="Tools-HelpIndex">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="action_name">.uno:HelpIndex</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="Tools-CloseDoc">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="action_name">.uno:CloseDoc</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="Edit-Undo1">
-                            <property name="can_focus">False</property>
-                            <property name="action_name">.uno:Undo</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="Edit-Redo1">
-                            <property name="can_focus">False</property>
-                            <property name="action_name">.uno:Redo</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="box34">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Tools-Menu:MenuSettings">
-                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenuButton">_Menu</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-DropdownBox" id="FileSection">
+              <object class="sfxlo-DropdownBox" id="File">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">5</property>
@@ -3378,7 +3259,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="fileb:MenuFile">
+                          <object class="svtlo-ManagedMenuButton" id="fileb:Menu File">
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -3411,11 +3292,11 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-DropdownBox" id="ClipboardSection">
+              <object class="sfxlo-DropdownBox" id="Clipboard">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
@@ -3489,7 +3370,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="editb:MenuEdit">
+                          <object class="svtlo-ManagedMenuButton" id="editb:Menu Edit">
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -3522,7 +3403,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -3531,7 +3412,7 @@
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="DefaultContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="Context Default">
                     <property name="can_focus">False</property>
                     <child>
                       <object class="sfxlo-OptionalBox" id="Default-Section-Styles">
@@ -3608,7 +3489,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Default-Style:MenuStyle">
+                                  <object class="svtlo-ManagedMenuButton" id="Default-Style:Menu Style">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -3762,7 +3643,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Default-Font:MenuFormat">
+                                  <object class="svtlo-ManagedMenuButton" id="Default-Font:Menu Format">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatb">F_ont</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -3997,7 +3878,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph">
+                                  <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:Menu Paragraph">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -4639,7 +4520,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert">
+                                  <object class="svtlo-ManagedMenuButton" id="Default-Insert:Menu Insert">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">_Insert</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -4753,7 +4634,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Default-Review:MenuReview">
+                                  <object class="svtlo-ManagedMenuButton" id="Default-Review:Menu Review">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -4867,7 +4748,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Default-View:MenuView">
+                                  <object class="svtlo-ManagedMenuButton" id="Default-View:Menu View">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -4979,7 +4860,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="svtlo-ManagedMenuButton" id="Default-FormButton:MenuForm">
+                              <object class="svtlo-ManagedMenuButton" id="Default-FormButton:Menu Form">
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|FormButton">Fo_rm</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -5026,7 +4907,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="Context Text">
                     <property name="can_focus">False</property>
                     <child>
                       <object class="sfxlo-OptionalBox" id="DrawText-Section-Styles">
@@ -5103,7 +4984,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="DrawText-Style:MenuStyle">
+                                  <object class="svtlo-ManagedMenuButton" id="DrawText-Style:Menu Style">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -5490,7 +5371,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="paragraphS:MenuParagraph">
+                                  <object class="svtlo-ManagedMenuButton" id="paragraphS:Menu Paragraph">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphS">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -5748,7 +5629,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="viewS:MenuView">
+                                  <object class="svtlo-ManagedMenuButton" id="viewS:Menu View">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewS">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -5798,7 +5679,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="DrawContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="Context Draw">
                     <property name="can_focus">False</property>
                     <child>
                       <object class="sfxlo-OptionalBox" id="Draw-Section-Edit">
@@ -5886,7 +5767,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Draw-Edit:MenuDrawEdit">
+                                  <object class="svtlo-ManagedMenuButton" id="Draw-Edit:Menu Edit Draw">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">D_raw</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -6324,7 +6205,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Draw-Arrange:MenuArrange">
+                                  <object class="svtlo-ManagedMenuButton" id="Draw-Arrange:Menu Arrange">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -6608,7 +6489,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw">
+                                  <object class="svtlo-ManagedMenuButton" id="Draw-Draw:Menu Draw">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">_Shape</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -6864,7 +6745,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Draw-Group:MenuGroup">
+                                  <object class="svtlo-ManagedMenuButton" id="Draw-Group:Menu Group">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewDrawb">Grou_p</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -6990,7 +6871,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D">
+                                  <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu 3d">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -7225,7 +7106,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Draw-Fontwork:MenuFontwork">
+                                  <object class="svtlo-ManagedMenuButton" id="Draw-Fontwork:Menu Fontwork">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Fontwork</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -7339,7 +7220,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Draw-Grid:MenuGrid">
+                                  <object class="svtlo-ManagedMenuButton" id="Draw-Grid:Menu Grid">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -7394,7 +7275,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="ImageContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="Context Image">
                     <property name="can_focus">False</property>
                     <child>
                       <object class="sfxlo-OptionalBox" id="Image-Section-Image">
@@ -7472,7 +7353,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Image-Image:MenuGraphic">
+                                  <object class="svtlo-ManagedMenuButton" id="Image-Image:Menu Image">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ImageButton">Im_age</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -7910,7 +7791,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Image-Arrange:MenuArrange">
+                                  <object class="svtlo-ManagedMenuButton" id="Image-Arrange:Menu Arrange">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -8415,7 +8296,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Image-Grid:MenuGrid">
+                                  <object class="svtlo-ManagedMenuButton" id="Image-Grid:Menu Grid">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -8465,7 +8346,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="ObjectContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="Context Object">
                     <property name="can_focus">False</property>
                     <child>
                       <object class="sfxlo-OptionalBox" id="Object-Section-Graphic">
@@ -8543,7 +8424,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Object-Frame:MenuOLE">
+                                  <object class="svtlo-ManagedMenuButton" id="Object-Frame:Menu Object">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Object</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -8981,7 +8862,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Object-Arrange:MenuArrange">
+                                  <object class="svtlo-ManagedMenuButton" id="Object-Arrange:Menu Arrange">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -9238,7 +9119,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Object-Grid:MenuGrid">
+                                  <object class="svtlo-ManagedMenuButton" id="Object-Grid:Menu Grid">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -9289,7 +9170,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="MediaContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="Context Media">
                     <property name="can_focus">False</property>
                     <child>
                       <object class="sfxlo-OptionalBox" id="Media-Section-Media">
@@ -9367,7 +9248,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Media-Media:MenuMedia">
+                                  <object class="svtlo-ManagedMenuButton" id="Media-Media:Menu Media">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Media</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -9602,7 +9483,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Media-Arrange:MenuArrange">
+                                  <object class="svtlo-ManagedMenuButton" id="Media-Arrange:Menu Arrange">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -9860,7 +9741,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Media-Grid:MenuGrid">
+                                  <object class="svtlo-ManagedMenuButton" id="Media-Grid:Menu Grid">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -9910,7 +9791,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="MultiContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="Context Multiobject">
                     <property name="can_focus">False</property>
                     <child>
                       <object class="sfxlo-OptionalBox" id="Multi-Section-Edit">
@@ -9998,7 +9879,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Multi-Edit:MenuDrawEdit">
+                                  <object class="svtlo-ManagedMenuButton" id="Multi-Edit:Menu Edit Draw">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">_Edit</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -10436,7 +10317,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Multi-Arrange:MenuArrange">
+                                  <object class="svtlo-ManagedMenuButton" id="Multi-Arrange:Menu Arrange">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -10693,7 +10574,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Multi-Group:MenuGroup">
+                                  <object class="svtlo-ManagedMenuButton" id="Multi-Group:Menu Group">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewDrawb">Grou_p</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -10808,7 +10689,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Multi-Grid:MenuGrid">
+                                  <object class="svtlo-ManagedMenuButton" id="Multi-Grid:Menu Grid">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -10858,7 +10739,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="PrintContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="Context Print">
                     <property name="can_focus">False</property>
                     <child>
                       <object class="sfxlo-OptionalBox" id="Print-Section-SlideLayout">
@@ -11293,7 +11174,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Print-Print:MenuPrint">
+                                  <object class="svtlo-ManagedMenuButton" id="Print-Print:Menu Print">
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|PrintMenuButton">_Print</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -11340,7 +11221,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="FormContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="Context Form">
                     <property name="can_focus">False</property>
                     <child>
                       <object class="sfxlo-OptionalBox" id="Form-Section-Form">
@@ -11426,7 +11307,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="svtlo-ManagedMenuButton" id="Form-FormButton:MenuForm">
+                              <object class="svtlo-ManagedMenuButton" id="Form-FormButton:Menu Form">
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|FormButton">Fo_rm</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -12127,6 +12008,125 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-DropdownBox" id="Tools">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkBox" id="Ext2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="toolbar_style">icons</property>
+                        <property name="show_arrow">False</property>
+                        <child>
+                          <object class="GtkToolButton" id="Tools-SearchDialog">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="action_name">.uno:SearchDialog</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="Tools-HelpIndex">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="action_name">.uno:HelpIndex</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="Tools-CloseDoc">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="action_name">.uno:CloseDoc</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="Edit-Undo1">
+                            <property name="can_focus">False</property>
+                            <property name="action_name">.uno:Undo</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="Edit-Redo1">
+                            <property name="can_focus">False</property>
+                            <property name="action_name">.uno:Redo</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">False</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box34">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="svtlo-ManagedMenuButton" id="Tools-Menu:Menu Settings">
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenuButton">_Menu</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <property name="relief">none</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
                 <property name="position">3</property>
               </packing>
             </child>