summaryrefslogtreecommitdiff
path: root/rsc/source/parser
diff options
context:
space:
mode:
Diffstat (limited to 'rsc/source/parser')
-rw-r--r--rsc/source/parser/erscerr.cxx2
-rw-r--r--rsc/source/parser/rscdb.cxx79
-rw-r--r--rsc/source/parser/rscibas.cxx32
-rw-r--r--rsc/source/parser/rscicpx.cxx61
-rw-r--r--rsc/source/parser/rscinit.cxx108
-rw-r--r--rsc/source/parser/rsckey.cxx10
-rwxr-xr-x[-rw-r--r--]rsc/source/parser/rsclex.cxx43
-rw-r--r--rsc/source/parser/rsclex.hxx2
-rw-r--r--rsc/source/parser/rscpar.cxx12
-rw-r--r--rsc/source/parser/rscyacc.cxx22
-rw-r--r--rsc/source/parser/rscyacc.y42
11 files changed, 206 insertions, 207 deletions
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 0b9f6e13e9d1..23337514b2c5 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -77,10 +77,8 @@ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel )
*************************************************************************/
void RscError::StdErr( const char * pStr )
{
-#ifndef WIN
if( pStr )
fprintf( stderr, "%s", pStr );
-#endif
}
/*************************************************************************
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 8a0c7e517c01..a71b4a51eea2 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -64,9 +64,9 @@ RscTypCont :: RscTypCont( RscError * pErrHdl,
nSourceCharSet( RTL_TEXTENCODING_UTF8 ),
nByteOrder( nOrder ),
aSearchPath( rSearchPath ),
- aBool( pHS->getID( "BOOL" ), RSC_NOTYPE ),
+ aBool( pHS->getID( "sal_Bool" ), RSC_NOTYPE ),
aShort( pHS->getID( "short" ), RSC_NOTYPE ),
- aUShort( pHS->getID( "USHORT" ), RSC_NOTYPE ),
+ aUShort( pHS->getID( "sal_uInt16" ), RSC_NOTYPE ),
aLong( pHS->getID( "long" ), RSC_NOTYPE ),
aEnumLong( pHS->getID( "enum_long" ), RSC_NOTYPE ),
aIdUShort( pHS->getID( "IDUSHORT" ), RSC_NOTYPE ),
@@ -80,6 +80,7 @@ RscTypCont :: RscTypCont( RscError * pErrHdl,
a0to9999Short( pHS->getID( "YearShort" ), RSC_NOTYPE ),
aIdLong( pHS->getID( "IDLONG" ), RSC_NOTYPE ),
aString( pHS->getID( "Chars" ), RSC_NOTYPE ),
+ aStringLiteral( pHS->getID( "Chars" ), RSC_NOTYPE ),
aWinBits( pHS->getID( "WinBits" ), RSC_NOTYPE ),
aLangType(),
aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType ),
@@ -124,7 +125,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
else
rLang = rtl::OString();
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, " %s (0x%hx)", aL.getStr(), nRet );
+ fprintf( stderr, " %s (0x%hx)", aL.getStr(), (int)nRet );
#endif
return nRet;
}
@@ -368,17 +369,17 @@ void RscTypCont :: Delete( Atom nRT, const RscId & rId ){
|*
*************************************************************************/
sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
- sal_uInt32 nConst, sal_uInt32 nId, BOOL bFirst )
+ sal_uInt32 nConst, sal_uInt32 nId, sal_Bool bFirst )
{
RscSysEntry *pSysEntry;
RscSysEntry *pFoundEntry = NULL;
- BOOL bId1 = FALSE;
+ sal_Bool bId1 = sal_False;
for ( size_t i = 0, n = aSysLst.size(); i < n; ++i )
{
pSysEntry = aSysLst[ i ];
if( pSysEntry->nKey == 1 )
- bId1 = TRUE;
+ bId1 = sal_True;
if( !strcmp( pSysEntry->aFileName.GetBuffer(), pFileName ) )
if( pSysEntry->nRscTyp == nRscTyp
&& pSysEntry->nTyp == nConst
@@ -415,7 +416,7 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
|* RscTypCont :: WriteInc
|*
*************************************************************************/
-void RscTypCont :: WriteInc( FILE * fOutput, ULONG lFileKey )
+void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey )
{
RscFile * pFName;
@@ -472,7 +473,7 @@ private:
ERRTYPE aError; // Enthaelt den ersten Fehler
RscTypCont* pTypCont;
FILE * fOutput; // AusgabeDatei
- ULONG lFileKey; // Welche src-Datei
+ sal_uLong lFileKey; // Welche src-Datei
RscTop * pClass;
DECL_LINK( CallBackWriteRc, ObjNode * );
@@ -520,7 +521,7 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode )
aError = pClass->WriteRcHeader( RSCINST( pClass, pObjNode->GetRscObj() ),
aMem, pTypCont,
- pObjNode->GetRscId(), 0, TRUE );
+ pObjNode->GetRscId(), 0, sal_True );
if( aError.IsError() || aError.IsWarning() )
pTypCont->pEH->Error( aError, pClass, pObjNode->GetRscId() );
@@ -599,18 +600,18 @@ void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut ){
if( nRT == RSC_VERSIONCONTROL )
{ // kommt immmer als letztes
- INT32 nCount = pTypCont->aIdTranslator.size();
+ sal_Int32 nCount = pTypCont->aIdTranslator.size();
// groesse der Tabelle
- UINT32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(INT32))) + sizeof(INT32);
+ sal_uInt32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(sal_Int32))) + sizeof(sal_Int32);
rMem.Put( nCount ); //Anzahl speichern
- for( std::map< sal_uInt64, ULONG >::const_iterator it =
+ for( std::map< sal_uInt64, sal_uLong >::const_iterator it =
pTypCont->aIdTranslator.begin(); it != pTypCont->aIdTranslator.end(); ++it )
{
// Schluessel schreiben
rMem.Put( it->first );
// Objekt Id oder Position schreiben
- rMem.Put( (INT32)it->second );
+ rMem.Put( (sal_Int32)it->second );
}
rMem.Put( nSize ); // Groesse hinten Speichern
}
@@ -652,7 +653,7 @@ public:
return aEnumObj.aError;
};
- ERRTYPE WriteSrc( ULONG lFileKey )
+ ERRTYPE WriteSrc( sal_uLong lFileKey )
{
aEnumObj.lFileKey = lFileKey;
@@ -661,7 +662,7 @@ public:
return aEnumObj.aError;
}
- ERRTYPE WriteCxx( ULONG lFileKey )
+ ERRTYPE WriteCxx( sal_uLong lFileKey )
{
aEnumObj.lFileKey = lFileKey;
@@ -670,7 +671,7 @@ public:
return aEnumObj.aError;
}
- ERRTYPE WriteHxx( ULONG lFileKey )
+ ERRTYPE WriteHxx( sal_uLong lFileKey )
{
aEnumObj.lFileKey = lFileKey;
@@ -755,7 +756,7 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
// version control
RscWriteRc aMem( nByteOrder );
- aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, TRUE );
+ aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, sal_True );
aEnumRef.aEnumObj.WriteRcFile( aMem, rContext.fOutput );
return aError;
@@ -766,8 +767,8 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
|* RscTypCont :: WriteSrc
|*
*************************************************************************/
-void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey,
- CharSet /*nCharSet*/, BOOL bName )
+void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey,
+ CharSet /*nCharSet*/, sal_Bool bName )
{
RscFile * pFName;
RscEnumerateRef aEnumRef( this, pRoot, fOutput );
@@ -799,7 +800,7 @@ void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey,
}
else
{
- RscId::SetNames( FALSE );
+ RscId::SetNames( sal_False );
if( NOFILE_INDEX == nFileKey )
{
pFName = aFileTab.First();
@@ -820,7 +821,7 @@ void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey,
|* RscTypCont :: WriteHxx
|*
*************************************************************************/
-ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
+ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, sal_uLong nFileKey )
{
fprintf( fOutput, "#include <tools/rc.hxx>\n" );
fprintf( fOutput, "#include <tools/resid.hxx>\n" );
@@ -836,7 +837,7 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
fprintf( fOutput, "#include <vcl/fixed.hxx>\n" );
fprintf( fOutput, "#include <vcl/group.hxx>\n" );
fprintf( fOutput, "#include <vcl/image.hxx>\n" );
- fprintf( fOutput, "#include <vcl/imagebtn.hxx>\n" );
+ fprintf( fOutput, "#include <vcl/button.hxx>\n" );
fprintf( fOutput, "#include <vcl/keycod.hxx>\n" );
fprintf( fOutput, "#include <vcl/lstbox.hxx>\n" );
fprintf( fOutput, "#include <vcl/mapmod.hxx>\n" );
@@ -882,7 +883,7 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
|* RscTypCont :: WriteCxx
|*
*************************************************************************/
-ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey,
+ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, sal_uLong nFileKey,
const ByteString & rHxxName )
{
RscEnumerateRef aEnumRef( this, pRoot, fOutput );
@@ -940,14 +941,14 @@ void RscTypCont::WriteRcCtor
*************************************************************************/
class RscDel
{
- ULONG lFileKey;
+ sal_uLong lFileKey;
DECL_LINK( Delete, RscTop * );
public:
- RscDel( RscTop * pRoot, ULONG lKey );
+ RscDel( RscTop * pRoot, sal_uLong lKey );
};
-inline RscDel::RscDel( RscTop * pRoot, ULONG lKey )
+inline RscDel::RscDel( RscTop * pRoot, sal_uLong lKey )
{
lFileKey = lKey;
pRoot->EnumNodes( LINK( this, RscDel, Delete ) );
@@ -961,7 +962,7 @@ IMPL_LINK_INLINE_START( RscDel, Delete, RscTop *, pNode )
}
IMPL_LINK_INLINE_END( RscDel, Delete, RscTop *, pNode )
-void RscTypCont :: Delete( ULONG lFileKey ){
+void RscTypCont :: Delete( sal_uLong lFileKey ){
// Resourceinstanzen loeschen
RscDel aDel( pRoot, lFileKey );
// Defines loeschen
@@ -973,54 +974,54 @@ void RscTypCont :: Delete( ULONG lFileKey ){
|* RscTypCont :: MakeConsistent()
|*
*************************************************************************/
-BOOL IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop )
+sal_Bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop )
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if( pObjNode ){
RSCINST aTmpI;
if( ! IsInstConsistent( (ObjNode*)pObjNode->Left(), pRscTop ) )
- bRet = FALSE;
+ bRet = sal_False;
aTmpI.pClass = pRscTop;
aTmpI.pData = pObjNode->GetRscObj();
if( ! aTmpI.pClass->IsConsistent( aTmpI ) )
- bRet = FALSE;
+ bRet = sal_False;
if( ! IsInstConsistent( (ObjNode*)pObjNode->Right(), pRscTop ) )
- bRet = FALSE;
+ bRet = sal_False;
};
return( bRet );
}
-BOOL MakeConsistent( RscTop * pRscTop )
+sal_Bool MakeConsistent( RscTop * pRscTop )
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if( pRscTop ){
if( ! ::MakeConsistent( (RscTop*)pRscTop->Left() ) )
- bRet = FALSE;
+ bRet = sal_False;
if( pRscTop->GetObjNode() ){
if( ! pRscTop->GetObjNode()->IsConsistent() ){
pRscTop->GetObjNode()->OrderTree();
if( ! pRscTop->GetObjNode()->IsConsistent() )
- bRet = FALSE;
+ bRet = sal_False;
}
if( ! IsInstConsistent( pRscTop->GetObjNode(), pRscTop ) )
- bRet = FALSE;
+ bRet = sal_False;
}
if( ! ::MakeConsistent( (RscTop*)pRscTop->Right() ) )
- bRet = FALSE;
+ bRet = sal_False;
};
return bRet;
}
-BOOL RscTypCont :: MakeConsistent(){
+sal_Bool RscTypCont :: MakeConsistent(){
return( ::MakeConsistent( pRoot ) );
}
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 1acd8abc3bf8..f2456cfca257 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -53,7 +53,7 @@
#include <boost/unordered_map.hpp>
/****************** M A C R O S ******************************************/
-void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal )
+void RscTypCont::SETCONST( RscConst * pClass, const char * szString, sal_uInt32 nVal )
{
#if OSL_DEBUG_LEVEL > 2
fprintf( stderr, "setconst : %s\n", szString );
@@ -62,7 +62,7 @@ void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal
CONSTNAME, nVal ), nVal );
}
-void RscTypCont::SETCONST( RscConst * pClass, Atom nName, UINT32 nVal )
+void RscTypCont::SETCONST( RscConst * pClass, Atom nName, sal_uInt32 nVal )
{
#if OSL_DEBUG_LEVEL > 2
fprintf( stderr, "setconst hash: %u\n", (unsigned int)nName );
@@ -103,7 +103,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex )) && ( pLangEntry->mnLang != LANGUAGE_DONTKNOW ))
{
#if OSL_DEBUG_LEVEL > 2
- fprintf( stderr, "ISO Language in : %d %d %s\n",
+ fprintf( stderr, "ISO Language in : %d\n",
(int)nIndex,
pLangEntry->mnLang,
MsLangId::convertLanguageToIsoByteString( pLangEntry->mnLang ).getStr() );
@@ -201,7 +201,7 @@ Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames )
mnLangId++;
}
#if OSL_DEBUG_LEVEL > 2
- fprintf( stderr, "AddLanguage( %s ) = 0x%lx\n", pLang, nResult );
+ fprintf( stderr, "AddLanguage( %s ) = %d\n", pLang, nResult );
#endif
return nResult;
}
@@ -460,12 +460,12 @@ RscEnum * RscTypCont::InitMessButtons()
{
RscEnum * pMessButtons;
pMessButtons = new RscEnum( pHS->getID( "EnumMessButtons" ), RSC_NOTYPE );
- SETCONST( pMessButtons, "WB_OK", sal::static_int_cast<UINT32>(WB_OK) );
- SETCONST( pMessButtons, "WB_OK_CANCEL", sal::static_int_cast<UINT32>(WB_OK_CANCEL) );
- SETCONST( pMessButtons, "WB_YES_NO", sal::static_int_cast<UINT32>(WB_YES_NO) );
- SETCONST( pMessButtons, "WB_YES_NO_CANCEL", sal::static_int_cast<UINT32>(WB_YES_NO_CANCEL) );
- SETCONST( pMessButtons, "WB_RETRY_CANCEL", sal::static_int_cast<UINT32>(WB_RETRY_CANCEL) );
- SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE", sal::static_int_cast<UINT32>(WB_ABORT_RETRY_IGNORE) );
+ SETCONST( pMessButtons, "WB_OK", sal::static_int_cast<sal_uInt32>(WB_OK) );
+ SETCONST( pMessButtons, "WB_OK_CANCEL", sal::static_int_cast<sal_uInt32>(WB_OK_CANCEL) );
+ SETCONST( pMessButtons, "WB_YES_NO", sal::static_int_cast<sal_uInt32>(WB_YES_NO) );
+ SETCONST( pMessButtons, "WB_YES_NO_CANCEL", sal::static_int_cast<sal_uInt32>(WB_YES_NO_CANCEL) );
+ SETCONST( pMessButtons, "WB_RETRY_CANCEL", sal::static_int_cast<sal_uInt32>(WB_RETRY_CANCEL) );
+ SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE", sal::static_int_cast<sal_uInt32>(WB_ABORT_RETRY_IGNORE) );
return( pMessButtons );
}
@@ -479,12 +479,12 @@ RscEnum * RscTypCont::InitMessDefButton(){
pMessDefButton = new RscEnum( pHS->getID( "EnumMessDefButton" ),
RSC_NOTYPE );
- SETCONST( pMessDefButton, "WB_DEF_OK", sal::static_int_cast<UINT32>(WB_DEF_OK) );
- SETCONST( pMessDefButton, "WB_DEF_CANCEL", sal::static_int_cast<UINT32>(WB_DEF_CANCEL) );
- SETCONST( pMessDefButton, "WB_DEF_RETRY", sal::static_int_cast<UINT32>(WB_DEF_RETRY) );
- SETCONST( pMessDefButton, "WB_DEF_YES", sal::static_int_cast<UINT32>(WB_DEF_YES) );
- SETCONST( pMessDefButton, "WB_DEF_NO", sal::static_int_cast<UINT32>(WB_DEF_NO) );
- SETCONST( pMessDefButton, "WB_DEF_IGNORE", sal::static_int_cast<UINT32>(WB_DEF_IGNORE) );
+ SETCONST( pMessDefButton, "WB_DEF_OK", sal::static_int_cast<sal_uInt32>(WB_DEF_OK) );
+ SETCONST( pMessDefButton, "WB_DEF_CANCEL", sal::static_int_cast<sal_uInt32>(WB_DEF_CANCEL) );
+ SETCONST( pMessDefButton, "WB_DEF_RETRY", sal::static_int_cast<sal_uInt32>(WB_DEF_RETRY) );
+ SETCONST( pMessDefButton, "WB_DEF_YES", sal::static_int_cast<sal_uInt32>(WB_DEF_YES) );
+ SETCONST( pMessDefButton, "WB_DEF_NO", sal::static_int_cast<sal_uInt32>(WB_DEF_NO) );
+ SETCONST( pMessDefButton, "WB_DEF_IGNORE", sal::static_int_cast<sal_uInt32>(WB_DEF_IGNORE) );
return( pMessDefButton );
}
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index d9210049ac9d..072f1f085649 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -41,7 +41,7 @@
#include <rscclass.hxx>
#include <rsccont.hxx>
#include <rscdb.hxx>
-#include <rscsfx.hxx>
+#include <rsc/rscsfx.hxx>
#include "rsclex.hxx"
#include <yyrscyacc.hxx>
@@ -56,7 +56,7 @@ void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName,
// Clientvariablen einfuegen
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, &aWinBits, nVal )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nVal )
);
Atom nId = aNmTb.Put( rName.GetBuffer(), VARNAME );
pClass->SetVariable( nId, pClient, NULL,
@@ -75,7 +75,7 @@ RscTop * RscTypCont::InitClassMgr()
RscBaseCont * pClass;
Atom nId;
- aBaseLst.push_back( pClass = new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, FALSE ) );
+ aBaseLst.push_back( pClass = new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, sal_False ) );
nId = pHS->getID( "Resource" );
pClassMgr = new RscMgr( nId, RSC_RESOURCE, pClass );
@@ -213,7 +213,7 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitma
pClassImageList->SetVariable( nId, pClassColor, NULL,
VAR_SVDYNAMIC, RSC_IMAGELIST_MASKCOLOR );
- RscCont * pCont = new RscCont( pHS->getID( "USHORT *" ), RSC_NOTYPE );
+ RscCont * pCont = new RscCont( pHS->getID( "sal_uInt16 *" ), RSC_NOTYPE );
pCont->SetTypeClass( &aIdUShort );
aBaseLst.push_back( pCont );
nId = aNmTb.Put( "IdList", VARNAME );
@@ -264,14 +264,14 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
VAR_HIDDEN | VAR_NOENUM );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nDisableId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nDisableId )
);
nId = aNmTb.Put( "Disable", VARNAME );
pClassWindow->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nOutputSizeId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nOutputSizeId )
);
nId = aNmTb.Put( "OutputSize", VARNAME );
pClassWindow->SetVariable( nId, pClient, NULL,
@@ -288,7 +288,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
InsWinBit( pClassWindow, "DialogControl", nTabControlId );
nId = aNmTb.Put( "HelpID", VARNAME );
- pClassWindow->SetVariable( nId, &aIdLong );
+ pClassWindow->SetVariable( nId, &aStringLiteral, NULL, 0, WINDOW_HELPID );
nRsc_XYMAPMODEId = nId = aNmTb.Put( "_XYMapMode", VARNAME );
@@ -316,7 +316,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
nId = aNmTb.Put( "ExtraLong", VARNAME );
pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_EXTRALONG );
nId = aNmTb.Put( "UniqueId", VARNAME );
- pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_UNIQUEID );
+ pClassWindow->SetVariable( nId, &aString, NULL, 0, WINDOW_UNIQUEID );
// BorderStyle
RscEnum* pBorderStyleEnum = new RscEnum( pHS->getID( "WindowBorderStyle" ), RSC_NOTYPE );
@@ -688,7 +688,7 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
{
RSCINST aDfltI;
- aDfltI = aShort.Create( NULL, RSCINST(), FALSE );
+ aDfltI = aShort.Create( NULL, RSCINST(), sal_False );
aDfltI.pClass->SetNumber( aDfltI, 100 );
// aDfltI.pClass->MakeDefault( aDfltI );
@@ -700,7 +700,7 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
{
RSCINST aDfltI;
- aDfltI = aShort.Create( NULL, RSCINST(), FALSE );
+ aDfltI = aShort.Create( NULL, RSCINST(), sal_False );
aDfltI.pClass->SetNumber( aDfltI, 1 );
// aDfltI.pClass->MakeDefault( aDfltI );
@@ -710,7 +710,7 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
{
RSCINST aDfltI;
- aDfltI = aShort.Create( NULL, RSCINST(), FALSE );
+ aDfltI = aShort.Create( NULL, RSCINST(), sal_False );
aDfltI.pClass->SetNumber( aDfltI, 1 );
// aDfltI.pClass->MakeDefault( aDfltI );
nId = aNmTb.Put( "LineSize", VARNAME );
@@ -750,8 +750,8 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
INS_WINBIT(pClassListBox,DDExtraWidth)
{
- RSCINST aDflt = aUShort.Create( NULL, RSCINST(), FALSE );
- aDflt.pClass->SetNumber( aDflt, (USHORT)0xFFFF );
+ RSCINST aDflt = aUShort.Create( NULL, RSCINST(), sal_False );
+ aDflt.pClass->SetNumber( aDflt, (sal_uInt16)0xFFFF );
nId = aNmTb.Put( "CurPos", VARNAME );
pClassListBox->SetVariable( nId, &aUShort, &aDflt );
}
@@ -968,14 +968,14 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
// Clientvariablen einfuegen
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nShiftId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nShiftId )
);
nId = aNmTb.Put( "Shift", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nMod1Id )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nMod1Id )
);
nId = aNmTb.Put( "Modifier1", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, NULL,
@@ -983,7 +983,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nMod2Id )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nMod2Id )
);
nId = aNmTb.Put( "Modifier2", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, NULL,
@@ -1129,35 +1129,35 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
// Clientvariablen einfuegen
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nCheckableId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nCheckableId )
);
nId = aNmTb.Put( "Checkable", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nAutoCheckId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nAutoCheckId )
);
nId = aNmTb.Put( "AutoCheck", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nRadioCheckId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nRadioCheckId )
);
nId = aNmTb.Put( "RadioCheck", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nAboutId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nAboutId )
);
nId = aNmTb.Put( "About", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nHelpId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nHelpId )
);
nId = aNmTb.Put( "Help", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
@@ -1174,7 +1174,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
pClassMenuItem->SetVariable( nId, &aLangString, NULL, 0,
RSC_MENUITEM_HELPTEXT );
nId = aNmTb.Put( "HelpID", VARNAME );
- pClassMenuItem->SetVariable( nId, &aIdLong, NULL, 0,
+ pClassMenuItem->SetVariable( nId, &aStringLiteral, NULL, 0,
RSC_MENUITEM_HELPID );
nId = aNmTb.Put( "AccelKey", VARNAME );
pClassMenuItem->SetVariable( nId, pClassKeyCode, NULL, 0,
@@ -1247,7 +1247,7 @@ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper,
nId = aNmTb.Put( "DefButton", VARNAME );
pClassMessBox->SetVariable( nId, pMessDefButton );
nId = aNmTb.Put( "HelpID", VARNAME );
- pClassMessBox->SetVariable( nId, &aIdLong );
+ pClassMessBox->SetVariable( nId, &aStringLiteral );
nId = aNmTb.Put( "SysModal", VARNAME );
pClassMessBox->SetVariable( nId, &aBool );
nId = aNmTb.Put( "Title", VARNAME );
@@ -1946,43 +1946,43 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
// Clientvariablen einfuegen
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nCheckableId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nCheckableId )
);
nId = aNmTb.Put( "Checkable", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nAutoCheckId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nAutoCheckId )
);
nId = aNmTb.Put( "AutoCheck", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nRadioCheckId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nRadioCheckId )
);
nId = aNmTb.Put( "RadioCheck", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nLeftId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nLeftId )
);
nId = aNmTb.Put( "Left", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nAutoSizeId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nAutoSizeId )
);
nId = aNmTb.Put( "AutoSize", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nDropDownId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nDropDownId )
);
nId = aNmTb.Put( "DropDown", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
}
nId = aNmTb.Put( "HelpID", VARNAME );
- pClassToolBoxItem->SetVariable( nId, &aIdLong, NULL, 0,
+ pClassToolBoxItem->SetVariable( nId, &aStringLiteral, NULL, 0,
RSC_TOOLBOXITEM_HELPID );
nId = aNmTb.Put( "Text", VARNAME );
pClassToolBoxItem->SetVariable( nId, &aLangString, NULL, 0,
@@ -2239,7 +2239,6 @@ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper,
pClassTabControl->SetVariable( nId, pCont, NULL, 0,
RSC_TABCONTROL_ITEMLIST );
- INS_WINBIT( pClassTabControl, SingleLine );
INS_WINBIT( pClassTabControl, DropDown );
}
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index c3dac0a6b009..c16c9826dbf7 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -191,7 +191,7 @@ void RscTypCont::Init()
Atom nId;
- aNmTb.SetSort( FALSE );
+ aNmTb.SetSort( sal_False );
{
/********** C O M P I L E R T Y P E N ******************************/
aNmTb.Put( "LINE", LINE, (long)0 );
@@ -204,12 +204,14 @@ void RscTypCont::Init()
aNmTb.Put( "writeifset", WRITEIFSET, (long)0 );
/* Werte fuer Aufzaehlungstypen */
- aNmTb.Put( "TRUE", BOOLEAN, (long)TRUE );
- aNmTb.Put( "FALSE", BOOLEAN, (long)FALSE );
+ aNmTb.Put( "TRUE", BOOLEAN, (long)sal_True );
+ aNmTb.Put( "FALSE", BOOLEAN, (long)sal_False );
+ #if 0
/* Vordefinierte HilfeId's */
aNmTb.Put( "HELP_INDEX", NUMBER, OOO_HELP_INDEX );
aNmTb.Put( "HELP_HELPONHELP", NUMBER, OOO_HELP_HELPONHELP );
+ #endif
aNmTb.Put( "XSCALE", XSCALE , (long)0 );
aNmTb.Put( "YSCALE", YSCALE , (long)0 );
@@ -260,119 +262,117 @@ void RscTypCont::Init()
// Windows
nBorderId = pHS->getID( "WB_BORDER" );
- aWinBits.SetConstant( nBorderId, sal::static_int_cast<INT32>(WB_BORDER) );
+ aWinBits.SetConstant( nBorderId, sal::static_int_cast<sal_Int32>(WB_BORDER) );
nHideId = pHS->getID( "WB_HIDE" );
- aWinBits.SetConstant( nHideId, sal::static_int_cast<INT32>(WB_HIDE) );
+ aWinBits.SetConstant( nHideId, sal::static_int_cast<sal_Int32>(WB_HIDE) );
nClipChildrenId = pHS->getID( "WB_CLIPCHILDREN" );
- aWinBits.SetConstant( nClipChildrenId, sal::static_int_cast<INT32>(WB_CLIPCHILDREN) );
+ aWinBits.SetConstant( nClipChildrenId, sal::static_int_cast<sal_Int32>(WB_CLIPCHILDREN) );
nSizeableId = pHS->getID( "WB_SIZEABLE" );
- aWinBits.SetConstant( nSizeableId, sal::static_int_cast<INT32>(WB_SIZEABLE) );
+ aWinBits.SetConstant( nSizeableId, sal::static_int_cast<sal_Int32>(WB_SIZEABLE) );
nMoveableId = pHS->getID( "WB_MOVEABLE" );
- aWinBits.SetConstant( nMoveableId, sal::static_int_cast<INT32>(WB_MOVEABLE) );
+ aWinBits.SetConstant( nMoveableId, sal::static_int_cast<sal_Int32>(WB_MOVEABLE) );
nMinimizeId = pHS->getID( "WB_MINABLE" );
aWinBits.SetConstant( nMinimizeId, 0 /*WB_MINABLE*/ );
nMaximizeId = pHS->getID( "WB_MAXABLE" );
aWinBits.SetConstant( nMaximizeId, 0 /*WB_MAXABLE*/ );
nCloseableId = pHS->getID( "WB_CLOSEABLE" );
- aWinBits.SetConstant( nCloseableId, sal::static_int_cast<INT32>(WB_CLOSEABLE) );
+ aWinBits.SetConstant( nCloseableId, sal::static_int_cast<sal_Int32>(WB_CLOSEABLE) );
nAppId = pHS->getID( "WB_APP" );
- aWinBits.SetConstant( nAppId, sal::static_int_cast<INT32>(WB_APP) );
+ aWinBits.SetConstant( nAppId, sal::static_int_cast<sal_Int32>(WB_APP) );
nTabstopId = pHS->getID( "WB_TABSTOP" );
- aWinBits.SetConstant( nTabstopId, sal::static_int_cast<INT32>(WB_TABSTOP) );
+ aWinBits.SetConstant( nTabstopId, sal::static_int_cast<sal_Int32>(WB_TABSTOP) );
nGroupId = pHS->getID( "WB_GROUP" );
- aWinBits.SetConstant( nGroupId, sal::static_int_cast<INT32>(WB_GROUP) );
+ aWinBits.SetConstant( nGroupId, sal::static_int_cast<sal_Int32>(WB_GROUP) );
nSysmodalId = pHS->getID( "WB_SYSMODAL" );
aWinBits.SetConstant( nSysmodalId, 0 /*WB_SYSMODAL*/ );
}
{
nLeftId = pHS->getID( "WB_LEFT" );
- aWinBits.SetConstant( nLeftId, sal::static_int_cast<INT32>(WB_LEFT) );
+ aWinBits.SetConstant( nLeftId, sal::static_int_cast<sal_Int32>(WB_LEFT) );
nCenterId = pHS->getID( "WB_CENTER" );
- aWinBits.SetConstant( nCenterId, sal::static_int_cast<INT32>(WB_CENTER) );
+ aWinBits.SetConstant( nCenterId, sal::static_int_cast<sal_Int32>(WB_CENTER) );
nRightId = pHS->getID( "WB_RIGHT" );
- aWinBits.SetConstant( nRightId, sal::static_int_cast<INT32>(WB_RIGHT) );
+ aWinBits.SetConstant( nRightId, sal::static_int_cast<sal_Int32>(WB_RIGHT) );
nTopId = pHS->getID( "WB_TOP" );
- aWinBits.SetConstant( nTopId, sal::static_int_cast<INT32>(WB_TOP) );
+ aWinBits.SetConstant( nTopId, sal::static_int_cast<sal_Int32>(WB_TOP) );
nVCenterId = pHS->getID( "WB_VCENTER" );
- aWinBits.SetConstant( nVCenterId, sal::static_int_cast<INT32>(WB_VCENTER) );
+ aWinBits.SetConstant( nVCenterId, sal::static_int_cast<sal_Int32>(WB_VCENTER) );
nBottomId = pHS->getID( "WB_BOTTOM" );
- aWinBits.SetConstant( nBottomId, sal::static_int_cast<INT32>(WB_BOTTOM) );
+ aWinBits.SetConstant( nBottomId, sal::static_int_cast<sal_Int32>(WB_BOTTOM) );
nHScrollId = pHS->getID( "WB_HSCROLL" );
- aWinBits.SetConstant( nHScrollId, sal::static_int_cast<INT32>(WB_HSCROLL) );
+ aWinBits.SetConstant( nHScrollId, sal::static_int_cast<sal_Int32>(WB_HSCROLL) );
nVScrollId = pHS->getID( "WB_VSCROLL" );
- aWinBits.SetConstant( nVScrollId, sal::static_int_cast<INT32>(WB_VSCROLL) );
+ aWinBits.SetConstant( nVScrollId, sal::static_int_cast<sal_Int32>(WB_VSCROLL) );
nSortId = pHS->getID( "WB_SORT" );
- aWinBits.SetConstant( nSortId, sal::static_int_cast<INT32>(WB_SORT) );
+ aWinBits.SetConstant( nSortId, sal::static_int_cast<sal_Int32>(WB_SORT) );
nDefaultId = pHS->getID( "WB_DEFBUTTON" );
- aWinBits.SetConstant( nDefaultId, sal::static_int_cast<INT32>(WB_DEFBUTTON) );
+ aWinBits.SetConstant( nDefaultId, sal::static_int_cast<sal_Int32>(WB_DEFBUTTON) );
nRepeatId = pHS->getID( "WB_REPEAT" );
- aWinBits.SetConstant( nRepeatId, sal::static_int_cast<INT32>(WB_REPEAT) );
+ aWinBits.SetConstant( nRepeatId, sal::static_int_cast<sal_Int32>(WB_REPEAT) );
nSVLookId = pHS->getID( "WB_SVLOOK" );
- aWinBits.SetConstant( nSVLookId, sal::static_int_cast<INT32>(WB_3DLOOK) );
+ aWinBits.SetConstant( nSVLookId, sal::static_int_cast<sal_Int32>(WB_3DLOOK) );
nDropDownId = pHS->getID( "WB_DROPDOWN" );
- aWinBits.SetConstant( nDropDownId, sal::static_int_cast<INT32>(WB_DROPDOWN) );
+ aWinBits.SetConstant( nDropDownId, sal::static_int_cast<sal_Int32>(WB_DROPDOWN) );
nPassWordId = pHS->getID( "WB_PASSWORD" );
- aWinBits.SetConstant( nPassWordId, sal::static_int_cast<INT32>(WB_PASSWORD) );
+ aWinBits.SetConstant( nPassWordId, sal::static_int_cast<sal_Int32>(WB_PASSWORD) );
nReadOnlyId = pHS->getID( "WB_READONLY" );
- aWinBits.SetConstant( nReadOnlyId, sal::static_int_cast<INT32>(WB_READONLY) );
+ aWinBits.SetConstant( nReadOnlyId, sal::static_int_cast<sal_Int32>(WB_READONLY) );
nAutoSizeId = pHS->getID( "WB_AUTOSIZE" );
- aWinBits.SetConstant( nAutoSizeId, sal::static_int_cast<INT32>(WB_AUTOSIZE) );
+ aWinBits.SetConstant( nAutoSizeId, sal::static_int_cast<sal_Int32>(WB_AUTOSIZE) );
nSpinId = pHS->getID( "WB_SPIN" );
- aWinBits.SetConstant( nSpinId, sal::static_int_cast<INT32>(WB_SPIN) );
+ aWinBits.SetConstant( nSpinId, sal::static_int_cast<sal_Int32>(WB_SPIN) );
nTabControlId = pHS->getID( "WB_DIALOGCONTROL" );
- aWinBits.SetConstant( nTabControlId, sal::static_int_cast<INT32>(WB_DIALOGCONTROL) );
+ aWinBits.SetConstant( nTabControlId, sal::static_int_cast<sal_Int32>(WB_DIALOGCONTROL) );
nSimpleModeId = pHS->getID( "WB_SIMPLEMODE" );
- aWinBits.SetConstant( nSimpleModeId, sal::static_int_cast<INT32>(WB_SIMPLEMODE) );
+ aWinBits.SetConstant( nSimpleModeId, sal::static_int_cast<sal_Int32>(WB_SIMPLEMODE) );
nDragId = pHS->getID( "WB_DRAG" );
- aWinBits.SetConstant( nDragId, sal::static_int_cast<INT32>(WB_DRAG) );
+ aWinBits.SetConstant( nDragId, sal::static_int_cast<sal_Int32>(WB_DRAG) );
nScrollId = pHS->getID( "WB_SCROLL" );
- aWinBits.SetConstant( nScrollId, sal::static_int_cast<INT32>(WB_SCROLL) );
+ aWinBits.SetConstant( nScrollId, sal::static_int_cast<sal_Int32>(WB_SCROLL) );
nZoomableId = pHS->getID( "WB_ZOOMABLE" );
- aWinBits.SetConstant( nZoomableId, sal::static_int_cast<INT32>(WB_ROLLABLE) );
+ aWinBits.SetConstant( nZoomableId, sal::static_int_cast<sal_Int32>(WB_ROLLABLE) );
nHideWhenDeactivateId = pHS->getID( "WB_HIDEWHENDEACTIVATE" );
aWinBits.SetConstant( nHideWhenDeactivateId, 0 /*WB_HIDEWHENDEACTIVATE*/ );
nAutoHScrollId = pHS->getID( "WB_AUTOHSCROLL" );
- aWinBits.SetConstant( nAutoHScrollId, sal::static_int_cast<INT32>(WB_AUTOHSCROLL) );
+ aWinBits.SetConstant( nAutoHScrollId, sal::static_int_cast<sal_Int32>(WB_AUTOHSCROLL) );
nAutoVScrollId = pHS->getID( "WB_AUTOVSCROLL" );
- aWinBits.SetConstant( nAutoVScrollId, sal::static_int_cast<INT32>(WB_AUTOVSCROLL) );
+ aWinBits.SetConstant( nAutoVScrollId, sal::static_int_cast<sal_Int32>(WB_AUTOVSCROLL) );
nDDExtraWidthId = pHS->getID( "WB_DDEXTRAWIDTH" );
aWinBits.SetConstant( nDDExtraWidthId, 0 /*WB_DDEXTRAWIDTH*/ );
nWordBreakId = pHS->getID( "WB_WORDBREAK" );
- aWinBits.SetConstant( nWordBreakId, sal::static_int_cast<INT32>(WB_WORDBREAK) );
+ aWinBits.SetConstant( nWordBreakId, sal::static_int_cast<sal_Int32>(WB_WORDBREAK) );
nLeftLabelId = pHS->getID( "WB_LEFTLABEL" );
aWinBits.SetConstant( nLeftLabelId, 0 /*WB_LEFTLABEL*/ );
nHasLinesId = pHS->getID( "WB_HASLINES" );
- aWinBits.SetConstant( nHasLinesId, sal::static_int_cast<INT32>(WB_HASLINES) );
+ aWinBits.SetConstant( nHasLinesId, sal::static_int_cast<sal_Int32>(WB_HASLINES) );
nHasButtonsId = pHS->getID( "WB_HASBUTTONS" );
- aWinBits.SetConstant( nHasButtonsId, sal::static_int_cast<INT32>(WB_HASBUTTONS) );
+ aWinBits.SetConstant( nHasButtonsId, sal::static_int_cast<sal_Int32>(WB_HASBUTTONS) );
nRectStyleId = pHS->getID( "WB_RECTSTYLE" );
- aWinBits.SetConstant( nRectStyleId, sal::static_int_cast<INT32>(WB_RECTSTYLE) );
+ aWinBits.SetConstant( nRectStyleId, sal::static_int_cast<sal_Int32>(WB_RECTSTYLE) );
nLineSpacingId = pHS->getID( "WB_LINESPACING" );
- aWinBits.SetConstant( nLineSpacingId, sal::static_int_cast<INT32>(WB_LINESPACING) );
+ aWinBits.SetConstant( nLineSpacingId, sal::static_int_cast<sal_Int32>(WB_LINESPACING) );
nSmallStyleId = pHS->getID( "WB_SMALLSTYLE" );
- aWinBits.SetConstant( nSmallStyleId, sal::static_int_cast<INT32>(WB_SMALLSTYLE) );
+ aWinBits.SetConstant( nSmallStyleId, sal::static_int_cast<sal_Int32>(WB_SMALLSTYLE) );
nEnableResizingId = pHS->getID( "WB_ENABLERESIZING" );
aWinBits.SetConstant( nEnableResizingId, 0 /*WB_ENABLERESIZING*/ );
nDockableId = pHS->getID( "WB_DOCKABLE" );
- aWinBits.SetConstant( nDockableId, sal::static_int_cast<INT32>(WB_DOCKABLE) );
+ aWinBits.SetConstant( nDockableId, sal::static_int_cast<sal_Int32>(WB_DOCKABLE) );
nScaleId = pHS->getID( "WB_SCALE" );
- aWinBits.SetConstant( nScaleId, sal::static_int_cast<INT32>(WB_SCALE) );
+ aWinBits.SetConstant( nScaleId, sal::static_int_cast<sal_Int32>(WB_SCALE) );
nIgnoreTabId = pHS->getID( "WB_IGNORETAB" );
- aWinBits.SetConstant( nIgnoreTabId, sal::static_int_cast<INT32>(WB_IGNORETAB) );
+ aWinBits.SetConstant( nIgnoreTabId, sal::static_int_cast<sal_Int32>(WB_IGNORETAB) );
nNoSplitDrawId = pHS->getID( "WB_NOSPLITDRAW" );
- aWinBits.SetConstant( nNoSplitDrawId, sal::static_int_cast<INT32>(WB_NOSPLITDRAW) );
+ aWinBits.SetConstant( nNoSplitDrawId, sal::static_int_cast<sal_Int32>(WB_NOSPLITDRAW) );
nTopImageId = pHS->getID( "WB_TOPIMAGE" );
- aWinBits.SetConstant( nTopImageId, sal::static_int_cast<INT32>(WB_TOPIMAGE) );
+ aWinBits.SetConstant( nTopImageId, sal::static_int_cast<sal_Int32>(WB_TOPIMAGE) );
nNoLabelId = pHS->getID( "WB_NOLABEL" );
- aWinBits.SetConstant( nNoLabelId, sal::static_int_cast<INT32>(WB_NOLABEL) );
+ aWinBits.SetConstant( nNoLabelId, sal::static_int_cast<sal_Int32>(WB_NOLABEL) );
nVertId = pHS->getID( "WB_VERT" );
- aWinBits.SetConstant( nVertId, sal::static_int_cast<INT32>(WB_VERT) );
- nSingleLineId = pHS->getID( "WB_SINGLELINE" );
- aWinBits.SetConstant( nSingleLineId, sal::static_int_cast<INT32>(WB_SINGLELINE) );
+ aWinBits.SetConstant( nVertId, sal::static_int_cast<sal_Int32>(WB_VERT) );
nSysWinId = pHS->getID( "WB_SYSTEMWINDOW" );
- aWinBits.SetConstant( nSysWinId, sal::static_int_cast<INT32>(WB_SYSTEMWINDOW) );
+ aWinBits.SetConstant( nSysWinId, sal::static_int_cast<sal_Int32>(WB_SYSTEMWINDOW) );
nStdPopupId = pHS->getID( "WB_STDPOPUP" );
- aWinBits.SetConstant( nStdPopupId, sal::static_int_cast<INT32>(WB_STDPOPUP) );
+ aWinBits.SetConstant( nStdPopupId, sal::static_int_cast<sal_Int32>(WB_STDPOPUP) );
}
{
/********** I n i t B a s i c T y p e s **************************/
@@ -695,7 +695,7 @@ void RscTypCont::Init()
// Clientvariablen einfuegen
// Sysmodal
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, &aWinBits, nRepeatId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nRepeatId )
);
nId = aNmTb.Put( "Repeat", VARNAME );
pClassSpinButton->SetVariable( nId, pClient, NULL,
diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx
index be0cefcf029b..e6e1559a4130 100644
--- a/rsc/source/parser/rsckey.cxx
+++ b/rsc/source/parser/rsckey.cxx
@@ -71,7 +71,7 @@ int KeyCompare( const void * pFirst, const void * pSecond ){
|*
*************************************************************************/
RscNameTable::RscNameTable() {
- bSort = TRUE;
+ bSort = sal_True;
nEntries = 0;
pTable = NULL;
};
@@ -92,7 +92,7 @@ RscNameTable::~RscNameTable() {
|* RscNameTable::SetSort()
|*
*************************************************************************/
-void RscNameTable::SetSort( BOOL bSorted ){
+void RscNameTable::SetSort( sal_Bool bSorted ){
bSort = bSorted;
if( bSort && pTable){
// Schluesselwort Feld sortieren
@@ -157,7 +157,7 @@ Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp, RscTop * pClass )
|* RscNameTable::Get()
|*
*************************************************************************/
-BOOL RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){
+sal_Bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){
KEY_STRUCT * pKey = NULL;
KEY_STRUCT aSearchName;
sal_uInt32 i;
@@ -184,9 +184,9 @@ BOOL RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){
if( pKey ){ // Schluesselwort gefunden
*pEle = *pKey;
- return( TRUE );
+ return( sal_True );
};
- return( FALSE );
+ return( sal_False );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 5c38c66790ca..0f59c7ab4cdf 100644..100755
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -68,7 +68,7 @@ const char* StringContainer::putString( const char* pString )
/*************************************************************************/
int c;
-BOOL bLastInclude;// War letztes Symbol INCLUDE
+sal_Bool bLastInclude;// War letztes Symbol INCLUDE
RscFileInst* pFI;
RscTypCont* pTC;
RscExpression * pExp;
@@ -76,15 +76,15 @@ struct KeyVal {
int nKeyWord;
YYSTYPE aYYSType;
} aKeyVal[ 1 ];
-BOOL bTargetDefined;
+sal_Bool bTargetDefined;
StringContainer* pStringContainer = NULL;
/****************** C O D E **********************************************/
-UINT32 GetNumber(){
- UINT32 l = 0;
- UINT32 nLog = 10;
+sal_uInt32 GetNumber(){
+ sal_uInt32 l = 0;
+ sal_uInt32 nLog = 10;
if( '0' == c ){
c = pFI->GetFastChar();
@@ -122,7 +122,7 @@ UINT32 GetNumber(){
int MakeToken( YYSTYPE * pTokenVal ){
int c1;
- while( TRUE ){ // Kommentare und Leerzeichen ueberlesen
+ while( sal_True ){ // Kommentare und Leerzeichen ueberlesen
while( isspace( c ) )
c = pFI->GetFastChar();
if( '/' == c ){
@@ -154,7 +154,7 @@ int MakeToken( YYSTYPE * pTokenVal ){
}
if( bLastInclude ){
- bLastInclude = FALSE; //Zuruecksetzten
+ bLastInclude = sal_False; //Zuruecksetzten
if( '<' == c ){
OStringBuffer aBuf( 256 );
c = pFI->GetFastChar();
@@ -172,20 +172,25 @@ int MakeToken( YYSTYPE * pTokenVal ){
if( c == '"' )
{
OStringBuffer aBuf( 256 );
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
while( !bDone && !pFI->IsEof() && c )
{
c = pFI->GetFastChar();
if( c == '"' )
{
- c = pFI->GetFastChar();
+ do
+ {
+ c = pFI->GetFastChar();
+ }
+ while( c == ' ' || c == '\t' );
if( c == '"' )
{
- aBuf.append( '"' );
- aBuf.append( '"' );
+ // this is a continued string
+ // note: multiline string continuations are handled by the parser
+ // see rscyacc.y
}
else
- bDone = TRUE;
+ bDone = sal_True;
}
else if( c == '\\' )
{
@@ -238,10 +243,10 @@ int MakeToken( YYSTYPE * pTokenVal ){
pTokenVal->constname.nValue = aKey.yylval;
break;
case BOOLEAN:
- pTokenVal->svbool = (BOOL)aKey.yylval;
+ pTokenVal->svbool = (sal_Bool)aKey.yylval;
break;
case INCLUDE:
- bLastInclude = TRUE;
+ bLastInclude = sal_True;
default:
pTokenVal->value = aKey.yylval;
};
@@ -305,7 +310,7 @@ int yylex()
#endif
{
if( bTargetDefined )
- bTargetDefined = FALSE;
+ bTargetDefined = sal_False;
else
aKeyVal[ 0 ].nKeyWord =
MakeToken( &aKeyVal[ 0 ].aYYSType );
@@ -333,10 +338,10 @@ void InitParser( RscFileInst * pFileInst )
pFI = pFileInst;
pStringContainer = new StringContainer();
pExp = NULL; //fuer MacroParser
- bTargetDefined = FALSE;
+ bTargetDefined = sal_False;
// Anfangszeichen initialisieren
- bLastInclude = FALSE;
+ bLastInclude = sal_False;
c = pFI->GetFastChar();
}
@@ -362,7 +367,7 @@ void IncludeParser( RscFileInst * pFileInst )
int nToken; // Wert des Tokens
YYSTYPE aYYSType; // Daten des Tokens
RscFile * pFName; // Filestruktur
- ULONG lKey; // Fileschluessel
+ sal_uLong lKey; // Fileschluessel
RscTypCont * pTypCon = pFileInst->pTypCont;
pFName = pTypCon->aFileTab.Get( pFileInst->GetFileIndex() );
@@ -418,7 +423,7 @@ RscExpression * MacroParser( RscFileInst & rFileInst )
//Ziel auf macro_expression setzen
aKeyVal[ 0 ].nKeyWord = MACROTARGET;
- bTargetDefined = TRUE;
+ bTargetDefined = sal_True;
aError = yyparse();
pExpression = pExp;
diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx
index 2cc5a4193106..c861e89402f6 100644
--- a/rsc/source/parser/rsclex.hxx
+++ b/rsc/source/parser/rsclex.hxx
@@ -77,7 +77,7 @@ class ObjectStack {
ObjectStack () { pRoot = NULL; }
const RSCINST & Top () { return pRoot->aInst; }
- BOOL IsEmpty() { return( pRoot == NULL ); }
+ sal_Bool IsEmpty() { return( pRoot == NULL ); }
void IncTupelRec() { pRoot->nTupelRec++; }
void DecTupelRec() { pRoot->nTupelRec--; }
sal_uInt32 TupelRecCount() const { return pRoot->nTupelRec; }
diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
index 389d2c686c05..fc3c44c8754d 100644
--- a/rsc/source/parser/rscpar.cxx
+++ b/rsc/source/parser/rscpar.cxx
@@ -49,7 +49,7 @@ void RscFileInst::Init()
*pLine = '\0';
nScanPos = 0;
cLastChar = '\0';
- bEof = FALSE;
+ bEof = sal_False;
};
/*************************************************************************
@@ -57,8 +57,8 @@ void RscFileInst::Init()
|* RscFileInst::RscFileInst()
|*
*************************************************************************/
-RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
- ULONG lFIndex, FILE * fFile )
+RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
+ sal_uLong lFIndex, FILE * fFile )
{
pTypCont = pTC;
Init();
@@ -72,8 +72,8 @@ RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
pInput = (char *)rtl_allocateMemory( nInputBufLen );
}
-RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
- ULONG lFIndex, const ByteString& rBuf )
+RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
+ sal_uLong lFIndex, const ByteString& rBuf )
{
pTypCont = pTC;
Init();
@@ -113,7 +113,7 @@ int RscFileInst::GetChar()
else if( nInputPos >= nInputEndPos && nInputEndPos != nInputBufLen )
{
// Dateiende
- bEof = TRUE;
+ bEof = sal_True;
return 0;
}
else
diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx
index 8cbe5d0d2063..efef5f3b42ff 100644
--- a/rsc/source/parser/rscyacc.cxx
+++ b/rsc/source/parser/rscyacc.cxx
@@ -65,7 +65,7 @@ RSCINST GetVarInst( const RSCINST & rInst, const char * pVarName )
return( aInst );
}
-void SetNumber( const RSCINST & rInst, const char * pVarName, INT32 lValue )
+void SetNumber( const RSCINST & rInst, const char * pVarName, sal_Int32 lValue )
{
RSCINST aInst;
@@ -81,7 +81,7 @@ void SetNumber( const RSCINST & rInst, const char * pVarName, INT32 lValue )
}
void SetConst( const RSCINST & rInst, const char * pVarName,
- Atom nValueId, INT32 nVal )
+ Atom nValueId, sal_Int32 nVal )
{
RSCINST aInst;
@@ -113,11 +113,11 @@ void SetString( const RSCINST & rInst, const char * pVarName, const char * pStr
RscId MakeRscId( RscExpType aExpType )
{
if( !aExpType.IsNothing() ){
- INT32 lValue;
+ sal_Int32 lValue;
if( !aExpType.Evaluate( &lValue ) )
pTC->pEH->Error( ERR_ZERODIVISION, NULL, RscId() );
- if( lValue < 1 || lValue > (INT32)0x7FFF )
+ if( lValue < 1 || lValue > (sal_Int32)0x7FFF )
{
pTC->pEH->Error( ERR_IDRANGE, NULL, RscId(),
ByteString::CreateFromInt32( lValue ).GetBuffer() );
@@ -131,7 +131,7 @@ RscId MakeRscId( RscExpType aExpType )
return RscId();
}
-BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
+sal_Bool DoClassHeader( RSCHEADER * pHeader, sal_Bool bMember )
{
RSCINST aCopyInst;
RscId aName1 = MakeRscId( pHeader->nName1 );
@@ -179,7 +179,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
{
if( S.IsEmpty() )
{
- if( (INT32)aName1 < 256 )
+ if( (sal_Int32)aName1 < 256 )
pTC->pEH->Error( WRN_GLOBALID, pHeader->pClass, aName1 );
if( aCopyInst.IsInst() )
@@ -201,7 +201,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
RSCINST aTmpI;
ERRTYPE aError;
- if( (INT32)aName1 >= 256 && aName1.IsId() )
+ if( (sal_Int32)aName1 >= 256 && aName1.IsId() )
pTC->pEH->Error( WRN_LOCALID, pHeader->pClass, aName1 );
aError = S.Top().pClass->GetElement( S.Top(), aName1,
pHeader->pClass, aCopyInst, &aTmpI );
@@ -219,7 +219,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
pHeader->pClass, RSCINST(), &aTmpI );
if( !aTmpI.IsInst() )
- return( FALSE );
+ return( sal_False );
}
S.Push( aTmpI );
};
@@ -232,7 +232,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
pTC->pEH->Error( aError, S.Top().pClass, aName1 );
}
- return( TRUE );
+ return( sal_True );
}
RSCINST GetFirstTupelEle( const RSCINST & rTop )
@@ -255,12 +255,8 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop )
#ifdef UNX
#define YYMAXDEPTH 2000
#else
-#ifdef W30
-#define YYMAXDEPTH 300
-#else
#define YYMAXDEPTH 800
#endif
-#endif
#if defined _MSC_VER
#pragma warning(push, 1)
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index a522d7416782..329884e498b6 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -39,7 +39,7 @@
Atom varid;
struct {
Atom hashid;
- INT32 nValue;
+ sal_Int32 nValue;
} constname;
RscTop * pClass;
RSCHEADER header;
@@ -47,11 +47,11 @@
CLASS_DATA pData;
RscTop * pClass;
} instance;
- INT32 value;
- USHORT ushort;
+ sal_Int32 value;
+ sal_uInt16 ushort;
short exp_short;
char * string;
- BOOL svbool;
+ sal_Bool svbool;
REF_ENUM copyref;
RscDefine * defineele;
CharSet charset;
@@ -130,7 +130,7 @@ resource_definitions
| MACROTARGET macro_expression
{
RscExpType aExpType;
- INT32 lValue;
+ sal_Int32 lValue;
aExpType.cType = RSCEXP_NOTHING;
pExp = new RscExpression( aExpType, '+', $2 );
@@ -143,13 +143,13 @@ resource_definition
: line_number
| '#' DEFINE SYMBOL macro_expression
{
- BOOL bError = FALSE;
+ sal_Bool bError = sal_False;
if( $4.IsNumber() ){
if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
ByteString( $3 ),
$4.GetLong(), LIST_APPEND ) )
- bError = TRUE;
+ bError = sal_True;
}
else if( $4.IsDefinition() ){
RscExpType aExpType;
@@ -162,13 +162,13 @@ resource_definition
if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
ByteString( $3 ), pExpr, LIST_APPEND ) )
- bError = TRUE;
+ bError = sal_True;
}
else if( $4.IsExpression() ){
if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
ByteString( $3 ), $4.aExp.pExp,
LIST_APPEND ) )
- bError = TRUE;
+ bError = sal_True;
}
if( bError ){
@@ -200,7 +200,7 @@ resource_definition
new_class_definition_header
: CLASS SYMBOL id_expression ':' CLASSNAME
{
- INT32 lType;
+ sal_Int32 lType;
$3.Evaluate( &lType );
@@ -319,7 +319,7 @@ class_definition
class_header
: class_header_body
{
- if( !DoClassHeader( &$1, FALSE ) )
+ if( !DoClassHeader( &$1, sal_False ) )
return( ERR_ERROR );
$$ = $1;
}
@@ -528,7 +528,7 @@ var_header_class
{
RSCINST aInst;
- aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST(), FALSE, $3.pClass );
+ aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST(), sal_False, $3.pClass );
if( aInst.pData )
S.Push( aInst );
@@ -539,7 +539,7 @@ var_header_class
return( ERR_ERROR );
};
- if( !DoClassHeader( &$3, TRUE ) )
+ if( !DoClassHeader( &$3, sal_True ) )
return( ERR_ERROR );
$$ = $3;
}
@@ -567,7 +567,7 @@ var_header_class
pHS->getString( $1 ) );
return( ERR_ERROR );
};
- if( !DoClassHeader( &$6, TRUE ) )
+ if( !DoClassHeader( &$6, sal_True ) )
return( ERR_ERROR );
$$ = $6;
}
@@ -596,7 +596,7 @@ var_header_class
pHS->getString( $1 ) );
return( ERR_ERROR );
};
- if( !DoClassHeader( &$6, TRUE ) )
+ if( !DoClassHeader( &$6, sal_True ) )
return( ERR_ERROR );
$$ = $6;
}
@@ -784,7 +784,7 @@ list
var_bodysimple
: macro_expression
{
- INT32 l;
+ sal_Int32 l;
ERRTYPE aError;
if( !$1.Evaluate( &l ) )
@@ -1064,7 +1064,7 @@ id_expression
| macro_expression
{ // pExpession auswerten und loeschen
if( RSCEXP_EXP == $1.cType ){
- INT32 lValue;
+ sal_Int32 lValue;
if( !$1.Evaluate( &lValue ) )
pTC->pEH->Error( ERR_ZERODIVISION, NULL, RscId() );
@@ -1094,8 +1094,8 @@ line_number
pFI->SetLineNo( $3 );
pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( ByteString( $4 ) ) );
pFName = pTC->aFileTab.Get( pFI->GetFileIndex() );
- pFName->bLoaded = TRUE;
- pFName->bScanned = TRUE;
+ pFName->bLoaded = sal_True;
+ pFName->bScanned = sal_True;
}
| '#' NUMBER STRING DUMMY_NUMBER
{
@@ -1104,8 +1104,8 @@ line_number
pFI->SetLineNo( $2 );
pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( ByteString( $3 ) ) );
pFName = pTC->aFileTab.Get( pFI->GetFileIndex() );
- pFName->bLoaded = TRUE;
- pFName->bScanned = TRUE;
+ pFName->bLoaded = sal_True;
+ pFName->bScanned = sal_True;
}
| '#' NUMBER
{
generated by cgit (git 2.34.1) at 2024-07-10 12:02:30 +0000