summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-06 14:32:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-06 15:09:22 +0100
commit6e57881e9908f6263069f3b3a585bc404799b9a4 (patch)
tree59800b58cc5a7b453ec00c5e57baae06b5e46aa2 /cui
parentfe5e9610df64709cf505c0b5dc74aef2f55c1b77 (diff)
I can't see any evidence of any remaining magenta mask using image resources
Change-Id: I12865d743daa3e6479edb60584d5bd01f88e818d
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/cuires.src9
-rw-r--r--cui/source/dialogs/hyperdlg.src32
-rw-r--r--cui/source/tabpages/border.src2
3 files changed, 11 insertions, 32 deletions
diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
index 57d1708f2418..aabffbfc1f81 100644
--- a/cui/source/dialogs/cuires.src
+++ b/cui/source/dialogs/cuires.src
@@ -70,31 +70,24 @@ String RID_SVXSTR_EDIT_GRAPHIC
Text [ en-US ] = "Link" ;
};
-#define MASKCOLOR MaskColor = \
- Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
Image RID_CUIIMG_HARDDISK
{
- ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "harddisk_16.png" ; };
};
Image RID_CUIIMG_LIB
{
ImageBitmap = Bitmap { File = "im30820.png"; };
- MASKCOLOR
};
Image RID_CUIIMG_MACRO
{
ImageBitmap = Bitmap { File = "im30821.png"; };
- MASKCOLOR
};
Image RID_CUIIMG_DOC
{
ImageBitmap = Bitmap { File = "im30826.png"; };
- MASKCOLOR
};
String RID_SVXSTR_LOADACCELCONFIG
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 4ce60c01208a..0ebc1e0bdb11 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -21,8 +21,6 @@
#include <cuires.hrc>
#include "helpid.hrc"
-#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; };
-
String RID_SVXSTR_HYPDLG_CLOSEBUT
{
Text [ en-US ] = "Close" ;
@@ -98,62 +96,52 @@ String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE
Image RID_SVXBMP_HLINETTP
{
- ImageBitmap = Bitmap { File = "hlinettp.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "hlinettp.png" ; };
};
Image RID_SVXBMP_HLMAILTP
{
- ImageBitmap = Bitmap { File = "hlmailtp.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "hlmailtp.png" ; };
};
Image RID_SVXBMP_HLDOCTP
{
- ImageBitmap = Bitmap { File = "hldoctp.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "hldoctp.png" ; };
};
Image RID_SVXBMP_HLDOCNTP
{
- ImageBitmap = Bitmap { File = "hldocntp.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "hldocntp.png" ; };
};
Image RID_SVXBMP_BROWSE
{
- ImageBitmap = Bitmap { File = "browse.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "browse.png" ; };
};
Image RID_SVXBMP_SCRIPT
{
- ImageBitmap = Bitmap { File = "script.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "script.png" ; };
};
Image RID_SVXBMP_ADRESSBOOK
{
- ImageBitmap = Bitmap { File = "adrbook.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "adrbook.png" ; };
};
Image RID_SVXBMP_FILEOPEN
{
- ImageBitmap = Bitmap { File = "fileopen.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "fileopen.png" ; };
};
Image RID_SVXBMP_TARGET
{
- ImageBitmap = Bitmap { File = "target.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "target.png" ; };
};
Image RID_SVXBMP_NEWDOC
{
- ImageBitmap = Bitmap { File = "newdoc.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "newdoc.png" ; };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 139033ddd7f2..20246164f117 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -22,8 +22,6 @@
#include "border.hrc"
#include <svx/dialogs.hrc>
-#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
-
ImageList IL_PRE_BITMAPS
{
Prefix = "pr";