From 3ec607fbb2bc98924126a0098fbef88c87305ddf Mon Sep 17 00:00:00 2001
From: Yousuf Philips <philipz85@hotmail.com>
Date: Tue, 11 Nov 2014 22:17:23 +0400
Subject: fdo#86086 addition of number format submenu and simplifying items
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic65cb86872241b0b9425e65883a75b1e7382522e
Reviewed-on: https://gerrit.libreoffice.org/12367
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 .../data/org/openoffice/Office/UI/CalcCommands.xcu | 26 ++++++++++++++--------
 sc/uiconfig/scalc/menubar/menubar.xml              | 11 +++++++++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 03d2b847421c..7c8766a2a9d7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1585,9 +1585,17 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:NumberFormatMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Number Format</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:NumberFormatCurrency" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number Format: Currency</value>
+          <value xml:lang="en-US">Currency</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1595,7 +1603,7 @@
       </node>
       <node oor:name=".uno:NumberFormatPercent" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number Format: Percent</value>
+          <value xml:lang="en-US">Percent</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1603,7 +1611,7 @@
       </node>
       <node oor:name=".uno:NumberFormatStandard" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number Format: Standard</value>
+          <value xml:lang="en-US">General</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1611,7 +1619,7 @@
       </node>
       <node oor:name=".uno:NumberFormatDate" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number Format : Date</value>
+          <value xml:lang="en-US">Date</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1619,7 +1627,7 @@
       </node>
       <node oor:name=".uno:NumberFormatDecimal" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number Format: Decimal</value>
+          <value xml:lang="en-US">Number</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1627,7 +1635,7 @@
       </node>
       <node oor:name=".uno:NumberFormatScientific" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number Format: Exponential</value>
+          <value xml:lang="en-US">Scientific</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1635,12 +1643,12 @@
       </node>
       <node oor:name=".uno:NumberFormatTime" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number Format: Time</value>
+          <value xml:lang="en-US">Time</value>
         </prop>
       </node>
       <node oor:name=".uno:NumberFormatIncDecimals" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number Format: Add Decimal Place</value>
+          <value xml:lang="en-US">Add Decimal Place</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1648,7 +1656,7 @@
       </node>
       <node oor:name=".uno:NumberFormatDecDecimals" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number Format: Delete Decimal Place</value>
+          <value xml:lang="en-US">Delete Decimal Place</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 758dba6f286e..02f8779455b5 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -248,6 +248,17 @@
         <menu:menupopup>
             <menu:menuitem menu:id=".uno:ResetAttributes"/>
             <menu:menuseparator/>
+            <menu:menu menu:id=".uno:NumberFormatMenu">
+                <menu:menupopup>
+                    <menu:menuitem menu:id=".uno:NumberFormatStandard"/>
+                    <menu:menuitem menu:id=".uno:NumberFormatDecimal"/>
+                    <menu:menuitem menu:id=".uno:NumberFormatPercent"/>
+                    <menu:menuitem menu:id=".uno:NumberFormatCurrency"/>
+                    <menu:menuitem menu:id=".uno:NumberFormatDate"/>
+                    <menu:menuitem menu:id=".uno:NumberFormatTime"/>
+                    <menu:menuitem menu:id=".uno:NumberFormatScientific"/>
+                </menu:menupopup>
+            </menu:menu>
             <menu:menuitem menu:id=".uno:FormatCellDialog"/>
             <menu:menu menu:id=".uno:RowMenu">
                 <menu:menupopup>
-- 
cgit