NB tabbed: update draw tab drop down menu entries

Change-Id: Id12b92eaa472e59681cf684e6f007476c884cc5a
Reviewed-on: https://gerrit.libreoffice.org/61964
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>

4 files changed, 238 insertions, 363 deletions

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 7f0b9d144572..0a2863fb8611 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -249,188 +249,57 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="LineD">
+      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Line</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="Freeline_UnfilledD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Freeline_Unfilled</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="FreelineD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Freeline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="Bezier_UnfilledD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Bezier_Unfilled</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="BezierFillD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:BezierFill</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="Polygon_UnfilledD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Unfilled</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="Polygon_Diagonal_UnfilledD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="Polygon_DiagonalD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Diagonal</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator131">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="BasicShapesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:BasicShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SymbolShapesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SymbolShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ArrowShapesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ArrowShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="StarShapesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:StarShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="CalloutShapesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CalloutShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="FlowChartShapesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlowChartShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator134">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="DrawCaptionD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DrawCaption</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="VerticalCaptionD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalCaption</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator135">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="DrawText3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DrawText</property>
+        <property name="action_name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="VerticalTextD">
+      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalText</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertGraphicD2">
+      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectRotateMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertGraphic</property>
+        <property name="action_name">.uno:ToggleObjectRotateMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FontworkGalleryFloaterD1">
+      <object class="GtkMenuItem" id="MenuDraw-ObjectMirrorVertical">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FontworkGalleryFloater</property>
+        <property name="action_name">.uno:FlipVertical</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Text_MarqueeD">
+      <object class="GtkMenuItem" id="MenuDraw-ObjectMirrorHorizontal">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Text_Marquee</property>
+        <property name="action_name">.uno:FlipHorizontal</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator136">
+      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ToggleObjectBezierModeD">
+      <object class="GtkMenuItem" id="MenuDraw-RenameObject">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToggleObjectBezierMode</property>
+        <property name="action_name">.uno:RenameObject</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtrusionToggleD">
+      <object class="GtkMenuItem" id="MenuDraw-ObjectTitleDescription">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExtrusionToggle</property>
+        <property name="action_name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
   </object>
@@ -1057,6 +926,27 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuImage-EditShapeHyperlink">
+        <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="MenuImage-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="MenuImage-OpenHyperlinkOnCursor">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OpenHyperlinkOnCursor</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuImage-AssignMacro">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1247,6 +1137,40 @@
         <property name="action_name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuMedia-separator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuMedia-EditShapeHyperlink">
+        <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="MenuMedia-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="MenuMedia-OpenHyperlinkOnCursor">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OpenHyperlinkOnCursor</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuMedia-AssignMacro">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:AssignMacro</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuPage">
     <property name="visible">True</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 0bbb2c88cf85..814c56c0fe26 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -61,107 +61,107 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Line">
+      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Line</property>
+        <property name="action_name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled">
+      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectRotateMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Freeline_Unfilled</property>
+        <property name="action_name">.uno:ToggleObjectRotateMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Freeline">
+      <object class="GtkMenuItem" id="MenuDraw-MirrorVert">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Freeline</property>
+        <property name="action_name">.uno:MirrorVert</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled">
+      <object class="GtkMenuItem" id="MenuDraw-MirrorHorz">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Bezier_Unfilled</property>
+        <property name="action_name">.uno:MirrorHorz</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-BezierFill">
+      <object class="GtkMenuItem" id="MenuDraw-AdvancedMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BezierFill</property>
+        <property name="action_name">.uno:AdvancedMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled">
+      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Unfilled</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled">
+      <object class="GtkMenuItem" id="MenuDraw-Combine">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property>
+        <property name="action_name">.uno:Combine</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal">
+      <object class="GtkMenuItem" id="MenuDraw-Dismantle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Diagonal</property>
+        <property name="action_name">.uno:Dismantle</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator">
+      <object class="GtkMenuItem" id="MenuDraw-Merge">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Merge</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-BasicShapes">
+      <object class="GtkMenuItem" id="MenuDraw-Substract">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BasicShapes</property>
+        <property name="action_name">.uno:Substract</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-SymbolShapes">
+      <object class="GtkMenuItem" id="MenuDraw-Intersect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SymbolShapes</property>
+        <property name="action_name">.uno:Intersect</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-ArrowShapes">
+      <object class="GtkMenuItem" id="MenuDraw-EqualizeWidth">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ArrowShapes</property>
+        <property name="action_name">.uno:EqualizeWidth</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-StarShapes">
+      <object class="GtkMenuItem" id="MenuDraw-EqualizeHeight">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StarShapes</property>
+        <property name="action_name">.uno:EqualizeHeight</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-CalloutShapes">
+      <object class="GtkMenuItem" id="MenuDraw-Connect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CalloutShapes</property>
+        <property name="action_name">.uno:Connect</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes">
+      <object class="GtkMenuItem" id="MenuDraw-Break">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlowChartShapes</property>
+        <property name="action_name">.uno:Break</property>
       </object>
     </child>
     <child>
