diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-21 12:59:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-21 12:59:47 +0000 |
| commit | caadb8a39129f7408d2592e51d3f25c2307e94b9 (patch) | |
| tree | 07d02bbb76ed45cd1c8ca52fa60da3f697561f6a /rsc/source/parser/rscicpx.cxx | |
| parent | 574a32f575f8bc9f88129ae53e0aa665d451483b (diff) | |
INTEGRATION: CWS bmpres01 (1.7.8); FILE MERGED
2004/04/27 13:42:45 ka 1.7.8.2: created new resource structure for images
2004/04/21 14:50:03 ka 1.7.8.1: changed resource format for ImageLists (added Prefix, removed file references
Diffstat (limited to 'rsc/source/parser/rscicpx.cxx')
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index c875791e77ca..9e543fa8775e 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rscicpx.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2004-01-06 16:42:56 $ + * last change: $Author: rt $ $Date: 2004-05-21 13:59:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -244,7 +244,7 @@ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap, |* RscTypCont::InitClassImageList() *************************************************************************/ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * pClassBitmap, - RscTop * pClassColor ) + RscTop * pClassColor, RscCont * pStrLst ) { HASHID nId; RscTop * pClassImageList; @@ -255,27 +255,23 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * pClassBitmap, pClassImageList->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); aNmTb.Put( nId, CLASSNAME, pClassImageList ); - // Variablen anlegen - nId = aNmTb.Put( "ImageBitmap", VARNAME ); - pClassImageList->SetVariable( nId, pClassBitmap, NULL, 0, - RSC_IMAGELIST_IMAGEBITMAP ); - nId = aNmTb.Put( "MaskBitmap", VARNAME ); - pClassImageList->SetVariable( nId, pClassBitmap, NULL, 0, - RSC_IMAGELIST_MASKBITMAP ); + nId = aNmTb.Put( "Prefix", VARNAME ); + pClassImageList->SetVariable( nId, &aString ); + nId = aNmTb.Put( "MaskColor", VARNAME ); pClassImageList->SetVariable( nId, pClassColor, NULL, VAR_SVDYNAMIC, RSC_IMAGELIST_MASKCOLOR ); - { - RscCont * pCont; - - pCont = new RscCont( pHS->Insert( "USHORT *" ), RSC_NOTYPE ); - pCont->SetTypeClass( &aIdUShort ); - aBaseLst.Insert( pCont, LIST_APPEND ); - nId = aNmTb.Put( "IdList", VARNAME ); - pClassImageList->SetVariable( nId, pCont, NULL, 0, + RscCont * pCont = new RscCont( pHS->Insert( "USHORT *" ), RSC_NOTYPE ); + pCont->SetTypeClass( &aIdUShort ); + aBaseLst.Insert( pCont, LIST_APPEND ); + nId = aNmTb.Put( "IdList", VARNAME ); + pClassImageList->SetVariable( nId, pCont, NULL, 0, RSC_IMAGELIST_IDLIST ); - } + + nId = aNmTb.Put( "FileList", VARNAME ); + pClassImageList->SetVariable( nId, pStrLst ); + nId = aNmTb.Put( "IdCount", VARNAME ); pClassImageList->SetVariable( nId, &aUShort, NULL, 0, RSC_IMAGELIST_IDCOUNT ); |