[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - officecfg/registry sc/uiconfig

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   18 ++++++++++
 sc/uiconfig/scalc/toolbar/formatobjectbar.xml                     |   12 +++---
 2 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit c609824138ebe50053aa42a33cdcd3b8f113193e
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Fri Nov 21 19:46:05 2014 +0400

    fdo#86132 add tooltips to calc xcu file
    
    Change-Id: I9c643e72cb0e925c2d4e5283c6811ef73306c76b
    Reviewed-on: https://gerrit.libreoffice.org/13027
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 6256909..9df5465 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1611,6 +1611,9 @@
       </node>
       <node oor:name=".uno:NumberFormatCurrency" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Format as Currency</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Currency</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
@@ -1619,6 +1622,9 @@
       </node>
       <node oor:name=".uno:NumberFormatPercent" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Format as Percent</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Percent</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
@@ -1627,6 +1633,9 @@
       </node>
       <node oor:name=".uno:NumberFormatStandard" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Format as General</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">General</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
@@ -1635,6 +1644,9 @@
       </node>
       <node oor:name=".uno:NumberFormatDate" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Format as Date</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Date</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
@@ -1643,6 +1655,9 @@
       </node>
       <node oor:name=".uno:NumberFormatDecimal" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Format as Number</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Number</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
@@ -1651,6 +1666,9 @@
       </node>
       <node oor:name=".uno:NumberFormatScientific" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Format as Scientific</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Scientific</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 1077e09..ab547e6 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -54,12 +54,12 @@
  <toolbar:toolbaritem xlink:href=".uno:AlignVCenter" toolbar:style="radio auto"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard" toolbar:tooltip="Format as General" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrency" toolbar:tooltip="Format as Currency"/>
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent" toolbar:tooltip="Format as Percent"/>
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatDecimal" toolbar:tooltip="Format as Number"/>
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatDate" toolbar:tooltip="Format as Date" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatScientific" toolbar:tooltip="Format as Scientific" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrency"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatDecimal"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatDate" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatScientific" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatIncDecimals"/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatDecDecimals"/>
  <toolbar:toolbarseparator/>