[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source formula/source include/tools reportdesign/source rsc/inc rsc/source sc/source sfx2/source svtools/source svx/source sw/source vcl/source xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Thu Oct 6 14:11:32 UTC 2016
basctl/source/basicide/basidesh.src | 15 -----
chart2/source/controller/dialogs/Bitmaps.src | 15 -----
cui/source/dialogs/cuires.src | 9 ---
cui/source/dialogs/hyperdlg.src | 32 +++--------
cui/source/tabpages/border.src | 2
dbaccess/source/ui/dlg/indexdialog.src | 1
dbaccess/source/ui/dlg/sqlmessage.src | 3 -
dbaccess/source/ui/imagelists/dbimagelists.src | 18 ------
dbaccess/source/ui/misc/WizardPages.src | 12 ----
desktop/source/deployment/gui/dp_gui_backend.src | 27 +++------
extensions/source/dbpilots/commonpagesdbp.src | 6 --
extensions/source/update/ui/updatecheckui.src | 19 ++----
formula/source/ui/dlg/formdlgs.src | 20 ++----
formula/source/ui/dlg/parawin.src | 7 --
include/tools/rc.h | 3 -
reportdesign/source/ui/report/report.src | 3 -
rsc/inc/rscdb.hxx | 3 -
rsc/source/parser/rscicpx.cxx | 6 --
rsc/source/parser/rscinit.cxx | 6 --
sc/source/ui/cctrl/checklistmenu.src | 2
sc/source/ui/formdlg/dwfunctr.src | 1
sc/source/ui/navipi/navipi.src | 6 --
sc/source/ui/pagedlg/pagedlg.src | 2
sfx2/source/appl/newhelp.src | 66 +++++++----------------
sfx2/source/dialog/dinfdlg.src | 1
sfx2/source/dialog/recfloat.src | 2
svtools/source/contnr/fileview.src | 2
svtools/source/contnr/svcontnr.src | 2
svtools/source/misc/imagemgr.src | 1
svx/source/dialog/langbox.src | 6 --
svx/source/engine3d/float3d.src | 33 -----------
svx/source/gallery2/gallery.src | 32 ++++-------
svx/source/stbctrls/stbctrls.src | 18 ------
svx/source/tbxctrls/extrusioncontrols.src | 51 -----------------
svx/source/tbxctrls/fontworkgallery.src | 7 --
svx/source/tbxctrls/tbcontrl.src | 29 +++-------
sw/source/ui/utlui/utlui.src | 7 --
sw/source/uibase/lingu/olmenu.src | 2
vcl/source/image/Image.cxx | 10 ---
xmlsecurity/source/dialogs/certificateviewer.src | 1
40 files changed, 92 insertions(+), 396 deletions(-)
New commits:
commit 6e57881e9908f6263069f3b3a585bc404799b9a4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 6 14:32:21 2016 +0100
I can't see any evidence of any remaining magenta mask using image resources
Change-Id: I12865d743daa3e6479edb60584d5bd01f88e818d
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 052b04c..08a6f72 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -23,8 +23,6 @@
#include <sfx2/sfxcommands.h>
#include <svx/svxcommands.h>
-#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
-
String RID_STR_FILTER_ALLFILES
{
Text [ en-US ] = "<All>" ;
@@ -300,8 +298,7 @@ ImageButton RID_IMGBTN_REMOVEWATCH
SmallStyle = TRUE ;
ButtonImage = Image
{
- ImageBitmap = Bitmap { File = "baswatr.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "baswatr.png" ; };
};
QuickHelpText [ en-US ] = "Remove Watch" ;
};
@@ -458,53 +455,43 @@ ImageList RID_IMGLST_LAYOUT
Image RID_IMG_LOCKED
{
ImageBitmap = Bitmap { File = "lock.png" ; };
- MASKCOLOR
};
Image RID_IMG_INSTALLATION
{
ImageBitmap = Bitmap { File = "harddisk_16.png"; };
- MASKCOLOR
};
Image RID_IMG_DOCUMENT
{
ImageBitmap = Bitmap { File = "im30826.png"; };
- MASKCOLOR
};
Image RID_IMG_MODLIB
{
ImageBitmap = Bitmap { File = "im30820.png"; };
- MASKCOLOR
};
Image RID_IMG_MODLIBNOTLOADED
{
ImageBitmap = Bitmap { File = "im30827.png"; };
- MASKCOLOR
};
Image RID_IMG_MODULE
{
ImageBitmap = Bitmap { File = "im30821.png"; };
- MASKCOLOR
};
Image RID_IMG_MACRO
{
ImageBitmap = Bitmap { File = "im30822.png"; };
- MASKCOLOR
};
Image RID_IMG_DLGLIB
{
ImageBitmap = Bitmap { File = "dialogfolder_16.png"; };
- MASKCOLOR
};
Image RID_IMG_DLGLIBNOTLOADED
{
ImageBitmap = Bitmap { File = "dialogfoldernot_16.png"; };
- MASKCOLOR
};
Image RID_IMG_DIALOG
{
ImageBitmap = Bitmap { File = "im30823.png"; };
- MASKCOLOR
};
String RID_STR_QUERYREPLACEMACRO
{
diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src
index 79cd6a9..05ae95e 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -21,77 +21,62 @@
Image IMG_TYPE_COLUMN
{
ImageBitmap = Bitmap { File = "typecolumn_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_BAR
{
ImageBitmap = Bitmap { File = "typebar_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_PIE
{
ImageBitmap = Bitmap { File = "typepie_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_LINE
{
ImageBitmap = Bitmap { File = "typepointline_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_XY
{
ImageBitmap = Bitmap { File = "typexy_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_AREA
{
ImageBitmap = Bitmap { File = "typearea_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_NET
{
ImageBitmap = Bitmap { File = "typenet_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_STOCK
{
ImageBitmap = Bitmap { File = "typestock_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_COLUMN_LINE
{
ImageBitmap = Bitmap { File = "typecolumnline_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_BUBBLE
{
ImageBitmap = Bitmap { File = "typebubble_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_GL3D_BAR
{
ImageBitmap = Bitmap { File = "typegl3dbar_16.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_STEP_START
{
ImageBitmap = Bitmap { File = "step_start_30.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_STEP_END
{
ImageBitmap = Bitmap { File = "step_end_30.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_STEP_CENTER_X
{
ImageBitmap = Bitmap { File = "step_center_x_30.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_STEP_CENTER_Y
{
ImageBitmap = Bitmap { File = "step_center_y_30.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Bitmap BMP_BUBBLE_1
{
diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
index 57d1708..aabffbf 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 4ce60c0..0ebc1e0 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 139033d..2024616 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";
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index 12ea5d0..141d5d1 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -55,7 +55,6 @@ String STR_LOGICAL_INDEX_NAME
Image IMG_PKEYICON
{
ImageBitmap = Bitmap { File = "pkey.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
String STR_NEED_INDEX_FIELDS
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index 978f7d7..ca684e0 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -23,19 +23,16 @@
Image BMP_EXCEPTION_ERROR
{
ImageBitmap = Bitmap { File = "exerror.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
};
Image BMP_EXCEPTION_WARNING
{
ImageBitmap = Bitmap { File = "exwarning.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
};
Image BMP_EXCEPTION_INFO
{
ImageBitmap = Bitmap { File = "exinfo.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
};
String STR_EXCEPTION_STATUS
diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src
index f3e7bd5..dff9830 100644
--- a/dbaccess/source/ui/imagelists/dbimagelists.src
+++ b/dbaccess/source/ui/imagelists/dbimagelists.src
@@ -20,8 +20,6 @@
#include "dbu_dlg.hrc"
#include "browserids.hxx"
-#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }
-
#define IL_TOOL_2 \
\
IdList = {\
@@ -50,25 +48,21 @@ ImageList IMG_INDEX_DLG_LC
Image IMG_FORMFOLDER_TREE_L
{
ImageBitmap = Bitmap { File = "forms_32"; };
- MASKCOLOR;
};
Image IMG_REPORTFOLDER_TREE_L
{
ImageBitmap = Bitmap { File = "reports_32"; };
- MASKCOLOR;
};
Image IMG_QUERYFOLDER_TREE_L
{
ImageBitmap = Bitmap { File = "queries_32"; };
- MASKCOLOR;
};
Image IMG_TABLEFOLDER_TREE_L
{
ImageBitmap = Bitmap { File = "tables_32"; };
- MASKCOLOR;
};
// database object icons
@@ -78,7 +72,6 @@ Image IMG_TABLEFOLDER_TREE_L
Image DATABASE_TREE_ICON
{
ImageBitmap = Bitmap { File = "db.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
};
// tables and table folders
@@ -86,13 +79,11 @@ Image DATABASE_TREE_ICON
Image TABLE_TREE_ICON
{
ImageBitmap = Bitmap { File = "sx03188.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
Image TABLEFOLDER_TREE_ICON
{
ImageBitmap = Bitmap { File = "sx03187.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
// views
@@ -100,7 +91,6 @@ Image TABLEFOLDER_TREE_ICON
Image VIEW_TREE_ICON
{
ImageBitmap = Bitmap { File = "sx16670.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
// queries and query folders
@@ -108,13 +98,11 @@ Image VIEW_TREE_ICON
Image QUERY_TREE_ICON
{
ImageBitmap = Bitmap { File = "sx03202.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
Image QUERYFOLDER_TREE_ICON
{
ImageBitmap = Bitmap { File = "sx03201.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
// forms and form folders
@@ -122,13 +110,11 @@ Image QUERYFOLDER_TREE_ICON
Image FORM_TREE_ICON
{
ImageBitmap = Bitmap { File = "form_16"; };
- MASKCOLOR;
};
Image FORMFOLDER_TREE_ICON
{
ImageBitmap = Bitmap { File = "forms_16"; };
- MASKCOLOR;
};
// reports and report folders
@@ -136,13 +122,11 @@ Image FORMFOLDER_TREE_ICON
Image REPORT_TREE_ICON
{
ImageBitmap = Bitmap { File = "report_16"; };
- MASKCOLOR;
};
Image REPORTFOLDER_TREE_ICON
{
ImageBitmap = Bitmap { File = "reports_16"; };
- MASKCOLOR;
};
// new folder and parent folder
@@ -150,13 +134,11 @@ Image REPORTFOLDER_TREE_ICON
Image IMG_NAVIGATION_BTN_UP_SC
{
ImageBitmap = Bitmap { File = "fp010"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
Image IMG_NAVIGATION_CREATEFOLDER_SC
{
ImageBitmap = Bitmap { File = "fp015"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 4f2d1e8..398e348 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -77,12 +77,6 @@ Image IMG_UP
{
File = "sortup.png" ;
};
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
};
Image IMG_DOWN
@@ -91,12 +85,6 @@ Image IMG_DOWN
{
File = "sortdown.png" ;
};
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
};
String STR_WIZ_TABLE_COPY
diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src
index 8cece98..39fff6d 100644
--- a/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/desktop/source/deployment/gui/dp_gui_backend.src
@@ -22,59 +22,50 @@
// package bundle:
Image RID_IMG_DEF_PACKAGE_BUNDLE
{
- ImageBitmap = Bitmap { File = "sx03256.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "sx03256.png"; };
};
// script, dialog:
Image RID_IMG_SCRIPTLIB
{
- ImageBitmap = Bitmap { File = "im30820.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "im30820.png"; };
};
Image RID_IMG_DIALOGLIB
{
- ImageBitmap = Bitmap { File = "dialogfolder_16.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "dialogfolder_16.png"; };
};
// configuration:
Image RID_IMG_CONF_XML
{
- ImageBitmap = Bitmap { File = "xml_16.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "xml_16.png"; };
};
// component, typelib:
Image RID_IMG_COMPONENT
{
- ImageBitmap = Bitmap { File = "component_16.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "component_16.png"; };
};
Image RID_IMG_JAVA_COMPONENT
{
- ImageBitmap = Bitmap { File = "javacomponent_16.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "javacomponent_16.png"; };
};
Image RID_IMG_TYPELIB
{
- ImageBitmap = Bitmap { File = "library_16.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "library_16.png"; };
};
Image RID_IMG_JAVA_TYPELIB
{
- ImageBitmap = Bitmap { File = "javalibrary_16.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "javalibrary_16.png"; };
};
Image RID_IMG_HELP
{
- ImageBitmap = Bitmap { File = "sc_helperdialog.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "sc_helperdialog.png"; };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
index 896bc0e..dec21f0 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -22,14 +22,12 @@
Image IMG_TABLE
{
- ImageBitmap = Bitmap { File = "sx03188.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ ImageBitmap = Bitmap { File = "sx03188.png"; };
};
Image IMG_QUERY
{
- ImageBitmap = Bitmap { File = "sx03202.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ ImageBitmap = Bitmap { File = "sx03202.png"; };
};
String RID_STR_OPTION_DB_FIELD_TITLE
diff --git a/extensions/source/update/ui/updatecheckui.src b/extensions/source/update/ui/updatecheckui.src
index 352b9e6..a151f8b 100644
--- a/extensions/source/update/ui/updatecheckui.src
+++ b/extensions/source/update/ui/updatecheckui.src
@@ -19,17 +19,14 @@
#include "updatecheckui.hrc"
-#define STD_MASK_COLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
+Image RID_UPDATE_AVAILABLE_16
+{
+ ImageBitmap = Bitmap{ file = "onlineupdate_16.png"; };
+};
- Image RID_UPDATE_AVAILABLE_16
- {
- ImageBitmap = Bitmap{ file = "onlineupdate_16.png"; };
- STD_MASK_COLOR
- };
- Image RID_UPDATE_AVAILABLE_26
- {
- ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; };
- STD_MASK_COLOR
- };
+Image RID_UPDATE_AVAILABLE_26
+{
+ ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; };
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 4159da1..e646606 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 1d43bbc..df7fa38 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: */
diff --git a/include/tools/rc.h b/include/tools/rc.h
index f37c5fe..fefaede 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -139,10 +139,9 @@ namespace o3tl {
// For "Image":
enum class RscImageFlags {
ImageBitmap = 0x01,
- MaskColor = 0x04
};
namespace o3tl {
- template<> struct typed_flags<RscImageFlags> : is_typed_flags<RscImageFlags, 0x05> {};
+ template<> struct typed_flags<RscImageFlags> : is_typed_flags<RscImageFlags, 0x01> {};
}
// For "ImageList":
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index 6cb3212..648bd53 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -95,13 +95,11 @@ String RID_STR_PROPTITLE_GROUP
Image RID_IMG_TREENODE_COLLAPSED
{
ImageBitmap = Bitmap { File = "plus.png"; } ;
- MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
};
Image RID_IMG_TREENODE_EXPANDED
{
ImageBitmap = Bitmap { File = "minus.png"; } ;
- MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
};
String STR_SHOW_RULER
@@ -590,7 +588,6 @@ String RID_STR_FUNCTION
Image REPORT_TREE_ICON
{
ImageBitmap = Bitmap { File = "report_16"; };
- MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
};
String RID_STR_COULD_NOT_CREATE_REPORT
{
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 95c8158..3e80b39 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -177,8 +177,7 @@ class RscTypCont
RscTop * InitClassString( RscTop * pSuper );
RscTop * InitClassBitmap( RscTop * pSuper );
RscTop * InitClassColor( RscTop * pSuper, RscEnum * pColor );
- RscTop * InitClassImage( RscTop * pSuper, RscTop *pClassBitmap,
- RscTop * pClassColor );
+ RscTop * InitClassImage( RscTop * pSuper, RscTop *pClassBitmap );
RscTop * InitClassImageList( RscTop * pSuper, RscCont * pStrLst );
RscTop * InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
RscArray * pLangGeo );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 94fd77b..e67747c 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -138,8 +138,7 @@ RscTop * RscTypCont::InitClassColor( RscTop * pSuper, RscEnum * pColor )
return pClassColor;
}
-RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap,
- RscTop * pClassColor )
+RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap )
{
Atom nId;
RscTop * pClassImage;
@@ -153,9 +152,6 @@ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap,
// initialize variables
nId = aNmTb.Put( "ImageBitmap", VARNAME );
pClassImage->SetVariable( nId, pClassBitmap, nullptr, 0, (sal_uInt32)RscImageFlags::ImageBitmap );
- nId = aNmTb.Put( "MaskColor", VARNAME );
- pClassImage->SetVariable( nId, pClassColor, nullptr,
- VAR_SVDYNAMIC, (sal_uInt32)RscImageFlags::MaskColor );
return pClassImage;
}
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 71cdbaf..15596c6 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -59,7 +59,6 @@ void RscTypCont::Init()
RscTop * pClassString;
RscTop * pClassStringArray;
RscTop * pClassBitmap;
- RscTop * pClassColor;
RscTop * pClassImage;
RscTop * pClassImageList;
RscTop * pClassWindow;
@@ -287,10 +286,7 @@ void RscTypCont::Init()
}
{
- pClassColor = InitClassColor( pClassMgr, pColor );
- pRoot->Insert( pClassColor );
-
- pClassImage = InitClassImage( pClassMgr, pClassBitmap, pClassColor );
+ pClassImage = InitClassImage( pClassMgr, pClassBitmap );
pRoot->Insert( pClassImage );
pClassImageList = InitClassImageList( pClassMgr, pStringLongTupelList );
diff --git a/sc/source/ui/cctrl/checklistmenu.src b/sc/source/ui/cctrl/checklistmenu.src
index a6a0fe7..59c8eb09 100644
--- a/sc/source/ui/cctrl/checklistmenu.src
+++ b/sc/source/ui/cctrl/checklistmenu.src
@@ -63,7 +63,6 @@ Image RID_IMG_SELECT_CURRENT
{
File = "popup_select_current.png";
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_IMG_UNSELECT_CURRENT
@@ -72,7 +71,6 @@ Image RID_IMG_UNSELECT_CURRENT
{
File = "popup_unselect_current.png";
};
- MaskColor = STD_MASKCOLOR;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/formdlg/dwfunctr.src b/sc/source/ui/formdlg/dwfunctr.src
index 4aecde6..7f7d136 100644
--- a/sc/source/ui/formdlg/dwfunctr.src
+++ b/sc/source/ui/formdlg/dwfunctr.src
@@ -98,7 +98,6 @@ Window FID_FUNCTION_BOX
{
File = "fx.png";
};
- MaskColor = STD_MASKCOLOR;
};
DefButton = TRUE ;
QuickHelpText [ en-US ] = "Insert Function into calculation sheet" ;
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index eaf7dbd..a602335 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -181,37 +181,31 @@ ImageList RID_IMAGELIST_NAVCONT
Image RID_IMG_DROP_URL
{
ImageBitmap = Bitmap { File = "dropurl.png" ; };
- MaskColor = STD_MASKCOLOR ;
};
Image RID_IMG_DROP_LINK
{
ImageBitmap = Bitmap { File = "droplink.png" ; };
- MaskColor = STD_MASKCOLOR ;
};
Image RID_IMG_DROP_COPY
{
ImageBitmap = Bitmap { File = "dropcopy.png" ; };
- MaskColor = STD_MASKCOLOR ;
};
Image IMG_ELEMENT_DEFAULT
{
ImageBitmap = Bitmap { File = "xml_element.png" ; };
- MaskColor = STD_MASKCOLOR ;
};
Image IMG_ELEMENT_REPEAT
{
ImageBitmap = Bitmap { File = "xml_element_repeat.png" ; };
- MaskColor = STD_MASKCOLOR ;
};
Image IMG_ELEMENT_ATTRIBUTE
{
ImageBitmap = Bitmap { File = "xml_attribute.png" ; };
- MaskColor = STD_MASKCOLOR ;
};
// content description strings are also used in ScLinkTargetsObj
diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src
index 56d571a..e26d0db 100644
--- a/sc/source/ui/pagedlg/pagedlg.src
+++ b/sc/source/ui/pagedlg/pagedlg.src
@@ -21,12 +21,10 @@
Image IMG_LEFTRIGHT
{
ImageBitmap = Bitmap { File = "lftrgt.png" ; };
- MaskColor = STD_MASKCOLOR;
};
Image IMG_TOPDOWN
{
ImageBitmap = Bitmap { File = "topdown.png" ; };
- MaskColor = STD_MASKCOLOR;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 0420003..f1f228e 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -21,79 +21,64 @@
#include "newhelp.hrc"
#include "helpid.hrc"
-#define MASKCOLOR_MAGENTA \
- MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
Image IMG_HELP_TOOLBOX_INDEX_ON
{
- ImageBitmap = Bitmap { File = "indexon_small.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexon_small.png" ; };
};
Image IMG_HELP_TOOLBOX_INDEX_OFF
{
- ImageBitmap = Bitmap { File = "indexoff_small.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexoff_small.png" ; };
};
Image IMG_HELP_TOOLBOX_START
{
- ImageBitmap = Bitmap { File = "sc06303.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc06303.png" ; };
};
Image IMG_HELP_TOOLBOX_PREV
{
- ImageBitmap = Bitmap { File = "sc06301.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc06301.png" ; };
};
Image IMG_HELP_TOOLBOX_NEXT
{
- ImageBitmap = Bitmap { File = "sc06300.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc06300.png" ; };
};
Image IMG_HELP_TOOLBOX_PRINT
{
- ImageBitmap = Bitmap { File = "sc05504.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc05504.png" ; };
};
Image IMG_HELP_TOOLBOX_BOOKMARKS
{
- ImageBitmap = Bitmap { File = "favourite.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "favourite.png" ; };
};
Image IMG_HELP_TOOLBOX_SEARCHDIALOG
{
- ImageBitmap = Bitmap { File = "sc05961.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc05961.png" ; };
};
Image IMG_HELP_TOOLBOX_COPY
{
- ImageBitmap = Bitmap { File = "sc05711.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc05711.png" ; };
};
Image IMG_HELP_CONTENT_BOOK_OPEN
{
- ImageBitmap = Bitmap { File = "hlpbookopen.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "hlpbookopen.png" ; };
};
Image IMG_HELP_CONTENT_BOOK_CLOSED
{
- ImageBitmap = Bitmap { File = "hlpbookclosed.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "hlpbookclosed.png" ; };
};
Image IMG_HELP_CONTENT_DOC
{
- ImageBitmap = Bitmap { File = "hlpdoc.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "hlpdoc.png" ; };
};
String STR_HELP_WINDOW_TITLE
@@ -207,56 +192,47 @@ String STR_INFO_NOSEARCHTEXTFOUND
Image IMG_HELP_TOOLBOX_L_INDEX_ON
{
- ImageBitmap = Bitmap { File = "indexon_big.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexon_big.png" ; };
};
Image IMG_HELP_TOOLBOX_L_INDEX_OFF
{
- ImageBitmap = Bitmap { File = "indexoff_big.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexoff_big.png" ; };
};
Image IMG_HELP_TOOLBOX_L_START
{
- ImageBitmap = Bitmap { File = "lc06303.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc06303.png" ; };
};
Image IMG_HELP_TOOLBOX_L_PREV
{
- ImageBitmap = Bitmap { File = "lc06301.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc06301.png" ; };
};
Image IMG_HELP_TOOLBOX_L_NEXT
{
- ImageBitmap = Bitmap { File = "lc06300.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc06300.png" ; };
};
Image IMG_HELP_TOOLBOX_L_PRINT
{
- ImageBitmap = Bitmap { File = "lc05504.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc05504.png" ; };
};
Image IMG_HELP_TOOLBOX_L_BOOKMARKS
{
- ImageBitmap = Bitmap { File = "favourite_big.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "favourite_big.png" ; };
};
Image IMG_HELP_TOOLBOX_L_SEARCHDIALOG
{
- ImageBitmap = Bitmap { File = "lc05961.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc05961.png" ; };
};
Image IMG_HELP_TOOLBOX_L_COPY
{
- ImageBitmap = Bitmap { File = "lc05711.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc05711.png" ; };
};
CheckBox RID_HELP_ONSTARTUP_BOX
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 450ba7a..f981589 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -132,7 +132,6 @@ String STR_SFX_REMOVE_PROPERTY
Image SFX_IMG_PROPERTY_REMOVE
{
ImageBitmap = Bitmap { File = "deleterow.bmp" ; };
- MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
};
String STR_SFX_QUERY_WRONG_TYPE
diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src
index 8a5c484..96064e6 100644
--- a/sfx2/source/dialog/recfloat.src
+++ b/sfx2/source/dialog/recfloat.src
@@ -20,8 +20,6 @@
#include "helpid.hrc"
#include "dialog.hrc"
-#define STD_MASKCOLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
-
String STR_MACRO_LOSS
{
Text [ en-US ] = "Do you really want to cancel the recording? Any steps recorded up to this point will be lost.";
diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
index 54119f3..414bf3c 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -73,13 +73,11 @@ String STR_SVT_GB
Image IMG_SVT_FOLDER
{
ImageBitmap = Bitmap { File = "folder.png" ; };
- MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
};
Image IMG_SVT_FOLDER_OPEN
{
ImageBitmap = Bitmap { File = "folderop.png" ; };
- MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
};
// Menus -----------------------------------------------------------------
diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src
index 9e4e807..ccef108 100644
--- a/svtools/source/contnr/svcontnr.src
+++ b/svtools/source/contnr/svcontnr.src
@@ -22,13 +22,11 @@
Image RID_IMG_TREENODE_COLLAPSED
{
ImageBitmap = Bitmap { File = "plus.png"; } ;
- MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
};
Image RID_IMG_TREENODE_EXPANDED
{
ImageBitmap = Bitmap { File = "minus.png"; } ;
- MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
};
// descriptions of accessible objects
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 4275a41..a98e593 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -122,7 +122,6 @@ Image BMP_LIST_ADD
{
File = "list_add.png" ;
};
- MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
};
// description strings
diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src
index 21caee6..9960187 100644
--- a/svx/source/dialog/langbox.src
+++ b/svx/source/dialog/langbox.src
@@ -21,14 +21,12 @@
Image RID_SVXIMG_NOTCHECKED
{
- ImageBitmap = Bitmap { File = "notcheck.bmp" ; } ;
- MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+ ImageBitmap = Bitmap { File = "notcheck.png" ; } ;
};
Image RID_SVXIMG_CHECKED
{
- ImageBitmap = Bitmap { File = "lngcheck.bmp" ; } ;
- MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+ ImageBitmap = Bitmap { File = "lngcheck.png" ; } ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index 3a3451e..7341170 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -21,50 +21,19 @@
#include "float3d.hrc"
#include <svx/svxcommands.h>
-#define WIDTH 158
-#define HEIGHT 209
-#define BORDER 3
-#define BUTTON_WIDTH 13
-#define BUTTON_HEIGHT 13
-#define VT_BUTTON_WIDTH 18
-#define GROUP_WIDTH (WIDTH - 2 * BORDER)
-#define IMG_BUTTON_HEIGHT 15
-#define IMG_BUTTON_NEXT (IMG_BUTTON_HEIGHT + 2)
-#define IMG_BUTTON_SIZE MAP_APPFONT( BUTTON_WIDTH, IMG_BUTTON_HEIGHT )
-#define FIXED_LINE_HEIGHT 8
-#define FIXED_LINE_SIZE MAP_APPFONT( GROUP_WIDTH, FIXED_LINE_HEIGHT )
-#define TOP_FIXED_LINE_POS MAP_APPFONT( BORDER, 2+BORDER + IMG_BUTTON_HEIGHT )
-#define FT_WIDTH_SHORT 56
-#define FT_WIDTH_LONG 89
-#define FT_HEIGHT 8
-#define FT_OFFSET_NEXT (FT_HEIGHT + 6)
-#define FT_INDENT (BORDER + 6)
-#define FIRST_FT_START_Y (2+BORDER+IMG_BUTTON_HEIGHT + 13)
-#define SEGMENTS_START_Y (FIRST_FT_START_Y + 3*FT_OFFSET_NEXT + 13)
-#define NORMALS_START_Y (SEGMENTS_START_Y + 2*13)
-#define NORMALS_BT_START_Y (SEGMENTS_START_Y + 2*13 +11)
-#define SHADOW_START_Y (FIRST_FT_START_Y + 13)
-#define CAMERA_START_Y (SHADOW_START_Y + FT_OFFSET_NEXT + 13)
-#define SPECULAR_START_Y (FIRST_FT_START_Y + 2*FT_OFFSET_NEXT + 13)
-
-#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; };
-
Image RID_SVXIMAGE_LIGHT_ON
{
- ImageBitmap = Bitmap { File = "lighton.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "lighton.png" ; };
};
Image RID_SVXIMAGE_LIGHT_OFF
{
ImageBitmap = Bitmap { File = "light.bmp" ; };
- MASKCOLOR
};
Image RID_SVXIMAGE_COLORDLG
{
ImageBitmap = Bitmap { File = "colordlg.bmp" ; };
- MASKCOLOR
};
String RID_SVXFLOAT3D_FAVORITE
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index b3ef1d2..abd82ce 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -21,8 +21,6 @@
#include "helpid.hrc"
#include "gallery.hrc"
-#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
String RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS
{
Text [ en-US ] = "Update";
@@ -122,74 +120,72 @@ String RID_SVXSTR_GALLERY_LISTVIEW
Bitmap RID_SVXBMP_GALLERY
{
- File = "lx03135.bmp" ;
+ File = "lx03135.png" ;
};
Bitmap RID_SVXBMP_THEME_NORMAL
{
- File = "galnors.bmp" ;
+ File = "galnors.png" ;
};
Bitmap RID_SVXBMP_THEME_READONLY
{
- File = "galrdos.bmp" ;
+ File = "galrdos.png" ;
};
Bitmap RID_SVXBMP_THEME_DEFAULT
{
- File = "galdefs.bmp" ;
+ File = "galdefs.png" ;
};
Bitmap RID_SVXBMP_GALLERY_MEDIA
{
- File = "galmedia.bmp";
+ File = "galmedia.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_1
{
- File = "galsnd1.bmp";
+ File = "galsnd1.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_2
{
- File = "galsnd2.bmp";
+ File = "galsnd2.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_3
{
- File = "galsnd3.bmp";
+ File = "galsnd3.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_4
{
- File = "galsnd4.bmp";
+ File = "galsnd4.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_5
{
- File = "galsnd5.bmp";
+ File = "galsnd5.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_6
{
- File = "galsnd6.bmp";
+ File = "galsnd6.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_7
{
- File = "galsnd7.bmp";
+ File = "galsnd7.png";
};
Image RID_SVXIMG_GALLERY_VIEW_ICON
{
- ImageBitmap = Bitmap { File = "galicon.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "galicon.png"; };
};
Image RID_SVXIMG_GALLERY_VIEW_LIST
{
- ImageBitmap = Bitmap { File = "gallist.bmp"; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "gallist.png"; };
};
Menu RID_SVXMN_GALLERY1
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 0337f77..bc0d332 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -306,23 +306,19 @@ Menu RID_SVXMNU_XMLSECSTATBAR
// Images ----------------------------------------------------------------
-#define STD_MASKCOLOR Color{Red=0xffff;Green=0x0000;Blue=0xffff;}
-
Image RID_SVXBMP_POSITION
{
ImageBitmap = Bitmap
{
- File = "sc10223.bmp" ;
+ File = "sc10223.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_SIZE
{
ImageBitmap = Bitmap
{
- File = "sc10224.bmp" ;
+ File = "sc10224.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_SIGNET
{
@@ -330,7 +326,6 @@ Image RID_SVXBMP_SIGNET
{
File = "signet_11x16.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_SIGNET_BROKEN
{
@@ -338,7 +333,6 @@ Image RID_SVXBMP_SIGNET_BROKEN
{
File = "caution_11x16.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_SIGNET_NOTVALIDATED
{
@@ -346,7 +340,6 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED
{
File = "notcertificate_16.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_SLIDERBUTTON
@@ -355,7 +348,6 @@ Image RID_SVXBMP_SLIDERBUTTON
{
File = "slidezoombutton_10.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_SLIDERDECREASE
{
@@ -363,7 +355,6 @@ Image RID_SVXBMP_SLIDERDECREASE
{
File = "slidezoomout_10.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_SLIDERINCREASE
{
@@ -371,7 +362,6 @@ Image RID_SVXBMP_SLIDERINCREASE
{
File = "slidezoomin_10.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_DOC_MODIFIED_YES
{
@@ -379,7 +369,6 @@ Image RID_SVXBMP_DOC_MODIFIED_YES
{
File = "doc_modified_yes_14.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_DOC_MODIFIED_NO
{
@@ -387,7 +376,6 @@ Image RID_SVXBMP_DOC_MODIFIED_NO
{
File = "doc_modified_no_14.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_DOC_MODIFIED_FEEDBACK
{
@@ -395,7 +383,6 @@ Image RID_SVXBMP_DOC_MODIFIED_FEEDBACK
{
File = "doc_modified_feedback.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
Image RID_SVXBMP_ZOOM_PAGE
{
@@ -403,7 +390,6 @@ Image RID_SVXBMP_ZOOM_PAGE
{
File = "zoom_page_statusbar.png" ;
};
- MaskColor = STD_MASKCOLOR;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 157cc90..7dfc57d 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -20,72 +20,59 @@
#include <svx/dialogs.hrc>
#include "extrusioncontrols.hrc"
-#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; };
-
Image RID_SVXIMG_DIRECTION + DIRECTION_NW
{
ImageBitmap = Bitmap { File = "directionnorthwest_22.bmp" ; };
- MASKCOLOR
};
Image RID_SVXIMG_DIRECTION + DIRECTION_N
{
ImageBitmap = Bitmap { File = "directionnorth_22.bmp" ; };
- MASKCOLOR
};
Image RID_SVXIMG_DIRECTION + DIRECTION_NE
{
ImageBitmap = Bitmap { File = "directionnortheast_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DIRECTION + DIRECTION_W
{
ImageBitmap = Bitmap { File = "directionwest_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DIRECTION + DIRECTION_NONE
{
ImageBitmap = Bitmap { File = "directionstraight_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DIRECTION + DIRECTION_E
{
ImageBitmap = Bitmap { File = "directioneast_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DIRECTION + DIRECTION_SW
{
ImageBitmap = Bitmap { File = "directionsouthwest_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DIRECTION + DIRECTION_S
{
ImageBitmap = Bitmap { File = "directionsouth_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DIRECTION + DIRECTION_SE
{
ImageBitmap = Bitmap { File = "directionsoutheast_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_PERSPECTIVE
{
ImageBitmap = Bitmap { File = "perspective_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_PARALLEL
{
ImageBitmap = Bitmap { File = "parallel_16.bmp"; };
- MASKCOLOR
};
String RID_SVXSTR_PERSPECTIVE
@@ -146,169 +133,141 @@ String RID_SVXSTR_DIRECTION + DIRECTION_SE
Image RID_SVXIMG_LIGHT_OFF + FROM_TOP_LEFT
{
ImageBitmap = Bitmap { File = "lightofffromtopleft_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_OFF + FROM_TOP
{
ImageBitmap = Bitmap { File = "lightofffromtop_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_OFF + FROM_TOP_RIGHT
{
ImageBitmap = Bitmap { File = "lightofffromtopright_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_OFF + FROM_LEFT
{
ImageBitmap = Bitmap { File = "lightofffromleft_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_OFF + FROM_RIGHT
{
ImageBitmap = Bitmap { File = "lightofffromright_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_OFF + FROM_BOTTOM_LEFT
{
ImageBitmap = Bitmap { File = "lightofffrombottomleft_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_OFF + FROM_BOTTOM
{
ImageBitmap = Bitmap { File = "lightofffrombottom_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_OFF + FROM_BOTTOM_RIGHT
{
ImageBitmap = Bitmap { File = "lightofffrombottomright_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_ON + FROM_TOP_LEFT
{
ImageBitmap = Bitmap { File = "lightonfromtopleft_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_ON + FROM_TOP
{
ImageBitmap = Bitmap { File = "lightonfromtop_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_ON + FROM_TOP_RIGHT
{
ImageBitmap = Bitmap { File = "lightonfromtopright_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_ON + FROM_LEFT
{
ImageBitmap = Bitmap { File = "lightonfromleft_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_ON + FROM_RIGHT
{
ImageBitmap = Bitmap { File = "lightonfromright_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_ON + FROM_BOTTOM_LEFT
{
ImageBitmap = Bitmap { File = "lightonfrombottomleft_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_ON + FROM_BOTTOM
{
ImageBitmap = Bitmap { File = "lightonfrombottom_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_ON + FROM_BOTTOM_RIGHT
{
ImageBitmap = Bitmap { File = "lightonfrombottomright_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_PREVIEW + FROM_TOP_LEFT
{
ImageBitmap = Bitmap { File = "lightfromtopleft_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_PREVIEW + FROM_TOP
{
ImageBitmap = Bitmap { File = "lightfromtop_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_PREVIEW + FROM_TOP_RIGHT
{
ImageBitmap = Bitmap { File = "lightfromtopright_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_PREVIEW + FROM_LEFT
{
ImageBitmap = Bitmap { File = "lightfromleft_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_PREVIEW + FROM_RIGHT
{
ImageBitmap = Bitmap { File = "lightfromright_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_PREVIEW + FROM_FRONT
{
ImageBitmap = Bitmap { File = "lightfromfront_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_PREVIEW + FROM_BOTTOM_LEFT
{
ImageBitmap = Bitmap { File = "lightfrombottomleft_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_PREVIEW + FROM_BOTTOM
{
ImageBitmap = Bitmap { File = "lightfrombottom_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHT_PREVIEW + FROM_BOTTOM_RIGHT
{
ImageBitmap = Bitmap { File = "lightfrombottomright_22.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHTING_BRIGHT
{
ImageBitmap = Bitmap { File = "brightlit_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHTING_NORMAL
{
ImageBitmap = Bitmap { File = "normallit_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_LIGHTING_DIM
{
ImageBitmap = Bitmap { File = "dimlit_16.bmp"; };
- MASKCOLOR
};
String RID_SVXSTR_BRIGHT
@@ -349,61 +308,51 @@ String RID_SVXSTR_METAL
Image RID_SVXIMG_WIRE_FRAME
{
ImageBitmap = Bitmap { File = "wireframe_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_MATTE
{
ImageBitmap = Bitmap { File = "matte_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_PLASTIC
{
ImageBitmap = Bitmap { File = "plastic_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_METAL
{
ImageBitmap = Bitmap { File = "metal_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DEPTH_0
{
ImageBitmap = Bitmap { File = "extrusion0inch_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DEPTH_1
{
ImageBitmap = Bitmap { File = "extrusion05inch_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DEPTH_2
{
ImageBitmap = Bitmap { File = "extrusion1inch_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DEPTH_3
{
ImageBitmap = Bitmap { File = "extrusion2inch_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DEPTH_4
{
ImageBitmap = Bitmap { File = "extrusion4inch_16.bmp"; };
- MASKCOLOR
};
Image RID_SVXIMG_DEPTH_INFINITY
{
ImageBitmap = Bitmap { File = "extrusioninfinity_16.bmp"; };
- MASKCOLOR
};
String RID_SVXSTR_EXTRUSION_COLOR
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
index dee254d..86d7954 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -20,8 +20,6 @@
#include "helpid.hrc"
#include <svx/dialogs.hrc>
-#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; };
-
String RID_SVXSTR_ALIGN_LEFT
{
Text [ en-US ] = "~Left Align";
@@ -50,31 +48,26 @@ String RID_SVXSTR_ALIGN_STRETCH
Image RID_SVXIMG_FONTWORK_ALIGN_LEFT
{
ImageBitmap = Bitmap { File = "fontworkalignleft_16.png"; };
- MASKCOLOR
};
Image RID_SVXIMG_FONTWORK_ALIGN_CENTER
{
ImageBitmap = Bitmap { File = "fontworkaligncentered_16.png"; };
- MASKCOLOR
};
Image RID_SVXIMG_FONTWORK_ALIGN_RIGHT
{
ImageBitmap = Bitmap { File = "fontworkalignright_16.png"; };
- MASKCOLOR
};
Image RID_SVXIMG_FONTWORK_ALIGN_WORD
{
ImageBitmap = Bitmap { File = "fontworkalignjustified_16.png"; };
- MASKCOLOR
};
Image RID_SVXIMG_FONTWORK_ALIGN_STRETCH
{
ImageBitmap = Bitmap { File = "fontworkalignstretch_16.png"; };
- MASKCOLOR
};
String RID_SVXSTR_CHARS_SPACING_VERY_TIGHT
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 32f2591..312d462 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -24,18 +24,14 @@
* Bitmaps for SvxFrameWindow
*/
-#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
Image RID_SVX_RELOAD_NORMAL
{
- ImageBitmap = Bitmap { File = "reload.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "reload.png" ; };
};
Image RID_SVX_RELOAD_SPECIAL
{
- ImageBitmap = Bitmap { File = "reloads.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "reloads.png" ; };
};
ImageList RID_SVXIL_FRAME
@@ -158,38 +154,31 @@ String RID_SVXSTR_PAGES
Image RID_SVXIMG_GRAF_RED
{
- ImageBitmap = Bitmap { File = "sc10865.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "sc10865.png" ; };
};
Image RID_SVXIMG_GRAF_GREEN
{
- ImageBitmap = Bitmap { File = "sc10866.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "sc10866.png" ; };
};
Image RID_SVXIMG_GRAF_BLUE
{
- ImageBitmap = Bitmap { File = "sc10867.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "sc10867.png" ; };
};
Image RID_SVXIMG_GRAF_LUMINANCE
{
- ImageBitmap = Bitmap { File = "sc10863.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "sc10863.png" ; };
};
Image RID_SVXIMG_GRAF_CONTRAST
{
- ImageBitmap = Bitmap { File = "sc10864.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "sc10864.png" ; };
};
Image RID_SVXIMG_GRAF_GAMMA
{
- ImageBitmap = Bitmap { File = "sc10868.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "sc10868.png" ; };
};
Image RID_SVXIMG_GRAF_TRANSPARENCE
{
- ImageBitmap = Bitmap { File = "sc10869.bmp" ; };
- MASKCOLOR
+ ImageBitmap = Bitmap { File = "sc10869.png" ; };
};
String RID_SVXSTR_CLEARFORM
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index bd9c15d..0b83f80 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -343,7 +343,6 @@ Image IMG_VIEWLAYOUT_AUTOMATIC
{
File = "twopages_10x24.png" ;
};
- MaskColor = IMAGE_MASK_COLOR;
};
Image IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE
{
@@ -351,7 +350,6 @@ Image IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE
{
File = "twopages_a_10x24.png" ;
};
- MaskColor = IMAGE_MASK_COLOR;
};
Image IMG_VIEWLAYOUT_BOOKMODE
@@ -360,7 +358,6 @@ Image IMG_VIEWLAYOUT_BOOKMODE
{
File = "doublepage_10x22.png" ;
};
- MaskColor = IMAGE_MASK_COLOR;
};
Image IMG_VIEWLAYOUT_BOOKMODE_ACTIVE
{
@@ -368,7 +365,6 @@ Image IMG_VIEWLAYOUT_BOOKMODE_ACTIVE
{
File = "doublepage_a_10x22.png" ;
};
- MaskColor = IMAGE_MASK_COLOR;
};
Image IMG_VIEWLAYOUT_SINGLECOLUMN
@@ -377,7 +373,6 @@ Image IMG_VIEWLAYOUT_SINGLECOLUMN
{
File = "emptypage_10x14.png" ;
};
- MaskColor = IMAGE_MASK_COLOR;
};
Image IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE
{
@@ -385,7 +380,6 @@ Image IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE
{
File = "emptypage_a_10x14.png" ;
};
- MaskColor = IMAGE_MASK_COLOR;
};
Image IMG_PAGE_BREAK
{
@@ -393,7 +387,6 @@ Image IMG_PAGE_BREAK
{
File = "page_break.png" ;
};
- MaskColor = IMAGE_MASK_COLOR;
};
String STR_HYPERCTRL_SEL
diff --git a/sw/source/uibase/lingu/olmenu.src b/sw/source/uibase/lingu/olmenu.src
index 560eff2..7dc4175 100644
--- a/sw/source/uibase/lingu/olmenu.src
+++ b/sw/source/uibase/lingu/olmenu.src
@@ -22,7 +22,6 @@
#include "cmdid.h"
#include "helpid.h"
-#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
#define SEPARATOR MenuItem { Separator = TRUE; };
Menu MN_SPELL_POPUP
@@ -152,7 +151,6 @@ String STR_EXPLANATION_LINK
Image IMG_INFO_16
{
ImageBitmap = Bitmap { File = "info_16.png" ; };
- MASKCOLOR
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index de1774e..2aab6a8 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -65,16 +65,6 @@ Image::Image( const ResId& rResId ) :
pResMgr->Increment( ResMgr::GetObjSize( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()) ) );
}
- if( nObjMask & RscImageFlags::MaskColor )
- {
- if( !aBmpEx.IsEmpty() && aBmpEx.GetTransparentType() == TransparentType::NONE )
- {
- const Color aMaskColor( ResId( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()), *pResMgr ) );
- aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMaskColor );
- }
-
- pResMgr->Increment( ResMgr::GetObjSize( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()) ) );
- }
if( ! aBmpEx.IsEmpty() )
ImplInit( aBmpEx );
}
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index b3ed85a..b967efb 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -27,7 +27,6 @@ String STR_CERTIFICATE_NOT_VALIDATED
Image IMG_STATE_NOT_VALIDATED
{
ImageBitmap = Bitmap { File = "notcertificate_40x56.png"; };
- MaskColor = STD_MASKCOLOR;
};
String STR_HEADERBAR
More information about the Libreoffice-commits
mailing list