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

Yousuf Philips philipz85 at hotmail.com
Wed Jun 7 13:29:09 UTC 2017


 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   67 +++++++++-
 sc/uiconfig/scalc/menubar/menubar.xml                             |   21 ++-
 2 files changed, 86 insertions(+), 2 deletions(-)

New commits:
commit d8b18479b178b96eb86cde5ae21ae916f24895e0
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Sun May 21 19:13:50 2017 +0400

    tdf#91820 Add cell style and spreadsheet theme command
    
    Change-Id: Ia9a3a4704b5c07e5ae26a290855cf77bd33bcbd1
    Reviewed-on: https://gerrit.libreoffice.org/37844
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    Tested-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit f4c4e407c6731f37769d6ffaaadbf3a07951a594)
    Reviewed-on: https://gerrit.libreoffice.org/37879
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack 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 a558ff951111..e084fbb73d0b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -168,7 +168,7 @@
       </node>
       <node oor:name=".uno:ChooseDesign" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Choose Themes</value>
+          <value xml:lang="en-US">Spreadsheet Theme</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -2212,6 +2212,71 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:StyleApply?Style:string=Default&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Default</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Accent 1&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Accent 1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Accent 2&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Accent 2</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Accent 3&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Accent 3</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Heading 1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Heading 2</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Bad&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Bad</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Error&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Error</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Good&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Good</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Neutral&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Neutral</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Warning&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Warning</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Footnote&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Footnote</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:StyleApply?Style:string=Note&FamilyName:string=CellStyles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Note</value>
+        </prop>
+      </node>
     </node>
   </node>
 </oor:component-data>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 1012715154a2..961002e65e77 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -149,7 +149,6 @@
             <menu:menuitem menu:id=".uno:ViewRowColumnHeaders"/>
             <menu:menuitem menu:id=".uno:ViewValueHighlighting"/>
             <menu:menuitem menu:id=".uno:ToggleFormula"/>
-            <menu:menuitem menu:id=".uno:ShowAnnotations"/>
             <menu:menu menu:id=".uno:GridMenu">
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:GridVisible"/>
@@ -158,6 +157,7 @@
                 </menu:menupopup>
             </menu:menu>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowAnnotations"/>
             <menu:menuitem menu:id=".uno:ToggleSheetGrid"/>
             <menu:menu menu:id=".uno:FreezeCellsMenu">
                 <menu:menupopup>
@@ -370,6 +370,24 @@
             <menu:menuseparator/>
             <menu:menu menu:id=".uno:FormatStylesMenu">
                 <menu:menupopup>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default&FamilyName:string=CellStyles"/>
+                    <menu:menuseparator/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Accent 1&FamilyName:string=CellStyles"/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Accent 2&FamilyName:string=CellStyles"/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Accent 3&FamilyName:string=CellStyles"/>
+                    <menu:menuseparator/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=CellStyles"/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=CellStyles"/>
+                    <menu:menuseparator/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Bad&FamilyName:string=CellStyles"/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Error&FamilyName:string=CellStyles"/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Good&FamilyName:string=CellStyles"/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Neutral&FamilyName:string=CellStyles"/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Warning&FamilyName:string=CellStyles"/>
+                    <menu:menuseparator/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Footnote&FamilyName:string=CellStyles"/>
+                    <menu:menuitem menu:id=".uno:StyleApply?Style:string=Note&FamilyName:string=CellStyles"/>
+                    <menu:menuseparator/>
                     <menu:menuitem menu:id=".uno:StyleUpdateByExample"/>
                     <menu:menuitem menu:id=".uno:StyleNewByExample"/>
                     <menu:menuseparator/>
@@ -418,6 +436,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ConditionalFormatMenu"/>
             <menu:menuitem menu:id=".uno:AutoFormat"/>
+            <menu:menuitem menu:id=".uno:ChooseDesign"/>
             <menu:menuseparator/>
             <menu:menu menu:id=".uno:FormatImageMenu">
                 <menu:menupopup>


More information about the Libreoffice-commits mailing list