From 6e57881e9908f6263069f3b3a585bc404799b9a4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 6 Oct 2016 14:32:21 +0100
Subject: I can't see any evidence of any remaining magenta mask using image
 resources

Change-Id: I12865d743daa3e6479edb60584d5bd01f88e818d
---
 formula/source/ui/dlg/formdlgs.src | 20 ++++++--------------
 formula/source/ui/dlg/parawin.src  |  7 ++-----
 2 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'formula/source/ui')

diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 4159da13e6b3..e6466069d568 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -20,30 +20,24 @@
 #include "formdlgs.hrc"
 #include "ForResId.hrc"
 
-#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
-
 Image BMP_STR_CLOSE
 {
-    ImageBitmap = Bitmap { File = "fapclose.bmp"; };
-    MaskColor = STD_MASKCOLOR;
+    ImageBitmap = Bitmap { File = "fapclose.png"; };
 };
 
 Image BMP_STR_OPEN
 {
-    ImageBitmap = Bitmap { File = "fapopen.bmp"; };
-    MaskColor = STD_MASKCOLOR;
+    ImageBitmap = Bitmap { File = "fapopen.png"; };
 };
 
 Image BMP_STR_END
 {
-    ImageBitmap = Bitmap { File = "fapok.bmp"; };
-    MaskColor = STD_MASKCOLOR;
+    ImageBitmap = Bitmap { File = "fapok.png"; };
 };
 
 Image BMP_STR_ERROR
 {
-    ImageBitmap = Bitmap { File = "faperror.bmp"; };
-    MaskColor = STD_MASKCOLOR;
+    ImageBitmap = Bitmap { File = "faperror.png"; };
 };
 
 String STR_STRUCT_ERR1
@@ -75,9 +69,8 @@ Image RID_BMP_REFBTN1
 {
     ImageBitmap = Bitmap
     {
-        File = "refinp1.bmp";
+        File = "refinp1.png";
     };
-    MaskColor = STD_MASKCOLOR;
 };
 
 String RID_STR_SHRINK
@@ -89,9 +82,8 @@ Image RID_BMP_REFBTN2
 {
     ImageBitmap = Bitmap
     {
-        File = "refinp2.bmp";
+        File = "refinp2.png";
     };
-    MaskColor = STD_MASKCOLOR;
 };
 
 String RID_STR_EXPAND
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index 1d43bbcf7fcb..df7fa389425b 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -19,22 +19,19 @@
 
 #include "ForResId.hrc"
 
-#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
-
 Image BMP_FX
 {
-    ImageBitmap = Bitmap { File = "fx.bmp" ; };
-    MaskColor = STD_MASKCOLOR;
+    ImageBitmap = Bitmap { File = "fx.png" ; };
 };
 
 String STR_OPTIONAL
 {
     Text [ en-US ] = "(optional)" ;
 };
+
 String STR_REQUIRED
 {
     Text [ en-US ] = "(required)" ;
 };
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit