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

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Tue Dec 17 13:55:53 UTC 2019


 vcl/inc/bitmaps.hlst |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit acd4a9822ca62de406680403e22a0680281bd621
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Dec 17 14:44:15 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Dec 17 14:54:46 2019 +0100

    loplugin:duplicate-defines
    
    seems to be a search/replace error in
    
        commit f08faa70ccaa3bbf335b7b2ddff02a9f37efe125
        Date:   Tue Apr 25 19:21:42 2017 +0100
        fix attempt to load converted bitmap resource uses from vcl
    
    Change-Id: I882904652c9ecdfc28322cd7b5d05d3507090f2f
    Reviewed-on: https://gerrit.libreoffice.org/85297
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
index 56dac252b77b..5ce994a0c384 100644
--- a/vcl/inc/bitmaps.hlst
+++ b/vcl/inc/bitmaps.hlst
@@ -64,7 +64,6 @@
 #define SV_PRINT_COLLATE_BMP                         "vcl/res/collate.png"
 #define SV_PRINT_NOCOLLATE_BMP                       "vcl/res/ncollate.png"
 
-#define MAINAPP_48_8                                 "res/mainapp_48_8.png"
 #define MAINAPP_48_8                                 "res/mainapp_48_8.png"
 #define ODT_48_8                                     "res/odt_48_8.png"
 #define OTT_48_8                                     "res/ott_48_8.png"
@@ -75,9 +74,7 @@
 #define ODM_48_8                                     "res/odm_48_8.png"
 #define ODB_48_8                                     "res/odb_48_8.png"
 #define ODF_48_8                                     "res/odf_48_8.png"
-#define MAINAPP_48_8                                 "res/mainapp_48_8.png"
 
-#define MAINAPP_32_8                                 "res/mainapp_32_8.png"
 #define MAINAPP_32_8                                 "res/mainapp_32_8.png"
 #define ODT_32_8                                     "res/odt_32_8.png"
 #define OTT_32_8                                     "res/ott_32_8.png"
@@ -88,9 +85,7 @@
 #define ODM_32_8                                     "res/odm_32_8.png"
 #define ODB_32_8                                     "res/odb_32_8.png"
 #define ODF_32_8                                     "res/odf_32_8.png"
-#define MAINAPP_32_8                                 "res/mainapp_32_8.png"
 
-#define MAINAPP_16_8                                 "res/mainapp_16_8.png"
 #define MAINAPP_16_8                                 "res/mainapp_16_8.png"
 #define ODT_16_8                                     "res/odt_16_8.png"
 #define OTT_16_8                                     "res/ott_16_8.png"
@@ -101,7 +96,6 @@
 #define ODM_16_8                                     "res/odm_16_8.png"
 #define ODB_16_8                                     "res/odb_16_8.png"
 #define ODF_16_8                                     "res/odf_16_8.png"
-#define MAINAPP_16_8                                 "res/mainapp_16_8.png"
 
 //start, Throbber::getDefaultImageURLs
 #define SPINNER_16_01                                "vcl/res/spinner-16-01.png"


More information about the Libreoffice-commits mailing list