diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-11-24 13:35:44 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-24 14:56:14 +0000 |
commit | d04a05a7d4692dcb3083d1089a3f4e78fb07bcbf (patch) | |
tree | ea00acd12fbdc6a9caa3eb9716b9567b6392dd15 /rsc | |
parent | 427e6996bd042af61fd04aae6381c2958d2fda70 (diff) |
ditch a pile of other unused rsc stuff
Change-Id: Id982a8898241b20db11b43c18ae2c062c92c61fc
Diffstat (limited to 'rsc')
-rw-r--r-- | rsc/inc/rscdb.hxx | 7 | ||||
-rw-r--r-- | rsc/source/parser/rscibas.cxx | 99 | ||||
-rw-r--r-- | rsc/source/parser/rscinit.cxx | 17 |
3 files changed, 1 insertions, 122 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index ad9da6cc87cb..11e369b65195 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -85,15 +85,8 @@ class RscTypCont inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, MapUnit p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); } RscEnum * InitFieldUnitsType(); - RscEnum * InitColor(); - RscEnum * InitMapUnit(); RscEnum * InitKey(); - RscEnum * InitTriState(); - RscCont * InitStringList(); - RscArray * InitLangStringList( RscCont * pStrLst ); - RscTupel * InitStringTupel(); RscTupel * InitStringLongTupel(); - static RscCont * InitStringTupelList( RscTupel * pStringTupel ); static RscCont * InitStringLongTupelList( RscTupel * pStringLongTupel ); RscArray * InitLangStringLongTupelList( RscCont * pStrLongTupelLst ); diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 1d344a62b68b..c21b8524e6ad 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -193,52 +193,6 @@ RscEnum * RscTypCont::InitFieldUnitsType() return pFieldUnits; } -RscEnum * RscTypCont::InitColor() -{ - RscEnum * pColor; - pColor = new RscEnum( pHS->getID( "EnumColor" ), RSC_NOTYPE ); - - SETCONST( pColor, "COL_BLACK", COL_BLACK ); - SETCONST( pColor, "COL_BLUE", COL_BLUE ); - SETCONST( pColor, "COL_GREEN", COL_GREEN ); - SETCONST( pColor, "COL_CYAN", COL_CYAN ); - SETCONST( pColor, "COL_RED", COL_RED ); - SETCONST( pColor, "COL_MAGENTA", COL_MAGENTA ); - SETCONST( pColor, "COL_BROWN", COL_BROWN ); - SETCONST( pColor, "COL_GRAY", COL_GRAY ); - SETCONST( pColor, "COL_LIGHTGRAY", COL_LIGHTGRAY ); - SETCONST( pColor, "COL_LIGHTBLUE", COL_LIGHTBLUE ); - SETCONST( pColor, "COL_LIGHTGREEN", COL_LIGHTGREEN ); - SETCONST( pColor, "COL_LIGHTCYAN", COL_LIGHTCYAN ); - SETCONST( pColor, "COL_LIGHTRED", COL_LIGHTRED ); - SETCONST( pColor, "COL_LIGHTMAGENTA", COL_LIGHTMAGENTA ); - SETCONST( pColor, "COL_YELLOW", COL_YELLOW ); - SETCONST( pColor, "COL_WHITE", COL_WHITE ); - - return pColor; -} - -RscEnum * RscTypCont::InitMapUnit() -{ - RscEnum * pMapUnit; - pMapUnit = new RscEnum( pHS->getID( "EnumMapUnit" ), RSC_NOTYPE ); - - SETCONST( pMapUnit, "MAP_PIXEL", MapUnit::MapPixel ); - SETCONST( pMapUnit, "MAP_SYSFONT", MapUnit::MapSysFont ); - SETCONST( pMapUnit, "MAP_100TH_MM", MapUnit::Map100thMM ); - SETCONST( pMapUnit, "MAP_10TH_MM", MapUnit::Map10thMM ); - SETCONST( pMapUnit, "MAP_MM", MapUnit::MapMM ); - SETCONST( pMapUnit, "MAP_CM", MapUnit::MapCM ); - SETCONST( pMapUnit, "MAP_1000TH_INCH", MapUnit::Map1000thInch ); - SETCONST( pMapUnit, "MAP_100TH_INCH", MapUnit::Map100thInch ); - SETCONST( pMapUnit, "MAP_10TH_INCH", MapUnit::Map10thInch ); - SETCONST( pMapUnit, "MAP_INCH", MapUnit::MapInch ); - SETCONST( pMapUnit, "MAP_POINT", MapUnit::MapPoint ); - SETCONST( pMapUnit, "MAP_TWIP", MapUnit::MapTwip ); - SETCONST( pMapUnit, "MAP_APPFONT", MapUnit::MapAppFont ); - return pMapUnit; -} - RscEnum * RscTypCont::InitKey() { RscEnum * pKey; @@ -355,49 +309,6 @@ RscEnum * RscTypCont::InitKey() return pKey; } -RscEnum * RscTypCont::InitTriState() -{ - RscEnum * pTriState; - pTriState = new RscEnum( pHS->getID( "EnumTriState" ), RSC_NOTYPE ); - - SETCONST( pTriState, "STATE_NOCHECK", TRISTATE_FALSE ); - SETCONST( pTriState, "STATE_CHECK", TRISTATE_TRUE ); - SETCONST( pTriState, "STATE_DONTKNOW", TRISTATE_INDET ); - - return pTriState; -} - -RscCont * RscTypCont::InitStringList() -{ - RscCont * pCont; - - pCont = new RscCont( pHS->getID( "Chars[]" ), RSC_NOTYPE ); - pCont->SetTypeClass( &aString ); - - return pCont; -} - -RscArray * RscTypCont::InitLangStringList( RscCont * pStrLst ) -{ - return new RscArray( pHS->getID( "Lang_CharsList" ), - RSC_NOTYPE, pStrLst, &aLangType ); -} - -RscTupel * RscTypCont::InitStringTupel() -{ - RscTop * pTupel; - Atom nId; - - // Clientvariablen einfuegen - pTupel = new RscTupel( pHS->getID( "CharsTupel" ), RSC_NOTYPE ); - nId = aNmTb.Put( "FILTER", VARNAME ); - pTupel->SetVariable( nId, &aString ); - nId = aNmTb.Put( "MASK", VARNAME ); - pTupel->SetVariable( nId, &aString ); - - return static_cast<RscTupel *>(pTupel); -} - RscTupel * RscTypCont::InitStringLongTupel() { RscTop * pTupel; @@ -413,16 +324,6 @@ RscTupel * RscTypCont::InitStringLongTupel() return static_cast<RscTupel *>(pTupel); } -RscCont * RscTypCont::InitStringTupelList( RscTupel * pTupelString ) -{ - RscCont * pCont; - - pCont = new RscCont( pHS->getID( "CharsCharsTupel[]" ), RSC_NOTYPE ); - pCont->SetTypeClass( pTupelString ); - - return pCont; -} - RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong ) { RscCont * pCont; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index c4cb36935d10..13b8859ab35a 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -40,16 +40,8 @@ void RscTypCont::Init() { - RscEnum * pFieldUnits; - RscEnum * pColor; - RscEnum * pMapUnit; RscEnum * pKey; - RscEnum * pTriState; - RscCont * pStringList; - RscArray * pLangStringList; - RscTupel * pStringTupel; RscTupel * pStringLongTupel; - RscCont * pStringTupelList; RscCont * pStringLongTupelList; RscArray * pLangStringLongTupelList; @@ -91,16 +83,9 @@ void RscTypCont::Init() } { aLangType.Init( aNmTb ); - aBaseLst.push_back( pFieldUnits = InitFieldUnitsType() ); - aBaseLst.push_back( pColor = InitColor() ); - aBaseLst.push_back( pMapUnit = InitMapUnit() ); + aBaseLst.push_back( InitFieldUnitsType() ); aBaseLst.push_back( pKey = InitKey() ); - aBaseLst.push_back( pTriState = InitTriState() ); - aBaseLst.push_back( pStringList = InitStringList() ); - aBaseLst.push_back( pLangStringList = InitLangStringList( pStringList ) ); - aBaseLst.push_back( pStringTupel = InitStringTupel() ); - aBaseLst.push_back( pStringTupelList = InitStringTupelList( pStringTupel ) ); aBaseLst.push_back( pStringLongTupel = InitStringLongTupel() ); aBaseLst.push_back( pStringLongTupelList = InitStringLongTupelList( pStringLongTupel ) ); aBaseLst.push_back( pLangStringLongTupelList = InitLangStringLongTupelList( pStringLongTupelList ) ); |