summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Johnson <ross.johnson@homemail.com.au>2021-10-01 20:43:33 +1000
committerHeiko Tietze <heiko.tietze@documentfoundation.org>2021-10-19 08:18:09 +0200
commit672b4c155766e9bf18e109e92f3e8cc71a52e21d (patch)
treecec67f6a75fd2d61269a2e6bd9a36c2cfffee68d
parent63007619da7e6c4a6d0c466a8fe54324252be14b (diff)
tdf#144572 - fix incomplete labeling of Pivot Table UI elements
Created an additional alias of .uno:DataDataPilotRun, of which .uno:InsertPivotTable is already an alias, called .uno:InsertPivotTableNBLabel for use in the NoteBook UI styles. ContextLabel didn't appear to apply to these instances, they must be considered sub menus even though they appear not. Change-Id: Ic526adbf8ed4ad47524426430a47229c8ed919cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122911 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu11
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar.ui2
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_compact.ui2
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui2
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui2
5 files changed, 15 insertions, 4 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 3c1013147c65..12e39a72ed0f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -480,6 +480,17 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:InsertPivotTableNBLabel" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Insert or Edit Pivot Table...</value>
+ </prop>
+ <prop oor:name="TargetURL" oor:type="xs:string">
+ <value>.uno:DataDataPilotRun</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:GoLeftToStartOfDataSel" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Select to Left Block Margin</value>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 2682869eacea..a4aff25ee371 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -129,7 +129,7 @@
<object class="GtkMenuItem" id="MenuData-InsertPivotTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPivotTable</property>
+ <property name="action_name">.uno:InsertPivotTableNBLabel</property>
</object>
</child>
<child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 62ec2e2645a8..93fe9cf63e3e 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -129,7 +129,7 @@
<object class="GtkMenuItem" id="InsertPivotTableD">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPivotTable</property>
+ <property name="action_name">.uno:InsertPivotTableNBLabel</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 db1a7849f907..06aa431e165b 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -2826,7 +2826,7 @@
<object class="GtkMenuItem" id="MenuData-InsertPivotTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPivotTable</property>
+ <property name="action_name">.uno:InsertPivotTableNBLabel</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 a0c64db41c7e..ef0423549647 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -498,7 +498,7 @@
<object class="GtkMenuItem" id="MenuData-InsertPivotTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPivotTable</property>
+ <property name="action_name">.uno:InsertPivotTableNBLabel</property>
</object>
</child>
<child>