summaryrefslogtreecommitdiff
path: root/basic/source/classes
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2011-01-10 14:40:57 +0100
committerMikhail Voytenko <mav@openoffice.org>2011-01-10 14:40:57 +0100
commit642cfe8ac206af4fe82bc695d38b5c7f0edf7dc7 (patch)
treeb5b4029cf2c401a9907f3be73e88c1d0d617bd6d /basic/source/classes
parentf8431bc530cabfe39df3918b994269dded8d7f8c (diff)
removetooltypes01: #i112600# adjust basic and scaddins
Diffstat (limited to 'basic/source/classes')
-rw-r--r--basic/source/classes/disas.cxx72
-rw-r--r--basic/source/classes/eventatt.cxx6
-rw-r--r--basic/source/classes/image.cxx150
-rw-r--r--basic/source/classes/propacc.cxx28
-rw-r--r--basic/source/classes/sb.cxx288
-rw-r--r--basic/source/classes/sbintern.cxx8
-rwxr-xr-xbasic/source/classes/sbunoobj.cxx234
-rwxr-xr-xbasic/source/classes/sbxmod.cxx284
8 files changed, 535 insertions, 535 deletions
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index a837a3dc4f24..37d777cb8da8 100644
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -236,7 +236,7 @@ static const char* _crlf()
}
// This method exists because we want to load the file as own segment
-BOOL SbModule::Disassemble( String& rText )
+sal_Bool SbModule::Disassemble( String& rText )
{
rText.Erase();
if( pImage )
@@ -244,7 +244,7 @@ BOOL SbModule::Disassemble( String& rText )
SbiDisas aDisas( this, pImage );
aDisas.Disas( rText );
}
- return BOOL( rText.Len() != 0 );
+ return sal_Bool( rText.Len() != 0 );
}
SbiDisas::SbiDisas( SbModule* p, const SbiImage* q ) : rImg( *q ), pMod( p )
@@ -278,23 +278,23 @@ SbiDisas::SbiDisas( SbModule* p, const SbiImage* q ) : rImg( *q ), pMod( p )
}
nOff = 0;
// Add the publics
- for( USHORT i = 0; i < pMod->GetMethods()->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMod->GetMethods()->Count(); i++ )
{
SbMethod* pMeth = PTR_CAST(SbMethod,pMod->GetMethods()->Get( i ));
if( pMeth )
{
- USHORT nPos = (USHORT) (pMeth->GetId());
+ sal_uInt16 nPos = (sal_uInt16) (pMeth->GetId());
cLabels[ nPos >> 3 ] |= ( 1 << ( nPos & 7 ) );
}
}
}
// Read current opcode
-BOOL SbiDisas::Fetch()
+sal_Bool SbiDisas::Fetch()
{
nPC = nOff;
if( nOff >= rImg.GetCodeSize() )
- return FALSE;
+ return sal_False;
const unsigned char* p = (const unsigned char*)( rImg.GetCode() + nOff );
eOp = (SbiOpcode) ( *p++ & 0xFF );
if( eOp <= SbOP0_END )
@@ -302,29 +302,29 @@ BOOL SbiDisas::Fetch()
nOp1 = nOp2 = 0;
nParts = 1;
nOff++;
- return TRUE;
+ return sal_True;
}
else if( eOp <= SbOP1_END )
{
nOff += 5;
if( nOff > rImg.GetCodeSize() )
- return FALSE;
+ return sal_False;
nOp1 = *p++; nOp1 |= *p++ << 8; nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
nParts = 2;
- return TRUE;
+ return sal_True;
}
else if( eOp <= SbOP2_END )
{
nOff += 9;
if( nOff > rImg.GetCodeSize() )
- return FALSE;
+ return sal_False;
nOp1 = *p++; nOp1 |= *p++ << 8; nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
nOp2 = *p++; nOp2 |= *p++ << 8; nOp2 |= *p++ << 16; nOp2 |= *p++ << 24;
nParts = 3;
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
void SbiDisas::Disas( SvStream& r )
@@ -351,7 +351,7 @@ void SbiDisas::Disas( String& r )
aText.ConvertLineEnd();
}
-BOOL SbiDisas::DisasLine( String& rText )
+sal_Bool SbiDisas::DisasLine( String& rText )
{
char cBuf[ 100 ];
const char* pMask[] = {
@@ -361,7 +361,7 @@ BOOL SbiDisas::DisasLine( String& rText )
"%08" SAL_PRIXUINT32 " %02X %08X %08X " };
rText.Erase();
if( !Fetch() )
- return FALSE;
+ return sal_False;
#ifdef DBG_TRACE_BASIC
String aTraceStr_STMNT;
@@ -373,8 +373,8 @@ BOOL SbiDisas::DisasLine( String& rText )
// Find line
String aSource = rImg.aOUSource;
nLine = nOp1;
- USHORT n = 0;
- USHORT l = (USHORT)nLine;
+ sal_uInt16 n = 0;
+ sal_uInt16 l = (sal_uInt16)nLine;
while( --l ) {
n = aSource.SearchAscii( "\n", n );
if( n == STRING_NOTFOUND ) break;
@@ -383,16 +383,16 @@ BOOL SbiDisas::DisasLine( String& rText )
// Show position
if( n != STRING_NOTFOUND )
{
- USHORT n2 = aSource.SearchAscii( "\n", n );
+ sal_uInt16 n2 = aSource.SearchAscii( "\n", n );
if( n2 == STRING_NOTFOUND ) n2 = aSource.Len() - n;
String s( aSource.Copy( n, n2 - n + 1 ) );
- BOOL bDone;
+ sal_Bool bDone;
do {
- bDone = TRUE;
+ bDone = sal_True;
n = s.Search( '\r' );
- if( n != STRING_NOTFOUND ) bDone = FALSE, s.Erase( n, 1 );
+ if( n != STRING_NOTFOUND ) bDone = sal_False, s.Erase( n, 1 );
n = s.Search( '\n' );
- if( n != STRING_NOTFOUND ) bDone = FALSE, s.Erase( n, 1 );
+ if( n != STRING_NOTFOUND ) bDone = sal_False, s.Erase( n, 1 );
} while( !bDone );
// snprintf( cBuf, sizeof(cBuf), pMask[ 0 ], nPC );
// rText += cBuf;
@@ -412,7 +412,7 @@ BOOL SbiDisas::DisasLine( String& rText )
{
// Public?
ByteString aByteMethName;
- for( USHORT i = 0; i < pMod->GetMethods()->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMod->GetMethods()->Count(); i++ )
{
SbMethod* pMeth = PTR_CAST(SbMethod,pMod->GetMethods()->Get( i ));
if( pMeth )
@@ -442,7 +442,7 @@ BOOL SbiDisas::DisasLine( String& rText )
rText += ':';
rText.AppendAscii( _crlf() );
}
- snprintf( cBuf, sizeof(cBuf), pMask[ nParts ], nPC, (USHORT) eOp, nOp1, nOp2 );
+ snprintf( cBuf, sizeof(cBuf), pMask[ nParts ], nPC, (sal_uInt16) eOp, nOp1, nOp2 );
String aPCodeStr;
aPCodeStr.AppendAscii( cBuf );
@@ -466,13 +466,13 @@ BOOL SbiDisas::DisasLine( String& rText )
dbg_RegisterTraceTextForPC( pMod, nPC, aTraceStr_STMNT, aPCodeStr );
#endif
- return TRUE;
+ return sal_True;
}
// Read from StringPool
void SbiDisas::StrOp( String& rText )
{
- String aStr = rImg.GetString( (USHORT)nOp1 );
+ String aStr = rImg.GetString( (sal_uInt16)nOp1 );
ByteString aByteString( aStr, RTL_TEXTENCODING_ASCII_US );
const char* p = aByteString.GetBuffer();
if( p )
@@ -484,7 +484,7 @@ void SbiDisas::StrOp( String& rText )
else
{
rText.AppendAscii( "?String? " );
- rText += (USHORT)nOp1;
+ rText += (sal_uInt16)nOp1;
}
}
@@ -538,7 +538,7 @@ void SbiDisas::ResumeOp( String& rText )
}
// print Prompt
-// FALSE/TRUE
+// sal_False/TRUE
void SbiDisas::PromptOp( String& rText )
{
if( nOp1 )
@@ -570,16 +570,16 @@ void SbiDisas::CharOp( String& rText )
rText += '\'';
else
rText.AppendAscii( "char " ),
- rText += (USHORT)nOp1;
+ rText += (sal_uInt16)nOp1;
}
// Print var: String-ID and type
void SbiDisas::VarOp( String& rText )
{
- rText += rImg.GetString( (USHORT)(nOp1 & 0x7FFF) );
+ rText += rImg.GetString( (sal_uInt16)(nOp1 & 0x7FFF) );
rText.AppendAscii( "\t; " );
// The type
- UINT32 n = nOp1;
+ sal_uInt32 n = nOp1;
nOp1 = nOp2;
TypeOp( rText );
if( n & 0x8000 )
@@ -589,7 +589,7 @@ void SbiDisas::VarOp( String& rText )
// Define variable: String-ID and type
void SbiDisas::VarDefOp( String& rText )
{
- rText += rImg.GetString( (USHORT)(nOp1 & 0x7FFF) );
+ rText += rImg.GetString( (sal_uInt16)(nOp1 & 0x7FFF) );
rText.AppendAscii( "\t; " );
// The Typ
nOp1 = nOp2;
@@ -602,7 +602,7 @@ void SbiDisas::OffOp( String& rText )
rText += String::CreateFromInt32( nOp1 & 0x7FFF );
rText.AppendAscii( "\t; " );
// The type
- UINT32 n = nOp1;
+ sal_uInt32 n = nOp1;
nOp1 = nOp2;
TypeOp( rText );
if( n & 0x8000 )
@@ -638,14 +638,14 @@ void SbiDisas::TypeOp( String& rText )
else
{
rText.AppendAscii( "type " );
- rText += (USHORT)nOp1;
+ rText += (sal_uInt16)nOp1;
}
}
#ifdef HP9000
#undef pTypes
#endif
-// TRUE-Label, condition Opcode
+// sal_True-Label, condition Opcode
void SbiDisas::CaseOp( String& rText )
{
LblOp( rText );
@@ -658,8 +658,8 @@ void SbiDisas::StmntOp( String& rText )
{
rText += String::CreateFromInt32( nOp1 );
rText += ',';
- UINT32 nCol = nOp2 & 0xFF;
- UINT32 nFor = nOp2 / 0x100;
+ sal_uInt32 nCol = nOp2 & 0xFF;
+ sal_uInt32 nFor = nOp2 / 0x100;
rText += String::CreateFromInt32( nCol );
rText.AppendAscii( " (For-Level: " );
rText += String::CreateFromInt32( nFor );
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 6c77259ccc7d..8d9f30e4982f 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -298,7 +298,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
if( aName == aLibName )
{
// Search only in the lib, not automatically in application basic
- USHORT nFlags = pBasic->GetFlags();
+ sal_uInt16 nFlags = pBasic->GetFlags();
pBasic->ResetFlag( SBX_GBLSEARCH );
pMethVar = pBasic->Find( aMacro, SbxCLASS_DONTCARE );
pBasic->SetFlags( nFlags );
@@ -328,7 +328,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
{
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
- xArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+ xArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
}
}
@@ -443,7 +443,7 @@ static ::rtl::OUString aDecorationPropName =
static ::rtl::OUString aTitlePropName =
::rtl::OUString::createFromAscii( "Title" );
-void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAscii( "ResourceResolver" );
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 79f49eb8724a..fc6228d1aee9 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -47,8 +47,8 @@ SbiImage::SbiImage()
nLegacyCodeSize =
nDimBase = 0;
bInit =
- bError = FALSE;
- bFirstInit = TRUE;
+ bError = sal_False;
+ bFirstInit = sal_True;
eCharSet = gsl_getSystemTextEncoding();
}
@@ -73,7 +73,7 @@ void SbiImage::Clear()
nCodeSize = 0;
eCharSet = gsl_getSystemTextEncoding();
nDimBase = 0;
- bError = FALSE;
+ bError = sal_False;
}
/**************************************************************************
@@ -82,25 +82,25 @@ void SbiImage::Clear()
*
**************************************************************************/
-BOOL SbiGood( SvStream& r )
+sal_Bool SbiGood( SvStream& r )
{
- return BOOL( !r.IsEof() && r.GetError() == SVSTREAM_OK );
+ return sal_Bool( !r.IsEof() && r.GetError() == SVSTREAM_OK );
}
// Open Record
-ULONG SbiOpenRecord( SvStream& r, UINT16 nSignature, UINT16 nElem )
+sal_uIntPtr SbiOpenRecord( SvStream& r, sal_uInt16 nSignature, sal_uInt16 nElem )
{
- ULONG nPos = r.Tell();
- r << nSignature << (INT32) 0 << nElem;
+ sal_uIntPtr nPos = r.Tell();
+ r << nSignature << (sal_Int32) 0 << nElem;
return nPos;
}
// Close Record
-void SbiCloseRecord( SvStream& r, ULONG nOff )
+void SbiCloseRecord( SvStream& r, sal_uIntPtr nOff )
{
- ULONG nPos = r.Tell();
+ sal_uIntPtr nPos = r.Tell();
r.Seek( nOff + 2 );
- r << (INT32) ( nPos - nOff - 8 );
+ r << (sal_Int32) ( nPos - nOff - 8 );
r.Seek( nPos );
}
@@ -112,40 +112,40 @@ void SbiCloseRecord( SvStream& r, ULONG nOff )
// If the version number does not find, binary parts are omitted, but not
// source, comments and name
-BOOL SbiImage::Load( SvStream& r )
+sal_Bool SbiImage::Load( SvStream& r )
{
- UINT32 nVersion = 0; // Versionsnumber
+ sal_uInt32 nVersion = 0; // Versionsnumber
return Load( r, nVersion );
}
-BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
+sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
{
- UINT16 nSign, nCount;
- UINT32 nLen, nOff;
+ sal_uInt16 nSign, nCount;
+ sal_uInt32 nLen, nOff;
Clear();
// Read Master-Record
r >> nSign >> nLen >> nCount;
- ULONG nLast = r.Tell() + nLen;
- UINT32 nCharSet; // System charset
- UINT32 lDimBase;
- UINT16 nReserved1;
- UINT32 nReserved2;
- UINT32 nReserved3;
- BOOL bBadVer = FALSE;
+ sal_uIntPtr nLast = r.Tell() + nLen;
+ sal_uInt32 nCharSet; // System charset
+ sal_uInt32 lDimBase;
+ sal_uInt16 nReserved1;
+ sal_uInt32 nReserved2;
+ sal_uInt32 nReserved3;
+ sal_Bool bBadVer = sal_False;
if( nSign == B_MODULE )
{
r >> nVersion >> nCharSet >> lDimBase
>> nFlags >> nReserved1 >> nReserved2 >> nReserved3;
eCharSet = (CharSet) nCharSet;
eCharSet = GetSOLoadTextEncoding( eCharSet );
- bBadVer = BOOL( nVersion > B_CURVERSION );
- nDimBase = (USHORT) lDimBase;
+ bBadVer = sal_Bool( nVersion > B_CURVERSION );
+ nDimBase = (sal_uInt16) lDimBase;
}
bool bLegacy = ( nVersion < B_EXT_IMG_VERSION );
- ULONG nNext;
+ sal_uIntPtr nNext;
while( ( nNext = r.Tell() ) < nLast )
{
short i;
@@ -174,7 +174,7 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
#ifdef EXTENDED_BINARY_MODULES
case B_EXTSOURCE:
{
- for( UINT16 j = 0 ; j < nCount ; j++ )
+ for( sal_uInt16 j = 0 ; j < nCount ; j++ )
{
String aTmp;
r.ReadByteString( aTmp, eCharSet );
@@ -191,10 +191,10 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
if ( bLegacy )
{
ReleaseLegacyBuffer(); // release any previously held buffer
- nLegacyCodeSize = (UINT16) nCodeSize;
+ nLegacyCodeSize = (sal_uInt16) nCodeSize;
pLegacyPCode = pCode;
- PCodeBuffConvertor< UINT16, UINT32 > aLegacyToNew( (BYTE*)pLegacyPCode, nLegacyCodeSize );
+ PCodeBuffConvertor< sal_uInt16, sal_uInt32 > aLegacyToNew( (sal_uInt8*)pLegacyPCode, nLegacyCodeSize );
aLegacyToNew.convert();
pCode = (char*)aLegacyToNew.GetBuffer();
nCodeSize = aLegacyToNew.GetSize();
@@ -219,20 +219,20 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
for( i = 0; i < nStrings && SbiGood( r ); i++ )
{
r >> nOff;
- pStringOff[ i ] = (USHORT) nOff;
+ pStringOff[ i ] = (sal_uInt16) nOff;
}
r >> nLen;
if( SbiGood( r ) )
{
delete [] pStrings;
pStrings = new sal_Unicode[ nLen ];
- nStringSize = (USHORT) nLen;
+ nStringSize = (sal_uInt16) nLen;
char* pByteStrings = new char[ nLen ];
r.Read( pByteStrings, nStringSize );
for( short j = 0; j < nStrings; j++ )
{
- USHORT nOff2 = (USHORT) pStringOff[ j ];
+ sal_uInt16 nOff2 = (sal_uInt16) pStringOff[ j ];
String aStr( pByteStrings + nOff2, eCharSet );
memcpy( pStrings + nOff2, aStr.GetBuffer(), (aStr.Len() + 1) * sizeof( sal_Unicode ) );
}
@@ -252,11 +252,11 @@ done:
//if( eCharSet != ::GetSystemCharSet() )
//ConvertStrings();
if( !SbiGood( r ) )
- bError = TRUE;
- return BOOL( !bError );
+ bError = sal_True;
+ return sal_Bool( !bError );
}
-BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
+sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
{
bool bLegacy = ( nVer < B_EXT_IMG_VERSION );
@@ -267,23 +267,23 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
SbiImage aEmptyImg;
aEmptyImg.aName = aName;
aEmptyImg.Save( r, B_LEGACYVERSION );
- return TRUE;
+ return sal_True;
}
// First of all the header
- ULONG nStart = SbiOpenRecord( r, B_MODULE, 1 );
- ULONG nPos;
+ sal_uIntPtr nStart = SbiOpenRecord( r, B_MODULE, 1 );
+ sal_uIntPtr nPos;
eCharSet = GetSOStoreTextEncoding( eCharSet );
if ( bLegacy )
- r << (INT32) B_LEGACYVERSION;
+ r << (sal_Int32) B_LEGACYVERSION;
else
- r << (INT32) B_CURVERSION;
- r << (INT32) eCharSet
- << (INT32) nDimBase
- << (INT16) nFlags
- << (INT16) 0
- << (INT32) 0
- << (INT32) 0;
+ r << (sal_Int32) B_CURVERSION;
+ r << (sal_Int32) eCharSet
+ << (sal_Int32) nDimBase
+ << (sal_Int16) nFlags
+ << (sal_Int16) 0
+ << (sal_Int32) 0
+ << (sal_Int32) 0;
// Name?
if( aName.Len() && SbiGood( r ) )
@@ -320,9 +320,9 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
if( nLen > STRING_MAXLEN )
{
sal_Int32 nRemainingLen = nLen - nMaxUnitSize;
- UINT16 nUnitCount = UINT16( (nRemainingLen + nMaxUnitSize - 1) / nMaxUnitSize );
+ sal_uInt16 nUnitCount = sal_uInt16( (nRemainingLen + nMaxUnitSize - 1) / nMaxUnitSize );
nPos = SbiOpenRecord( r, B_EXTSOURCE, nUnitCount );
- for( UINT16 i = 0 ; i < nUnitCount ; i++ )
+ for( sal_uInt16 i = 0 ; i < nUnitCount ; i++ )
{
sal_Int32 nCopyLen =
(nRemainingLen > nMaxUnitSize) ? nMaxUnitSize : nRemainingLen;
@@ -341,7 +341,7 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
if ( bLegacy )
{
ReleaseLegacyBuffer(); // release any previously held buffer
- PCodeBuffConvertor< UINT32, UINT16 > aNewToLegacy( (BYTE*)pCode, nCodeSize );
+ PCodeBuffConvertor< sal_uInt32, sal_uInt16 > aNewToLegacy( (sal_uInt8*)pCode, nCodeSize );
aNewToLegacy.convert();
pLegacyPCode = (char*)aNewToLegacy.GetBuffer();
nLegacyCodeSize = aNewToLegacy.GetSize();
@@ -356,21 +356,21 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
{
nPos = SbiOpenRecord( r, B_STRINGPOOL, nStrings );
// For every String:
- // UINT32 Offset of the Strings in the Stringblock
+ // sal_uInt32 Offset of the Strings in the Stringblock
short i;
for( i = 0; i < nStrings && SbiGood( r ); i++ )
- r << (UINT32) pStringOff[ i ];
+ r << (sal_uInt32) pStringOff[ i ];
// Then the String-Block
char* pByteStrings = new char[ nStringSize ];
for( i = 0; i < nStrings; i++ )
{
- USHORT nOff = (USHORT) pStringOff[ i ];
+ sal_uInt16 nOff = (sal_uInt16) pStringOff[ i ];
ByteString aStr( pStrings + nOff, eCharSet );
memcpy( pByteStrings + nOff, aStr.GetBuffer(), (aStr.Len() + 1) * sizeof( char ) );
}
- r << (UINT32) nStringSize;
+ r << (sal_uInt32) nStringSize;
r.Write( pByteStrings, nStringSize );
delete[] pByteStrings;
@@ -379,8 +379,8 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
// Set overall length
SbiCloseRecord( r, nStart );
if( !SbiGood( r ) )
- bError = TRUE;
- return BOOL( !bError );
+ bError = sal_True;
+ return sal_Bool( !bError );
}
/**************************************************************************
@@ -396,15 +396,15 @@ void SbiImage::MakeStrings( short nSize )
nStringOff = 0;
nStringSize = 1024;
pStrings = new sal_Unicode[ nStringSize ];
- pStringOff = new UINT32[ nSize ];
+ pStringOff = new sal_uInt32[ nSize ];
if( pStrings && pStringOff )
{
nStrings = nSize;
- memset( pStringOff, 0, nSize * sizeof( UINT32 ) );
+ memset( pStringOff, 0, nSize * sizeof( sal_uInt32 ) );
memset( pStrings, 0, nStringSize * sizeof( sal_Unicode ) );
}
else
- bError = TRUE;
+ bError = sal_True;
}
// Hinzufuegen eines Strings an den StringPool. Der String-Puffer
@@ -414,16 +414,16 @@ void SbiImage::MakeStrings( short nSize )
void SbiImage::AddString( const String& r )
{
if( nStringIdx >= nStrings )
- bError = TRUE;
+ bError = sal_True;
if( !bError )
{
xub_StrLen len = r.Len() + 1;
- UINT32 needed = nStringOff + len;
+ sal_uInt32 needed = nStringOff + len;
if( needed > 0xFFFFFF00L )
- bError = TRUE; // out of mem!
+ bError = sal_True; // out of mem!
else if( needed > nStringSize )
{
- UINT32 nNewLen = needed + 1024;
+ sal_uInt32 nNewLen = needed + 1024;
nNewLen &= 0xFFFFFC00; // trim to 1K border
if( nNewLen > 0xFFFFFF00L )
nNewLen = 0xFFFFFF00L;
@@ -433,10 +433,10 @@ void SbiImage::AddString( const String& r )
memcpy( p, pStrings, nStringSize * sizeof( sal_Unicode ) );
delete[] pStrings;
pStrings = p;
- nStringSize = sal::static_int_cast< UINT16 >(nNewLen);
+ nStringSize = sal::static_int_cast< sal_uInt16 >(nNewLen);
}
else
- bError = TRUE;
+ bError = sal_True;
}
if( !bError )
{
@@ -455,7 +455,7 @@ void SbiImage::AddString( const String& r )
// The block was fetched by the compiler from class SbBuffer and
// is already created with new. Additionally it contains all Integers
// in Big Endian format, so can be directly read/written.
-void SbiImage::AddCode( char* p, UINT32 s )
+void SbiImage::AddCode( char* p, sal_uInt32 s )
{
pCode = p;
nCodeSize = s;
@@ -489,14 +489,14 @@ String SbiImage::GetString( short nId ) const
{
if( nId && nId <= nStrings )
{
- UINT32 nOff = pStringOff[ nId - 1 ];
+ sal_uInt32 nOff = pStringOff[ nId - 1 ];
sal_Unicode* pStr = pStrings + nOff;
// #i42467: Special treatment for vbNullChar
if( *pStr == 0 )
{
- UINT32 nNextOff = (nId < nStrings) ? pStringOff[ nId ] : nStringOff;
- UINT32 nLen = nNextOff - nOff - 1;
+ sal_uInt32 nNextOff = (nId < nStrings) ? pStringOff[ nId ] : nStringOff;
+ sal_uInt32 nLen = nNextOff - nOff - 1;
if( nLen == 1 )
{
// Force length 1 and make char 0 afterwards
@@ -519,14 +519,14 @@ const SbxObject* SbiImage::FindType (String aTypeName) const
return rTypes.Is() ? (SbxObject*)rTypes->Find(aTypeName,SbxCLASS_OBJECT) : NULL;
}
-UINT16 SbiImage::CalcLegacyOffset( INT32 nOffset )
+sal_uInt16 SbiImage::CalcLegacyOffset( sal_Int32 nOffset )
{
- return SbiCodeGen::calcLegacyOffSet( (BYTE*)pCode, nOffset ) ;
+ return SbiCodeGen::calcLegacyOffSet( (sal_uInt8*)pCode, nOffset ) ;
}
-UINT32 SbiImage::CalcNewOffset( INT16 nOffset )
+sal_uInt32 SbiImage::CalcNewOffset( sal_Int16 nOffset )
{
- return SbiCodeGen::calcNewOffSet( (BYTE*)pLegacyPCode, nOffset ) ;
+ return SbiCodeGen::calcNewOffSet( (sal_uInt8*)pLegacyPCode, nOffset ) ;
}
void SbiImage::ReleaseLegacyBuffer()
@@ -536,9 +536,9 @@ void SbiImage::ReleaseLegacyBuffer()
nLegacyCodeSize = 0;
}
-BOOL SbiImage::ExceedsLegacyLimits()
+sal_Bool SbiImage::ExceedsLegacyLimits()
{
if ( ( nStringSize > 0xFF00L ) || ( CalcLegacyOffset( nCodeSize ) > 0xFF00L ) )
- return TRUE;
- return FALSE;
+ return sal_True;
+ return sal_False;
}
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 8c7fa0b273b2..9168ef915770 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -93,7 +93,7 @@ SbPropertyValues::~SbPropertyValues()
{
_xInfo = Reference< XPropertySetInfo >();
- for ( USHORT n = 0; n < _aPropVals.Count(); ++n )
+ for ( sal_uInt16 n = 0; n < _aPropVals.Count(); ++n )
delete _aPropVals.GetObject( n );
}
@@ -112,7 +112,7 @@ Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw(
//-------------------------------------------------------------------------
-INT32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
+sal_Int32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
{
PropertyValue **ppPV;
ppPV = (PropertyValue **)
@@ -133,9 +133,9 @@ void SbPropertyValues::setPropertyValue(
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException)
{
- INT32 nIndex = GetIndex_Impl( aPropertyName );
+ sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
PropertyValue *pPropVal = _aPropVals.GetObject(
- sal::static_int_cast< USHORT >(nIndex));
+ sal::static_int_cast< sal_uInt16 >(nIndex));
pPropVal->Value = aValue;
}
@@ -147,10 +147,10 @@ Any SbPropertyValues::getPropertyValue(
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException)
{
- INT32 nIndex = GetIndex_Impl( aPropertyName );
+ sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
if ( nIndex != USHRT_MAX )
return _aPropVals.GetObject(
- sal::static_int_cast< USHORT >(nIndex))->Value;
+ sal::static_int_cast< sal_uInt16 >(nIndex))->Value;
return Any();
}
@@ -199,7 +199,7 @@ void SbPropertyValues::removeVetoableChangeListener(
Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException)
{
Sequence<PropertyValue> aRet( _aPropVals.Count());
- for ( USHORT n = 0; n < _aPropVals.Count(); ++n )
+ for ( sal_uInt16 n = 0; n < _aPropVals.Count(); ++n )
aRet.getArray()[n] = *_aPropVals.GetObject(n);
return aRet;
}
@@ -231,14 +231,14 @@ PropertySetInfoImpl::PropertySetInfoImpl()
{
}
-INT32 PropertySetInfoImpl::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
+sal_Int32 PropertySetInfoImpl::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
{
Property *pP;
pP = (Property*)
bsearch( &rPropName, _aProps.getConstArray(), _aProps.getLength(),
sizeof( Property ),
SbCompare_UString_Property_Impl );
- return pP ? sal::static_int_cast<INT32>( (pP-_aProps.getConstArray()) / sizeof(pP) ) : -1;
+ return pP ? sal::static_int_cast<sal_Int32>( (pP-_aProps.getConstArray()) / sizeof(pP) ) : -1;
}
Sequence< Property > PropertySetInfoImpl::getProperties(void) throw()
@@ -272,7 +272,7 @@ SbPropertySetInfo::SbPropertySetInfo()
SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals )
{
aImpl._aProps.realloc( rPropVals.Count() );
- for ( USHORT n = 0; n < rPropVals.Count(); ++n )
+ for ( sal_uInt16 n = 0; n < rPropVals.Count(); ++n )
{
Property &rProp = aImpl._aProps.getArray()[n];
const PropertyValue &rPropVal = *rPropVals.GetObject(n);
@@ -302,7 +302,7 @@ Property SbPropertySetInfo::getPropertyByName(const ::rtl::OUString& Name)
return aImpl.getPropertyByName( Name );
}
-BOOL SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
throw( RuntimeException )
{
return aImpl.hasPropertyByName( Name );
@@ -323,7 +323,7 @@ SbPropertyContainer::~SbPropertyContainer()
//----------------------------------------------------------------------------
void SbPropertyContainer::addProperty(const ::rtl::OUString& Name,
- INT16 Attributes,
+ sal_Int16 Attributes,
const Any& DefaultValue)
throw( PropertyExistException, IllegalTypeException,
IllegalArgumentException, RuntimeException )
@@ -353,7 +353,7 @@ Property SbPropertyContainer::getPropertyByName(const ::rtl::OUString& Name)
return aImpl.getPropertyByName( Name );
}
-BOOL SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
throw( RuntimeException )
{
return aImpl.hasPropertyByName( Name );
@@ -375,7 +375,7 @@ void SbPropertyContainer::setPropertyValues(const Sequence< PropertyValue >& Pro
//----------------------------------------------------------------------------
-void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 30e01892fab9..e2f53dd8ed8e 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -119,7 +119,7 @@ SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t )
// Create array for conversion SFX <-> VB error code
struct SFX_VB_ErrorItem
{
- USHORT nErrorVB;
+ sal_uInt16 nErrorVB;
SbError nErrorSFX;
};
@@ -255,7 +255,7 @@ const SFX_VB_ErrorItem __FAR_DATA SFX_VB_ErrorTab[] =
// the Modul-relationshop. But it works only when a modul is loaded.
// Can cause troubles with separately loaded properties!
-SbxBase* SbiFactory::Create( UINT16 nSbxId, UINT32 nCreator )
+SbxBase* SbiFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
{
if( nCreator == SBXCR_SBX )
{
@@ -304,11 +304,11 @@ SbxObject* SbiFactory::CreateObject( const String& rClass )
class SbOLEFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
-SbxBase* SbOLEFactory::Create( UINT16, UINT32 )
+SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 )
{
// Not supported
return NULL;
@@ -329,11 +329,11 @@ SbxObject* SbOLEFactory::CreateObject( const String& rClassName )
class SbFormFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
-SbxBase* SbFormFactory::Create( UINT16, UINT32 )
+SbxBase* SbFormFactory::Create( sal_uInt16, sal_uInt32 )
{
// Not supported
return NULL;
@@ -377,8 +377,8 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
// Copy the properties, not only the reference to them
SbxArray* pProps = pRet->GetProperties();
- UINT32 nCount = pProps->Count32();
- for( UINT32 i = 0 ; i < nCount ; i++ )
+ sal_uInt32 nCount = pProps->Count32();
+ for( sal_uInt32 i = 0 ; i < nCount ; i++ )
{
SbxVariable* pVar = pProps->Get32( i );
SbxProperty* pProp = PTR_CAST( SbxProperty, pVar );
@@ -391,22 +391,22 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
SbxBase* pParObj = pVar->GetObject();
SbxDimArray* pSource = PTR_CAST(SbxDimArray,pParObj);
SbxDimArray* pDest = new SbxDimArray( pVar->GetType() );
- INT32 lb = 0;
- INT32 ub = 0;
+ sal_Int32 lb = 0;
+ sal_Int32 ub = 0;
pDest->setHasFixedSize( pSource->hasFixedSize() );
if ( pSource->GetDims() && pSource->hasFixedSize() )
{
- for ( INT32 j = 1 ; j <= pSource->GetDims(); ++j )
+ for ( sal_Int32 j = 1 ; j <= pSource->GetDims(); ++j )
{
- pSource->GetDim32( (INT32)j, lb, ub );
+ pSource->GetDim32( (sal_Int32)j, lb, ub );
pDest->AddDim32( lb, ub );
}
}
else
pDest->unoAddDim( 0, -1 ); // variant array
- USHORT nSavFlags = pVar->GetFlags();
+ sal_uInt16 nSavFlags = pVar->GetFlags();
pNewProp->ResetFlag( SBX_FIXED );
// need to reset the FIXED flag
// when calling PutObject ( because the type will not match Object )
@@ -432,11 +432,11 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
class SbTypeFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
-SbxBase* SbTypeFactory::Create( UINT16, UINT32 )
+SbxBase* SbTypeFactory::Create( sal_uInt16, sal_uInt32 )
{
// Not supported
return NULL;
@@ -480,8 +480,8 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
// Copy the methods from original class module
SbxArray* pClassMethods = pClassModule->GetMethods();
- UINT32 nMethodCount = pClassMethods->Count32();
- UINT32 i;
+ sal_uInt32 nMethodCount = pClassMethods->Count32();
+ sal_uInt32 i;
for( i = 0 ; i < nMethodCount ; i++ )
{
SbxVariable* pVar = pClassMethods->Get32( i );
@@ -493,7 +493,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
SbMethod* pMethod = PTR_CAST(SbMethod, pVar );
if( pMethod )
{
- USHORT nFlags_ = pMethod->GetFlags();
+ sal_uInt16 nFlags_ = pMethod->GetFlags();
pMethod->SetFlag( SBX_NO_BROADCAST );
SbMethod* pNewMethod = new SbMethod( *pMethod );
pNewMethod->ResetFlag( SBX_NO_BROADCAST );
@@ -501,7 +501,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
pNewMethod->pMod = this;
pNewMethod->SetParent( this );
pMethods->PutDirect( pNewMethod, i );
- StartListening( pNewMethod->GetBroadcaster(), TRUE );
+ StartListening( pNewMethod->GetBroadcaster(), sal_True );
}
}
}
@@ -539,14 +539,14 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
// Copy the properties from original class module
SbxArray* pClassProps = pClassModule->GetProperties();
- UINT32 nPropertyCount = pClassProps->Count32();
+ sal_uInt32 nPropertyCount = pClassProps->Count32();
for( i = 0 ; i < nPropertyCount ; i++ )
{
SbxVariable* pVar = pClassProps->Get32( i );
SbProcedureProperty* pProcedureProp = PTR_CAST( SbProcedureProperty, pVar );
if( pProcedureProp )
{
- USHORT nFlags_ = pProcedureProp->GetFlags();
+ sal_uInt16 nFlags_ = pProcedureProp->GetFlags();
pProcedureProp->SetFlag( SBX_NO_BROADCAST );
SbProcedureProperty* pNewProp = new SbProcedureProperty
( pProcedureProp->GetName(), pProcedureProp->GetType() );
@@ -555,14 +555,14 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
pNewProp->ResetFlag( SBX_NO_BROADCAST ); // except the Broadcast if it was set
pProcedureProp->SetFlags( nFlags_ );
pProps->PutDirect( pNewProp, i );
- StartListening( pNewProp->GetBroadcaster(), TRUE );
+ StartListening( pNewProp->GetBroadcaster(), sal_True );
}
else
{
SbxProperty* pProp = PTR_CAST( SbxProperty, pVar );
if( pProp )
{
- USHORT nFlags_ = pProp->GetFlags();
+ sal_uInt16 nFlags_ = pProp->GetFlags();
pProp->SetFlag( SBX_NO_BROADCAST );
SbxProperty* pNewProp = new SbxProperty( *pProp );
@@ -709,7 +709,7 @@ void SbClassFactory::RemoveClassModule( SbModule* pClassModule )
xClassModules->Remove( pClassModule );
}
-SbxBase* SbClassFactory::Create( UINT16, UINT32 )
+SbxBase* SbClassFactory::Create( sal_uInt16, sal_uInt32 )
{
// Not supported
return NULL;
@@ -737,13 +737,13 @@ SbModule* SbClassFactory::FindClass( const String& rClassName )
typedef std::vector< StarBASIC* > DocBasicVector;
static DocBasicVector GaDocBasics;
-StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic )
+StarBASIC::StarBASIC( StarBASIC* p, sal_Bool bIsDocBasic )
: SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASIC") ) ), bDocBasic( bIsDocBasic )
{
SetParent( p );
pLibInfo = NULL;
- bNoRtl = bBreak = FALSE;
- bVBAEnabled = FALSE;
+ bNoRtl = bBreak = sal_False;
+ bVBAEnabled = sal_False;
pModules = new SbxArray;
if( !GetSbData()->nInst++ )
@@ -765,7 +765,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic )
// Search via StarBasic is always global
SetFlag( SBX_GBLSEARCH );
pVBAGlobals = NULL;
- bQuit = FALSE;
+ bQuit = sal_False;
if( bDocBasic )
GaDocBasics.push_back( this );
@@ -773,7 +773,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic )
// #51727 Override SetModified so that the modified state
// is not given to the parent
-void StarBASIC::SetModified( BOOL b )
+void StarBASIC::SetModified( sal_Bool b )
{
SbxBase::SetModified( b );
}
@@ -835,8 +835,8 @@ StarBASIC::~StarBASIC()
// #100326 Set Parent NULL in registered listeners
if( xUnoListeners.Is() )
{
- USHORT uCount = xUnoListeners->Count();
- for( USHORT i = 0 ; i < uCount ; i++ )
+ sal_uInt16 uCount = xUnoListeners->Count();
+ for( sal_uInt16 i = 0 ; i < uCount ; i++ )
{
SbxVariable* pListenerObj = xUnoListeners->Get( i );
pListenerObj->SetParent( NULL );
@@ -853,7 +853,7 @@ void* StarBASIC::operator new( size_t n )
{
if( n < sizeof( StarBASIC ) )
{
-// DBG_ASSERT( FALSE, "Warnung: inkompatibler BASIC-Stand!" );
+// DBG_ASSERT( sal_False, "Warnung: inkompatibler BASIC-Stand!" );
n = sizeof( StarBASIC );
}
return ::operator new( n );
@@ -868,14 +868,14 @@ void StarBASIC::implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic )
{
if( this != pDeletedBasic )
{
- for( USHORT i = 0; i < pModules->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
{
SbModule* p = (SbModule*)pModules->Get( i );
p->ClearVarsDependingOnDeletedBasic( pDeletedBasic );
}
}
- for( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+ for( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
{
SbxVariable* pVar = pObjs->Get( nObj );
StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -929,7 +929,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo,
p->SetSource32( rSrc );
p->SetParent( this );
pModules->Insert( p, pModules->Count() );
- SetModified( TRUE );
+ SetModified( sal_True );
return p;
}
@@ -939,14 +939,14 @@ void StarBASIC::Insert( SbxVariable* pVar )
{
pModules->Insert( pVar, pModules->Count() );
pVar->SetParent( this );
- StartListening( pVar->GetBroadcaster(), TRUE );
+ StartListening( pVar->GetBroadcaster(), sal_True );
}
else
{
- BOOL bWasModified = IsModified();
+ sal_Bool bWasModified = IsModified();
SbxObject::Insert( pVar );
if( !bWasModified && pVar->IsSet( SBX_DONTSTORE ) )
- SetModified( FALSE );
+ SetModified( sal_False );
}
}
@@ -964,17 +964,17 @@ void StarBASIC::Remove( SbxVariable* pVar )
SbxObject::Remove( pVar );
}
-BOOL StarBASIC::Compile( SbModule* pMod )
+sal_Bool StarBASIC::Compile( SbModule* pMod )
{
- return pMod ? pMod->Compile() : FALSE;
+ return pMod ? pMod->Compile() : sal_False;
}
-BOOL StarBASIC::Disassemble( SbModule* pMod, String& rText )
+sal_Bool StarBASIC::Disassemble( SbModule* pMod, String& rText )
{
rText.Erase();
if( pMod )
pMod->Disassemble( rText );
- return BOOL( rText.Len() != 0 );
+ return sal_Bool( rText.Len() != 0 );
}
void StarBASIC::Clear()
@@ -985,7 +985,7 @@ void StarBASIC::Clear()
SbModule* StarBASIC::FindModule( const String& rName )
{
- for( USHORT i = 0; i < pModules->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
{
SbModule* p = (SbModule*) pModules->Get( i );
if( p->GetName().EqualsIgnoreCaseAscii( rName ) )
@@ -1066,7 +1066,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
::vos::OGuard guard( Application::GetSolarMutex() );
// Init own modules
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
if( !pModule->IsCompiled() )
@@ -1079,7 +1079,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
// Consider required types to init in right order. Class modules
// that are required by other modules have to be initialized first.
ModuleInitDependencyMap aMIDMap;
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
String aModuleName = pModule->GetName();
@@ -1095,7 +1095,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
}
// Call RunInit on standard modules
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
if( !pModule->isProxyModule() )
@@ -1104,7 +1104,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
// Check all objects if they are BASIC,
// if yes initialize
- for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+ for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
{
SbxVariable* pVar = pObjs->Get( nObj );
StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1118,14 +1118,14 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
void StarBASIC::DeInitAllModules( void )
{
// Deinit own modules
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
if( pModule->pImage && !pModule->isProxyModule() && !pModule->ISA(SbObjModule) )
pModule->pImage->bInit = false;
}
- for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+ for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
{
SbxVariable* pVar = pObjs->Get( nObj );
StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1138,13 +1138,13 @@ void StarBASIC::DeInitAllModules( void )
void StarBASIC::ClearGlobalVars( void )
{
SbxArrayRef xProps( GetProperties() );
- USHORT nPropCount = xProps->Count();
- for ( USHORT nProp = 0 ; nProp < nPropCount ; ++nProp )
+ sal_uInt16 nPropCount = xProps->Count();
+ for ( sal_uInt16 nProp = 0 ; nProp < nPropCount ; ++nProp )
{
SbxBase* pVar = xProps->Get( nProp );
pVar->Clear();
}
- SetModified( TRUE );
+ SetModified( sal_True );
}
// This implementation at first searches within the runtime library,
@@ -1175,7 +1175,7 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
}
// Search module
if( !pRes )
- for( USHORT i = 0; i < pModules->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
{
SbModule* p = (SbModule*) pModules->Get( i );
if( p->IsVisible() )
@@ -1192,13 +1192,13 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
}
// Only variables qualified by the Module Name e.g. Sheet1.foo
// should work for Documant && Class type Modules
- INT32 nType = p->GetModuleType();
+ sal_Int32 nType = p->GetModuleType();
if ( nType == ModuleType::DOCUMENT || nType == ModuleType::FORM )
continue;
// otherwise check if the element is available
// unset GBLSEARCH-Flag (due to Rekursion)
- USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
+ sal_uInt16 nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
p->ResetFlag( SBX_GBLSEARCH );
pRes = p->Find( rName, t );
p->SetFlag( nGblFlag );
@@ -1214,9 +1214,9 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
return pRes;
}
-BOOL StarBASIC::Call( const String& rName, SbxArray* pParam )
+sal_Bool StarBASIC::Call( const String& rName, SbxArray* pParam )
{
- BOOL bRes = SbxObject::Call( rName, pParam );
+ sal_Bool bRes = SbxObject::Call( rName, pParam );
if( !bRes )
{
SbxError eErr = SbxBase::GetError();
@@ -1239,7 +1239,7 @@ SbxBase* StarBASIC::FindSBXInCurrentScope( const String& rName )
// Preserve old interface
SbxVariable* StarBASIC::FindVarInCurrentScopy
-( const String& rName, USHORT& rStatus )
+( const String& rName, sal_uInt16& rStatus )
{
rStatus = 1; // Presumption: nothing found
SbxVariable* pVar = NULL;
@@ -1257,7 +1257,7 @@ SbxVariable* StarBASIC::FindVarInCurrentScopy
void StarBASIC::QuitAndExitApplication()
{
Stop();
- bQuit = TRUE;
+ bQuit = sal_True;
}
void StarBASIC::Stop()
@@ -1270,9 +1270,9 @@ void StarBASIC::Stop()
}
}
-BOOL StarBASIC::IsRunning()
+sal_Bool StarBASIC::IsRunning()
{
- return BOOL( pINST != NULL );
+ return sal_Bool( pINST != NULL );
}
/**************************************************************************
@@ -1283,7 +1283,7 @@ BOOL StarBASIC::IsRunning()
// Activation of an object. There is no need to access active objects
// with name via BASIC. If NULL is given, everything is activated.
-void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
+void StarBASIC::ActivateObject( const String* pName, sal_Bool bActivate )
{
if( pName )
{
@@ -1298,7 +1298,7 @@ void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
}
else
{
- for( USHORT i = 0; i < GetObjects()->Count(); i++ )
+ for( sal_uInt16 i = 0; i < GetObjects()->Count(); i++ )
{
SbxObject* p = (SbxObject*) GetObjects()->Get( i );
if( bActivate )
@@ -1315,7 +1315,7 @@ void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
*
**************************************************************************/
-SbMethod* StarBASIC::GetActiveMethod( USHORT nLevel )
+SbMethod* StarBASIC::GetActiveMethod( sal_uInt16 nLevel )
{
if( pINST )
return pINST->GetCaller( nLevel );
@@ -1331,41 +1331,41 @@ SbModule* StarBASIC::GetActiveModule()
return pCMOD;
}
-USHORT StarBASIC::BreakPoint( USHORT l, USHORT c1, USHORT c2 )
+sal_uInt16 StarBASIC::BreakPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
SetErrorData( 0, l, c1, c2 );
- bBreak = TRUE;
+ bBreak = sal_True;
if( GetSbData()->aBreakHdl.IsSet() )
- return (USHORT) GetSbData()->aBreakHdl.Call( this );
+ return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
else
return BreakHdl();
}
-USHORT StarBASIC::StepPoint( USHORT l, USHORT c1, USHORT c2 )
+sal_uInt16 StarBASIC::StepPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
SetErrorData( 0, l, c1, c2 );
- bBreak = FALSE;
+ bBreak = sal_False;
if( GetSbData()->aBreakHdl.IsSet() )
- return (USHORT) GetSbData()->aBreakHdl.Call( this );
+ return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
else
return BreakHdl();
}
-USHORT __EXPORT StarBASIC::BreakHdl()
+sal_uInt16 __EXPORT StarBASIC::BreakHdl()
{
- return (USHORT) ( aBreakHdl.IsSet()
+ return (sal_uInt16) ( aBreakHdl.IsSet()
? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE );
}
// Calls for error handler and break handler
-USHORT StarBASIC::GetLine() { return GetSbData()->nLine; }
-USHORT StarBASIC::GetCol1() { return GetSbData()->nCol1; }
-USHORT StarBASIC::GetCol2() { return GetSbData()->nCol2; }
+sal_uInt16 StarBASIC::GetLine() { return GetSbData()->nLine; }
+sal_uInt16 StarBASIC::GetCol1() { return GetSbData()->nCol1; }
+sal_uInt16 StarBASIC::GetCol2() { return GetSbData()->nCol2; }
// Specific to error handler
SbError StarBASIC::GetErrorCode() { return GetSbData()->nCode; }
const String& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; }
-BOOL StarBASIC::IsCompilerError() { return GetSbData()->bCompiler; }
+sal_Bool StarBASIC::IsCompilerError() { return GetSbData()->bCompiler; }
void StarBASIC::SetGlobalLanguageMode( SbLanguageMode eLanguageMode )
{
GetSbData()->eLanguageMode = eLanguageMode;
@@ -1392,9 +1392,9 @@ SbLanguageMode StarBASIC::GetLanguageMode()
// binaere Suche bei VB-Error -> SFX-Error.
// Neue Fehler-Codes auf alte, Sbx-Kompatible zurueckmappen
-USHORT StarBASIC::GetVBErrorCode( SbError nError )
+sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError )
{
- USHORT nRet = 0;
+ sal_uInt16 nRet = 0;
if( SbiRuntime::isVBAEnabled() )
{
@@ -1419,7 +1419,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
// Suchschleife
const SFX_VB_ErrorItem* pErrItem;
- USHORT nIndex = 0;
+ sal_uInt16 nIndex = 0;
do
{
pErrItem = SFX_VB_ErrorTab + nIndex;
@@ -1434,7 +1434,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
return nRet;
}
-SbError StarBASIC::GetSfxFromVBError( USHORT nError )
+SbError StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
{
SbError nRet = 0L;
@@ -1466,7 +1466,7 @@ SbError StarBASIC::GetSfxFromVBError( USHORT nError )
}
}
const SFX_VB_ErrorItem* pErrItem;
- USHORT nIndex = 0;
+ sal_uInt16 nIndex = 0;
do
{
pErrItem = SFX_VB_ErrorTab + nIndex;
@@ -1486,7 +1486,7 @@ SbError StarBASIC::GetSfxFromVBError( USHORT nError )
// Error- / Break-Daten setzen
void StarBASIC::SetErrorData
-( SbError nCode, USHORT nLine, USHORT nCol1, USHORT nCol2 )
+( SbError nCode, sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 )
{
SbiGlobals& aGlobals = *GetSbData();
aGlobals.nCode = nCode;
@@ -1502,26 +1502,26 @@ struct BasicStringList_Impl : private Resource
{
ResId aResId;
- BasicStringList_Impl( ResId& rErrIdP, USHORT nId)
+ BasicStringList_Impl( ResId& rErrIdP, sal_uInt16 nId)
: Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr() ){}
~BasicStringList_Impl() { FreeResource(); }
String GetString(){ return String( aResId ); }
- BOOL IsErrorTextAvailable( void )
+ sal_Bool IsErrorTextAvailable( void )
{ return IsAvailableRes(aResId.SetRT(RSC_STRING)); }
};
//----------------------------------------------------------------
// #60175 Flag, das bei Basic-Fehlern das Anziehen der SFX-Resourcen verhindert
-static BOOL bStaticSuppressSfxResource = FALSE;
+static sal_Bool bStaticSuppressSfxResource = sal_False;
-void StarBASIC::StaticSuppressSfxResource( BOOL bSuppress )
+void StarBASIC::StaticSuppressSfxResource( sal_Bool bSuppress )
{
bStaticSuppressSfxResource = bSuppress;
}
// Hack for #83750, use bStaticSuppressSfxResource as setup flag
-BOOL runsInSetup( void )
+sal_Bool runsInSetup( void )
{
return bStaticSuppressSfxResource;
}
@@ -1537,11 +1537,11 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
return;
}
- USHORT nOldID = GetVBErrorCode( nId );
+ sal_uInt16 nOldID = GetVBErrorCode( nId );
// Hilfsklasse instanzieren
BasResId aId( RID_BASIC_START );
- BasicStringList_Impl aMyStringList( aId, USHORT(nId & ERRCODE_RES_MASK) );
+ BasicStringList_Impl aMyStringList( aId, sal_uInt16(nId & ERRCODE_RES_MASK) );
if( aMyStringList.IsErrorTextAvailable() )
{
@@ -1549,7 +1549,7 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
String aMsg1 = aMyStringList.GetString();
// Argument-Platzhalter durch %s ersetzen
String aSrgStr( RTL_CONSTASCII_USTRINGPARAM("$(ARG1)") );
- USHORT nResult = aMsg1.Search( aSrgStr );
+ sal_uInt16 nResult = aMsg1.Search( aSrgStr );
if( nResult != STRING_NOTFOUND )
{
@@ -1570,8 +1570,8 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
}
-BOOL StarBASIC::CError
- ( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::CError
+ ( SbError code, const String& rMsg, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
vos::OGuard aSolarGuard( Application::GetSolarMutex() );
@@ -1581,39 +1581,39 @@ BOOL StarBASIC::CError
// #109018 Check if running Basic is affected
StarBASIC* pStartedBasic = pINST->GetBasic();
if( pStartedBasic != this )
- return FALSE;
+ return sal_False;
Stop();
}
// Flag setzen, damit GlobalRunInit den Fehler mitbekommt
- GetSbData()->bGlobalInitErr = TRUE;
+ GetSbData()->bGlobalInitErr = sal_True;
// Fehlertext basteln
MakeErrorText( code, rMsg );
// Umsetzung des Codes fuer String-Transport in SFX-Error
if( rMsg.Len() )
- code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+ code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
SetErrorData( code, l, c1, c2 );
- GetSbData()->bCompiler = TRUE;
- BOOL bRet;
+ GetSbData()->bCompiler = sal_True;
+ sal_Bool bRet;
if( GetSbData()->aErrHdl.IsSet() )
- bRet = (BOOL) GetSbData()->aErrHdl.Call( this );
+ bRet = (sal_Bool) GetSbData()->aErrHdl.Call( this );
else
bRet = ErrorHdl();
- GetSbData()->bCompiler = FALSE; // nur TRUE fuer Error-Handler
+ GetSbData()->bCompiler = sal_False; // nur sal_True fuer Error-Handler
return bRet;
}
-BOOL StarBASIC::RTError
- ( SbError code, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::RTError
+ ( SbError code, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
return RTError( code, String(), l, c1, c2 );
}
-BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::RTError( SbError code, const String& rMsg, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
vos::OGuard aSolarGuard( Application::GetSolarMutex() );
@@ -1635,15 +1635,15 @@ BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1,
aTmp += String::CreateFromInt32( SbxErrObject::getUnoErrObject()->getNumber() );
aTmp += String( RTL_CONSTASCII_USTRINGPARAM("\'\n") );
aTmp += GetSbData()->aErrMsg.Len() ? GetSbData()->aErrMsg : rMsg;
- code = (ULONG)*new StringErrorInfo( code, aTmp );
+ code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
}
else
- code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+ code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
}
SetErrorData( code, l, c1, c2 );
if( GetSbData()->aErrHdl.IsSet() )
- return (BOOL) GetSbData()->aErrHdl.Call( this );
+ return (sal_Bool) GetSbData()->aErrHdl.Call( this );
else
return ErrorHdl();
}
@@ -1688,7 +1688,7 @@ String StarBASIC::GetErrorMsg()
return String();
}
-USHORT StarBASIC::GetErl()
+sal_uInt16 StarBASIC::GetErl()
{
if( pINST )
return pINST->GetErl();
@@ -1696,10 +1696,10 @@ USHORT StarBASIC::GetErl()
return 0;
}
-BOOL __EXPORT StarBASIC::ErrorHdl()
+sal_Bool __EXPORT StarBASIC::ErrorHdl()
{
- return (BOOL) ( aErrorHdl.IsSet()
- ? aErrorHdl.Call( this ) : FALSE );
+ return (sal_Bool) ( aErrorHdl.IsSet()
+ ? aErrorHdl.Call( this ) : sal_False );
}
Link StarBASIC::GetGlobalErrorHdl()
@@ -1737,16 +1737,16 @@ SbxArrayRef StarBASIC::getUnoListeners( void )
*
**************************************************************************/
-BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
+sal_Bool StarBASIC::LoadData( SvStream& r, sal_uInt16 nVer )
{
if( !SbxObject::LoadData( r, nVer ) )
- return FALSE;
+ return sal_False;
// #95459 Delete dialogs, otherwise endless recursion
// in SbxVarable::GetType() if dialogs are accessed
- USHORT nObjCount = pObjs->Count();
+ sal_uInt16 nObjCount = pObjs->Count();
SbxVariable** ppDeleteTab = new SbxVariable*[ nObjCount ];
- USHORT nObj;
+ sal_uInt16 nObj;
for( nObj = 0 ; nObj < nObjCount ; nObj++ )
{
@@ -1762,14 +1762,14 @@ BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
}
delete[] ppDeleteTab;
- UINT16 nMod;
+ sal_uInt16 nMod;
pModules->Clear();
r >> nMod;
- for( USHORT i = 0; i < nMod; i++ )
+ for( sal_uInt16 i = 0; i < nMod; i++ )
{
SbModule* pMod = (SbModule*) SbxBase::Load( r );
if( !pMod )
- return FALSE;
+ return sal_False;
else if( pMod->ISA(SbJScriptModule) )
{
// Ref zuweisen, damit pMod deleted wird
@@ -1792,26 +1792,26 @@ BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
// Suche ueber StarBASIC ist immer global
DBG_ASSERT( IsSet( SBX_GBLSEARCH ), "Basic ohne GBLSEARCH geladen" );
SetFlag( SBX_GBLSEARCH );
- return TRUE;
+ return sal_True;
}
-BOOL StarBASIC::StoreData( SvStream& r ) const
+sal_Bool StarBASIC::StoreData( SvStream& r ) const
{
if( !SbxObject::StoreData( r ) )
- return FALSE;
- r << (UINT16) pModules->Count();
- for( USHORT i = 0; i < pModules->Count(); i++ )
+ return sal_False;
+ r << (sal_uInt16) pModules->Count();
+ for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
{
SbModule* p = (SbModule*) pModules->Get( i );
if( !p->Store( r ) )
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
-BOOL StarBASIC::LoadOldModules( SvStream& )
+sal_Bool StarBASIC::LoadOldModules( SvStream& )
{
- return FALSE;
+ return sal_False;
}
bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
@@ -1884,7 +1884,7 @@ static const char pCountStr[] = "Count";
static const char pAddStr[] = "Add";
static const char pItemStr[] = "Item";
static const char pRemoveStr[] = "Remove";
-static USHORT nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
+static sal_uInt16 nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
SbxInfoRef BasicCollection::xAddInfo = NULL;
SbxInfoRef BasicCollection::xItemInfo = NULL;
@@ -1955,10 +1955,10 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
const SbxHint* p = PTR_CAST(SbxHint,&rHint);
if( p )
{
- ULONG nId = p->GetId();
- BOOL bRead = BOOL( nId == SBX_HINT_DATAWANTED );
- BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
- BOOL bRequestInfo = BOOL( nId == SBX_HINT_INFOWANTED );
+ sal_uIntPtr nId = p->GetId();
+ sal_Bool bRead = sal_Bool( nId == SBX_HINT_DATAWANTED );
+ sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
+ sal_Bool bRequestInfo = sal_Bool( nId == SBX_HINT_INFOWANTED );
SbxVariable* pVar = p->GetVar();
SbxArray* pArg = pVar->GetParameters();
XubString aVarName( pVar->GetName() );
@@ -1993,9 +1993,9 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 );
}
-INT32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
+sal_Int32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
{
- INT32 nIndex = -1;
+ sal_Int32 nIndex = -1;
if( pIndexVar->GetType() == SbxSTRING )
nIndex = implGetIndexForName( pIndexVar->GetString() );
else
@@ -2003,12 +2003,12 @@ INT32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
return nIndex;
}
-INT32 BasicCollection::implGetIndexForName( const String& rName )
+sal_Int32 BasicCollection::implGetIndexForName( const String& rName )
{
- INT32 nIndex = -1;
- INT32 nCount = xItemArray->Count32();
- INT32 nNameHash = MakeHashCode( rName );
- for( INT32 i = 0 ; i < nCount ; i++ )
+ sal_Int32 nIndex = -1;
+ sal_Int32 nCount = xItemArray->Count32();
+ sal_Int32 nNameHash = MakeHashCode( rName );
+ for( sal_Int32 i = 0 ; i < nCount ; i++ )
{
SbxVariable* pVar = xItemArray->Get32( i );
if( pVar->GetHashCode() == nNameHash &&
@@ -2023,7 +2023,7 @@ INT32 BasicCollection::implGetIndexForName( const String& rName )
void BasicCollection::CollAdd( SbxArray* pPar_ )
{
- USHORT nCount = pPar_->Count();
+ sal_uInt16 nCount = pPar_->Count();
if( nCount < 2 || nCount > 5 )
{
SetError( SbxERR_WRONG_ARGS );
@@ -2049,7 +2049,7 @@ void BasicCollection::CollAdd( SbxArray* pPar_ )
return;
}
SbxVariable* pAfter = pPar_->Get(4);
- INT32 nAfterIndex = implGetIndex( pAfter );
+ sal_Int32 nAfterIndex = implGetIndex( pAfter );
if( nAfterIndex == -1 )
{
SetError( SbERR_BAD_ARGUMENT );
@@ -2059,7 +2059,7 @@ void BasicCollection::CollAdd( SbxArray* pPar_ )
}
else // if( nCount == 4 )
{
- INT32 nBeforeIndex = implGetIndex( pBefore );
+ sal_Int32 nBeforeIndex = implGetIndex( pBefore );
if( nBeforeIndex == -1 )
{
SetError( SbERR_BAD_ARGUMENT );
@@ -2108,8 +2108,8 @@ void BasicCollection::CollItem( SbxArray* pPar_ )
}
SbxVariable* pRes = NULL;
SbxVariable* p = pPar_->Get( 1 );
- INT32 nIndex = implGetIndex( p );
- if( nIndex >= 0 && nIndex < (INT32)xItemArray->Count32() )
+ sal_Int32 nIndex = implGetIndex( p );
+ if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() )
pRes = xItemArray->Get32( nIndex );
if( !pRes )
SetError( SbERR_BAD_ARGUMENT );
@@ -2126,8 +2126,8 @@ void BasicCollection::CollRemove( SbxArray* pPar_ )
}
SbxVariable* p = pPar_->Get( 1 );
- INT32 nIndex = implGetIndex( p );
- if( nIndex >= 0 && nIndex < (INT32)xItemArray->Count32() )
+ sal_Int32 nIndex = implGetIndex( p );
+ if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() )
xItemArray->Remove32( nIndex );
else
SetError( SbERR_BAD_ARGUMENT );
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index 55b5f7f371ce..2b1f32e474d5 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -61,13 +61,13 @@ SbiGlobals::SbiGlobals()
nCode = 0;
nLine = 0;
nCol1 = nCol2 = 0;
- bCompiler = FALSE;
- bGlobalInitErr = FALSE;
- bRunInit = FALSE;
+ bCompiler = sal_False;
+ bGlobalInitErr = sal_False;
+ bRunInit = sal_False;
eLanguageMode = SB_LANG_BASIC;
pErrStack = NULL;
pTransliterationWrapper = NULL;
- bBlockCompilerError = FALSE;
+ bBlockCompilerError = sal_False;
pAppBasMgr = NULL;
pMSOMacroRuntimLib = NULL;
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index e176eb9e3654..625f1e00b3df 100755
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -444,7 +444,7 @@ String implGetWrappedMsg( const WrappedTargetException& e )
void implHandleBasicErrorException( BasicErrorException& e )
{
- SbError nError = StarBASIC::GetSfxFromVBError( (USHORT)e.ErrorCode );
+ SbError nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)e.ErrorCode );
StarBASIC::Error( nError, e.ErrorMessageArgument );
}
@@ -471,7 +471,7 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
// special handling for BasicErrorException errors
if ( aWrapped.TargetException >>= aBasicError )
{
- nError = StarBASIC::GetSfxFromVBError( (USHORT)aBasicError.ErrorCode );
+ nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)aBasicError.ErrorCode );
aMessageBuf.append( aBasicError.ErrorMessageArgument );
aExamine.clear();
break;
@@ -637,7 +637,7 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
sal_Int32 nLen = xIdlArray->getLen( aValue );
for ( sal_Int32 index = 0; index < nLen; ++index )
{
- Any aElementAny = xIdlArray->get( aValue, (UINT32)index );
+ Any aElementAny = xIdlArray->get( aValue, (sal_uInt32)index );
// This detects the dimension were currently processing
if ( dimCopy == dimension )
{
@@ -751,7 +751,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
if ( pArray )
{
SbxDimArrayRef xArray = pArray;
- USHORT nFlags = pVar->GetFlags();
+ sal_uInt16 nFlags = pVar->GetFlags();
pVar->ResetFlag( SBX_FIXED );
pVar->PutObject( (SbxDimArray*)xArray );
pVar->SetFlags( nFlags );
@@ -799,9 +799,9 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
sal_Int64 nValue64 = aCurrency.Value;
SbxINT64 aInt64;
aInt64.nHigh =
- sal::static_int_cast< INT32 >(
+ sal::static_int_cast< sal_Int32 >(
nValue64 >> 32);
- aInt64.nLow = (UINT32)( nValue64 & 0xffffffff );
+ aInt64.nLow = (sal_uInt32)( nValue64 & 0xffffffff );
pVar->PutCurrency( aInt64 );
break;
}
@@ -879,7 +879,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
for( i = 0 ; i < nLen ; i++ )
{
// Elemente wandeln
- Any aElementAny = xIdlArray->get( aValue, (UINT32)i );
+ Any aElementAny = xIdlArray->get( aValue, (sal_uInt32)i );
SbxVariableRef xVar = new SbxVariable( eSbxElementType );
unoToSbxValue( (SbxVariable*)xVar, aElementAny );
@@ -893,7 +893,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
}
// Array zurueckliefern
- USHORT nFlags = pVar->GetFlags();
+ sal_uInt16 nFlags = pVar->GetFlags();
pVar->ResetFlag( SBX_FIXED );
pVar->PutObject( (SbxDimArray*)xArray );
pVar->SetFlags( nFlags );
@@ -1033,9 +1033,9 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
// der genommen, sonst wird das ganze als Any-Sequence betrachtet
sal_Bool bNeedsInit = sal_True;
- INT32 nSize = nUpper - nLower + 1;
- INT32 nIdx = nLower;
- for( INT32 i = 0 ; i < nSize ; i++,nIdx++ )
+ sal_Int32 nSize = nUpper - nLower + 1;
+ sal_Int32 nIdx = nLower;
+ for( sal_Int32 i = 0 ; i < nSize ; i++,nIdx++ )
{
SbxVariableRef xVar = pArray->Get32( &nIdx );
Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar );
@@ -1071,10 +1071,10 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
if( eElementTypeClass == TypeClass_VOID || eElementTypeClass == TypeClass_ANY )
{
// For this check the array's dim structure does not matter
- UINT32 nFlatArraySize = pArray->Count32();
+ sal_uInt32 nFlatArraySize = pArray->Count32();
sal_Bool bNeedsInit = sal_True;
- for( UINT32 i = 0 ; i < nFlatArraySize ; i++ )
+ for( sal_uInt32 i = 0 ; i < nFlatArraySize ; i++ )
{
SbxVariableRef xVar = pArray->SbxArray::Get32( i );
Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar );
@@ -1578,13 +1578,13 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
}
// Dbg-Hilfsmethode zum Auslesen der in einem Object implementierten Interfaces
-String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, USHORT nRekLevel )
+String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel )
{
Type aIfaceType = ::getCppuType( (const Reference< XInterface > *)0 );
static Reference< XIdlClass > xIfaceClass = TypeToIdlClass( aIfaceType );
String aRetStr;
- for( USHORT i = 0 ; i < nRekLevel ; i++ )
+ for( sal_uInt16 i = 0 ; i < nRekLevel ; i++ )
aRetStr.AppendAscii( " " );
aRetStr += String( xClass->getName() );
::rtl::OUString aClassName = xClass->getName();
@@ -1603,8 +1603,8 @@ String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference<
// Super-Interfaces holen
Sequence< Reference< XIdlClass > > aSuperClassSeq = xClass->getSuperclasses();
const Reference< XIdlClass >* pClasses = aSuperClassSeq.getConstArray();
- UINT32 nSuperIfaceCount = aSuperClassSeq.getLength();
- for( UINT32 j = 0 ; j < nSuperIfaceCount ; j++ )
+ sal_uInt32 nSuperIfaceCount = aSuperClassSeq.getLength();
+ for( sal_uInt32 j = 0 ; j < nSuperIfaceCount ; j++ )
{
const Reference< XIdlClass >& rxIfaceClass = pClasses[j];
if( !rxIfaceClass->equals( xIfaceClass ) )
@@ -1685,8 +1685,8 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj,
{
Sequence< Type > aTypeSeq = xTypeProvider->getTypes();
const Type* pTypeArray = aTypeSeq.getConstArray();
- UINT32 nIfaceCount = aTypeSeq.getLength();
- for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
+ sal_uInt32 nIfaceCount = aTypeSeq.getLength();
+ for( sal_uInt32 j = 0 ; j < nIfaceCount ; j++ )
{
const Type& rType = pTypeArray[j];
@@ -1764,8 +1764,8 @@ String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj )
// Interfaces der Implementation holen
Sequence< Type > aTypeSeq = xTypeProvider->getTypes();
const Type* pTypeArray = aTypeSeq.getConstArray();
- UINT32 nIfaceCount = aTypeSeq.getLength();
- for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
+ sal_uInt32 nIfaceCount = aTypeSeq.getLength();
+ for( sal_uInt32 j = 0 ; j < nIfaceCount ; j++ )
{
const Type& rType = pTypeArray[j];
@@ -1865,13 +1865,13 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
}
Sequence<Property> props = xAccess->getProperties( PropertyConcept::ALL - PropertyConcept::DANGEROUS );
- UINT32 nUnoPropCount = props.getLength();
+ sal_uInt32 nUnoPropCount = props.getLength();
const Property* pUnoProps = props.getConstArray();
SbxArray* pProps = pUnoObj->GetProperties();
- USHORT nPropCount = pProps->Count();
- USHORT nPropsPerLine = 1 + nPropCount / 30;
- for( USHORT i = 0; i < nPropCount; i++ )
+ sal_uInt16 nPropCount = pProps->Count();
+ sal_uInt16 nPropsPerLine = 1 + nPropCount / 30;
+ for( sal_uInt16 i = 0; i < nPropCount; i++ )
{
SbxVariable* pVar = pProps->Get( i );
if( pVar )
@@ -1884,7 +1884,7 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
// Ist es in Uno eine Sequence?
SbxDataType eType = pVar->GetFullType();
- BOOL bMaybeVoid = FALSE;
+ sal_Bool bMaybeVoid = sal_False;
if( i < nUnoPropCount )
{
const Property& rProp = pUnoProps[ i ];
@@ -1894,7 +1894,7 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
if( rProp.Attributes & PropertyAttribute::MAYBEVOID )
{
eType = unoToSbxType( rProp.Type.getTypeClass() );
- bMaybeVoid = TRUE;
+ bMaybeVoid = sal_True;
}
if( eType == SbxOBJECT )
{
@@ -1945,14 +1945,14 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj )
const Reference< XIdlMethod >* pUnoMethods = methods.getConstArray();
SbxArray* pMethods = pUnoObj->GetMethods();
- USHORT nMethodCount = pMethods->Count();
+ sal_uInt16 nMethodCount = pMethods->Count();
if( !nMethodCount )
{
aRet.AppendAscii( "\nNo methods found\n" );
return aRet;
}
- USHORT nPropsPerLine = 1 + nMethodCount / 30;
- for( USHORT i = 0; i < nMethodCount; i++ )
+ sal_uInt16 nPropsPerLine = 1 + nMethodCount / 30;
+ for( sal_uInt16 i = 0; i < nMethodCount; i++ )
{
SbxVariable* pVar = pMethods->Get( i );
if( pVar )
@@ -1980,12 +1980,12 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj )
// get-Methode darf keinen Parameter haben
Sequence< Reference< XIdlClass > > aParamsSeq = rxMethod->getParameterTypes();
- UINT32 nParamCount = aParamsSeq.getLength();
+ sal_uInt32 nParamCount = aParamsSeq.getLength();
const Reference< XIdlClass >* pParams = aParamsSeq.getConstArray();
if( nParamCount > 0 )
{
- for( USHORT j = 0; j < nParamCount; j++ )
+ for( sal_uInt16 j = 0; j < nParamCount; j++ )
{
String aTypeStr = Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) );
aPropStr += aTypeStr;
@@ -2032,7 +2032,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if( pHint->GetId() == SBX_HINT_DATAWANTED )
{
// Test-Properties
- INT32 nId = pProp->nId;
+ sal_Int32 nId = pProp->nId;
if( nId < 0 )
{
// Id == -1: Implementierte Interfaces gemaess ClassProvider anzeigen
@@ -2143,18 +2143,18 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if( pHint->GetId() == SBX_HINT_DATAWANTED )
{
// Anzahl Parameter -1 wegen Param0 == this
- UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+ sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
Sequence<Any> args;
- BOOL bOutParams = FALSE;
- UINT32 i;
+ sal_Bool bOutParams = sal_False;
+ sal_uInt32 i;
if( !bInvocation && mxUnoAccess.is() )
{
// Infos holen
const Sequence<ParamInfo>& rInfoSeq = pMeth->getParamInfos();
const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
- UINT32 nUnoParamCount = rInfoSeq.getLength();
- UINT32 nAllocParamCount = nParamCount;
+ sal_uInt32 nUnoParamCount = rInfoSeq.getLength();
+ sal_uInt32 nAllocParamCount = nParamCount;
// Ueberschuessige Parameter ignorieren, Alternative: Error schmeissen
if( nParamCount > nUnoParamCount )
@@ -2197,14 +2197,14 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
com::sun::star::uno::Type aType( rxClass->getTypeClass(), rxClass->getName() );
// ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
- pAnyArgs[i] = sbxToUnoValue( pParams->Get( (USHORT)(i+1) ), aType );
+ pAnyArgs[i] = sbxToUnoValue( pParams->Get( (sal_uInt16)(i+1) ), aType );
// Wenn es nicht schon feststeht pruefen, ob Out-Parameter vorliegen
if( !bOutParams )
{
ParamMode aParamMode = rInfo.aMode;
if( aParamMode != ParamMode_IN )
- bOutParams = TRUE;
+ bOutParams = sal_True;
}
}
}
@@ -2229,7 +2229,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
Any aValAny;
for( i = 0 ; i < nParamCount ; i++ )
{
- USHORT iSbx = (USHORT)(i+1);
+ sal_uInt16 iSbx = (sal_uInt16)(i+1);
// ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
aValAny = sbxToUnoValueImpl( pParams->Get( iSbx ),
@@ -2254,14 +2254,14 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
for( i = 0 ; i < nParamCount ; i++ )
{
// ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
- pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (USHORT)(i+1) ),
+ pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (sal_uInt16)(i+1) ),
bBlockConversionToSmallestType );
}
}
}
// Methode callen
- GetSbData()->bBlockCompilerError = TRUE; // #106433 Block compiler errors for API calls
+ GetSbData()->bBlockCompilerError = sal_True; // #106433 Block compiler errors for API calls
try
{
if( !bInvocation && mxUnoAccess.is() )
@@ -2280,13 +2280,13 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const Sequence<ParamInfo>& rInfoSeq = pMeth->getParamInfos();
const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
- UINT32 j;
+ sal_uInt32 j;
for( j = 0 ; j < nParamCount ; j++ )
{
const ParamInfo& rInfo = pParamInfos[j];
ParamMode aParamMode = rInfo.aMode;
if( aParamMode != ParamMode_IN )
- unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pAnyArgs[ j ] );
+ unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pAnyArgs[ j ] );
}
}
}
@@ -2301,21 +2301,21 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
aRetAny = xDirectInvoke->directInvoke( pMeth->GetName(), args );
else
{
- Sequence< INT16 > OutParamIndex;
+ Sequence< sal_Int16 > OutParamIndex;
Sequence< Any > OutParam;
aRetAny = mxInvocation->invoke( pMeth->GetName(), args, OutParamIndex, OutParam );
- const INT16* pIndices = OutParamIndex.getConstArray();
- UINT32 nLen = OutParamIndex.getLength();
+ const sal_Int16* pIndices = OutParamIndex.getConstArray();
+ sal_uInt32 nLen = OutParamIndex.getLength();
if( nLen )
{
const Any* pNewValues = OutParam.getConstArray();
- for( UINT32 j = 0 ; j < nLen ; j++ )
+ for( sal_uInt32 j = 0 ; j < nLen ; j++ )
{
- INT16 iTarget = pIndices[ j ];
- if( iTarget >= (INT16)nParamCount )
+ sal_Int16 iTarget = pIndices[ j ];
+ if( iTarget >= (sal_Int16)nParamCount )
break;
- unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
+ unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pNewValues[ j ] );
}
}
}
@@ -2333,7 +2333,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
implHandleAnyException( ::cppu::getCaughtException() );
}
- GetSbData()->bBlockCompilerError = FALSE; // #106433 Unblock compiler errors
+ GetSbData()->bBlockCompilerError = sal_False; // #106433 Unblock compiler errors
}
}
else
@@ -2349,8 +2349,8 @@ Reference< XInvocation > createDynamicInvocationFor( const Any& aAny );
SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
: SbxObject( aName_ )
- , bNeedIntrospection( TRUE )
- , bNativeCOMObject( FALSE )
+ , bNeedIntrospection( sal_True )
+ , bNativeCOMObject( sal_False )
{
static Reference< XIntrospection > xIntrospection;
@@ -2393,7 +2393,7 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
// Rest bezieht sich nur auf Introspection
if( !xTypeProvider.is() )
{
- bNeedIntrospection = FALSE;
+ bNeedIntrospection = sal_False;
return;
}
@@ -2401,34 +2401,34 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
// hiding of equally named COM symbols, e.g. XInvocation::getValue
Reference< oleautomation::XAutomationObject > xAutomationObject( aUnoObj_, UNO_QUERY );
if( xAutomationObject.is() )
- bNativeCOMObject = TRUE;
+ bNativeCOMObject = sal_True;
}
maTmpUnoObj = aUnoObj_;
//*** Namen bestimmen ***
- BOOL bFatalError = TRUE;
+ sal_Bool bFatalError = sal_True;
// Ist es ein Interface oder eine struct?
- BOOL bSetClassName = FALSE;
+ sal_Bool bSetClassName = sal_False;
String aClassName_;
if( eType == TypeClass_STRUCT || eType == TypeClass_EXCEPTION )
{
// Struct ist Ok
- bFatalError = FALSE;
+ bFatalError = sal_False;
// #67173 Echten Klassen-Namen eintragen
if( aName_.Len() == 0 )
{
aClassName_ = String( aUnoObj_.getValueType().getTypeName() );
- bSetClassName = TRUE;
+ bSetClassName = sal_True;
}
}
else if( eType == TypeClass_INTERFACE )
{
// #70197 Interface geht immer durch Typ im Any
- bFatalError = FALSE;
+ bFatalError = sal_False;
// Nach XIdlClassProvider-Interface fragen
Reference< XIdlClassProvider > xClassProvider( x, UNO_QUERY );
@@ -2438,14 +2438,14 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
if( aName_.Len() == 0 )
{
Sequence< Reference< XIdlClass > > szClasses = xClassProvider->getIdlClasses();
- UINT32 nLen = szClasses.getLength();
+ sal_uInt32 nLen = szClasses.getLength();
if( nLen )
{
const Reference< XIdlClass > xImplClass = szClasses.getConstArray()[ 0 ];
if( xImplClass.is() )
{
aClassName_ = String( xImplClass->getName() );
- bSetClassName = TRUE;
+ bSetClassName = sal_True;
}
}
}
@@ -2476,7 +2476,7 @@ void SbUnoObject::doIntrospection( void )
if( !bNeedIntrospection )
return;
- bNeedIntrospection = FALSE;
+ bNeedIntrospection = sal_False;
if( !xIntrospection.is() )
{
@@ -2623,16 +2623,16 @@ SbxInfo* SbUnoMethod::GetInfo()
const Sequence<ParamInfo>& rInfoSeq = getParamInfos();
const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
- UINT32 nParamCount = rInfoSeq.getLength();
+ sal_uInt32 nParamCount = rInfoSeq.getLength();
- for( UINT32 i = 0 ; i < nParamCount ; i++ )
+ for( sal_uInt32 i = 0 ; i < nParamCount ; i++ )
{
const ParamInfo& rInfo = pParamInfos[i];
::rtl::OUString aParamName = rInfo.aName;
// const Reference< XIdlClass >& rxClass = rInfo.aType;
SbxDataType t = SbxVARIANT;
- USHORT nFlags_ = SBX_READ;
+ sal_uInt16 nFlags_ = SBX_READ;
pInfo->AddParam( aParamName, t, nFlags_ );
}
}
@@ -2655,7 +2655,7 @@ SbUnoProperty::SbUnoProperty
const String& aName_,
SbxDataType eSbxType,
const Property& aUnoProp_,
- INT32 nId_,
+ sal_Int32 nId_,
bool bInvocation
)
: SbxProperty( aName_, eSbxType )
@@ -2871,10 +2871,10 @@ void SbUnoObject::implCreateAll( void )
// Properties anlegen
Sequence<Property> props = xAccess->getProperties( PropertyConcept::ALL - PropertyConcept::DANGEROUS );
- UINT32 nPropCount = props.getLength();
+ sal_uInt32 nPropCount = props.getLength();
const Property* pProps_ = props.getConstArray();
- UINT32 i;
+ sal_uInt32 i;
for( i = 0 ; i < nPropCount ; i++ )
{
const Property& rProp = pProps_[ i ];
@@ -2897,7 +2897,7 @@ void SbUnoObject::implCreateAll( void )
// Methoden anlegen
Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods
( MethodConcept::ALL - MethodConcept::DANGEROUS );
- UINT32 nMethCount = aMethodSeq.getLength();
+ sal_uInt32 nMethCount = aMethodSeq.getLength();
const Reference< XIdlMethod >* pMethods_ = aMethodSeq.getConstArray();
for( i = 0 ; i < nMethCount ; i++ )
{
@@ -2957,7 +2957,7 @@ SbUnoObject* Impl_CreateUnoStruct( const String& aClassName )
// Factory-Klasse fuer das Anlegen von Uno-Structs per DIM AS NEW
-SbxBase* SbUnoFactory::Create( UINT16, UINT32 )
+SbxBase* SbUnoFactory::Create( sal_uInt16, sal_uInt32 )
{
// Ueber SbxId laeuft in Uno nix
return NULL;
@@ -2990,7 +2990,7 @@ void createAllObjectProperties( SbxObject* pObj )
}
-void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3015,7 +3015,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
refVar->PutObject( (SbUnoObject*)xUnoObj );
}
-void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3069,7 +3069,7 @@ void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
}
}
-void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3127,7 +3127,7 @@ void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar,
}
}
-void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3151,13 +3151,13 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL
}
}
-void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
// Wir brauchen mindestens 2 Parameter
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3166,7 +3166,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
// Variable fuer Rueckgabewert
SbxVariableRef refVar = rPar.Get(0);
- refVar->PutBool( FALSE );
+ refVar->PutBool( sal_False );
// Uno-Objekt holen
SbxBaseRef pObj = (SbxBase*)rPar.Get( 1 )->GetObject();
@@ -3185,7 +3185,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
if( !xCoreReflection.is() )
return;
- for( USHORT i = 2 ; i < nParCount ; i++ )
+ for( sal_uInt16 i = 2 ; i < nParCount ; i++ )
{
// Interface-Name der struct holen
String aIfaceName = rPar.Get( i )->GetString();
@@ -3202,11 +3202,11 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
return;
}
- // Alles hat geklappt, dann TRUE liefern
- refVar->PutBool( TRUE );
+ // Alles hat geklappt, dann sal_True liefern
+ refVar->PutBool( sal_True );
}
-void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3220,7 +3220,7 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
// Variable fuer Rueckgabewert
SbxVariableRef refVar = rPar.Get(0);
- refVar->PutBool( FALSE );
+ refVar->PutBool( sal_False );
// Uno-Objekt holen
SbxVariableRef xParam = rPar.Get( 1 );
@@ -3232,11 +3232,11 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
Any aAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
TypeClass eType = aAny.getValueType().getTypeClass();
if( eType == TypeClass_STRUCT )
- refVar->PutBool( TRUE );
+ refVar->PutBool( sal_True );
}
-void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3249,7 +3249,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
// Variable fuer Rueckgabewert
SbxVariableRef refVar = rPar.Get(0);
- refVar->PutBool( FALSE );
+ refVar->PutBool( sal_False );
// Uno-Objekte holen
SbxVariableRef xParam1 = rPar.Get( 1 );
@@ -3281,7 +3281,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
//XInterfaceRef x2 = *(XInterfaceRef*)aAny2.get();
if( x1 == x2 )
- refVar->PutBool( TRUE );
+ refVar->PutBool( sal_True );
}
typedef std::hash_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash;
@@ -3511,7 +3511,7 @@ SbxVariable* SbUnoClass::Find( const XubString& rName, SbxClassType t )
// Uns selbst gleich wieder als Listener rausnehmen,
// die Werte sind alle konstant
if( pRes->IsBroadcaster() )
- EndListening( pRes->GetBroadcaster(), TRUE );
+ EndListening( pRes->GetBroadcaster(), sal_True );
}
}
return pRes;
@@ -3595,14 +3595,14 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if( pUnoCtor && pHint->GetId() == SBX_HINT_DATAWANTED )
{
// Parameter count -1 because of Param0 == this
- UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+ sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
Sequence<Any> args;
- BOOL bOutParams = FALSE;
+ sal_Bool bOutParams = sal_False;
Reference< XServiceConstructorDescription > xCtor = pUnoCtor->getServiceCtorDesc();
Sequence< Reference< XParameter > > aParameterSeq = xCtor->getParameters();
const Reference< XParameter >* pParameterSeq = aParameterSeq.getConstArray();
- UINT32 nUnoParamCount = aParameterSeq.getLength();
+ sal_uInt32 nUnoParamCount = aParameterSeq.getLength();
// Default: Ignore not needed parameters
bool bParameterError = false;
@@ -3620,8 +3620,8 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
// Too many parameters with context as first parameter?
- USHORT nSbxParameterOffset = 1;
- USHORT nParameterOffsetByContext = 0;
+ sal_uInt16 nSbxParameterOffset = 1;
+ sal_uInt16 nParameterOffsetByContext = 0;
Reference < XComponentContext > xFirstParamContext;
if( nParamCount > nUnoParamCount )
{
@@ -3632,8 +3632,8 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
nParameterOffsetByContext = 1;
}
- UINT32 nEffectiveParamCount = nParamCount - nParameterOffsetByContext;
- UINT32 nAllocParamCount = nEffectiveParamCount;
+ sal_uInt32 nEffectiveParamCount = nParamCount - nParameterOffsetByContext;
+ sal_uInt32 nAllocParamCount = nEffectiveParamCount;
if( nEffectiveParamCount > nUnoParamCount )
{
if( !bRestParameterMode )
@@ -3660,9 +3660,9 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
args.realloc( nAllocParamCount );
Any* pAnyArgs = args.getArray();
- for( UINT32 i = 0 ; i < nEffectiveParamCount ; i++ )
+ for( sal_uInt32 i = 0 ; i < nEffectiveParamCount ; i++ )
{
- USHORT iSbx = (USHORT)(i + nSbxParameterOffset + nParameterOffsetByContext);
+ sal_uInt16 iSbx = (sal_uInt16)(i + nSbxParameterOffset + nParameterOffsetByContext);
// bRestParameterMode allows nEffectiveParamCount > nUnoParamCount
Reference< XParameter > xParam;
@@ -3684,7 +3684,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if( !bOutParams )
{
if( xParam->isOut() )
- bOutParams = TRUE;
+ bOutParams = sal_True;
}
}
else
@@ -3729,14 +3729,14 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
const Any* pAnyArgs = args.getConstArray();
- for( UINT32 j = 0 ; j < nUnoParamCount ; j++ )
+ for( sal_uInt32 j = 0 ; j < nUnoParamCount ; j++ )
{
Reference< XParameter > xParam = pParameterSeq[j];
if( !xParam.is() )
continue;
if( xParam->isOut() )
- unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pAnyArgs[ j ] );
+ unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pAnyArgs[ j ] );
}
}
}
@@ -3821,8 +3821,8 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pParams = pVar->GetParameters();
- UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
- UINT32 nAllowedParamCount = 1;
+ sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
+ sal_uInt32 nAllowedParamCount = 1;
Reference < XComponentContext > xContextToUse;
if( nParamCount > 0 )
@@ -3881,7 +3881,7 @@ public:
~BasicAllListener_Impl();
// Methoden von XInterface
- //virtual BOOL queryInterface( Uik aUik, Reference< XInterface > & rOut );
+ //virtual sal_Bool queryInterface( Uik aUik, Reference< XInterface > & rOut );
// Methoden von XAllListener
virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException );
@@ -3927,13 +3927,13 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
// In Basic Array anlegen
SbxArrayRef xSbxArray = new SbxArray( SbxVARIANT );
const Any * pArgs = Event.Arguments.getConstArray();
- INT32 nCount = Event.Arguments.getLength();
- for( INT32 i = 0; i < nCount; i++ )
+ sal_Int32 nCount = Event.Arguments.getLength();
+ for( sal_Int32 i = 0; i < nCount; i++ )
{
// Elemente wandeln
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
- xSbxArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+ xSbxArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
}
pLib->Call( aMethodName, xSbxArray );
@@ -3945,7 +3945,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
if( pVar )
{
// #95792 Avoid a second call
- USHORT nFlags = pVar->GetFlags();
+ sal_uInt16 nFlags = pVar->GetFlags();
pVar->SetFlag( SBX_NO_BROADCAST );
*pRet = sbxToUnoValueImpl( pVar );
pVar->SetFlags( nFlags );
@@ -4140,7 +4140,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const ::rtl::OUStri
// Uno-Service erzeugen
// 1. Parameter == Prefix-Name der Makros
// 2. Parameter == voll qualifizierter Name des Listeners
-void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
//RTLFUNC(CreateUnoListener)
{
(void)bWrite;
@@ -4204,7 +4204,7 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
//========================================================================
// Represents the DefaultContext property of the ProcessServiceManager
// in the Basic runtime system.
-void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -4232,7 +4232,7 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite
//========================================================================
// Creates a Basic wrapper object for a strongly typed Uno value
// 1. parameter: Uno type as full qualified type name, e.g. "byte[]"
-void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -4489,7 +4489,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
{
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
- xArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+ xArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
}
}
@@ -4627,8 +4627,8 @@ void disposeComVariablesForBasic( StarBASIC* pBasic )
StarBasicDisposeItem* pItem = *it;
SbxArray* pArray = pItem->m_pRegisteredVariables;
- USHORT nCount = pArray->Count();
- for( USHORT i = 0 ; i < nCount ; ++i )
+ sal_uInt16 nCount = pArray->Count();
+ for( sal_uInt16 i = 0 ; i < nCount ; ++i )
{
SbxVariable* pVar = pArray->Get( i );
pVar->ClearComListener();
@@ -4673,8 +4673,8 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
bool bSuccess = false;
SbxArray* pModIfaces = pClassData->mxIfaces;
- USHORT nCount = pModIfaces->Count();
- for( USHORT i = 0 ; i < nCount ; ++i )
+ sal_uInt16 nCount = pModIfaces->Count();
+ for( sal_uInt16 i = 0 ; i < nCount ; ++i )
{
SbxVariable* pVar = pModIfaces->Get( i );
::rtl::OUString aIfaceName = pVar->GetName();
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 0f807db7cf8f..a268568a410d 100755
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -265,7 +265,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
if ( pInfo )
{
sal_Int32 nSbxOptional = 0;
- USHORT n = 1;
+ sal_uInt16 n = 1;
for ( const SbxParamInfo* pParamInfo = pInfo->GetParam( n ); pParamInfo; pParamInfo = pInfo->GetParam( ++n ) )
{
if ( ( pParamInfo->nFlags & SBX_OPTIONAL ) != 0 )
@@ -289,7 +289,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
{
SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), pParams[i] );
- xSbxParams->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+ xSbxParams->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
// Enable passing by ref
if ( xSbxVar->GetType() != SbxVARIANT )
@@ -312,7 +312,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
if ( pInfo_ )
{
OutParamMap aOutParamMap;
- for ( USHORT n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
+ for ( sal_uInt16 n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
{
const SbxParamInfo* pParamInfo = pInfo_->GetParam( n );
if ( pParamInfo && ( pParamInfo->eType & SbxBYREF ) != 0 )
@@ -410,7 +410,7 @@ SbMethodRef DocObjectWrapper::getMethod( const rtl::OUString& aName ) throw (Run
SbMethodRef pMethod = NULL;
if ( m_pMod )
{
- USHORT nSaveFlgs = m_pMod->GetFlags();
+ sal_uInt16 nSaveFlgs = m_pMod->GetFlags();
// Limit search to this module
m_pMod->ResetFlag( SBX_GBLSEARCH );
pMethod = (SbMethod*) m_pMod->SbModule::Find( aName, SbxCLASS_METHOD );
@@ -425,7 +425,7 @@ SbPropertyRef DocObjectWrapper::getProperty( const rtl::OUString& aName ) throw
SbPropertyRef pProperty = NULL;
if ( m_pMod )
{
- USHORT nSaveFlgs = m_pMod->GetFlags();
+ sal_uInt16 nSaveFlgs = m_pMod->GetFlags();
// Limit search to this module.
m_pMod->ResetFlag( SBX_GBLSEARCH );
pProperty = (SbProperty*)m_pMod->SbModule::Find( aName, SbxCLASS_PROPERTY );
@@ -521,7 +521,7 @@ bool VBAUnlockControllers( StarBASIC* pBasic )
// Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
// Elemente von anderen Modulen aus gefunden werden koennen.
-SbModule::SbModule( const String& rName, BOOL bVBACompat )
+SbModule::SbModule( const String& rName, sal_Bool bVBACompat )
: SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASICModule") ) ),
pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( bVBACompat ), pDocObject( NULL ), bIsProxyModule( false )
{
@@ -557,9 +557,9 @@ SbModule::GetUnoModule()
return mxWrapper;
}
-BOOL SbModule::IsCompiled() const
+sal_Bool SbModule::IsCompiled() const
{
- return BOOL( pImage != 0 );
+ return sal_Bool( pImage != 0 );
}
const SbxObject* SbModule::FindType( String aTypeName ) const
@@ -578,12 +578,12 @@ void SbModule::StartDefinitions()
// Methoden und Properties bleiben erhalten, sind jedoch ungueltig
// schliesslich sind ja u.U. die Infos belegt
- USHORT i;
+ sal_uInt16 i;
for( i = 0; i < pMethods->Count(); i++ )
{
SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
if( p )
- p->bInvalid = TRUE;
+ p->bInvalid = sal_True;
}
for( i = 0; i < pProps->Count(); )
{
@@ -609,11 +609,11 @@ SbMethod* SbModule::GetMethod( const String& rName, SbxDataType t )
pMeth->SetParent( this );
pMeth->SetFlags( SBX_READ );
pMethods->Put( pMeth, pMethods->Count() );
- StartListening( pMeth->GetBroadcaster(), TRUE );
+ StartListening( pMeth->GetBroadcaster(), sal_True );
}
// Per Default ist die Methode GUELTIG, da sie auch vom Compiler
// (Codegenerator) erzeugt werden kann
- pMeth->bInvalid = FALSE;
+ pMeth->bInvalid = sal_False;
pMeth->ResetFlag( SBX_FIXED );
pMeth->SetFlag( SBX_WRITE );
pMeth->SetType( t );
@@ -637,7 +637,7 @@ SbProperty* SbModule::GetProperty( const String& rName, SbxDataType t )
pProp->SetFlag( SBX_READWRITE );
pProp->SetParent( this );
pProps->Put( pProp, pProps->Count() );
- StartListening( pProp->GetBroadcaster(), TRUE );
+ StartListening( pProp->GetBroadcaster(), sal_True );
}
return pProp;
}
@@ -655,7 +655,7 @@ SbProcedureProperty* SbModule::GetProcedureProperty
pProp->SetFlag( SBX_READWRITE );
pProp->SetParent( this );
pProps->Put( pProp, pProps->Count() );
- StartListening( pProp->GetBroadcaster(), TRUE );
+ StartListening( pProp->GetBroadcaster(), sal_True );
}
return pProp;
}
@@ -674,7 +674,7 @@ SbIfaceMapperMethod* SbModule::GetIfaceMapperMethod
pMapperMethod->SetFlags( SBX_READ );
pMethods->Put( pMapperMethod, pMethods->Count() );
}
- pMapperMethod->bInvalid = FALSE;
+ pMapperMethod->bInvalid = sal_False;
return pMapperMethod;
}
@@ -687,9 +687,9 @@ TYPEINIT1(SbIfaceMapperMethod,SbMethod)
// Aus dem Codegenerator: Ungueltige Eintraege entfernen
-void SbModule::EndDefinitions( BOOL bNewState )
+void SbModule::EndDefinitions( sal_Bool bNewState )
{
- for( USHORT i = 0; i < pMethods->Count(); )
+ for( sal_uInt16 i = 0; i < pMethods->Count(); )
{
SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
if( p )
@@ -705,7 +705,7 @@ void SbModule::EndDefinitions( BOOL bNewState )
else
i++;
}
- SetModified( TRUE );
+ SetModified( sal_True );
}
void SbModule::Clear()
@@ -812,7 +812,7 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
// side effects when using name as variable implicitely
bool bForwardToSbxObject = true;
- ULONG nId = pHint->GetId();
+ sal_uIntPtr nId = pHint->GetId();
if( (nId == SBX_HINT_DATAWANTED || nId == SBX_HINT_DATACHANGED) &&
pVar->GetName().EqualsIgnoreCaseAscii( "name" ) )
bForwardToSbxObject = false;
@@ -869,7 +869,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
aTok.SetCompatible( true );
else if ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) )
{
- BOOL bIsVBA = ( aTok.GetDbl()== 1 );
+ sal_Bool bIsVBA = ( aTok.GetDbl()== 1 );
SetVBACompat( bIsVBA );
aTok.SetCompatible( bIsVBA );
}
@@ -881,7 +881,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
SbMethod* pMeth = NULL;
if( eEndTok != NIL )
{
- USHORT nLine1 = aTok.GetLine();
+ sal_uInt16 nLine1 = aTok.GetLine();
if( aTok.Next() == SYMBOL )
{
String aName_( aTok.GetSym() );
@@ -891,7 +891,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
pMeth = GetMethod( aName_, t );
pMeth->nLine1 = pMeth->nLine2 = nLine1;
// Die Methode ist erst mal GUELTIG
- pMeth->bInvalid = FALSE;
+ pMeth->bInvalid = sal_False;
}
else
eEndTok = NIL;
@@ -911,18 +911,18 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
pMeth->nLine2 = aTok.GetLine();
}
}
- EndDefinitions( TRUE );
+ EndDefinitions( sal_True );
}
void SbModule::SetComment( const String& r )
{
aComment = r;
- SetModified( TRUE );
+ SetModified( sal_True );
}
-SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
+SbMethod* SbModule::GetFunctionForLine( sal_uInt16 nLine )
{
- for( USHORT i = 0; i < pMethods->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
{
SbMethod* p = (SbMethod*) pMethods->Get( i );
if( p->GetSbxId() == SBXID_BASICMETHOD )
@@ -936,14 +936,14 @@ SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
// Ausstrahlen eines Hints an alle Basics
-static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
+static void _SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
{
// Selbst ein BASIC?
if( pObj->IsA( TYPE(StarBASIC) ) && pObj->IsBroadcaster() )
pObj->GetBroadcaster().Broadcast( SbxHint( nId, p ) );
// Dann die Unterobjekte fragen
SbxArray* pObjs = pObj->GetObjects();
- for( USHORT i = 0; i < pObjs->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pObjs->Count(); i++ )
{
SbxVariable* pVar = pObjs->Get( i );
if( pVar->IsA( TYPE(SbxObject) ) )
@@ -951,7 +951,7 @@ static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
}
}
-static void SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
+static void SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
{
while( pObj->GetParent() )
pObj = pObj->GetParent();
@@ -988,8 +988,8 @@ void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
// Ueber alle Sub-Basics gehen
SbxArray* pObjs = pBasic->GetObjects();
- USHORT nCount = pObjs->Count();
- for( USHORT i = 0 ; i < nCount ; i++ )
+ sal_uInt16 nCount = pObjs->Count();
+ for( sal_uInt16 i = 0 ; i < nCount ; i++ )
{
SbxVariable* pObjVar = pObjs->Get( i );
StarBASIC* pSubBasic = PTR_CAST( StarBASIC, pObjVar );
@@ -1013,24 +1013,24 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
if( ((StarBASIC*)p) != pBasic )
ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
}
-BOOL SbModule::IsVBACompat() const
+sal_Bool SbModule::IsVBACompat() const
{
return mbVBACompat;
}
-void SbModule::SetVBACompat( BOOL bCompat )
+void SbModule::SetVBACompat( sal_Bool bCompat )
{
mbVBACompat = bCompat;
}
// Ausfuehren eines BASIC-Unterprogramms
-USHORT SbModule::Run( SbMethod* pMeth )
+sal_uInt16 SbModule::Run( SbMethod* pMeth )
{
- static USHORT nMaxCallLevel = 0;
+ static sal_uInt16 nMaxCallLevel = 0;
static String aMSOMacroRuntimeLibName = String::CreateFromAscii( "Launcher" );
static String aMSOMacroRuntimeAppSymbol = String::CreateFromAscii( "Application" );
- USHORT nRes = 0;
- BOOL bDelInst = BOOL( pINST == NULL );
+ sal_uInt16 nRes = 0;
+ sal_Bool bDelInst = sal_Bool( pINST == NULL );
StarBASICRef xBasic;
if( bDelInst )
{
@@ -1044,7 +1044,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
// Launcher problem
// i80726 The Find below will genarate an error in Testtool so we reset it unless there was one before already
- BOOL bWasError = SbxBase::GetError() != 0;
+ sal_Bool bWasError = SbxBase::GetError() != 0;
SbxVariable* pMSOMacroRuntimeLibVar = Find( aMSOMacroRuntimeLibName, SbxCLASS_OBJECT );
if ( !bWasError && (SbxBase::GetError() == SbxERR_PROC_UNDEFINED) )
SbxBase::ResetError();
@@ -1053,7 +1053,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
StarBASIC* pMSOMacroRuntimeLib = PTR_CAST(StarBASIC,pMSOMacroRuntimeLibVar);
if( pMSOMacroRuntimeLib )
{
- USHORT nGblFlag = pMSOMacroRuntimeLib->GetFlags() & SBX_GBLSEARCH;
+ sal_uInt16 nGblFlag = pMSOMacroRuntimeLib->GetFlags() & SBX_GBLSEARCH;
pMSOMacroRuntimeLib->ResetFlag( SBX_GBLSEARCH );
SbxVariable* pAppSymbol = pMSOMacroRuntimeLib->Find( aMSOMacroRuntimeAppSymbol, SbxCLASS_METHOD );
pMSOMacroRuntimeLib->SetFlag( nGblFlag );
@@ -1100,7 +1100,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
GlobalRunInit( /* bBasicStart = */ bDelInst );
// Trat ein Compiler-Fehler auf? Dann starten wir nicht
- if( GetSbData()->bGlobalInitErr == FALSE )
+ if( GetSbData()->bGlobalInitErr == sal_False )
{
if( bDelInst )
{
@@ -1126,7 +1126,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
pINST->pRun = pRt;
if ( mbVBACompat )
{
- pINST->EnableCompatibility( TRUE );
+ pINST->EnableCompatibility( sal_True );
}
while( pRt->Step() ) {}
if( pRt->pNext )
@@ -1151,7 +1151,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
GetpApp()->Yield();
}
- nRes = TRUE;
+ nRes = sal_True;
pINST->pRun = pRt->pNext;
pINST->nCallLvl--; // Call-Level wieder runter
@@ -1172,7 +1172,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
clearNativeObjectWrapperVector();
DBG_ASSERT(pINST->nCallLvl==0,"BASIC-Call-Level > 0");
- delete pINST, pINST = NULL, bDelInst = FALSE;
+ delete pINST, pINST = NULL, bDelInst = sal_False;
// #i30690
vos::OGuard aSolarGuard( Application::GetSolarMutex() );
@@ -1226,9 +1226,9 @@ void SbModule::RunInit()
&& pImage->GetFlag( SBIMG_INITCODE ) )
{
// Flag setzen, dass RunInit aktiv ist (Testtool)
- GetSbData()->bRunInit = TRUE;
+ GetSbData()->bRunInit = sal_True;
- // BOOL bDelInst = BOOL( pINST == NULL );
+ // sal_Bool bDelInst = sal_Bool( pINST == NULL );
// if( bDelInst )
// pINST = new SbiInstance( (StarBASIC*) GetParent() );
SbModule* pOldMod = pMOD;
@@ -1254,11 +1254,11 @@ void SbModule::RunInit()
pMOD = pOldMod;
// if( bDelInst )
// delete pINST, pINST = NULL;
- pImage->bInit = TRUE;
- pImage->bFirstInit = FALSE;
+ pImage->bInit = sal_True;
+ pImage->bFirstInit = sal_False;
// RunInit ist nicht mehr aktiv
- GetSbData()->bRunInit = FALSE;
+ GetSbData()->bRunInit = sal_False;
}
}
@@ -1292,7 +1292,7 @@ void SbModule::RemoveVars()
void SbModule::ClearPrivateVars()
{
- for( USHORT i = 0 ; i < pProps->Count() ; i++ )
+ for( sal_uInt16 i = 0 ; i < pProps->Count() ; i++ )
{
SbProperty* p = PTR_CAST(SbProperty,pProps->Get( i ) );
if( p )
@@ -1303,12 +1303,12 @@ void SbModule::ClearPrivateVars()
SbxArray* pArray = PTR_CAST(SbxArray,p->GetObject());
if( pArray )
{
- for( USHORT j = 0 ; j < pArray->Count() ; j++ )
+ for( sal_uInt16 j = 0 ; j < pArray->Count() ; j++ )
{
SbxVariable* pj = PTR_CAST(SbxVariable,pArray->Get( j ));
pj->SbxValue::Clear();
/*
- USHORT nFlags = pj->GetFlags();
+ sal_uInt16 nFlags = pj->GetFlags();
pj->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
pj->PutEmpty();
pj->SetFlags( nFlags );
@@ -1320,7 +1320,7 @@ void SbModule::ClearPrivateVars()
{
p->SbxValue::Clear();
/*
- USHORT nFlags = p->GetFlags();
+ sal_uInt16 nFlags = p->GetFlags();
p->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
p->PutEmpty();
p->SetFlags( nFlags );
@@ -1360,7 +1360,7 @@ void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
{
(void)pDeletedBasic;
- for( USHORT i = 0 ; i < pProps->Count() ; i++ )
+ for( sal_uInt16 i = 0 ; i < pProps->Count() ; i++ )
{
SbProperty* p = PTR_CAST(SbProperty,pProps->Get( i ) );
if( p )
@@ -1370,7 +1370,7 @@ void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
SbxArray* pArray = PTR_CAST(SbxArray,p->GetObject());
if( pArray )
{
- for( USHORT j = 0 ; j < pArray->Count() ; j++ )
+ for( sal_uInt16 j = 0 ; j < pArray->Count() ; j++ )
{
SbxVariable* pVar = PTR_CAST(SbxVariable,pArray->Get( j ));
implClearIfVarDependsOnDeletedBasic( pVar, pDeletedBasic );
@@ -1390,7 +1390,7 @@ void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
void StarBASIC::ClearAllModuleVars( void )
{
// Eigene Module initialisieren
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
// Nur initialisieren, wenn der Startcode schon ausgefuehrt wurde
@@ -1401,7 +1401,7 @@ void StarBASIC::ClearAllModuleVars( void )
/* #88042 This code can delete already used public vars during runtime!
// Alle Objekte ueberpruefen, ob es sich um ein Basic handelt
// Wenn ja, auch dort initialisieren
- for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+ for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
{
SbxVariable* pVar = pObjs->Get( nObj );
StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1412,7 +1412,7 @@ void StarBASIC::ClearAllModuleVars( void )
}
// Ausfuehren des Init-Codes aller Module
-void SbModule::GlobalRunInit( BOOL bBasicStart )
+void SbModule::GlobalRunInit( sal_Bool bBasicStart )
{
// Wenn kein Basic-Start, nur initialisieren, wenn Modul uninitialisiert
if( !bBasicStart )
@@ -1423,7 +1423,7 @@ void SbModule::GlobalRunInit( BOOL bBasicStart )
// Anhand dieses Flags kann in SbModule::Run() nach dem Aufruf
// von GlobalRunInit festgestellt werden, ob beim initialisieren
// der Module ein Fehler auftrat. Dann wird nicht gestartet.
- GetSbData()->bGlobalInitErr = FALSE;
+ GetSbData()->bGlobalInitErr = sal_False;
// Parent vom Modul ist ein Basic
StarBASIC *pBasic = PTR_CAST(StarBASIC,GetParent());
@@ -1470,15 +1470,15 @@ void SbModule::GlobalRunDeInit( void )
// Suche nach dem naechsten STMNT-Befehl im Code. Wird vom STMNT-
// Opcode verwendet, um die Endspalte zu setzen.
-const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol ) const
+const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine, sal_uInt16& nCol ) const
{
- return FindNextStmnt( p, nLine, nCol, FALSE );
+ return FindNextStmnt( p, nLine, nCol, sal_False );
}
-const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
- BOOL bFollowJumps, const SbiImage* pImg ) const
+const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine, sal_uInt16& nCol,
+ sal_Bool bFollowJumps, const SbiImage* pImg ) const
{
- UINT32 nPC = (UINT32) ( p - (const BYTE*) pImage->GetCode() );
+ sal_uInt32 nPC = (sal_uInt32) ( p - (const sal_uInt8*) pImage->GetCode() );
while( nPC < pImage->GetCodeSize() )
{
SbiOpcode eOp = (SbiOpcode ) ( *p++ );
@@ -1486,20 +1486,20 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
if( bFollowJumps && eOp == _JUMP && pImg )
{
DBG_ASSERT( pImg, "FindNextStmnt: pImg==NULL with FollowJumps option" );
- UINT32 nOp1 = *p++; nOp1 |= *p++ << 8;
+ sal_uInt32 nOp1 = *p++; nOp1 |= *p++ << 8;
nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
- p = (const BYTE*) pImg->GetCode() + nOp1;
+ p = (const sal_uInt8*) pImg->GetCode() + nOp1;
}
else if( eOp >= SbOP1_START && eOp <= SbOP1_END )
p += 4, nPC += 4;
else if( eOp == _STMNT )
{
- UINT32 nl, nc;
+ sal_uInt32 nl, nc;
nl = *p++; nl |= *p++ << 8;
nl |= *p++ << 16 ; nl |= *p++ << 24;
nc = *p++; nc |= *p++ << 8;
nc |= *p++ << 16 ; nc |= *p++ << 24;
- nLine = (USHORT)nl; nCol = (USHORT)nc;
+ nLine = (sal_uInt16)nl; nCol = (sal_uInt16)nc;
return p;
}
else if( eOp >= SbOP2_START && eOp <= SbOP2_END )
@@ -1515,16 +1515,16 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
// Testen, ob eine Zeile STMNT-Opcodes enthaelt
-BOOL SbModule::IsBreakable( USHORT nLine ) const
+sal_Bool SbModule::IsBreakable( sal_uInt16 nLine ) const
{
if( !pImage )
- return FALSE;
- const BYTE* p = (const BYTE* ) pImage->GetCode();
- USHORT nl, nc;
+ return sal_False;
+ const sal_uInt8* p = (const sal_uInt8* ) pImage->GetCode();
+ sal_uInt16 nl, nc;
while( ( p = FindNextStmnt( p, nl, nc ) ) != NULL )
if( nl == nLine )
- return TRUE;
- return FALSE;
+ return sal_True;
+ return sal_False;
}
size_t SbModule::GetBPCount() const
@@ -1532,7 +1532,7 @@ size_t SbModule::GetBPCount() const
return pBreaks ? pBreaks->size() : 0;
}
-USHORT SbModule::GetBP( size_t n ) const
+sal_uInt16 SbModule::GetBP( size_t n ) const
{
if( pBreaks && n < pBreaks->size() )
return pBreaks->operator[]( n );
@@ -1540,34 +1540,34 @@ USHORT SbModule::GetBP( size_t n ) const
return 0;
}
-BOOL SbModule::IsBP( USHORT nLine ) const
+sal_Bool SbModule::IsBP( sal_uInt16 nLine ) const
{
if( pBreaks )
{
for( size_t i = 0; i < pBreaks->size(); i++ )
{
- USHORT b = pBreaks->operator[]( i );
+ sal_uInt16 b = pBreaks->operator[]( i );
if( b == nLine )
- return TRUE;
+ return sal_True;
if( b < nLine )
break;
}
}
- return FALSE;
+ return sal_False;
}
-BOOL SbModule::SetBP( USHORT nLine )
+sal_Bool SbModule::SetBP( sal_uInt16 nLine )
{
if( !IsBreakable( nLine ) )
- return FALSE;
+ return sal_False;
if( !pBreaks )
pBreaks = new SbiBreakpoints;
size_t i;
for( i = 0; i < pBreaks->size(); i++ )
{
- USHORT b = pBreaks->operator[]( i );
+ sal_uInt16 b = pBreaks->operator[]( i );
if( b == nLine )
- return TRUE;
+ return sal_True;
if( b < nLine )
break;
}
@@ -1580,18 +1580,18 @@ BOOL SbModule::SetBP( USHORT nLine )
return IsBreakable( nLine );
}
-BOOL SbModule::ClearBP( USHORT nLine )
+sal_Bool SbModule::ClearBP( sal_uInt16 nLine )
{
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
if( pBreaks )
{
for( size_t i = 0; i < pBreaks->size(); i++ )
{
- USHORT b = pBreaks->operator[]( i );
+ sal_uInt16 b = pBreaks->operator[]( i );
if( b == nLine )
{
pBreaks->erase( pBreaks->begin() + i );
- bRes = TRUE;
+ bRes = sal_True;
break;
}
if( b < nLine )
@@ -1614,39 +1614,39 @@ SbModule::fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg ) const
{
if ( !pImg )
pImg = pImage;
- for( UINT32 i = 0; i < pMethods->Count(); i++ )
+ for( sal_uInt32 i = 0; i < pMethods->Count(); i++ )
{
- SbMethod* pMeth = PTR_CAST(SbMethod,pMethods->Get( (USHORT)i ) );
+ SbMethod* pMeth = PTR_CAST(SbMethod,pMethods->Get( (sal_uInt16)i ) );
if( pMeth )
{
//fixup method start positions
if ( bCvtToLegacy )
pMeth->nStart = pImg->CalcLegacyOffset( pMeth->nStart );
else
- pMeth->nStart = pImg->CalcNewOffset( (USHORT)pMeth->nStart );
+ pMeth->nStart = pImg->CalcNewOffset( (sal_uInt16)pMeth->nStart );
}
}
}
-BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
Clear();
if( !SbxObject::LoadData( rStrm, 1 ) )
- return FALSE;
+ return sal_False;
// Precaution...
SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
- BYTE bImage;
+ sal_uInt8 bImage;
rStrm >> bImage;
if( bImage )
{
SbiImage* p = new SbiImage;
- UINT32 nImgVer = 0;
+ sal_uInt32 nImgVer = 0;
if( !p->Load( rStrm, nImgVer ) )
{
delete p;
- return FALSE;
+ return sal_False;
}
// If the image is in old format, we fix up the method start offsets
if ( nImgVer < B_EXT_IMG_VERSION )
@@ -1674,24 +1674,24 @@ BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
delete p;
}
}
- return TRUE;
+ return sal_True;
}
-BOOL SbModule::StoreData( SvStream& rStrm ) const
+sal_Bool SbModule::StoreData( SvStream& rStrm ) const
{
- BOOL bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
+ sal_Bool bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
if ( bFixup )
fixUpMethodStart( true );
- BOOL bRet = SbxObject::StoreData( rStrm );
+ sal_Bool bRet = SbxObject::StoreData( rStrm );
if ( !bRet )
- return FALSE;
+ return sal_False;
if( pImage )
{
pImage->aOUSource = aOUSource;
pImage->aComment = aComment;
pImage->aName = GetName();
- rStrm << (BYTE) 1;
+ rStrm << (sal_uInt8) 1;
// # PCode is saved only for legacy formats only
// It should be noted that it probably isn't necessary
// It would be better not to store the image ( more flexible with
@@ -1708,12 +1708,12 @@ BOOL SbModule::StoreData( SvStream& rStrm ) const
aImg.aOUSource = aOUSource;
aImg.aComment = aComment;
aImg.aName = GetName();
- rStrm << (BYTE) 1;
+ rStrm << (sal_uInt8) 1;
return aImg.Save( rStrm );
}
}
-BOOL SbModule::ExceedsLegacyModuleSize()
+sal_Bool SbModule::ExceedsLegacyModuleSize()
{
if ( !IsCompiled() )
Compile();
@@ -1724,17 +1724,17 @@ BOOL SbModule::ExceedsLegacyModuleSize()
// Store only image, no source
-BOOL SbModule::StoreBinaryData( SvStream& rStrm )
+sal_Bool SbModule::StoreBinaryData( SvStream& rStrm )
{
return StoreBinaryData( rStrm, 0 );
}
-BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer )
{
- BOOL bRet = Compile();
+ sal_Bool bRet = Compile();
if( bRet )
{
- BOOL bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts
+ sal_Bool bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts
if ( bFixup ) // save in old image format, fix up method starts
fixUpMethodStart( true );
@@ -1745,7 +1745,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
pImage->aComment = aComment;
pImage->aName = GetName();
- rStrm << (BYTE) 1;
+ rStrm << (sal_uInt8) 1;
if ( nVer )
bRet = pImage->Save( rStrm, B_EXT_IMG_VERSION );
else
@@ -1762,7 +1762,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
// Called for >= OO 1.0 passwd protected libraries only
//
-BOOL SbModule::LoadBinaryData( SvStream& rStrm )
+sal_Bool SbModule::LoadBinaryData( SvStream& rStrm )
{
::rtl::OUString aKeepSource = aOUSource;
bool bRet = LoadData( rStrm, 2 );
@@ -1772,10 +1772,10 @@ BOOL SbModule::LoadBinaryData( SvStream& rStrm )
}
-BOOL SbModule::LoadCompleted()
+sal_Bool SbModule::LoadCompleted()
{
SbxArray* p = GetMethods();
- USHORT i;
+ sal_uInt16 i;
for( i = 0; i < p->Count(); i++ )
{
SbMethod* q = PTR_CAST(SbMethod,p->Get( i ) );
@@ -1789,7 +1789,7 @@ BOOL SbModule::LoadCompleted()
if( q )
q->pMod = this;
}
- return TRUE;
+ return sal_True;
}
void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint )
@@ -1818,12 +1818,12 @@ void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rH
aVals.eType = SbxVARIANT;
SbxArray* pArg = pVar->GetParameters();
- USHORT nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
+ sal_uInt16 nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
if( nVarParCount > 1 )
{
SbxArrayRef xMethParameters = new SbxArray;
xMethParameters->Put( pMeth, 0 ); // Method as parameter 0
- for( USHORT i = 1 ; i < nVarParCount ; ++i )
+ for( sal_uInt16 i = 1 ; i < nVarParCount ; ++i )
{
SbxVariable* pPar = pArg->Get( i );
xMethParameters->Put( pPar, i );
@@ -1891,32 +1891,32 @@ SbJScriptModule::SbJScriptModule( const String& rName )
{
}
-BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
(void)nVer;
Clear();
if( !SbxObject::LoadData( rStrm, 1 ) )
- return FALSE;
+ return sal_False;
// Source-String holen
String aTmp;
rStrm.ReadByteString( aTmp, gsl_getSystemTextEncoding() );
aOUSource = aTmp;
//rStrm >> aSource;
- return TRUE;
+ return sal_True;
}
-BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const
+sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const
{
if( !SbxObject::StoreData( rStrm ) )
- return FALSE;
+ return sal_False;
// Source-String schreiben
String aTmp = aOUSource;
rStrm.WriteByteString( aTmp, gsl_getSystemTextEncoding() );
//rStrm << aSource;
- return TRUE;
+ return sal_True;
}
@@ -1925,7 +1925,7 @@ BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const
SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p )
: SbxMethod( r, t ), pMod( p )
{
- bInvalid = TRUE;
+ bInvalid = sal_True;
nStart =
nDebugFlags =
nLine1 =
@@ -1970,35 +1970,35 @@ SbxArray* SbMethod::GetStatics()
return refStatics;
}
-BOOL SbMethod::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbMethod::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
if( !SbxMethod::LoadData( rStrm, 1 ) )
- return FALSE;
- INT16 n;
+ return sal_False;
+ sal_Int16 n;
rStrm >> n;
- INT16 nTempStart = (INT16)nStart;
+ sal_Int16 nTempStart = (sal_Int16)nStart;
// nDebugFlags = n; // AB 16.1.96: Nicht mehr uebernehmen
if( nVer == 2 )
rStrm >> nLine1 >> nLine2 >> nTempStart >> bInvalid;
// AB: 2.7.1996: HACK wegen 'Referenz kann nicht gesichert werden'
SetFlag( SBX_NO_MODIFY );
nStart = nTempStart;
- return TRUE;
+ return sal_True;
}
-BOOL SbMethod::StoreData( SvStream& rStrm ) const
+sal_Bool SbMethod::StoreData( SvStream& rStrm ) const
{
if( !SbxMethod::StoreData( rStrm ) )
- return FALSE;
- rStrm << (INT16) nDebugFlags
- << (INT16) nLine1
- << (INT16) nLine2
- << (INT16) nStart
- << (BYTE) bInvalid;
- return TRUE;
+ return sal_False;
+ rStrm << (sal_Int16) nDebugFlags
+ << (sal_Int16) nLine1
+ << (sal_Int16) nLine2
+ << (sal_Int16) nStart
+ << (sal_uInt8) bInvalid;
+ return sal_True;
}
-void SbMethod::GetLineRange( USHORT& l1, USHORT& l2 )
+void SbMethod::GetLineRange( sal_uInt16& l1, sal_uInt16& l2 )
{
l1 = nLine1; l2 = nLine2;
}
@@ -2048,7 +2048,7 @@ ErrCode SbMethod::Call( SbxValue* pRet )
// #100883 Own Broadcast for SbMethod
-void SbMethod::Broadcast( ULONG nHintId )
+void SbMethod::Broadcast( sal_uIntPtr nHintId )
{
if( pCst && !IsSet( SBX_NO_BROADCAST ) && StaticIsEnabledBroadcasting() )
{
@@ -2080,7 +2080,7 @@ void SbMethod::Broadcast( ULONG nHintId )
pCst = pSave;
pSave->Broadcast( SbxHint( nHintId, pThisCopy ) );
- USHORT nSaveFlags = GetFlags();
+ sal_uInt16 nSaveFlags = GetFlags();
SetFlag( SBX_READWRITE );
pCst = NULL;
Put( pThisCopy->GetValues_Impl() );
@@ -2382,7 +2382,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
{
SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), aArguments[i] );
- xArray->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+ xArray->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
// Enable passing by ref
if ( xSbxVar->GetType() != SbxVARIANT )
@@ -2395,7 +2395,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
{
- aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< USHORT >(i) + 1) );
+ aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< sal_uInt16 >(i) + 1) );
}
pMeth->SetParameters( NULL );
}
@@ -2465,10 +2465,10 @@ SbUserFormModuleInstance::SbUserFormModuleInstance( SbUserFormModule* pParentMod
{
}
-BOOL SbUserFormModuleInstance::IsClass( const XubString& rName ) const
+sal_Bool SbUserFormModuleInstance::IsClass( const XubString& rName ) const
{
- BOOL bParentNameMatches = m_pParentModule->GetName().EqualsIgnoreCaseAscii( rName );
- BOOL bRet = bParentNameMatches || SbxObject::IsClass( rName );
+ sal_Bool bParentNameMatches = m_pParentModule->GetName().EqualsIgnoreCaseAscii( rName );
+ sal_Bool bRet = bParentNameMatches || SbxObject::IsClass( rName );
return bRet;
}
@@ -2613,7 +2613,7 @@ SbUserFormModule::Find( const XubString& rName, SbxClassType t )
SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
: SbxProperty( r, t ), pMod( p )
{
- bInvalid = FALSE;
+ bInvalid = sal_False;
}
SbProperty::~SbProperty()
generated by cgit (git 2.34.1) at 2024-07-04 07:43:36 +0000