officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 14 +++++
sc/UIConfig_scalc.mk | 1
sc/uiconfig/scalc/menubar/menubar.xml | 9 ---
sc/uiconfig/scalc/popupmenu/printranges.xml | 15 ++++++
sc/uiconfig/scalc/ui/notebookbar.ui | 25
----------
sc/uiconfig/scalc/ui/notebookbar_compact.ui | 25
----------
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 25
----------
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 25
----------
8 files changed, 39 insertions(+), 100 deletions(-)
New commits:
commit 1310ce65f18c0b03051c6f23e40b8b39b8053fec
Author: Justin Luth <jl...@mail.com>
AuthorDate: Wed Jun 21 11:40:03 2023 -0400
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jun 22 18:34:24 2023 +0200
tdf#147056 sc: convert xml menu to popupmenu .uno:PrintRangesMenu
The labelling in the notebookbar left much to be desired
when adding the print ranges separately in the "context menus".
Making this into a proper submenu fixes the problem.
Thanks to Maxim for reviewing and for the commit template:
commit 0e7cd653ea90da388820220bf6a3eb140b57bbd6
Author: Maxim Monastirsky on Mon Jan 25 01:09:03 2016 +0200
tdf#86567 Dropdown for conditional formatting
Change-Id: If92836ee29d322f5a2fca1e27d2e034e5cc995e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153402
Tested-by: Justin Luth <jl...@mail.com>
Reviewed-by: Justin Luth <jl...@mail.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index de6221954ab0..b0e17643905d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -523,6 +523,20 @@
<value>showtrackedchanges</value>
</prop>
</node>
+ <node oor:name="c42" oor:op="replace">
+ <prop oor:name="Command">
+ <value>.uno:PrintRangesMenu</value>
+ </prop>
+ <prop oor:name="Module">
+ <value/>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.comp.framework.ResourceMenuController</value>
+ </prop>
+ <prop oor:name="Value">
+ <value>printranges</value>
+ </prop>
+ </node>
<node oor:name="WindowListMenu" oor:op="replace">
<prop oor:name="Command">
<value>.uno:WindowList</value>
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 214a300a04d9..637a1ac2eca6 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
sc/uiconfig/scalc/popupmenu/pagebreak \
sc/uiconfig/scalc/popupmenu/pivot \
sc/uiconfig/scalc/popupmenu/preview \
+ sc/uiconfig/scalc/popupmenu/printranges \
sc/uiconfig/scalc/popupmenu/rowheader \
sc/uiconfig/scalc/popupmenu/row_operations \
sc/uiconfig/scalc/popupmenu/sheettab \
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index 413e2e5ce11c..cbb352c7ac6a 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -409,14 +409,7 @@
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:PageFormatDialog"/>
- <menu:menu menu:id=".uno:PrintRangesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DefinePrintArea"/>
- <menu:menuitem menu:id=".uno:AddPrintArea"/>
- <menu:menuitem menu:id=".uno:EditPrintArea"/>
- <menu:menuitem menu:id=".uno:DeletePrintArea"/>
- </menu:menupopup>
- </menu:menu>
+ <menu:menuitem menu:id=".uno:PrintRangesMenu"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ConditionalFormatMenu"/>
<menu:menuitem menu:id=".uno:AutoFormat"/>
diff --git a/sc/uiconfig/scalc/popupmenu/printranges.xml
b/sc/uiconfig/scalc/popupmenu/printranges.xml
new file mode 100644
index 000000000000..7bd89fdef765
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/printranges.xml
@@ -0,0 +1,15 @@
+<?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:DefinePrintArea"/>
+ <menu:menuitem menu:id=".uno:AddPrintArea"/>
+ <menu:menuitem menu:id=".uno:EditPrintArea"/>
+ <menu:menuitem menu:id=".uno:DeletePrintArea"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 0adc829feab4..5f9ea5dff8cc 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1380,31 +1380,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuPage-DefinePrintArea">
+ <object class="GtkMenuItem" id="MenuPage-PrintRangesMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DefinePrintArea</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuPage-AddPrintArea">
- <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="MenuPage-EditPrintArea">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:EditPrintArea</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuPage-DeletePrintArea">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DeletePrintArea</property>
+ <property name="action_name">.uno:PrintRangesMenu</property>
</object>
</child>
<child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 8991949ac917..5da5b2f23216 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -1542,31 +1542,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="DefinePrintAreaD">
+ <object class="GtkMenuItem" id="PrintRangesMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DefinePrintArea</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="AddPrintAreaD">
- <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="EditPrintAreaD">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:EditPrintArea</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="DeletePrintAreaD">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DeletePrintArea</property>
+ <property name="action_name">.uno:PrintRangesMenu</property>
</object>
</child>
<child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index dc0bb54cdc2f..94f115231801 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -451,31 +451,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuEdit-DefinePrintArea">
+ <object class="GtkMenuItem" id="MenuEdit-PrintRangesMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DefinePrintArea</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-AddPrintArea">
- <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">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:EditPrintArea</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-DeletePrintArea">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DeletePrintArea</property>
+ <property name="action_name">.uno:PrintRangesMenu</property>
</object>
</child>
<child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 9520227fb4be..9e732516d85c 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -1142,31 +1142,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuEdit-DefinePrintArea">
+ <object class="GtkMenuItem" id="MenuEdit-PrintRangesMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DefinePrintArea</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-AddPrintArea">
- <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">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:EditPrintArea</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-DeletePrintArea">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DeletePrintArea</property>
+ <property name="action_name">.uno:PrintRangesMenu</property>
</object>
</child>
<child>
