diff options
-rw-r--r-- | include/tools/rcid.h | 2 | ||||
-rw-r--r-- | include/tools/resid.hxx | 4 | ||||
-rw-r--r-- | rsc/inc/rscdb.hxx | 5 | ||||
-rw-r--r-- | rsc/source/parser/rscicpx.cxx | 100 | ||||
-rw-r--r-- | rsc/source/parser/rscinit.cxx | 5 |
5 files changed, 2 insertions, 114 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 4a9951ecd11f..924b3d22dc02 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -43,8 +43,6 @@ #define RSC_IMAGE (RSC_NOTYPE + 0x23) #define RSC_IMAGELIST (RSC_NOTYPE + 0x24) -#define RSC_WINDOW (RSC_NOTYPE + 0x35) - #define RSC_STRINGARRAY (RSC_NOTYPE + 0x79) // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx index e29b0fea3031..9dd7b22abf2e 100644 --- a/include/tools/resid.hxx +++ b/include/tools/resid.hxx @@ -71,8 +71,8 @@ public: [Example] ResId aId( 1000 ); - aId.SetRT( RSC_WINDOW ); // settype window Window - //aId.GetRT() == RSC_WINDOW is true + aId.SetRT( RSC_RESOURCE ); // settype window Resource + //aId.GetRT() == RSC_RESOURCE is true @see ResId::GetRT2(), ResId::GetRT() diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index cc7bbaf0546a..4242f5e02de6 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -172,8 +172,6 @@ class RscTypCont RscTop * InitClassBitmap( RscTop * pSuper ); RscTop * InitClassImage( RscTop * pSuper, RscTop *pClassBitmap ); RscTop * InitClassImageList( RscTop * pSuper, RscCont * pStrLst ); - RscTop * InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, - RscArray * pLangGeo ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); RscTop * InitClassMenuItem( RscTop * pSuper ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); @@ -186,9 +184,6 @@ class RscTypCont RscTop * pStyleFamily ); RscTop * InitClassSfxSlotInfo( RscTop * pSuper ); - void InsWinBit( RscTop * pClass, const OString& rName, - Atom nVal ); - public: RscBool aBool; RscRange aShort; diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 3adc7122213c..f78d99b88426 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -33,23 +33,6 @@ #include <rsclex.hxx> #include <rscyacc.hxx> -void RscTypCont::InsWinBit( RscTop * pClass, const OString& rName, - Atom nVal ) -{ - RscClient * pClient; - - // add client variables - aBaseLst.push_back( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nVal ) - ); - Atom nId = aNmTb.Put( rName.getStr(), VARNAME ); - pClass->SetVariable( nId, pClient, nullptr, - VAR_NODATAINST, 0, nWinBitVarId ); -} - -#define INS_WINBIT( pClass, WinBit ) \ - InsWinBit( pClass, #WinBit, n##WinBit##Id ); - RscTop * RscTypCont::InitClassMgr() { RscTop * pClassMgr; @@ -162,89 +145,6 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscCont * pStrLst ) return pClassImageList; } -RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, - RscArray * pLangGeo ) -{ - Atom nId; - RscTop * pClassWindow; - - // initialize class - nId = pHS->getID( "Window" ); - pClassWindow = new RscClass( nId, RSC_WINDOW, pSuper ); - pClassWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassWindow ); - - // initialize variables - { - RscFlag * pFlag; - RscClient * pClient; - Atom nVarId, nDisableId, nOutputSizeId; - - aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagWndExtra" ), RSC_NOTYPE ) ); - - // set the constants in table - nDisableId = pHS->getID( "RSWND_DISABLE" ); - SETCONST( pFlag, nDisableId, RSWND::DISABLED ); - nOutputSizeId = pHS->getID( "RSWND_OUTPUTSIZE" ); - SETCONST( pFlag, nOutputSizeId, RSWND::CLIENTSIZE ); - - // add variable - nVarId = aNmTb.Put( "_RscExtraFlags", VARNAME ); - pClassWindow->SetVariable( nVarId, pFlag, nullptr, - VAR_HIDDEN | VAR_NOENUM ); - - aBaseLst.push_back( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nDisableId ) - ); - nId = aNmTb.Put( "Disable", VARNAME ); - pClassWindow->SetVariable( nId, pClient, nullptr, - VAR_NODATAINST, 0, nVarId ); - - aBaseLst.push_back( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nOutputSizeId ) - ); - nId = aNmTb.Put( "OutputSize", VARNAME ); - pClassWindow->SetVariable( nId, pClient, nullptr, - VAR_NODATAINST, 0, nVarId ); - } - - pClassWindow->SetVariable( nWinBitVarId, &aWinBits, nullptr, - VAR_HIDDEN | VAR_NOENUM ); - - INS_WINBIT(pClassWindow,Border) - INS_WINBIT(pClassWindow,Hide) - INS_WINBIT(pClassWindow,ClipChildren) - INS_WINBIT(pClassWindow,SVLook) - InsWinBit( pClassWindow, "DialogControl", nTabControlId ); - - nId = aNmTb.Put( "HelpID", VARNAME ); - pClassWindow->SetVariable( nId, &aStringLiteral, nullptr, 0, (sal_uInt32)RscWindowFlags::HelpId ); - - - nRsc_XYMAPMODEId = nId = aNmTb.Put( "_XYMapMode", VARNAME ); - pClassWindow->SetVariable( nId, pMapUnit, nullptr, 0, (sal_uInt32)RscWindowFlags::XYMapMode ); - nRsc_X = nId = aNmTb.Put( "_X", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, nullptr, 0, (sal_uInt32)RscWindowFlags::X ); - nRsc_Y = nId = aNmTb.Put( "_Y", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, nullptr, 0, (sal_uInt32)RscWindowFlags::Y ); - - nRsc_WHMAPMODEId = nId = aNmTb.Put( "_WHMapMode", VARNAME ); - pClassWindow->SetVariable( nId, pMapUnit, nullptr, 0, (sal_uInt32)RscWindowFlags::WHMapMode ); - nRsc_WIDTH = nId = aNmTb.Put( "_Width", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, nullptr, 0, (sal_uInt32)RscWindowFlags::Width ); - nRsc_HEIGHT = nId = aNmTb.Put( "_Height", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, nullptr, 0, (sal_uInt32)RscWindowFlags::Height ); - - nRsc_DELTALANG = nId = aNmTb.Put( "DeltaLang", VARNAME ); - pClassWindow->SetVariable( nId, pLangGeo, nullptr, VAR_NORC | VAR_NOENUM); - nId = aNmTb.Put( "Text", VARNAME ); - pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, (sal_uInt32)RscWindowFlags::Text ); - nId = aNmTb.Put( "QuickHelpText", VARNAME ); - pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, (sal_uInt32)RscWindowFlags::QuickText ); - - return pClassWindow; -} - RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index e7663c8e4016..b82cf7381f4f 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -61,7 +61,6 @@ void RscTypCont::Init() RscTop * pClassBitmap; RscTop * pClassImage; RscTop * pClassImageList; - RscTop * pClassWindow; RscTop * pClassKeyCode; Atom nId; @@ -276,10 +275,6 @@ void RscTypCont::Init() pClassImageList = InitClassImageList( pClassMgr, pStringLongTupelList ); pRoot->Insert( pClassImageList ); - - pClassWindow = InitClassWindow( pClassMgr, pMapUnit, - pLangGeometry ); - pRoot->Insert( pClassWindow ); } { pClassKeyCode = InitClassKeyCode( pClassMgr, pKey ); |