[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/tango officecfg/registry

Noel Grandin noel at peralex.com
Mon Jul 18 06:49:02 UTC 2016


 icon-themes/breeze/links.txt                                         |    2 +
 icon-themes/tango/links.txt                                          |   15 ++++++++++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    9 ------
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |    3 --
 4 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 9bf9f88e4c7e0b182ec6d8b4aefb7d735bb0653b
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Jun 9 11:24:50 2016 +0200

    clean up some "failed to load image" warnings
    
    By adding entries to links.txt and tweaking some of the
    commands to remove the icon flag.
    
    With these changes I can add an assert(false) in
    ImageAryData::Load and still pass make check.
    
    Change-Id: Iebb41318fa821628920a49019f201efa9fbbfbab
    Reviewed-on: https://gerrit.libreoffice.org/26095
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index fb05be8..a4b8e3b 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1338,3 +1338,5 @@ vcl/res/index.png cmd/sc_insertmultiindex.png
 # ==============================================
 xmlsecurity/res/key_12.png dbaccess/res/pkey.png
 xmlsecurity/res/signet_11x16.png xmlsecurity/res/notcertificate_16.png
+
+
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 9dd7758..ff991dc 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -103,7 +103,9 @@ cmd/sc_pagesetup.png cmd/sc_setdocumentproperties.png
 cmd/lc_closepreview.png cmd/lc_closedoc.png
 cmd/sc_closepreview.png cmd/sc_closedoc.png
 cmd/lc_objectmirrorvertical.png cmd/sc_flipvertical.png
+cmd/sc_objectmirrorvertical.png cmd/sc_flipvertical.png
 cmd/lc_objectmirrorhorizontal.png cmd/sc_fliphorizontal.png
+cmd/sc_objectmirrorhorizontal.png cmd/sc_fliphorizontal.png
 cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png
 cmd/sc_numberformattime.png cmd/sc_timefield.png
 
@@ -577,3 +579,16 @@ cmd/sc_lastslide.png cmd/sc_lastpage.png
 cmd/sc_previousslide.png cmd/sc_navigateback.png
 cmd/sc_nextslide.png cmd/sc_navigateforward.png
 cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png
+
+# just here to smother warnings about missing icons
+cmd/sc_trackchangesbar.png cmd/sc_ok.png
+cmd/sc_setoutline.png cmd/sc_outlineformat.png
+cmd/sc_diagramaxisall.png cmd/sc_diagramtype.png
+cmd/sc_diagramaxisz.png cmd/sc_diagramtype.png
+cmd/sc_diagramarea.png cmd/sc_diagramtype.png
+cmd/sc_insertmenutitles.png cmd/sc_insert.png
+cmd/sc_diagramwall.png cmd/sc_diagramtype.png
+cmd/sc_displaymode.png cmd/sc_ok.png
+cmd/sc_legend.png cmd/sc_ok.png
+cmd/sc_dataranges.png cmd/sc_ok.png
+cmd/sc_jumptospecificpage.png cmd/sc_ok.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index a6a69de..5bab960 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3437,17 +3437,11 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Rulers</value>
         </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
       </node>
       <node oor:name=".uno:ScrollBarMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Scrollbars</value>
         </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
       </node>
       <node oor:name=".uno:SidebarMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -5728,9 +5722,6 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Synony~ms</value>
         </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
       </node>
     </node>
     <node oor:name="Popups">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index e16538a..aac3b05 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -272,9 +272,6 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Track Changes</value>
         </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
         <prop oor:name="TargetURL" oor:type="xs:string">
           <value>.uno:ShowTrackedChanges</value>
         </prop>


More information about the Libreoffice-commits mailing list