diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-06 14:32:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-06 15:09:22 +0100 |
| commit | 6e57881e9908f6263069f3b3a585bc404799b9a4 (patch) | |
| tree | 59800b58cc5a7b453ec00c5e57baae06b5e46aa2 /rsc | |
| parent | fe5e9610df64709cf505c0b5dc74aef2f55c1b77 (diff) | |
I can't see any evidence of any remaining magenta mask using image resources
Change-Id: I12865d743daa3e6479edb60584d5bd01f88e818d
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 3 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 6 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 6 |
3 files changed, 3 insertions, 12 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 95c81582d928..3e80b393ba8f 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 94fd77b045f6..e67747cf752c 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 71cdbaf3a782..15596c683255 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 ); |