From 4e871d99ccace244de42c0d5c4bd11611af6ccb2 Mon Sep 17 00:00:00 2001
From: Justin Luth <justin.luth@collabora.com>
Date: Tue, 17 Oct 2023 08:18:17 -0400
Subject: tdf#157026 sd notebookbar: add ObjectAlign to MenuTable as popupmenu

The vast majority of this is just eliminating copy/paste,
since I have now created a popupmenu.xml list for the popup menu.

The "fix" is adding this to the Table menus.

.uno:ObjectAlign is basically just a "label".
Now it is a label for two different "views":
* a toolbar widget dropdown
* a menu subcategory

Perhaps it is confusing to have one UNO entry
serve these two similar purposes?

I suppose someone might also complain that a simple
    <menu:menu menu:id=".uno:ObjectAlign"/>
isn't clear that this is a submenu.

I considered making mine a new ObjectAlignMenu,
but the annoyance of having to create a duplicate string translation in
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
made me just reuse the existing label.

Change-Id: I17e037e0c9c5d1f57ac9f174a76cd041983bcea4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157894
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
---
 sd/uiconfig/sdraw/menubar/menubar.xml                  | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/3dobject.xml               | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/3dscene.xml                | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/3dscene2.xml               | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/connector.xml              | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/curve.xml                  | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/draw.xml                   | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/form.xml                   | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/graphic.xml                | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/group.xml                  | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/line.xml                   | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/measure.xml                | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/media.xml                  | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/multiselect.xml            | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/objectalign.xml            | 18 ++++++++++++++++++
 sd/uiconfig/sdraw/popupmenu/oleobject.xml              | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/table.xml                  | 12 +-----------
 sd/uiconfig/sdraw/popupmenu/textbox.xml                | 12 +-----------
 sd/uiconfig/sdraw/ui/notebookbar.ui                    |  7 +++++++
 sd/uiconfig/sdraw/ui/notebookbar_compact.ui            |  7 +++++++
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 13 +++++++++++++
 21 files changed, 62 insertions(+), 187 deletions(-)
 create mode 100644 sd/uiconfig/sdraw/popupmenu/objectalign.xml

(limited to 'sd/uiconfig/sdraw')

diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 824c3fd15124..a905b056929f 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -510,17 +510,7 @@
         </menu:menupopup>
       </menu:menu>
       <menu:menuseparator/>
-      <menu:menu menu:id=".uno:ObjectAlign">
-        <menu:menupopup>
-          <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-          <menu:menuitem menu:id=".uno:AlignCenter"/>
-          <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-          <menu:menuseparator/>
-          <menu:menuitem menu:id=".uno:AlignUp"/>
-          <menu:menuitem menu:id=".uno:AlignMiddle"/>
-          <menu:menuitem menu:id=".uno:AlignDown"/>
-        </menu:menupopup>
-      </menu:menu>
+      <menu:menu menu:id=".uno:ObjectAlign"/>
       <menu:menu menu:id=".uno:ArrangeMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/3dobject.xml b/sd/uiconfig/sdraw/popupmenu/3dobject.xml
index 6274cb1111fc..eb88db13df82 100644
--- a/sd/uiconfig/sdraw/popupmenu/3dobject.xml
+++ b/sd/uiconfig/sdraw/popupmenu/3dobject.xml
@@ -18,17 +18,7 @@
   <menu:menuitem menu:id=".uno:FormatLine"/>
   <menu:menuitem menu:id=".uno:FormatArea"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/3dscene.xml b/sd/uiconfig/sdraw/popupmenu/3dscene.xml
index 7af0eb556df3..119a806cf61d 100644
--- a/sd/uiconfig/sdraw/popupmenu/3dscene.xml
+++ b/sd/uiconfig/sdraw/popupmenu/3dscene.xml
@@ -18,17 +18,7 @@
   <menu:menuitem menu:id=".uno:FormatLine"/>
   <menu:menuitem menu:id=".uno:FormatArea"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/3dscene2.xml b/sd/uiconfig/sdraw/popupmenu/3dscene2.xml
