summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2014-12-02 16:04:39 +0400
committerCaolán McNamara <caolanm@redhat.com>2014-12-02 14:02:52 +0000
commitdd359cff8814ad7a9796f05cd21c9d98190898c2 (patch)
treee56bd470211518fd7235929fb4832f353aca0c38
parent82842e725cdc64abf4931ad294367b699ce2a18b (diff)
fdo#81475 reorganization of writer's table toolbar
Change-Id: I3672fa8e32975723d58e92fe3eceafc2e8993646 Reviewed-on: https://gerrit.libreoffice.org/13267 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu12
-rw-r--r--sw/uiconfig/swriter/toolbar/tableobjectbar.xml35
2 files changed, 25 insertions, 22 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index a417ddcec06a..8616b5e6224e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1109,7 +1109,7 @@
</node>
<node oor:name=".uno:DeleteRows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Delete Row</value>
+ <value xml:lang="en-US">Delete Rows</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">~Rows</value>
@@ -1120,7 +1120,7 @@
</node>
<node oor:name=".uno:DeleteColumns" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Delete Column</value>
+ <value xml:lang="en-US">Delete Columns</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">~Columns</value>
@@ -1199,10 +1199,10 @@
</node>
<node oor:name=".uno:EntireRow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Select Rows</value>
+ <value xml:lang="en-US">Select Row</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Rows</value>
+ <value xml:lang="en-US">~Row</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1210,7 +1210,7 @@
</node>
<node oor:name=".uno:EntireCell" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">C~ells</value>
+ <value xml:lang="en-US">C~ell</value>
</prop>
</node>
<node oor:name=".uno:GoUp" oor:op="replace">
@@ -1223,7 +1223,7 @@
<value xml:lang="en-US">Select Column</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Columns</value>
+ <value xml:lang="en-US">~Column</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
index 1e147ceda11a..4ca1f0239c5d 100644
--- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
@@ -18,33 +18,36 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteTable"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireRow"/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireColumn"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectTable"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
<toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AutoFormat"/>
- <toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AutoSum"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormula"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:TableSort"/>
</toolbar:toolbar>