[Libreoffice-commits] core.git: vcl/unx

[Julien Nabet]

 vcl/unx/generic/window/salframe.cxx |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

New commits:
commit a33201662c7b7b7350d23eb07f5a3d76fd67e8e1
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon May 1 21:42:18 2017 +0200

    tdf#107526: fix icon management
    
    by following http://opengrok.libreoffice.org/xref/core/vcl/inc/svdata.hxx#91
    
    Change-Id: I57d13e33c31f25580c93ef2abfec78e9386a8c04
    Reviewed-on: https://gerrit.libreoffice.org/37126
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 03a52f055e41..6a2c8ca1cf0f 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -209,11 +209,13 @@ namespace
         ODS_48_8,
         OTS_48_8,
         ODG_48_8,
+        MAINAPP_48_8,
         ODP_48_8,
+        MAINAPP_48_8,
         ODM_48_8,
+        MAINAPP_48_8,
         ODB_48_8,
-        ODF_48_8,
-        MAINAPP_48_8
+        ODF_48_8
     };
 
     const OUStringLiteral SV_ICON_SIZE32[] =
@@ -225,11 +227,13 @@ namespace
         ODS_32_8,
         OTS_32_8,
         ODG_32_8,
+        MAINAPP_32_8,
         ODP_32_8,
+        MAINAPP_32_8,
         ODM_32_8,
+        MAINAPP_32_8,
         ODB_32_8,
-        ODF_32_8,
-        MAINAPP_32_8
+        ODF_32_8
     };
 
     const OUStringLiteral SV_ICON_SIZE16[] =
@@ -241,11 +245,13 @@ namespace
         ODS_16_8,
         OTS_16_8,
         ODG_16_8,
+        MAINAPP_16_8,
         ODP_16_8,
+        MAINAPP_16_8,
         ODM_16_8,
+        MAINAPP_16_8,
         ODB_16_8,
-        ODF_16_8,
-        MAINAPP_16_8
+        ODF_16_8
     };
 }