summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2014-10-31 16:08:15 +0400
committerSamuel Mehrbrodt <s.mehrbrodt@gmail.com>2014-11-01 14:22:51 +0000
commit80f49553518e6d344dae81358b8d7fb5f24c3cf1 (patch)
treed2aeca0d131cb69a9d6510ef1bf3beb780cad587
parent7d9e3674a486f1fc251c8f159e093cf1c09daa45 (diff)
fdo#60349 - FORMATTING: Icon in Calc toolbar for wrap text
Change-Id: I04390075006bd0492e0c39c5e1bf4a4eb107ed2c Reviewed-on: https://gerrit.libreoffice.org/12163 Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
-rw-r--r--icon-themes/galaxy/cmd/lc_wraptext.pngbin0 -> 583 bytes
-rw-r--r--icon-themes/galaxy/cmd/sc_wraptext.pngbin0 -> 399 bytes
-rw-r--r--icon-themes/tango/cmd/lc_wraptext.pngbin0 -> 583 bytes
-rw-r--r--icon-themes/tango/cmd/sc_wraptext.pngbin0 -> 399 bytes
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu5
-rw-r--r--sc/uiconfig/scalc/toolbar/formatobjectbar.xml2
6 files changed, 6 insertions, 1 deletions
diff --git a/icon-themes/galaxy/cmd/lc_wraptext.png b/icon-themes/galaxy/cmd/lc_wraptext.png
new file mode 100644
index 000000000000..9df8481f7072
--- /dev/null
+++ b/icon-themes/galaxy/cmd/lc_wraptext.png
Binary files differ
diff --git a/icon-themes/galaxy/cmd/sc_wraptext.png b/icon-themes/galaxy/cmd/sc_wraptext.png
new file mode 100644
index 000000000000..555db611d08d
--- /dev/null
+++ b/icon-themes/galaxy/cmd/sc_wraptext.png
Binary files differ
diff --git a/icon-themes/tango/cmd/lc_wraptext.png b/icon-themes/tango/cmd/lc_wraptext.png
new file mode 100644
index 000000000000..9df8481f7072
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_wraptext.png
Binary files differ
diff --git a/icon-themes/tango/cmd/sc_wraptext.png b/icon-themes/tango/cmd/sc_wraptext.png
new file mode 100644
index 000000000000..555db611d08d
--- /dev/null
+++ b/icon-themes/tango/cmd/sc_wraptext.png
Binary files differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 64eb9ad4d2ab..9c5e84fe89d6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -537,7 +537,10 @@
</node>
<node oor:name=".uno:WrapText" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Automatic Row Break</value>
+ <value xml:lang="en-US">Wrap Text</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
</prop>
</node>
<node oor:name=".uno:DefinePrintArea" oor:op="replace">
diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 438666089fd3..4fcc8c107209 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -34,7 +34,9 @@
<toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:style="radio auto"/>
<toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio auto"/>
<toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:style="radio auto"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapText"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:style="radio"/>