officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |
8 --------
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
8 --------
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |
8 ++++++++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |
8 --------
4 files changed, 8 insertions(+), 24 deletions(-)
New commits:
commit 2aae3ef9ab464b72f6616aa8a66b6f17cae456a4
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Mar 11 18:26:35 2022 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Tue Mar 15 17:42:09 2022 +0100
Related tdf#114286: put duplicates commands in GenericCommands (MergeCells)
Change-Id: Ied2eac088535c7abc2e823b18cb130eac8d36c3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131399
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index c7bfe5e55577..835de44367a5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1708,14 +1708,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:MergeCells" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Merge Cells</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:SplitCell" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Unmerge Cells</value>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index a7566af9360f..198e3f539222 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1914,14 +1914,6 @@
<value xml:lang="en-US">Tas~k Pane</value>
</prop>
</node>
- <node oor:name=".uno:MergeCells" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Merge Cells</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:SplitCell" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Split Cells</value>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 9cea6ad4deef..5d0b94f313dc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4043,6 +4043,14 @@ bit 3 (0x8): #define
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:MergeCells" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Merge Cells</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:Substract" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Subtract</value>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 602ab4e50028..0d379062d216 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1683,14 +1683,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:MergeCells" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Merge Cells</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:SetRowHeight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Row Height...</value>
