summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2014-11-04 18:43:54 +0400
committerJan Holesovsky <kendy@collabora.com>2014-11-12 18:59:04 +0000
commit73f78d738927434aa4b539dcaf220149a81ccd82 (patch)
treedd75a103b686d522b555e2578d10edf56fcc5385
parentd6afd367167ed406cd97192da358b776dbf5158e (diff)
fdo#60349 - FORMATTING: Icon in Calc toolbar for wrap text (4.3)
Change-Id: I4f2c5488465452894205b82cb998a22210605801 Reviewed-on: https://gerrit.libreoffice.org/12254 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--icon-themes/galaxy/cmd/lc_wraptext.pngbin0 -> 773 bytes
-rw-r--r--icon-themes/galaxy/cmd/sc_wraptext.pngbin0 -> 673 bytes
-rw-r--r--icon-themes/tango/cmd/lc_wraptext.pngbin0 -> 773 bytes
-rw-r--r--icon-themes/tango/cmd/sc_wraptext.pngbin0 -> 673 bytes
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu3
-rw-r--r--sc/uiconfig/scalc/toolbar/formatobjectbar.xml1
6 files changed, 4 insertions, 0 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..85875b80adca
--- /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..4416da1f6f23
--- /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..85875b80adca
--- /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..4416da1f6f23
--- /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 a0f7e86bb6d9..cadee7e3b9cc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -536,6 +536,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Automatic Row Break</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
<node oor:name=".uno:DefinePrintArea" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 438666089fd3..5036a1097673 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -35,6 +35,7 @@
<toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio auto"/>
<toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:style="radio auto"/>
<toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapText" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:style="radio"/>