tdf#129549: hide .uno:BulletsAndNumberingDialog from customization UI
... and replace its uses with universal .uno:OutlineBullet
Change-Id: Ia6bc1c5ca23440af333ffeed9fcd2c8dd47a6af4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86245
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c2ceb08..2567e0890 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5905,8 +5905,8 @@
RecordAbsolute = FALSE,
RecordPerSet;
AccelConfig = FALSE,
MenuConfig = FALSE,
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
GroupId = SfxGroupId::Format;
]
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index d063a0d..489b6b6 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -461,9 +461,9 @@
RecordPerSet;
Asynchron;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
AccelConfig = FALSE,
MenuConfig = FALSE,
ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Enumeration;
]
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index e74fcb8..268b30c 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -440,7 +440,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:PageDialog"/>
<menu:menuitem menu:id=".uno:TitlePageDialog" menu:style="text"/>
diff --git a/sw/uiconfig/sglobal/toolbar/numobjectbar.xml b/sw/uiconfig/sglobal/toolbar/numobjectbar.xml
index 14a05ef..9fcd5ed 100644
--- a/sw/uiconfig/sglobal/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/numobjectbar.xml
@@ -39,5 +39,5 @@
<toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SetOutline" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineBullet"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 9c0ac3e..8f773df 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -313,7 +313,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:PageDialog"/>
<menu:menuitem menu:id=".uno:FormatAllNotes" menu:style="text"/>
diff --git a/sw/uiconfig/sweb/toolbar/numobjectbar.xml b/sw/uiconfig/sweb/toolbar/numobjectbar.xml
index 14a05ef..9fcd5ed 100644
--- a/sw/uiconfig/sweb/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/numobjectbar.xml
@@ -39,5 +39,5 @@
<toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SetOutline" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineBullet"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 973cfd9..aaea61d 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -392,7 +392,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:PageDialog"/>
<menu:menuitem menu:id=".uno:TitlePageDialog" menu:style="text"/>
diff --git a/sw/uiconfig/swform/toolbar/numobjectbar.xml b/sw/uiconfig/swform/toolbar/numobjectbar.xml
index 14a05ef..9fcd5ed 100644
--- a/sw/uiconfig/swform/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/numobjectbar.xml
@@ -39,5 +39,5 @@
<toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SetOutline" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineBullet"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index a81e5dd..d2c1c62 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -378,7 +378,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:PageDialog"/>
<menu:menuitem menu:id=".uno:RubyDialog" menu:style="text"/>
diff --git a/sw/uiconfig/swreport/toolbar/numobjectbar.xml b/sw/uiconfig/swreport/toolbar/numobjectbar.xml
index d7adb62..87aa243 100644
--- a/sw/uiconfig/swreport/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/numobjectbar.xml
@@ -31,5 +31,5 @@
<toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:NumberingStart"/>
<toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineBullet"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index b76352de..6239cb5 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -448,7 +448,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:PageDialog"/>
<menu:menuitem menu:id=".uno:TitlePageDialog"/>
diff --git a/sw/uiconfig/swriter/toolbar/numobjectbar.xml b/sw/uiconfig/swriter/toolbar/numobjectbar.xml
index 14a05ef..9fcd5ed 100644
--- a/sw/uiconfig/swriter/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/numobjectbar.xml
@@ -39,5 +39,5 @@
<toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SetOutline" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineBullet"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 0cc64ef..26690ee 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -788,7 +788,7 @@
<object class="GtkMenuItem" id="MenuHome-BulletsAndNumberingDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:BulletsAndNumberingDialog</property>
<property name="action_name">.uno:OutlineBullet</property>
</object>
</child>
<child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 6760c60..72a5bf2 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -837,7 +837,7 @@
<object class="GtkMenuItem" id="MenuHome-BulletsAndNumberingDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:BulletsAndNumberingDialog</property>
<property name="action_name">.uno:OutlineBullet</property>
</object>
</child>
<child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 206a86f..03196e0 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -2303,7 +2303,7 @@
<object class="GtkMenuItem" id="MenuParagraph-BulletsAndNumberingDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:BulletsAndNumberingDialog</property>
<property name="action_name">.uno:OutlineBullet</property>
</object>
</child>
<child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 023642d..9eecdb6 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -2411,7 +2411,7 @@
<object class="GtkMenuItem" id="MenuParagraph-BulletsAndNumberingDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:BulletsAndNumberingDialog</property>
<property name="action_name">.uno:OutlineBullet</property>
</object>
</child>
<child>
@@ -5169,7 +5169,7 @@
<child>
<object class="GtkToolButton" id="BulletsAndNumberingDialog">
<property name="can_focus">False</property>
<property name="action_name">.uno:BulletsAndNumberingDialog</property>
<property name="action_name">.uno:OutlineBullet</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6969,7 +6969,7 @@
<child>
<object class="GtkToolButton" id="BulletsAndNumberingDialog1">
<property name="can_focus">False</property>
<property name="action_name">.uno:BulletsAndNumberingDialog</property>
<property name="action_name">.uno:OutlineBullet</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 1a03f67..c81b5be 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -439,7 +439,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:PageDialog"/>
<menu:menuitem menu:id=".uno:TitlePageDialog" menu:style="text"/>
diff --git a/sw/uiconfig/swxform/toolbar/numobjectbar.xml b/sw/uiconfig/swxform/toolbar/numobjectbar.xml
index 14a05ef..9fcd5ed 100644
--- a/sw/uiconfig/swxform/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/numobjectbar.xml
@@ -39,5 +39,5 @@
<toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SetOutline" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineBullet"/>
</toolbar:toolbar>