@@ -171,17 +171,17 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-DrawCaption">
+      <object class="GtkMenuItem" id="MenuDraw-CopyObjects">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:DrawCaption</property>
+        <property name="action_name">.uno:CopyObjects</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-VerticalCaption">
+      <object class="GtkMenuItem" id="MenuDraw-Morphing">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalCaption</property>
+        <property name="action_name">.uno:Morphing</property>
       </object>
     </child>
     <child>
@@ -191,31 +191,52 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-DrawText">
+      <object class="GtkMenuItem" id="MenuDraw-ChangeBezier">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:DrawText</property>
+        <property name="action_name">.uno:ChangeBezier</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuDraw-ChangePolygon">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ChangePolygon</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuDraw-convert_to_contour">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:convert_to_contour</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-VerticalText">
+      <object class="GtkMenuItem" id="MenuDraw-ConvertInto3D">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalText</property>
+        <property name="action_name">.uno:ConvertInto3D</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-FontWork">
+      <object class="GtkMenuItem" id="MenuDraw-ConvertInto3DLatheFast">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FontWork</property>
+        <property name="action_name">.uno:ConvertInto3DLatheFast</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Text_Marquee">
+      <object class="GtkMenuItem" id="MenuDraw-ConvertIntoBitmap">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Text_Marquee</property>
+        <property name="action_name">.uno:ConvertIntoBitmap</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuDraw-ConvertIntoMetaFile">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertIntoMetaFile</property>
       </object>
     </child>
     <child>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index e4774f569d02..657df0ccddd0 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -61,107 +61,107 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Line">
+      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Line</property>
+        <property name="action_name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled">
+      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectRotateMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Freeline_Unfilled</property>
+        <property name="action_name">.uno:ToggleObjectRotateMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Freeline">
+      <object class="GtkMenuItem" id="MenuDraw-MirrorVert">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Freeline</property>
+        <property name="action_name">.uno:MirrorVert</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled">
+      <object class="GtkMenuItem" id="MenuDraw-MirrorHorz">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Bezier_Unfilled</property>
+        <property name="action_name">.uno:MirrorHorz</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-BezierFill">
+      <object class="GtkMenuItem" id="MenuDraw-AdvancedMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BezierFill</property>
+        <property name="action_name">.uno:AdvancedMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled">
+      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Unfilled</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled">
+      <object class="GtkMenuItem" id="MenuDraw-Combine">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property>
+        <property name="action_name">.uno:Combine</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal">
+      <object class="GtkMenuItem" id="MenuDraw-Dismantle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Diagonal</property>
+        <property name="action_name">.uno:Dismantle</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator">
+      <object class="GtkMenuItem" id="MenuDraw-Merge">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Merge</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-BasicShapes">
+      <object class="GtkMenuItem" id="MenuDraw-Substract">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BasicShapes</property>
+        <property name="action_name">.uno:Substract</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-SymbolShapes">
+      <object class="GtkMenuItem" id="MenuDraw-Intersect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SymbolShapes</property>
+        <property name="action_name">.uno:Intersect</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-ArrowShapes">
+      <object class="GtkMenuItem" id="MenuDraw-EqualizeWidth">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ArrowShapes</property>
+        <property name="action_name">.uno:EqualizeWidth</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-StarShapes">
+      <object class="GtkMenuItem" id="MenuDraw-EqualizeHeight">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StarShapes</property>
+        <property name="action_name">.uno:EqualizeHeight</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-CalloutShapes">
+      <object class="GtkMenuItem" id="MenuDraw-Connect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CalloutShapes</property>
+        <property name="action_name">.uno:Connect</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes">
+      <object class="GtkMenuItem" id="MenuDraw-Break">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlowChartShapes</property>
+        <property name="action_name">.uno:Break</property>
       </object>
     </child>
     <child>
