summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-25 10:32:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-25 11:41:23 +0100
commit2b6abbaa24a35111902a9b31c8cf5dca5477c4e8 (patch)
tree9278b8b559172cad1c8866cbe3edc2d7382bb521 /rsc
parentf615d6195a2be9f9f2cbd7e9f77f042acac6656f (diff)
can drop RSC_WINDOW now
Change-Id: Ic60b35eb78ebd3e934cbf45c2184edf59c971a53
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscdb.hxx5
-rw-r--r--rsc/source/parser/rscicpx.cxx100
-rw-r--r--rsc/source/parser/rscinit.cxx5
3 files changed, 0 insertions, 110 deletions
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 );