index 71fbe2502437..be05eeeec3b7 100644
--- a/sd/uiconfig/sdraw/popupmenu/3dscene2.xml
+++ b/sd/uiconfig/sdraw/popupmenu/3dscene2.xml
@@ -16,17 +16,7 @@
   <menu:menuitem menu:id=".uno:FormatLine"/>
   <menu:menuitem menu:id=".uno:FormatArea"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/connector.xml b/sd/uiconfig/sdraw/popupmenu/connector.xml
index 65109ae4dc46..f8ddc04ac8de 100644
--- a/sd/uiconfig/sdraw/popupmenu/connector.xml
+++ b/sd/uiconfig/sdraw/popupmenu/connector.xml
@@ -19,17 +19,7 @@
   <menu:menuitem menu:id=".uno:ConnectorAttributes"/>
   <menu:menuitem menu:id=".uno:TransformDialog"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/curve.xml b/sd/uiconfig/sdraw/popupmenu/curve.xml
index 4861e8333f1f..ee57366df1c8 100644
--- a/sd/uiconfig/sdraw/popupmenu/curve.xml
+++ b/sd/uiconfig/sdraw/popupmenu/curve.xml
@@ -20,17 +20,7 @@
   <menu:menuitem menu:id=".uno:FontDialog"/>
   <menu:menuitem menu:id=".uno:ParagraphDialog"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/draw.xml b/sd/uiconfig/sdraw/popupmenu/draw.xml
index d29bb5046456..3f11c0fa728e 100644
--- a/sd/uiconfig/sdraw/popupmenu/draw.xml
+++ b/sd/uiconfig/sdraw/popupmenu/draw.xml
@@ -25,17 +25,7 @@
   <menu:menuitem menu:id=".uno:FormatLine"/>
   <menu:menuitem menu:id=".uno:FormatArea"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/form.xml b/sd/uiconfig/sdraw/popupmenu/form.xml
index 8952b64f7e16..8ea12e638b39 100644
--- a/sd/uiconfig/sdraw/popupmenu/form.xml
+++ b/sd/uiconfig/sdraw/popupmenu/form.xml
@@ -18,17 +18,7 @@
   <menu:menuitem menu:id=".uno:FormProperties"/>
   <menu:menuitem menu:id=".uno:ChangeControlType"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/graphic.xml b/sd/uiconfig/sdraw/popupmenu/graphic.xml
index 2ac8d1c54d30..6e7c6ef33b0c 100644
--- a/sd/uiconfig/sdraw/popupmenu/graphic.xml
+++ b/sd/uiconfig/sdraw/popupmenu/graphic.xml
@@ -22,17 +22,7 @@
   <menu:menuitem menu:id=".uno:TransformDialog"/>
   <menu:menuitem menu:id=".uno:FormatLine"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/group.xml b/sd/uiconfig/sdraw/popupmenu/group.xml
index 270add79bb2e..43b99eb991f6 100644
--- a/sd/uiconfig/sdraw/popupmenu/group.xml
+++ b/sd/uiconfig/sdraw/popupmenu/group.xml
@@ -16,17 +16,7 @@
   <menu:menuitem menu:id=".uno:FormatLine"/>
   <menu:menuitem menu:id=".uno:FormatArea"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/line.xml b/sd/uiconfig/sdraw/popupmenu/line.xml
index 8501167f1f44..fc94fa4a4d36 100644
--- a/sd/uiconfig/sdraw/popupmenu/line.xml
+++ b/sd/uiconfig/sdraw/popupmenu/line.xml
@@ -16,17 +16,7 @@
   <menu:menuitem menu:id=".uno:TransformDialog"/>
   <menu:menuitem menu:id=".uno:FormatLine"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/measure.xml b/sd/uiconfig/sdraw/popupmenu/measure.xml
index 9764346fdd62..2018233c8ade 100644
--- a/sd/uiconfig/sdraw/popupmenu/measure.xml
+++ b/sd/uiconfig/sdraw/popupmenu/measure.xml
@@ -21,17 +21,7 @@
   <menu:menuitem menu:id=".uno:FontDialog"/>
   <menu:menuitem menu:id=".uno:ParagraphDialog"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/media.xml b/sd/uiconfig/sdraw/popupmenu/media.xml
