From 04ba40c749fe01e226d30dc5d075e510d70bf48b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 6 Oct 2016 12:48:49 +0100
Subject: ImageList just reads and discards the MaskColor, so drop it

Change-Id: I243e739fea28e3f38b91534182cc54c2aa660f0e
---
 sw/source/ui/app/app.src                       | 17 +++++------------
 sw/source/ui/utlui/utlui.src                   |  1 -
 sw/source/uibase/dbui/mailmergechildwindow.src |  1 -
 sw/source/uibase/dialog/regionsw.src           |  1 -
 sw/source/uibase/ribbar/workctrl.src           |  1 -
 sw/source/uibase/utlui/navipi.src              |  2 --
 6 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'sw')

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 5ce2a0b872af..f3ec0f65b4d4 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -58,26 +58,15 @@ String STR_PAGE_COUNT_MACRO
 ImageList RID_DEFAULTIMAGELIST_SC
 {
     Prefix = "sc";
-    MaskColor = IMAGE_MASK_COLOR ;
     IMAGELIST_AND_COUNT
 };
 
 ImageList RID_DEFAULTIMAGELIST_LC
 {
     Prefix = "lc";
-    MaskColor = IMAGE_MASK_COLOR ;
     IMAGELIST_AND_COUNT
 };
 
-// Templates
-#define STYLE_IMAGE_LISTEF \
-    MaskColor = IMAGE_MASK_COLOR ; \
-    IdList = \
-    { \
-        1; 2; 3; 4; 5; 6;\
-    }; \
-    IdCount = 6;
-
 SfxStyleFamilies DLG_STYLE_DESIGNER
 {
     StyleFamilyList =
@@ -167,7 +156,11 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
     ImageList 1 // == BMP_COLOR_NORMAL + 1
     {
         Prefix = "sf";
-        STYLE_IMAGE_LISTEF
+        IdList =
+        {
+            1; 2; 3; 4; 5; 6;
+        };
+        IdCount = 6;
     };
 };
 
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 46b9966adf5d..bd9c15d96208 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -327,7 +327,6 @@ String STR_HYPH_TITLE
 ImageList ILIST_DB_DLG
 {
     Prefix = "sx";
-    MaskColor = IMAGE_MASK_COLOR;
     IdList =
     {
         IMG_COLLAPSE;
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src
index b3ea062b4878..f8b3ec20d176 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.src
+++ b/sw/source/uibase/dbui/mailmergechildwindow.src
@@ -33,7 +33,6 @@ String     ST_CONTINUE
 ImageList ILIST
 {
     Prefix = "sc";
-    MaskColor = IMAGE_MASK_COLOR;
     IdList =
     {
         FN_FORMULA_CANCEL ;
diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src
index a9770e1007ec..8558ed38e41f 100644
--- a/sw/source/uibase/dialog/regionsw.src
+++ b/sw/source/uibase/dialog/regionsw.src
@@ -25,7 +25,6 @@
 ImageList IL_SECTION_BITMAPS
 {
     Prefix = "re";
-    MaskColor = IMAGE_MASK_COLOR ;
     IdList =
     {
         BMP_HIDE           /*1*/ ;
diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src
index 5aefe659232c..6b08194cdea4 100644
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@@ -26,7 +26,6 @@
 ImageList IL_VALUES
 {
     Prefix = "sr";
-    MaskColor = IMAGE_MASK_COLOR ;
     IdList =
     {
         NID_NEXT ;
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
index 5d09491f8f56..88a986891125 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -41,7 +41,6 @@ Window DLG_NAVIGATION_PI
     ImageList IL_CONTENT
     {
         Prefix = "sc";
-        MaskColor = IMAGE_MASK_COLOR ;
         IdList =
         {
             FN_UP ;
@@ -314,7 +313,6 @@ Window DLG_NAVIGATION_PI
 ImageList IMG_NAVI_ENTRYBMP
 {
     Prefix = "nc";
-    MaskColor = IMAGE_MASK_COLOR ;
     IdList =
     {
         20000 ;
-- 
cgit