[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - icon-themes/galaxy icon-themes/tango officecfg/registry sc/uiconfig

[Yousuf Philips]

 icon-themes/galaxy/cmd/lc_wraptext.png                            |binary
 icon-themes/galaxy/cmd/sc_wraptext.png                            |binary
 icon-themes/tango/cmd/lc_wraptext.png                             |binary
 icon-themes/tango/cmd/sc_wraptext.png                             |binary
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |    3 +++
 sc/uiconfig/scalc/toolbar/formatobjectbar.xml                     |    1 +
 6 files changed, 4 insertions(+)

New commits:
commit 73f78d738927434aa4b539dcaf220149a81ccd82
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue Nov 4 18:43:54 2014 +0400

    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 at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/icon-themes/galaxy/cmd/lc_wraptext.png b/icon-themes/galaxy/cmd/lc_wraptext.png
new file mode 100644
index 0000000..85875b8
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_wraptext.png differ
diff --git a/icon-themes/galaxy/cmd/sc_wraptext.png b/icon-themes/galaxy/cmd/sc_wraptext.png
new file mode 100644
index 0000000..4416da1
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_wraptext.png differ
diff --git a/icon-themes/tango/cmd/lc_wraptext.png b/icon-themes/tango/cmd/lc_wraptext.png
new file mode 100644
index 0000000..85875b8
Binary files /dev/null and b/icon-themes/tango/cmd/lc_wraptext.png differ
diff --git a/icon-themes/tango/cmd/sc_wraptext.png b/icon-themes/tango/cmd/sc_wraptext.png
new file mode 100644
index 0000000..4416da1
Binary files /dev/null and b/icon-themes/tango/cmd/sc_wraptext.png differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index a0f7e86..cadee7e 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 4386660..5036a10 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"/>