diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-06 12:48:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-06 13:29:39 +0100 |
| commit | 04ba40c749fe01e226d30dc5d075e510d70bf48b (patch) | |
| tree | 4a50e7ee58de56f320426c5cd71011051f06e85d /rsc | |
| parent | 4dfa3161896a0e045da3b5cf656ebd8f40044a46 (diff) | |
ImageList just reads and discards the MaskColor, so drop it
Change-Id: I243e739fea28e3f38b91534182cc54c2aa660f0e
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 3 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 7 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 3 |
3 files changed, 3 insertions, 10 deletions
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, |