[Libreoffice-commits] core.git: svx/sdi sw/sdi sw/uiconfig

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Mon Jan 6 15:34:44 UTC 2020 

 svx/sdi/svx.sdi                                          |    4 ++--
 sw/sdi/swriter.sdi                                       |    6 +++---
 sw/uiconfig/sglobal/menubar/menubar.xml                  |    2 +-
 sw/uiconfig/sglobal/toolbar/numobjectbar.xml             |    2 +-
 sw/uiconfig/sweb/menubar/menubar.xml                     |    2 +-
 sw/uiconfig/sweb/toolbar/numobjectbar.xml                |    2 +-
 sw/uiconfig/swform/menubar/menubar.xml                   |    2 +-
 sw/uiconfig/swform/toolbar/numobjectbar.xml              |    2 +-
 sw/uiconfig/swreport/menubar/menubar.xml                 |    2 +-
 sw/uiconfig/swreport/toolbar/numobjectbar.xml            |    2 +-
 sw/uiconfig/swriter/menubar/menubar.xml                  |    2 +-
 sw/uiconfig/swriter/toolbar/numobjectbar.xml             |    2 +-
 sw/uiconfig/swriter/ui/notebookbar.ui                    |    2 +-
 sw/uiconfig/swriter/ui/notebookbar_compact.ui            |    2 +-
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui |    2 +-
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui    |    6 +++---
 sw/uiconfig/swxform/menubar/menubar.xml                  |    2 +-
 sw/uiconfig/swxform/toolbar/numobjectbar.xml             |    2 +-
 18 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit d1133d71a6109d1999121fd6a91573d12dc4852b
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sun Jan 5 20:48:16 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Jan 6 16:34:08 2020 +0100

    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 at gmail.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c2ceb08f7c0c..2567e08906b0 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5905,8 +5905,8 @@ SfxVoidItem OutlineBullet SID_OUTLINE_BULLET
     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 d063a0dd5441..489b6b698336 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -461,9 +461,9 @@ SfxVoidItem BulletsAndNumberingDialog FN_NUMBER_BULLETS
     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 e74fcb8f60ec..268b30cf68b8 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 14a05ef6f62a..9fcd5ed70c74 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 9c0ac3e88a3a..8f773df0c8c2 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 14a05ef6f62a..9fcd5ed70c74 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 973cfd9ade65..aaea61d9b1da 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 14a05ef6f62a..9fcd5ed70c74 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 a81e5dd14d42..d2c1c629182a 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 d7adb625dc18..87aa2432dadf 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 b76352de27b9..6239cb53071e 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 14a05ef6f62a..9fcd5ed70c74 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 0cc64ef83294..26690ee1bfe5 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 6760c607c84b..72a5bf22acc6 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 206a86f0e881..03196e0ff0aa 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 023642de8d30..9eecdb6fae9b 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 1a03f6786465..c81b5be0eaa0 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 14a05ef6f62a..9fcd5ed70c74 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>

More information about the Libreoffice-commits mailing list