index b1e967e77653..bdaea5c1f960 100644
--- a/sd/uiconfig/sdraw/popupmenu/media.xml
+++ b/sd/uiconfig/sdraw/popupmenu/media.xml
@@ -14,17 +14,7 @@
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:TransformDialog"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/multiselect.xml b/sd/uiconfig/sdraw/popupmenu/multiselect.xml
index b5a2e1b914fd..0b4c614a0e08 100644
--- a/sd/uiconfig/sdraw/popupmenu/multiselect.xml
+++ b/sd/uiconfig/sdraw/popupmenu/multiselect.xml
@@ -17,17 +17,7 @@
   <menu:menuitem menu:id=".uno:FormatArea"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:DistributeSelection"/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/objectalign.xml b/sd/uiconfig/sdraw/popupmenu/objectalign.xml
new file mode 100644
index 000000000000..4bb17386d158
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/objectalign.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+  <menu:menuitem menu:id=".uno:AlignCenter"/>
+  <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AlignUp"/>
+  <menu:menuitem menu:id=".uno:AlignMiddle"/>
+  <menu:menuitem menu:id=".uno:AlignDown"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/oleobject.xml b/sd/uiconfig/sdraw/popupmenu/oleobject.xml
index 0c871876bb20..7dfd16192ab2 100644
--- a/sd/uiconfig/sdraw/popupmenu/oleobject.xml
+++ b/sd/uiconfig/sdraw/popupmenu/oleobject.xml
@@ -17,17 +17,7 @@
   <menu:menuitem menu:id=".uno:FormatLine"/>
   <menu:menuitem menu:id=".uno:FormatArea"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/table.xml b/sd/uiconfig/sdraw/popupmenu/table.xml
index 4e544b9f8aeb..71ae6f2bd562 100644
--- a/sd/uiconfig/sdraw/popupmenu/table.xml
+++ b/sd/uiconfig/sdraw/popupmenu/table.xml
@@ -49,17 +49,7 @@
   <menu:menuitem menu:id=".uno:FontDialog"/>
   <menu:menuitem menu:id=".uno:ParagraphDialog"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/textbox.xml b/sd/uiconfig/sdraw/popupmenu/textbox.xml
index caaef6800d34..5f9c4cd8b24a 100644
--- a/sd/uiconfig/sdraw/popupmenu/textbox.xml
+++ b/sd/uiconfig/sdraw/popupmenu/textbox.xml
@@ -23,17 +23,7 @@
   <menu:menuitem menu:id=".uno:FontDialog"/>
   <menu:menuitem menu:id=".uno:ParagraphDialog"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:ObjectAlign">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-      <menu:menuitem menu:id=".uno:AlignCenter"/>
-      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:AlignUp"/>
-      <menu:menuitem menu:id=".uno:AlignMiddle"/>
-      <menu:menuitem menu:id=".uno:AlignDown"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign"/>
   <menu:menu menu:id=".uno:ArrangeMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:BringToFront"/>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index eb3f977a15a5..32e7212d5e70 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1598,6 +1598,13 @@
         <property name="action_name">.uno:AutoFormat</property>
       </object>
     </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuTable-ObjectAlign">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectAlign</property>
+      </object>
+    </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTable-separator1">
         <property name="visible">True</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
index 3aa52a0ccf82..6d45e5845bca 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
@@ -1647,6 +1647,13 @@
         <property name="action_name">.uno:AutoFormat</property>
       </object>
     </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuTable-ObjectAlign">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectAlign</property>
+      </object>
+    </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTable-separator1">
         <property name="visible">True</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index b1f8e937ca7f..083af53572d3 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -2215,6 +2215,19 @@
   <object class="GtkMenu" id="Menu Rows Columns">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="MenuTable-ObjectAlign">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectAlign</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuTable-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
     <child>
       <object class="GtkMenuItem" id="InsertRowsBeforeD">
         <property name="visible">True</property>
-- 
cgit