Skip to content

C
core
Kaydet (Commit) 7f5fd9d9 authored tarafından heiko tietze's avatar heiko tietze Kaydeden (comit) Heiko Tietze
Dosyalara gözat
Seçenekler

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: 's avatarHeiko Tietze <tietze.heiko@gmail.com>
üst 8e3814fd
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 80 deletions
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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>
......
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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>
......
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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>
......
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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>
......
sc/sdi/scalc.sdi
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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;
]
......
svx/sdi/svx.sdi
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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;
]
......
sw/sdi/swriter.sdi
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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;
]
......
sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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/>
......
sw/uiconfig/sweb/toolbar/tableobjectbar.xml
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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/>
......
sw/uiconfig/swform/toolbar/tableobjectbar.xml
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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/>
......
sw/uiconfig/swreport/toolbar/tableobjectbar.xml
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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/>
......
sw/uiconfig/swxform/toolbar/tableobjectbar.xml
Dosyayı görüntüle @ 7f5fd9d9
......@@ -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/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment