[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/colibre officecfg/registry

[andreas kainz]

 icon-themes/colibre/links.txt                                        |   10 +++++
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu    |   18 ++++++++++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    3 +
 3 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit e601f74df3e0bb0cf1eb1c33d122689d82ccd50e
Author: andreas kainz <kainz.a at gmail.com>
Date:   Tue Jul 3 17:55:40 2018 +0200

    Calc Menubar: add icons to some menubar entries
    
    Change-Id: Iad8334c3e0f27c39cdab54a06ca8e54de263d26b
    Reviewed-on: https://gerrit.libreoffice.org/56885
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>
    (cherry picked from commit 073d1907efdc381f1f992bcb944947ecc7484c20)
    Reviewed-on: https://gerrit.libreoffice.org/56917

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 5caafc1c11af..2eaed3777070 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -327,7 +327,6 @@ cmd/lc_editprintarea.png cmd/lc_editdoc.png
 cmd/sc_printpagepreview.png cmd/sc_printpreview.png
 cmd/sc_printlayout.png cmd/sc_printpreview.png
 cmd/sc_previewprintoptions.png cmd/sc_printpreview.png
-cmd/sc_defineprintarea.png cmd/sc_printpreview.png
 cmd/sc_sendfax.png cmd/sc_print.png
 cmd/sc_editprintarea.png cmd/sc_editdoc.png
 
@@ -609,6 +608,7 @@ cmd/sc_functiondialog.png cmd/sc_dbviewfunctions.png
 cmd/lc_functiondialog.png cmd/lc_dbviewfunctions.png
 cmd/sc_functionbox.png cmd/sc_dbviewfunctions.png
 cmd/sc_sheetcommentmenu.png cmd/sc_showannotations.png
+cmd/sc_cellcontentsmenu.png cmd/sc_calculate.png
 
 # calc tabs
 cmd/sc_insertcurrentdate.png cmd/sc_datefield.png
@@ -851,6 +851,14 @@ cmd/sc_arrangeframemenu.png cmd/sc_bringtofront.png
 cmd/lc_setobjecttobackground.png cmd/lc_sendtoback.png
 cmd/sc_setobjecttobackground.png cmd/sc_sendtoback.png
 
+# Cacl
+cmd/sc_fieldmenu.png cmd/sc_insertfieldctrl.png
+cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png
+cmd/sc_mergecellsmenu.png cmd/sc_togglemergecells.png
+cmd/sc_printrangesmenu.png cmd/sc_defineprintarea.png
+cmd/sc_insertcell.png cmd/sc_insertcellsright.png
+cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
+
 # Reload
 cmd/lc_refresh.png cmd/lc_reload.png
 cmd/lc_refreshformcontrol.png cmd/lc_reload.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 2626ce954b7e..4dcc7d46ab12 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -799,6 +799,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Statistics</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:SamplingDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1209,6 +1212,9 @@
         <prop oor:name="PopupLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Insert...</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:InsertRowsMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -2141,6 +2147,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Ca~lculate</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:NamesMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -2159,6 +2168,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Pivot Table</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:EditSheetMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -2217,11 +2229,17 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">M~erge Cells</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:PrintRangesMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Prin~t Ranges</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:ToggleFormula" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ad609bca111e..e15a5c063e16 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6352,6 +6352,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Fiel~d</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:FormattingMarkMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">