summaryrefslogtreecommitdiff
path: root/rsc/source/parser
diff options
context:
space:
mode:
Diffstat (limited to 'rsc/source/parser')
-rw-r--r--rsc/source/parser/rscdb.cxx11
-rw-r--r--rsc/source/parser/rscibas.cxx1
-rw-r--r--rsc/source/parser/rscicpx.cxx128
-rw-r--r--rsc/source/parser/rscinit.cxx21
-rw-r--r--rsc/source/parser/rscyacc.y1
5 files changed, 3 insertions, 159 deletions
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 1b76102351e2..e61532613769 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -21,11 +21,11 @@
#include <stdio.h>
#include <string.h>
-#include <tools/rc.h>
#include <i18nlangtag/languagetag.hxx>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <sal/macros.h>
+#include <tools/rcid.h>
#include <rsctree.hxx>
#include <rsctop.hxx>
@@ -44,13 +44,8 @@ RscTypCont::RscTypCont( RscError * pErrHdl,
, nUniqueId(256)
, nFilePos( 0 )
, nPMId(RSC_VERSIONCONTROL + RESOURCE_TYPE(1)) // at least one more
- , aBool( pHS->getID( "sal_Bool" ), RSC_NOTYPE )
- , aShort( pHS->getID( "short" ), RSC_NOTYPE )
- , aUShort( pHS->getID( "sal_uInt16" ), RSC_NOTYPE )
, aEnumLong( pHS->getID( "enum_long" ), RSC_NOTYPE )
- , aIdNoZeroUShort( pHS->getID( "IDUSHORT" ), RSC_NOTYPE )
, aString( pHS->getID( "Chars" ), RSC_NOTYPE )
- , aStringLiteral( pHS->getID( "Chars" ), RSC_NOTYPE )
, aLangType()
, aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType )
, pEH(pErrHdl)
@@ -171,10 +166,6 @@ RscTypCont::~RscTypCont()
for (RscTop* pItem : aBaseLst)
pItem->Pre_dtor();
- aBool.Pre_dtor();
- aShort.Pre_dtor();
- aUShort.Pre_dtor();
- aIdNoZeroUShort.Pre_dtor();
aString.Pre_dtor();
aVersion.pClass->Pre_dtor();
// sub-types
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 7b58d6885d77..8aea89f93937 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -29,7 +29,6 @@
#include <tools/fldunit.hxx>
#include <tools/gen.hxx>
#include <tools/mapunit.hxx>
-#include <tools/rc.h>
#include <tools/wintypes.hxx>
#include <rsc/rsc-vcl-shared-types.hxx>
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 69651c7cdd49..929ed89be284 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include <tools/rc.h>
+#include <tools/rcid.h>
#include <tools/wintypes.hxx>
#include <rsc/rsc-vcl-shared-types.hxx>
@@ -88,130 +88,4 @@ RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper )
return pClassBitmap;
}
-RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassMenuItem;
-
- // initialize class
- nId = pHS->getID( "MenuItem" );
- pClassMenuItem = new RscClass( nId, RSC_MENUITEM, pSuper );
- aNmTb.Put( nId, CLASSNAME, pClassMenuItem );
-
- // initialize variables
- nId = aNmTb.Put( "Separator", VARNAME );
- pClassMenuItem->SetVariable( nId, &aBool, nullptr, RSCVAR::NONE,
- (sal_uInt32)RscMenuItem::Separator );
- nId = aNmTb.Put( "Identifier", VARNAME );
- pClassMenuItem->SetVariable( nId, &aIdNoZeroUShort, nullptr, RSCVAR::NONE,
- (sal_uInt32)RscMenuItem::Id );
- {
- RscFlag * pFlag;
- RscClient * pClient;
- Atom nVarId, nAutoCheckId, nRadioCheckId;
- Atom nCheckableId, nAboutId, nHelpId;
-
- aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagMenuState" ), RSC_NOTYPE ) );
-
- // set constants in table
- nCheckableId = pHS->getID( "MIB_CHECKABLE" );
- SETCONST( pFlag, nCheckableId, MenuItemBits::CHECKABLE );
- nAutoCheckId = pHS->getID( "MIB_AUTOCHECK" );
- SETCONST( pFlag, nAutoCheckId, MenuItemBits::AUTOCHECK );
- nRadioCheckId = pHS->getID( "MIB_RADIOCHECK" );
- SETCONST( pFlag, nRadioCheckId, MenuItemBits::RADIOCHECK );
- nAboutId = pHS->getID( "MIB_ABOUT" );
- SETCONST( pFlag, nAboutId, MenuItemBits::ABOUT );
- nHelpId = pHS->getID( "MIB_HELP" );
- SETCONST( pFlag, nHelpId, MenuItemBits::HELP );
-
- // add variable
- nVarId = aNmTb.Put( "_MenuItemFlags", VARNAME );
- pClassMenuItem->SetVariable( nVarId, pFlag, nullptr,
- RSCVAR::Hidden | RSCVAR::NoEnum,
- (sal_uInt32)RscMenuItem::Status );
-
- // add client variables
- aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nCheckableId )
- );
- nId = aNmTb.Put( "Checkable", VARNAME );
- pClassMenuItem->SetVariable( nId, pClient, nullptr,
- RSCVAR::NoDataInst, 0, nVarId );
-
- aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nAutoCheckId )
- );
- nId = aNmTb.Put( "AutoCheck", VARNAME );
- pClassMenuItem->SetVariable( nId, pClient, nullptr,
- RSCVAR::NoDataInst, 0, nVarId );
-
- aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nRadioCheckId )
- );
- nId = aNmTb.Put( "RadioCheck", VARNAME );
- pClassMenuItem->SetVariable( nId, pClient, nullptr,
- RSCVAR::NoDataInst, 0, nVarId );
-
- aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nAboutId )
- );
- nId = aNmTb.Put( "About", VARNAME );
- pClassMenuItem->SetVariable( nId, pClient, nullptr,
- RSCVAR::NoDataInst, 0, nVarId );
-
- aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nHelpId )
- );
- nId = aNmTb.Put( "Help", VARNAME );
- pClassMenuItem->SetVariable( nId, pClient, nullptr,
- RSCVAR::NoDataInst, 0, nVarId );
-
- }
- nId = aNmTb.Put( "Text", VARNAME );
- pClassMenuItem->SetVariable( nId, &aLangString, nullptr, RSCVAR::NONE,
- (sal_uInt32)RscMenuItem::Text );
- nId = aNmTb.Put( "HelpText", VARNAME );
- pClassMenuItem->SetVariable( nId, &aLangString, nullptr, RSCVAR::NONE,
- (sal_uInt32)RscMenuItem::HelpText );
- nId = aNmTb.Put( "HelpID", VARNAME );
- pClassMenuItem->SetVariable( nId, &aStringLiteral, nullptr, RSCVAR::NONE,
- (sal_uInt32)RscMenuItem::HelpId );
- nId = aNmTb.Put( "Disable", VARNAME );
- pClassMenuItem->SetVariable( nId, &aBool, nullptr, RSCVAR::NONE,
- (sal_uInt32)RscMenuItem::Disable );
- nId = aNmTb.Put( "Command", VARNAME );
- pClassMenuItem->SetVariable( nId, &aString, nullptr, RSCVAR::NONE,
- (sal_uInt32)RscMenuItem::Command );
-
- return pClassMenuItem;
-}
-
-RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
- RscTop * pClassMenuItem )
-{
- Atom nId;
- RscTop * pClassMenu;
-
- // initialize class
- nId = pHS->getID( "Menu" );
- pClassMenu = new RscClass( nId, RSC_MENU, pSuper );
- pClassMenu->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
- aNmTb.Put( nId, CLASSNAME, pClassMenu );
-
- // initialize variables
- {
- RscCont * pCont;
-
- aBaseLst.push_back( pCont = new RscCont( pHS->getID( "ContMenuItem" ), RSC_NOTYPE ) );
- pCont->SetTypeClass( pClassMenuItem );
- nId = aNmTb.Put( "ItemList", VARNAME );
- pClassMenu->SetVariable( nId, pCont, nullptr, RSCVAR::NONE, (sal_uInt32)RscMenu::Items );
- }
- nId = aNmTb.Put( "Text", VARNAME );
- pClassMenu->SetVariable( nId, &aLangString, nullptr, RSCVAR::NONE, (sal_uInt32)RscMenu::Text );
-
- return pClassMenu;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 4ecf9f657fdd..a330f739fe2d 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -21,14 +21,13 @@
#include <stdlib.h>
#include <stdio.h>
-#include <tools/rc.h>
+#include <tools/rcid.h>
#include <tools/wintypes.hxx>
#include <rsctree.hxx>
#include <rsctop.hxx>
#include <rscrange.hxx>
#include <rscconst.hxx>
-#include <rscflag.hxx>
#include <rscstr.hxx>
#include <rsccont.hxx>
#include <rscmgr.hxx>
@@ -67,13 +66,7 @@ void RscTypCont::Init()
aNmTb.Put( "FALSE", BOOLEAN, (sal_IntPtr)false );
}
{
- aShort.SetRange( -32768, 32767 );
-
- aUShort.SetRange( 0, 0xFFFF );
-
aEnumLong.SetRange( SAL_MIN_INT32, SAL_MAX_INT32 );
-
- aIdNoZeroUShort.SetRange( 1, 0xFFFF );
}
{
aLangType.Init( aNmTb );
@@ -111,18 +104,6 @@ void RscTypCont::Init()
pRoot->Insert( pClassBitmap );
}
-{
- RscTop* pClassMenuItem = InitClassMenuItem(pClassMgr);
- pRoot->Insert( pClassMenuItem );
-
- RscTop* pClassMenu = InitClassMenu( pClassMgr, pClassMenuItem );
- pRoot->Insert( pClassMenu );
-
- // pClassMenu is only completely defined here
- nId = aNmTb.Put( "SubMenu", VARNAME );
- pClassMenuItem->SetVariable( nId, pClassMenu, nullptr, RSCVAR::SvDynamic,
- (sal_uInt32)RscMenuItem::Menu );
-}
aNmTb.SetSort();
}
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index d4cad7f1103c..6fd4eda414ef 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -25,7 +25,6 @@
#include <string.h>
#include <rtl/strbuf.hxx>
-#include <tools/rc.h>
#include <rscerror.h>
#include <rsctools.hxx>
#include <rscclass.hxx>
generated by cgit (git 2.34.1) at 2024-08-07 20:46:00 +0000