officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |
24 ----------
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
20 --------
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |
17 +++++++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |
18 -------
sc/sdi/scalc.sdi |
12 ++---
svx/sdi/svx.sdi |
4 -
sw/sdi/swriter.sdi |
4 -
sw/uiconfig/sglobal/toolbar/tableobjectbar.xml |
4 -
sw/uiconfig/sweb/toolbar/tableobjectbar.xml |
4 -
sw/uiconfig/swform/toolbar/tableobjectbar.xml |
4 -
sw/uiconfig/swreport/toolbar/tableobjectbar.xml |
4 -
sw/uiconfig/swxform/toolbar/tableobjectbar.xml |
4 -
12 files changed, 39 insertions(+), 80 deletions(-)
New commits:
commit 7f5fd9d9ebffa692ba670f01f8f833657bb7745f
Author: heiko tietze <tietze.he...@gmail.com>
AuthorDate: Tue Oct 9 12:05:31 2018 +0200
Commit: Heiko Tietze <tietze.he...@gmail.com>
CommitDate: Mon Oct 15 12:24:10 2018 +0200
tdf#120429 - Functions Insert Columns Exist Two Times
Legacy UNO commands InsertRows and InsertCols hidden from customization
Commands are still accessible via macro
Also fixed terminology in Draw/Impress for Insert Columns from Left/Right
to Before/After
Change-Id: I29a6b2fdb7481db43ad1a8ad25be5e9107558bd6
Reviewed-on: https://gerrit.libreoffice.org/61579
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 32159d1fd480..ca6329aa61ca 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1298,18 +1298,6 @@
<value>1</value>
</prop>
</node>
- <!-- 2015/06 Deprecated, use InsertRowsBefore instead -->
- <node oor:name=".uno:InsertRows" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert ~Rows Above</value>
- </prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Rows ~Above</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:InsertRowsBefore" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert ~Rows Above</value>
@@ -1324,18 +1312,6 @@
<value>1</value>
</prop>
</node>
- <!-- 2015/06 Deprecated, use InsertColumnsBefore instead -->
- <node oor:name=".uno:InsertColumns" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Co~lumns Left</value>
- </prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Columns ~Left</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:InsertColumnsBefore" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Co~lumns Before</value>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 59ee3828a3cd..a82e0c531123 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1897,14 +1897,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:InsertRows" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Row</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:InsertRowsAfter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Row Below</value>
@@ -1932,17 +1924,9 @@
<value xml:lang="en-US">Insert Rows...</value>
</prop>
</node>
- <node oor:name=".uno:InsertColumns" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Column</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:InsertColumnsAfter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Column Right</value>
+ <value xml:lang="en-US">Insert Column After</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1950,7 +1934,7 @@
</node>
<node oor:name=".uno:InsertColumnsBefore" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Column Left</value>
+ <value xml:lang="en-US">Insert Column Before</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index f808ea927ea1..07ad2d7bf0c2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6560,6 +6560,23 @@
<value xml:lang="en-US">~Right-to-left mark</value>
</prop>
</node>
+ <!-- 2018/10: 2015/06 The next two is to be deprecated one day or
another -->
+ <node oor:name=".uno:InsertRows" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Insert Row</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertColumns" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Insert Column</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:ManageLanguage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Manage Language</value>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index fcb924112781..6608a1871ec0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1422,15 +1422,6 @@
<value>1</value>
</prop>
</node>
- <!-- 2015/06 The next one is to be deprecated one day or another -->
- <node oor:name=".uno:InsertRows" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Row</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:InsertRowsAfter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Rows Below</value>
@@ -1461,15 +1452,6 @@
<value>1</value>
</prop>
</node>
- <!-- 2015/06 The next one is to be deprecated one day or another -->
- <node oor:name=".uno:InsertColumns" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Column</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:InsertColumnsAfter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Columns After</value>
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 0d8cbac8876d..c8283fd09ac0 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2880,9 +2880,9 @@ SfxVoidItem InsertColumns FID_INS_COLUMN
RecordAbsolute = FALSE,
RecordPerSet;
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Insert;
]
@@ -3117,9 +3117,9 @@ SfxVoidItem InsertRows FID_INS_ROW
RecordAbsolute = FALSE,
RecordPerSet;
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Insert;
]
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index bf1387a1d5a2..d38f9d78a69e 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -10994,7 +10994,7 @@ SfxVoidItem InsertRows SID_TABLE_INSERT_ROW
AccelConfig = FALSE,
MenuConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Table;
]
@@ -11012,7 +11012,7 @@ SfxVoidItem InsertColumns SID_TABLE_INSERT_COL
AccelConfig = FALSE,
MenuConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Table;
]
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 6f7d1d5e59e1..416b596965e4 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -2675,7 +2675,7 @@ SfxVoidItem InsertColumns FN_TABLE_INSERT_COL
AccelConfig = FALSE,
MenuConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Table;
]
@@ -3239,7 +3239,7 @@ SfxVoidItem InsertRows FN_TABLE_INSERT_ROW
AccelConfig = FALSE,
MenuConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Table;
]
diff --git a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
index ff7aceb27a4a..62eb9d8cc29b 100644
--- a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
@@ -32,8 +32,8 @@
<toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sweb/toolbar/tableobjectbar.xml
b/sw/uiconfig/sweb/toolbar/tableobjectbar.xml
index ff7aceb27a4a..62eb9d8cc29b 100644
--- a/sw/uiconfig/sweb/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/tableobjectbar.xml
@@ -32,8 +32,8 @@
<toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swform/toolbar/tableobjectbar.xml
b/sw/uiconfig/swform/toolbar/tableobjectbar.xml
index ff7aceb27a4a..62eb9d8cc29b 100644
--- a/sw/uiconfig/swform/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/tableobjectbar.xml
@@ -32,8 +32,8 @@
<toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swreport/toolbar/tableobjectbar.xml
b/sw/uiconfig/swreport/toolbar/tableobjectbar.xml
index ff7aceb27a4a..62eb9d8cc29b 100644
--- a/sw/uiconfig/swreport/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/tableobjectbar.xml
@@ -32,8 +32,8 @@
<toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
b/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
index ff7aceb27a4a..62eb9d8cc29b 100644
--- a/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
@@ -32,8 +32,8 @@
<toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
<toolbar:toolbarseparator/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