@@ -171,17 +171,17 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-DrawCaption">
+      <object class="GtkMenuItem" id="MenuDraw-CopyObjects">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:DrawCaption</property>
+        <property name="action_name">.uno:CopyObjects</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-VerticalCaption">
+      <object class="GtkMenuItem" id="MenuDraw-Morphing">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalCaption</property>
+        <property name="action_name">.uno:Morphing</property>
       </object>
     </child>
     <child>
@@ -191,31 +191,52 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-DrawText">
+      <object class="GtkMenuItem" id="MenuDraw-ChangeBezier">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:DrawText</property>
+        <property name="action_name">.uno:ChangeBezier</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-VerticalText">
+      <object class="GtkMenuItem" id="MenuDraw-ChangePolygon">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalText</property>
+        <property name="action_name">.uno:ChangePolygon</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-FontWork">
+      <object class="GtkMenuItem" id="MenuDraw-convert_to_contour">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FontWork</property>
+        <property name="action_name">.uno:convert_to_contour</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Text_Marquee">
+      <object class="GtkMenuItem" id="MenuDraw-ConvertInto3D">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Text_Marquee</property>
+        <property name="action_name">.uno:ConvertInto3D</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuDraw-ConvertInto3DLatheFast">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertInto3DLatheFast</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuDraw-ConvertIntoBitmap">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertIntoBitmap</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuDraw-ConvertIntoMetaFile">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertIntoMetaFile</property>
       </object>
     </child>
     <child>
@@ -1085,6 +1106,19 @@
         <property name="action_name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuMedia-separator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuMedia-AnimationEffects">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:AnimationEffects</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuObject">
     <property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index c5fe3f23f665..1f7131c0b189 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -8,107 +8,37 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Line">
+      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Line</property>
+        <property name="action_name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled">
+      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Freeline_Unfilled</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Freeline">
+      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectRotateMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Freeline</property>
+        <property name="action_name">.uno:ToggleObjectRotateMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled">
+      <object class="GtkMenuItem" id="MenuDraw-FlipVertical">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Bezier_Unfilled</property>
+        <property name="action_name">.uno:FlipVertical</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-BezierFill">
+      <object class="GtkMenuItem" id="MenuDraw-FlipHorizontal">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BezierFill</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Unfilled</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Polygon_Diagonal</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-BasicShapes">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:BasicShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-SymbolShapes">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SymbolShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-ArrowShapes">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ArrowShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-StarShapes">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:StarShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-CalloutShapes">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CalloutShapes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlowChartShapes</property>
+        <property name="action_name">.uno:FlipHorizontal</property>
       </object>
     </child>
     <child>
@@ -118,60 +48,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuDraw-DrawCaption">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DrawCaption</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-VerticalCaption">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalCaption</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-DrawText">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DrawText</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-VerticalText">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalText</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-FontWork">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FontWork</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-Text_Marquee">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Text_Marquee</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="MenuDraw-NameGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -766,7 +642,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator62">
+      <object class="GtkSeparatorMenuItem" id="MenuImage-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -786,7 +662,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator139">
+      <object class="GtkSeparatorMenuItem" id="MenuImage-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -806,7 +682,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator1">
+      <object class="GtkSeparatorMenuItem" id="MenuImage-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -818,6 +694,13 @@
         <property name="action_name">.uno:GraphicDialog</property>
       </object>
     </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuImage-InsertCaptionDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertCaptionDialog</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuInsert">
     <property name="visible">True</property>
@@ -995,6 +878,19 @@
         <property name="action_name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuMedia-separator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuMedia-InsertCaptionDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertCaptionDialog</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuObject">
     <property name="visible">True</property>