diff options
33 files changed, 9 insertions, 77 deletions
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src index 0b5c306dbeab..c7ab7256661d 100644 --- a/avmedia/source/framework/mediacontrol.src +++ b/avmedia/source/framework/mediacontrol.src @@ -87,7 +87,6 @@ String AVMEDIA_STR_MEDIAPLAYER ImageList AVMEDIA_IMGLST { Prefix = "av"; - MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; }; IdList = { AVMEDIA_IMG_OPEN; @@ -104,7 +103,6 @@ ImageList AVMEDIA_IMGLST ImageList AVMEDIA_IMGLST_L { Prefix = "avl"; - MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; }; IdList = { AVMEDIA_IMG_OPEN; diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 357c0069a8d6..052b04c1822d 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -447,7 +447,6 @@ Menu RID_POPUP_TABBAR ImageList RID_IMGLST_LAYOUT { Prefix = "im"; - MASKCOLOR IdList = { IMGID_BRKENABLED ; diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src index 5a15a1c5965e..7db8fc80c615 100644 --- a/cui/source/tabpages/align.src +++ b/cui/source/tabpages/align.src @@ -19,15 +19,11 @@ #include "align.hrc" -#define MASKCOLOR \ - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } - #define IL_LOCK_MCOL Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; } ImageList IL_LOCK_BMPS { Prefix = "lo"; - MaskColor = IL_LOCK_MCOL ; IdList = { IID_BOTTOMLOCK ; diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src index dfd0d0e7523d..139033ddd7f2 100644 --- a/cui/source/tabpages/border.src +++ b/cui/source/tabpages/border.src @@ -27,7 +27,6 @@ ImageList IL_PRE_BITMAPS { Prefix = "pr"; - MaskColor = STD_MASKCOLOR ; IdList = { IID_PRE_CELL_NONE ; @@ -58,7 +57,6 @@ ImageList IL_PRE_BITMAPS ImageList IL_SDW_BITMAPS { Prefix = "sh"; - MaskColor = STD_MASKCOLOR ; IdList = { IID_SHADOWNONE ; diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src index 6f5020731769..f3e7bd565749 100644 --- a/dbaccess/source/ui/imagelists/dbimagelists.src +++ b/dbaccess/source/ui/imagelists/dbimagelists.src @@ -37,14 +37,12 @@ ImageList IMG_INDEX_DLG_SC { - MASKCOLOR; prefix = "sc"; IL_TOOL_2 ; }; ImageList IMG_INDEX_DLG_LC { - MASKCOLOR; prefix = "lc"; IL_TOOL_2 ; }; diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index e675f0993150..861e9b6c512c 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -80,7 +80,6 @@ Menu RID_QUERYCOLPOPUPMENU ImageList IMG_JOINS { Prefix = "jo"; - MaskColor = Color { Red = 0xffff; Green = 0x0000; Blue = 0xffff; }; IdList = { IMG_PRIMARY_KEY; IMG_FOREIGN_KEY; }; diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src index 275c53e347dc..d5103605771f 100644 --- a/extensions/source/bibliography/toolbar.src +++ b/extensions/source/bibliography/toolbar.src @@ -21,8 +21,6 @@ #include "svx/svxcommands.h" #include "bib.hrc" -#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; - #define BIB_IMAGES \ IdList = \ { \ @@ -35,14 +33,12 @@ ImageList RID_TOOLBAR_IMGLIST { Prefix = "sc"; - MASKCOLOR BIB_IMAGES }; ImageList RID_TOOLBAR_BIGIMGLIST { Prefix = "lc"; - MASKCOLOR BIB_IMAGES }; diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src index f94d2d014480..59e1e9bf2d9a 100644 --- a/extensions/source/propctrlr/pcrmiscres.src +++ b/extensions/source/propctrlr/pcrmiscres.src @@ -75,7 +75,6 @@ Resource RID_RSC_BUTTON_IMAGES ImageList RID_IL_FORMEXPLORER { Prefix = "sx"; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; IMAGE_IDS; }; diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src index b25dcc83cc82..fa1aa8456f86 100644 --- a/fpicker/source/office/iodlg.src +++ b/fpicker/source/office/iodlg.src @@ -22,14 +22,11 @@ #include "iodlg.hrc" #include "OfficeFilePicker.hrc" -#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; - - // image lists *************************************************************** +// image lists *************************************************************** ImageList RID_FILEPICKER_IMAGES { Prefix = "fp"; - MASKCOLOR IdList = { IMG_FILEDLG_BTN_UP; diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index 8e9cc145a28c..4f851a71e13b 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -52,7 +52,6 @@ ImageList RID_SVXIMGLIST_RPTEXPL { Prefix = "sx"; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; NAVIGATOR_IMAGEIDS; }; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index dee45c8eddb1..95c81582d928 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -179,8 +179,7 @@ class RscTypCont RscTop * InitClassColor( RscTop * pSuper, RscEnum * pColor ); RscTop * InitClassImage( RscTop * pSuper, RscTop *pClassBitmap, RscTop * pClassColor ); - RscTop * InitClassImageList( RscTop * pSuper, - RscTop * pClassColor, RscCont * pStrLst ); + RscTop * InitClassImageList( RscTop * pSuper, RscCont * pStrLst ); RscTop * InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, RscArray * pLangGeo ); RscTop * InitClassControl( RscTop * pSuper ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 56a6c2ea1142..94fd77b045f6 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -160,8 +160,7 @@ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap, return pClassImage; } -RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, - RscTop * pClassColor, RscCont * pStrLst ) +RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscCont * pStrLst ) { Atom nId; RscTop * pClassImageList; @@ -175,10 +174,6 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, nId = aNmTb.Put( "Prefix", VARNAME ); pClassImageList->SetVariable( nId, &aString ); - nId = aNmTb.Put( "MaskColor", VARNAME ); - pClassImageList->SetVariable( nId, pClassColor, nullptr, - VAR_SVDYNAMIC, (sal_uInt32)RscImageListFlags::MaskColor ); - RscCont * pCont = new RscCont( pHS->getID( "sal_uInt16 *" ), RSC_NOTYPE ); pCont->SetTypeClass( &aIdUShort ); aBaseLst.push_back( pCont ); diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 022889a010f9..71cdbaf3a782 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -293,8 +293,7 @@ void RscTypCont::Init() pClassImage = InitClassImage( pClassMgr, pClassBitmap, pClassColor ); pRoot->Insert( pClassImage ); - pClassImageList = InitClassImageList( pClassMgr, - pClassColor, pStringLongTupelList ); + pClassImageList = InitClassImageList( pClassMgr, pStringLongTupelList ); pRoot->Insert( pClassImageList ); pClassWindow = InitClassWindow( pClassMgr, pMapUnit, diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src index a1f9fec99f2b..c212ca317c40 100644 --- a/sc/source/ui/dbgui/outline.src +++ b/sc/source/ui/dbgui/outline.src @@ -25,7 +25,6 @@ ImageList RID_OUTLINEBITMAPS { Prefix = "ou"; - MaskColor = STD_MASKCOLOR; IdList = { 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; 11; 12; }; IdCount = { 12; }; }; diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index dfa00c3b5c1b..eaf7dbdf9bd0 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -89,7 +89,6 @@ Window RID_SCDLG_NAVIGATOR ImageList IL_CMD { Prefix = "na"; - MaskColor = STD_MASKCOLOR ; IdList = { IID_DATA ; @@ -164,7 +163,6 @@ Window RID_SCDLG_NAVIGATOR ImageList RID_IMAGELIST_NAVCONT { Prefix = "nc"; - MaskColor = STD_MASKCOLOR ; // SC_CONTENT_... IdList = { diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src index d9c98a8fef73..b0955c09c884 100644 --- a/sc/source/ui/src/toolbox.src +++ b/sc/source/ui/src/toolbox.src @@ -84,14 +84,12 @@ String SCSTR_QHELP_COLLAPSE_FORMULA ImageList RID_DEFAULTIMAGELIST_SC { Prefix = "sc"; - MaskColor = STD_MASKCOLOR ; DEFAULT_IDLIST }; ImageList RID_DEFAULTIMAGELIST_LC { Prefix = "lc"; - MaskColor = STD_MASKCOLOR ; DEFAULT_IDLIST }; diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src index ccb74932f35a..d07b0fb1015b 100644 --- a/sc/source/ui/styleui/scstyles.src +++ b/sc/source/ui/styleui/scstyles.src @@ -55,7 +55,6 @@ SfxStyleFamilies DLG_STYLE_DESIGNER ImageList 1 // == BMP_COLOR_NORMAL + 1 { Prefix = "sf"; - MaskColor = STD_MASKCOLOR ; IdList = { 1; 2; }; }; }; diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index abc0ef1b0d46..d9c2f4af8a9c 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -317,7 +317,6 @@ SfxStyleFamilies DLG_STYLE_DESIGNER ImageList 1 // == BMP_COLOR_NORMAL + 1 { Prefix = "sf"; - MaskColor = IMAGE_MASK_STDCOLOR; STYLE_IMAGE_LISTEF }; #undef STYLE_IMAGE_LISTEF diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src index 9065c221da0c..27895096b822 100644 --- a/sd/source/ui/dlg/navigatr.src +++ b/sd/source/ui/dlg/navigatr.src @@ -119,7 +119,6 @@ Window FLT_NAVIGATOR ImageList IL_NAVIGATR { Prefix = "nv"; - MaskColor = IMAGE_STDBTN_COLOR ; NAVIGATR_IDLIST }; }; diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src index 16f2e57cf29d..9ce252983b3b 100644 --- a/sfx2/source/dialog/templdlg.src +++ b/sfx2/source/dialog/templdlg.src @@ -24,7 +24,6 @@ ImageList DLG_STYLE_DESIGNER { Prefix = "sc"; - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; IdList = { SID_STYLE_WATERCAN ; diff --git a/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src index 64581807ba60..2ffc3e1d45ec 100644 --- a/svtools/source/brwbox/editbrowsebox.src +++ b/svtools/source/brwbox/editbrowsebox.src @@ -23,11 +23,6 @@ ImageList RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX { Prefix = "ed"; - MaskColor = Color { - Red = 0xFFFF; - Green = 0x0000; - Blue = 0xFFFF; - }; IdList = { IMG_EBB_CURRENT; IMG_EBB_MODIFIED; diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src index de0d7d88f636..4275a41f9779 100644 --- a/svtools/source/misc/imagemgr.src +++ b/svtools/source/misc/imagemgr.src @@ -88,7 +88,6 @@ ImageList RID_SVTOOLS_IMAGELIST_BIG { Prefix = "lx"; - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; IdList = { X_IMAGE_LIST @@ -102,7 +101,6 @@ ImageList RID_SVTOOLS_IMAGELIST_BIG ImageList RID_SVTOOLS_IMAGELIST_SMALL { Prefix = "sx"; - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; IdList = { X_IMAGE_LIST diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index 9ea61002fd01..69e9f5b4ad7f 100644 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -23,7 +23,6 @@ ImageList IL_IMAPDLG { Prefix = "id"; - MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; IdList = { TBI_APPLY ; diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 1d0b0ddee976..e516ab8a26fb 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -22,8 +22,6 @@ #include "svx/fmresids.hrc" #include "fmhelp.hrc" -#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; - #define IMG_LST \ IdList = \ { \ @@ -38,7 +36,6 @@ IdCount = { 5 ; } ; ImageList RID_SVXIMGLIST_XFORMS_TBX { Prefix = "tb"; - MASKCOLOR IMG_LST }; #undef IMG_LST @@ -46,7 +43,6 @@ ImageList RID_SVXIMGLIST_XFORMS_TBX ImageList RID_SVXIL_DATANAVI { Prefix = "da"; - MASKCOLOR IdList = { IID_GROUP_CLOSED ; diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index 078e1df6a7cc..6e1abdd1e99b 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -296,7 +296,6 @@ Menu RID_FMSHELL_CONVERSIONMENU ImageList RID_SVXIMGLIST_FMEXPL { Prefix = "sx"; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; NAVIGATOR_IMAGEIDS; }; diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index 48777fc9d70a..32f2591bd435 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -43,7 +43,6 @@ ImageList RID_SVXIL_FRAME Prefix = "fr"; IdList = { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 ; 11 ; 12 ; }; IdCount = { 12 ; }; - MASKCOLOR }; String RID_SVXSTR_TRANSPARENT 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 ; diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx index dfbf7518db29..629e123519f8 100644 --- a/vcl/source/image/ImageList.cxx +++ b/vcl/source/image/ImageList.cxx @@ -57,10 +57,6 @@ ImageList::ImageList( const ResId& rResId ) : RscImageListFlags nObjMask = (RscImageListFlags)pResMgr->ReadLong(); pResMgr->ReadString(); //skip string - std::unique_ptr< Color > xMaskColor; - - if( nObjMask & RscImageListFlags::MaskColor ) - xMaskColor.reset( new Color( ResId( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()), *pResMgr ) ) ); pResMgr->Increment( ResMgr::GetObjSize( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()) ) ); |