summaryrefslogtreecommitdiffstats
path: root/basic/source/runtime
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/runtime
parentremovetooltypes: #i112600# adjust fpicker (diff)
downloadcore-642cfe8ac206af4fe82bc695d38b5c7f0edf7dc7.tar.gz
core-642cfe8ac206af4fe82bc695d38b5c7f0edf7dc7.zip
removetooltypes01: #i112600# adjust basic and scaddins
Diffstat (limited to 'basic/source/runtime')
-rw-r--r--basic/source/runtime/basrdll.cxx14
-rw-r--r--basic/source/runtime/ddectrl.cxx32
-rw-r--r--basic/source/runtime/ddectrl.hxx12
-rw-r--r--basic/source/runtime/dllmgr.cxx26
-rw-r--r--basic/source/runtime/inputbox.cxx4
-rw-r--r--basic/source/runtime/iosys.cxx98
-rw-r--r--basic/source/runtime/methods.cxx436
-rwxr-xr-xbasic/source/runtime/methods1.cxx346
-rw-r--r--basic/source/runtime/props.cxx12
-rw-r--r--basic/source/runtime/rtlproto.hxx4
-rw-r--r--basic/source/runtime/runtime.cxx86
-rw-r--r--basic/source/runtime/stdobj.cxx24
-rw-r--r--basic/source/runtime/stdobj1.cxx60
-rw-r--r--basic/source/runtime/step0.cxx62
-rw-r--r--basic/source/runtime/step1.cxx82
-rwxr-xr-xbasic/source/runtime/step2.cxx162
16 files changed, 730 insertions, 730 deletions
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index 799caf0cd954..0cf81e30d9a6 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -54,8 +54,8 @@ BasicDLL::BasicDLL()
::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
pSttResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(stt), aLocale );
pBasResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(sb), aLocale );
- bDebugMode = FALSE;
- bBreakEnabled = TRUE;
+ bDebugMode = sal_False;
+ bBreakEnabled = sal_True;
}
BasicDLL::~BasicDLL()
@@ -64,7 +64,7 @@ BasicDLL::~BasicDLL()
delete pBasResMgr;
}
-void BasicDLL::EnableBreak( BOOL bEnable )
+void BasicDLL::EnableBreak( sal_Bool bEnable )
{
BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -72,7 +72,7 @@ void BasicDLL::EnableBreak( BOOL bEnable )
pThis->bBreakEnabled = bEnable;
}
-void BasicDLL::SetDebugMode( BOOL bDebugMode )
+void BasicDLL::SetDebugMode( sal_Bool bDebugMode )
{
BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -85,7 +85,7 @@ void BasicDLL::BasicBreak()
{
//bJustStopping: Wenn jemand wie wild x-mal STOP drueckt, aber das Basic
// nicht schnell genug anhaelt, kommt die Box ggf. oefters...
- static BOOL bJustStopping = FALSE;
+ static sal_Bool bJustStopping = sal_False;
BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -93,11 +93,11 @@ void BasicDLL::BasicBreak()
{
if ( StarBASIC::IsRunning() && !bJustStopping && ( pThis->bBreakEnabled || pThis->bDebugMode ) )
{
- bJustStopping = TRUE;
+ bJustStopping = sal_True;
StarBASIC::Stop();
String aMessageStr( BasResId( IDS_SBERR_TERMINATED ) );
InfoBox( 0, aMessageStr ).Execute();
- bJustStopping = FALSE;
+ bJustStopping = sal_False;
}
}
}
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 89d473099f0b..5e8775159c38 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -93,12 +93,12 @@ SbiDdeControl::~SbiDdeControl()
delete pConvList;
}
-INT16 SbiDdeControl::GetFreeChannel()
+sal_Int16 SbiDdeControl::GetFreeChannel()
{
- INT16 nListSize = (INT16)pConvList->Count();
+ sal_Int16 nListSize = (sal_Int16)pConvList->Count();
DdeConnection* pPtr = pConvList->First();
pPtr = pConvList->Next(); // nullten eintrag ueberspringen
- INT16 nChannel;
+ sal_Int16 nChannel;
for( nChannel = 1; nChannel < nListSize; nChannel++ )
{
if( pPtr == DDE_FREECHANNEL )
@@ -111,7 +111,7 @@ INT16 SbiDdeControl::GetFreeChannel()
}
SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic,
- INT16& rnHandle )
+ sal_Int16& rnHandle )
{
SbError nErr;
DdeConnection* pConv = new DdeConnection( rService, rTopic );
@@ -123,26 +123,26 @@ SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic,
}
else
{
- INT16 nChannel = GetFreeChannel();
- pConvList->Replace( pConv, (ULONG)nChannel );
+ sal_Int16 nChannel = GetFreeChannel();
+ pConvList->Replace( pConv, (sal_uIntPtr)nChannel );
rnHandle = nChannel;
}
return 0;
}
-SbError SbiDdeControl::Terminate( INT16 nChannel )
+SbError SbiDdeControl::Terminate( sal_Int16 nChannel )
{
- DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+ DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
return SbERR_DDE_NO_CHANNEL;
- pConvList->Replace( DDE_FREECHANNEL, (ULONG)nChannel );
+ pConvList->Replace( DDE_FREECHANNEL, (sal_uIntPtr)nChannel );
delete pConv;
return 0L;
}
SbError SbiDdeControl::TerminateAll()
{
- INT16 nChannel = (INT16)pConvList->Count();
+ sal_Int16 nChannel = (sal_Int16)pConvList->Count();
while( nChannel )
{
nChannel--;
@@ -156,9 +156,9 @@ SbError SbiDdeControl::TerminateAll()
return 0;
}
-SbError SbiDdeControl::Request( INT16 nChannel, const String& rItem, String& rResult )
+SbError SbiDdeControl::Request( sal_Int16 nChannel, const String& rItem, String& rResult )
{
- DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+ DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
return SbERR_DDE_NO_CHANNEL;
@@ -169,9 +169,9 @@ SbError SbiDdeControl::Request( INT16 nChannel, const String& rItem, String& rRe
return GetLastErr( pConv );
}
-SbError SbiDdeControl::Execute( INT16 nChannel, const String& rCommand )
+SbError SbiDdeControl::Execute( sal_Int16 nChannel, const String& rCommand )
{
- DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+ DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
return SbERR_DDE_NO_CHANNEL;
DdeExecute aRequest( *pConv, rCommand, 30000 );
@@ -179,9 +179,9 @@ SbError SbiDdeControl::Execute( INT16 nChannel, const String& rCommand )
return GetLastErr( pConv );
}
-SbError SbiDdeControl::Poke( INT16 nChannel, const String& rItem, const String& rData )
+SbError SbiDdeControl::Poke( sal_Int16 nChannel, const String& rItem, const String& rData )
{
- DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+ DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
return SbERR_DDE_NO_CHANNEL;
DdePoke aRequest( *pConv, rItem, DdeData(rData), 30000 );
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index c1e9da823a20..a99575308fa8 100644
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -43,7 +43,7 @@ class SbiDdeControl
private:
DECL_LINK( Data, DdeData* );
SbError GetLastErr( DdeConnection* );
- INT16 GetFreeChannel();
+ sal_Int16 GetFreeChannel();
DdeConnections* pConvList;
String aData;
@@ -53,12 +53,12 @@ public:
~SbiDdeControl();
SbError Initiate( const String& rService, const String& rTopic,
- INT16& rnHandle );
- SbError Terminate( INT16 nChannel );
+ sal_Int16& rnHandle );
+ SbError Terminate( sal_Int16 nChannel );
SbError TerminateAll();
- SbError Request( INT16 nChannel, const String& rItem, String& rResult );
- SbError Execute( INT16 nChannel, const String& rCommand );
- SbError Poke( INT16 nChannel, const String& rItem, const String& rData );
+ SbError Request( sal_Int16 nChannel, const String& rItem, String& rResult );
+ SbError Execute( sal_Int16 nChannel, const String& rCommand );
+ SbError Poke( sal_Int16 nChannel, const String& rItem, const String& rData );
};
#endif
diff --git a/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx
index 04f1ee0a8acc..28201226333a 100644
--- a/basic/source/runtime/dllmgr.cxx
+++ b/basic/source/runtime/dllmgr.cxx
@@ -168,7 +168,7 @@ std::size_t alignment(SbxVariable * variable) {
std::size_t n = 1;
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
GetProperties();
- for (USHORT i = 0; i < props->Count(); ++i) {
+ for (sal_uInt16 i = 0; i < props->Count(); ++i) {
n = std::max(n, alignment(props->Get(i)));
}
return n;
@@ -183,9 +183,9 @@ std::size_t alignment(SbxVariable * variable) {
} else {
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
int dims = arr->GetDims();
- std::vector< INT32 > low(dims);
+ std::vector< sal_Int32 > low(dims);
for (int i = 0; i < dims; ++i) {
- INT32 up;
+ sal_Int32 up;
arr->GetDim32(i + 1, low[i], up);
}
return alignment(arr->Get32(&low[0]));
@@ -219,7 +219,7 @@ SbError marshalStruct(
OSL_ASSERT(variable != 0);
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
GetProperties();
- for (USHORT i = 0; i < props->Count(); ++i) {
+ for (sal_uInt16 i = 0; i < props->Count(); ++i) {
SbError e = marshal(false, props->Get(i), false, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
@@ -235,12 +235,12 @@ SbError marshalArray(
OSL_ASSERT(variable != 0);
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
int dims = arr->GetDims();
- std::vector< INT32 > low(dims);
- std::vector< INT32 > up(dims);
+ std::vector< sal_Int32 > low(dims);
+ std::vector< sal_Int32 > up(dims);
for (int i = 0; i < dims; ++i) {
arr->GetDim32(i + 1, low[i], up[i]);
}
- for (std::vector< INT32 > idx = low;;) {
+ for (std::vector< sal_Int32 > idx = low;;) {
SbError e = marshal(
false, arr->Get32(&idx[0]), false, blob, offset, data);
if (e != ERRCODE_NONE) {
@@ -405,7 +405,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
alignment(variable)));
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
GetProperties();
- for (USHORT i = 0; i < props->Count(); ++i) {
+ for (sal_uInt16 i = 0; i < props->Count(); ++i) {
data = unmarshal(props->Get(i), data);
}
break;
@@ -423,12 +423,12 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
} else {
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
int dims = arr->GetDims();
- std::vector< INT32 > low(dims);
- std::vector< INT32 > up(dims);
+ std::vector< sal_Int32 > low(dims);
+ std::vector< sal_Int32 > up(dims);
for (int i = 0; i < dims; ++i) {
arr->GetDim32(i + 1, low[i], up[i]);
}
- for (std::vector< INT32 > idx = low;;) {
+ for (std::vector< sal_Int32 > idx = low;;) {
data = unmarshal(arr->Get32(&idx[0]), data);
int i = dims - 1;
while (idx[i] == up[i]) {
@@ -488,7 +488,7 @@ SbError call(
RTL_CONSTASCII_STRINGPARAM("KERNEL32.DLL")) &&
(proc.name ==
rtl::OString(RTL_CONSTASCII_STRINGPARAM("GetLogicalDriveStringsA")));
- for (USHORT i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
+ for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
SbError e = marshal(
true, arguments->Get(i), special && i == 2, stack, stack.size(),
data);
@@ -550,7 +550,7 @@ SbError call(
OSL_ASSERT(false);
break;
}
- for (USHORT i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
+ for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
arguments->Get(i)->ResetFlag(SBX_REFERENCE);
//TODO: skipped for errors?!?
}
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 17b98ad7addd..c43519a9b2de 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -162,14 +162,14 @@ RTLFUNC(InputBox)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count();
+ sal_uIntPtr nArgCount = rPar.Count();
if ( nArgCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
String aTitle;
String aDefault;
- INT32 nX = -1, nY = -1; // zentrieren
+ sal_Int32 nX = -1, nY = -1; // zentrieren
const String& rPrompt = rPar.Get(1)->GetString();
if ( nArgCount > 2 && !rPar.Get(2)->IsErr() )
aTitle = rPar.Get(2)->GetString();
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 9940890286b4..06faa7c0aba5 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -217,13 +217,13 @@ void SbiStream::MapError()
// Hack for #83750
-BOOL runsInSetup( void );
+sal_Bool runsInSetup( void );
-BOOL needSecurityRestrictions( void )
+sal_Bool needSecurityRestrictions( void )
{
#ifdef _USE_UNO
- static BOOL bNeedInit = TRUE;
- static BOOL bRetVal = TRUE;
+ static sal_Bool bNeedInit = sal_True;
+ static sal_Bool bRetVal = sal_True;
if( bNeedInit )
{
@@ -232,11 +232,11 @@ BOOL needSecurityRestrictions( void )
if( runsInSetup() )
{
// Setup is not critical
- bRetVal = FALSE;
+ bRetVal = sal_False;
return bRetVal;
}
- bNeedInit = FALSE;
+ bNeedInit = sal_False;
// Get system user to compare to portal user
oslSecurity aSecurity = osl_getCurrentSecurity();
@@ -245,12 +245,12 @@ BOOL needSecurityRestrictions( void )
if( !bRet )
{
// No valid security! -> Secure mode!
- return TRUE;
+ return sal_True;
}
Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
if( !xSMgr.is() )
- return TRUE;
+ return sal_True;
Reference< XBridgeFactory > xBridgeFac( xSMgr->createInstance
( ::rtl::OUString::createFromAscii( "com.sun.star.bridge.BridgeFactory" ) ), UNO_QUERY );
@@ -265,13 +265,13 @@ BOOL needSecurityRestrictions( void )
if( nBridgeCount == 0 )
{
// No bridges -> local
- bRetVal = FALSE;
+ bRetVal = sal_False;
return bRetVal;
}
// Iterate through all bridges to find (portal) user property
const Reference< XBridge >* pBridges = aBridgeSeq.getConstArray();
- bRetVal = FALSE; // Now only TRUE if user different from portal user is found
+ bRetVal = sal_False; // Now only sal_True if user different from portal user is found
sal_Int32 i;
for( i = 0 ; i < nBridgeCount ; i++ )
{
@@ -289,7 +289,7 @@ BOOL needSecurityRestrictions( void )
else
{
// Different user -> Secure mode!
- bRetVal = TRUE;
+ bRetVal = sal_True;
break;
}
}
@@ -299,27 +299,27 @@ BOOL needSecurityRestrictions( void )
return bRetVal;
#else
- return FALSE;
+ return sal_False;
#endif
}
-// Returns TRUE if UNO is available, otherwise the old file
+// Returns sal_True if UNO is available, otherwise the old file
// system implementation has to be used
// #89378 New semantic: Don't just ask for UNO but for UCB
-BOOL hasUno( void )
+sal_Bool hasUno( void )
{
#ifdef _USE_UNO
- static BOOL bNeedInit = TRUE;
- static BOOL bRetVal = TRUE;
+ static sal_Bool bNeedInit = sal_True;
+ static sal_Bool bRetVal = sal_True;
if( bNeedInit )
{
- bNeedInit = FALSE;
+ bNeedInit = sal_False;
Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
if( !xSMgr.is() )
{
// No service manager at all
- bRetVal = FALSE;
+ bRetVal = sal_False;
}
else
{
@@ -329,13 +329,13 @@ BOOL hasUno( void )
if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString::createFromAscii( "file:///" ) ).is() ) )
{
// No UCB
- bRetVal = FALSE;
+ bRetVal = sal_False;
}
}
}
return bRetVal;
#else
- return FALSE;
+ return sal_False;
#endif
}
@@ -351,11 +351,11 @@ class OslStream : public SvStream
public:
OslStream( const String& rName, short nStrmMode );
~OslStream();
- virtual ULONG GetData( void* pData, ULONG nSize );
- virtual ULONG PutData( const void* pData, ULONG nSize );
- virtual ULONG SeekPos( ULONG nPos );
+ virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize );
+ virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize );
+ virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos );
virtual void FlushData();
- virtual void SetSize( ULONG nSize );
+ virtual void SetSize( sal_uIntPtr nSize );
};
OslStream::OslStream( const String& rName, short nStrmMode )
@@ -396,23 +396,23 @@ OslStream::~OslStream()
maFile.close();
}
-ULONG OslStream::GetData( void* pData, ULONG nSize )
+sal_uIntPtr OslStream::GetData( void* pData, sal_uIntPtr nSize )
{
sal_uInt64 nBytesRead = nSize;
FileBase::RC nRet = FileBase::E_None;
nRet = maFile.read( pData, nBytesRead, nBytesRead );
- return (ULONG)nBytesRead;
+ return (sal_uIntPtr)nBytesRead;
}
-ULONG OslStream::PutData( const void* pData, ULONG nSize )
+sal_uIntPtr OslStream::PutData( const void* pData, sal_uIntPtr nSize )
{
sal_uInt64 nBytesWritten;
FileBase::RC nRet = FileBase::E_None;
nRet = maFile.write( pData, (sal_uInt64)nSize, nBytesWritten );
- return (ULONG)nBytesWritten;
+ return (sal_uIntPtr)nBytesWritten;
}
-ULONG OslStream::SeekPos( ULONG nPos )
+sal_uIntPtr OslStream::SeekPos( sal_uIntPtr nPos )
{
FileBase::RC nRet;
if( nPos == STREAM_SEEK_TO_END )
@@ -425,14 +425,14 @@ ULONG OslStream::SeekPos( ULONG nPos )
}
sal_uInt64 nRealPos;
nRet = maFile.getPos( nRealPos );
- return sal::static_int_cast<ULONG>(nRealPos);
+ return sal::static_int_cast<sal_uIntPtr>(nRealPos);
}
void OslStream::FlushData()
{
}
-void OslStream::SetSize( ULONG nSize )
+void OslStream::SetSize( sal_uIntPtr nSize )
{
FileBase::RC nRet = FileBase::E_None;
nRet = maFile.setSize( (sal_uInt64)nSize );
@@ -454,17 +454,17 @@ public:
UCBStream( Reference< XOutputStream > & xOS );
UCBStream( Reference< XStream > & xS );
~UCBStream();
- virtual ULONG GetData( void* pData, ULONG nSize );
- virtual ULONG PutData( const void* pData, ULONG nSize );
- virtual ULONG SeekPos( ULONG nPos );
+ virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize );
+ virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize );
+ virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos );
virtual void FlushData();
- virtual void SetSize( ULONG nSize );
+ virtual void SetSize( sal_uIntPtr nSize );
};
/*
-ULONG UCBErrorToSvStramError( ucb::IOErrorCode nError )
+sal_uIntPtr UCBErrorToSvStramError( ucb::IOErrorCode nError )
{
- ULONG eReturn = ERRCODE_IO_GENERAL;
+ sal_uIntPtr eReturn = ERRCODE_IO_GENERAL;
switch( nError )
{
case ucb::IOErrorCode_ABORT: eReturn = SVSTREAM_GENERALERROR; break;
@@ -535,7 +535,7 @@ UCBStream::~UCBStream()
}
}
-ULONG UCBStream::GetData( void* pData, ULONG nSize )
+sal_uIntPtr UCBStream::GetData( void* pData, sal_uIntPtr nSize )
{
try
{
@@ -564,7 +564,7 @@ ULONG UCBStream::GetData( void* pData, ULONG nSize )
return 0;
}
-ULONG UCBStream::PutData( const void* pData, ULONG nSize )
+sal_uIntPtr UCBStream::PutData( const void* pData, sal_uIntPtr nSize )
{
try
{
@@ -591,13 +591,13 @@ ULONG UCBStream::PutData( const void* pData, ULONG nSize )
return 0;
}
-ULONG UCBStream::SeekPos( ULONG nPos )
+sal_uIntPtr UCBStream::SeekPos( sal_uIntPtr nPos )
{
try
{
if( xSeek.is() )
{
- ULONG nLen = sal::static_int_cast<ULONG>( xSeek->getLength() );
+ sal_uIntPtr nLen = sal::static_int_cast<sal_uIntPtr>( xSeek->getLength() );
if( nPos > nLen )
nPos = nLen;
xSeek->seek( nPos );
@@ -631,7 +631,7 @@ void UCBStream::FlushData()
}
}
-void UCBStream::SetSize( ULONG nSize )
+void UCBStream::SetSize( sal_uIntPtr nSize )
{
(void)nSize;
@@ -738,7 +738,7 @@ SbError SbiStream::Close()
return nError;
}
-SbError SbiStream::Read( ByteString& rBuf, USHORT n, bool bForceReadingPerByte )
+SbError SbiStream::Read( ByteString& rBuf, sal_uInt16 n, bool bForceReadingPerByte )
{
nExpandOnWriteTo = 0;
if( !bForceReadingPerByte && IsText() )
@@ -777,10 +777,10 @@ void SbiStream::ExpandFile()
{
if ( nExpandOnWriteTo )
{
- ULONG nCur = pStrm->Seek(STREAM_SEEK_TO_END);
+ sal_uIntPtr nCur = pStrm->Seek(STREAM_SEEK_TO_END);
if( nCur < nExpandOnWriteTo )
{
- ULONG nDiff = nExpandOnWriteTo - nCur;
+ sal_uIntPtr nDiff = nExpandOnWriteTo - nCur;
char c = 0;
while( nDiff-- )
*pStrm << c;
@@ -793,7 +793,7 @@ void SbiStream::ExpandFile()
}
}
-SbError SbiStream::Write( const ByteString& rBuf, USHORT n )
+SbError SbiStream::Write( const ByteString& rBuf, sal_uInt16 n )
{
ExpandFile();
if( IsAppend() )
@@ -804,7 +804,7 @@ SbError SbiStream::Write( const ByteString& rBuf, USHORT n )
aLine += rBuf;
// Raus damit, wenn das Ende ein LF ist, aber CRLF vorher
// strippen, da der SvStrm ein CRLF anfuegt!
- USHORT nLineLen = aLine.Len();
+ sal_uInt16 nLineLen = aLine.Len();
if( nLineLen && aLine.GetBuffer()[ --nLineLen ] == 0x0A )
{
aLine.Erase( nLineLen );
@@ -1023,8 +1023,8 @@ void SbiIoSystem::ReadCon( ByteString& rIn )
void SbiIoSystem::WriteCon( const ByteString& rText )
{
aOut += rText;
- USHORT n1 = aOut.Search( '\n' );
- USHORT n2 = aOut.Search( '\r' );
+ sal_uInt16 n1 = aOut.Search( '\n' );
+ sal_uInt16 n2 = aOut.Search( '\r' );
if( n1 != STRING_NOTFOUND || n2 != STRING_NOTFOUND )
{
if( n1 == STRING_NOTFOUND ) n1 = n2;
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 97f6ed227d47..de3149d7892e 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -154,7 +154,7 @@ static CharClass& GetCharClass( void )
return aCharClass;
}
-static inline BOOL isFolder( FileStatus::Type aType )
+static inline sal_Bool isFolder( FileStatus::Type aType )
{
return ( aType == FileStatus::Directory || aType == FileStatus::Volume );
}
@@ -220,8 +220,8 @@ static com::sun::star::uno::Reference< XSimpleFileAccess3 > getFileAccess( void
-// Properties und Methoden legen beim Get (bPut = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bPut = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bPut = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bPut = sal_True) wird der Wert aus
// Element 0 gespeichert.
// CreateObject( class )
@@ -254,7 +254,7 @@ RTLFUNC(Error)
{
String aErrorMsg;
SbError nErr = 0L;
- INT32 nCode = 0;
+ sal_Int32 nCode = 0;
if( rPar.Count() == 1 )
{
nErr = StarBASIC::GetErrBasic();
@@ -266,7 +266,7 @@ RTLFUNC(Error)
if( nCode > 65535L )
StarBASIC::Error( SbERR_CONVERSION );
else
- nErr = StarBASIC::GetSfxFromVBError( (USHORT)nCode );
+ nErr = StarBASIC::GetSfxFromVBError( (sal_uInt16)nCode );
}
bool bVBA = SbiRuntime::isVBAEnabled();
@@ -452,7 +452,7 @@ RTLFUNC(CurDir)
int nSize = _PATH_INCR;
char* pMem;
- while( TRUE )
+ while( sal_True )
{
pMem = new char[nSize];
if( !pMem )
@@ -489,17 +489,17 @@ RTLFUNC(ChDir) // JSM
{
#ifdef _ENABLE_CUR_DIR
String aPath = rPar.Get(1)->GetString();
- BOOL bError = FALSE;
+ sal_Bool bError = sal_False;
#ifdef WNT
// #55997 Laut MI hilft es bei File-URLs einen DirEntry zwischenzuschalten
// #40996 Harmoniert bei Verwendung der WIN32-Funktion nicht mit getdir
DirEntry aEntry( aPath );
ByteString aFullPath( aEntry.GetFull(), gsl_getSystemTextEncoding() );
if( chdir( aFullPath.GetBuffer()) )
- bError = TRUE;
+ bError = sal_True;
#else
if (!DirEntry(aPath).SetCWD())
- bError = TRUE;
+ bError = sal_True;
#endif
if( bError )
StarBASIC::Error( SbERR_PATH_NOT_FOUND );
@@ -880,7 +880,7 @@ RTLFUNC(FileLen)
{
SbxVariableRef pArg = rPar.Get( 1 );
String aStr( pArg->GetString() );
- INT32 nLen = 0;
+ sal_Int32 nLen = 0;
// <-- UCB
if( hasUno() )
{
@@ -908,7 +908,7 @@ RTLFUNC(FileLen)
FileBase::RC nRet = DirectoryItem::get( getFullPathUNC( aStr ), aItem );
FileStatus aFileStatus( FileStatusMask_FileSize );
nRet = aItem.getFileStatus( aFileStatus );
- nLen = (INT32)aFileStatus.getFileSize();
+ nLen = (sal_Int32)aFileStatus.getFileSize();
#endif
}
rPar.Get(0)->PutLong( (long)nLen );
@@ -942,23 +942,23 @@ RTLFUNC(InStr)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- USHORT nStartPos = 1;
+ sal_uInt16 nStartPos = 1;
- USHORT nFirstStringPos = 1;
+ sal_uInt16 nFirstStringPos = 1;
if ( nArgCount >= 3 )
{
- INT32 lStartPos = rPar.Get(1)->GetLong();
+ sal_Int32 lStartPos = rPar.Get(1)->GetLong();
if( lStartPos <= 0 || lStartPos > 0xffff )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
lStartPos = 1;
}
- nStartPos = (USHORT)lStartPos;
+ nStartPos = (sal_uInt16)lStartPos;
nFirstStringPos++;
}
@@ -968,7 +968,7 @@ RTLFUNC(InStr)
if( bCompatibility )
{
SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
- bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+ bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
}
else
{
@@ -977,7 +977,7 @@ RTLFUNC(InStr)
if ( nArgCount == 4 )
bTextMode = rPar.Get(4)->GetInteger();
- USHORT nPos;
+ sal_uInt16 nPos;
const String& rToken = rPar.Get(nFirstStringPos+1)->GetString();
// #97545 Always find empty string
@@ -1024,7 +1024,7 @@ RTLFUNC(InStrRev)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -1032,7 +1032,7 @@ RTLFUNC(InStrRev)
String aStr1 = rPar.Get(1)->GetString();
String aToken = rPar.Get(2)->GetString();
- INT32 lStartPos = -1;
+ sal_Int32 lStartPos = -1;
if ( nArgCount >= 3 )
{
lStartPos = rPar.Get(3)->GetLong();
@@ -1049,7 +1049,7 @@ RTLFUNC(InStrRev)
if( bCompatibility )
{
SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
- bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+ bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
}
else
{
@@ -1058,13 +1058,13 @@ RTLFUNC(InStrRev)
if ( nArgCount == 4 )
bTextMode = rPar.Get(4)->GetInteger();
- USHORT nStrLen = aStr1.Len();
- USHORT nStartPos = lStartPos == -1 ? nStrLen : (USHORT)lStartPos;
+ sal_uInt16 nStrLen = aStr1.Len();
+ sal_uInt16 nStartPos = lStartPos == -1 ? nStrLen : (sal_uInt16)lStartPos;
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
if( nStartPos <= nStrLen )
{
- USHORT nTokenLen = aToken.Len();
+ sal_uInt16 nTokenLen = aToken.Len();
if( !nTokenLen )
{
// Always find empty string
@@ -1080,7 +1080,7 @@ RTLFUNC(InStrRev)
if( nRet == -1 )
nPos = 0;
else
- nPos = (USHORT)nRet + 1;
+ nPos = (sal_uInt16)nRet + 1;
}
else
{
@@ -1094,7 +1094,7 @@ RTLFUNC(InStrRev)
if( nRet == -1 )
nPos = 0;
else
- nPos = (USHORT)nRet + 1;
+ nPos = (sal_uInt16)nRet + 1;
}
}
}
@@ -1178,7 +1178,7 @@ RTLFUNC(Left)
else
{
String aStr( rPar.Get(1)->GetString() );
- INT32 lResultLen = rPar.Get(2)->GetLong();
+ sal_Int32 lResultLen = rPar.Get(2)->GetLong();
if( lResultLen > 0xffff )
{
lResultLen = 0xffff;
@@ -1188,7 +1188,7 @@ RTLFUNC(Left)
lResultLen = 0;
StarBASIC::Error( SbERR_BAD_ARGUMENT );
}
- aStr.Erase( (USHORT)lResultLen );
+ aStr.Erase( (sal_uInt16)lResultLen );
rPar.Get(0)->PutString( aStr );
}
}
@@ -1237,7 +1237,7 @@ RTLFUNC(Mid)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -1247,23 +1247,23 @@ RTLFUNC(Mid)
// Anders als im Original kann in dieser Variante der 3. Parameter
// nLength nicht weggelassen werden. Ist ueber bWrite schon vorgesehen.
if( nArgCount == 4 )
- bWrite = TRUE;
+ bWrite = sal_True;
String aArgStr = rPar.Get(1)->GetString();
- USHORT nStartPos = (USHORT)(rPar.Get(2)->GetLong() );
+ sal_uInt16 nStartPos = (sal_uInt16)(rPar.Get(2)->GetLong() );
if ( nStartPos == 0 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
nStartPos--;
- USHORT nLen = 0xffff;
+ sal_uInt16 nLen = 0xffff;
bool bWriteNoLenParam = false;
if ( nArgCount == 3 || bWrite )
{
- INT32 n = rPar.Get(3)->GetLong();
+ sal_Int32 n = rPar.Get(3)->GetLong();
if( bWrite && n == -1 )
bWriteNoLenParam = true;
- nLen = (USHORT)n;
+ nLen = (sal_uInt16)n;
}
String aResultStr;
if ( bWrite )
@@ -1272,7 +1272,7 @@ RTLFUNC(Mid)
bool bCompatibility = ( pInst && pInst->IsCompatibility() );
if( bCompatibility )
{
- USHORT nArgLen = aArgStr.Len();
+ sal_uInt16 nArgLen = aArgStr.Len();
if( nStartPos + 1 > nArgLen )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1280,8 +1280,8 @@ RTLFUNC(Mid)
}
String aReplaceStr = rPar.Get(4)->GetString();
- USHORT nReplaceStrLen = aReplaceStr.Len();
- USHORT nReplaceLen;
+ sal_uInt16 nReplaceStrLen = aReplaceStr.Len();
+ sal_uInt16 nReplaceLen;
if( bWriteNoLenParam )
{
nReplaceLen = nReplaceStrLen;
@@ -1293,12 +1293,12 @@ RTLFUNC(Mid)
nReplaceLen = nReplaceStrLen;
}
- USHORT nReplaceEndPos = nStartPos + nReplaceLen;
+ sal_uInt16 nReplaceEndPos = nStartPos + nReplaceLen;
if( nReplaceEndPos > nArgLen )
nReplaceLen -= (nReplaceEndPos - nArgLen);
aResultStr = aArgStr;
- USHORT nErase = nReplaceLen;
+ sal_uInt16 nErase = nReplaceLen;
aResultStr.Erase( nStartPos, nErase );
aResultStr.Insert( aReplaceStr, 0, nReplaceLen, nStartPos );
}
@@ -1346,7 +1346,7 @@ RTLFUNC(Replace)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 6 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -1355,7 +1355,7 @@ RTLFUNC(Replace)
String aFindStr = rPar.Get(2)->GetString();
String aReplaceStr = rPar.Get(3)->GetString();
- INT32 lStartPos = 1;
+ sal_Int32 lStartPos = 1;
if ( nArgCount >= 4 )
{
if( rPar.Get(4)->GetType() != SbxEMPTY )
@@ -1367,7 +1367,7 @@ RTLFUNC(Replace)
}
}
- INT32 lCount = -1;
+ sal_Int32 lCount = -1;
if( nArgCount >=5 )
{
if( rPar.Get(5)->GetType() != SbxEMPTY )
@@ -1385,7 +1385,7 @@ RTLFUNC(Replace)
if( bCompatibility )
{
SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
- bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+ bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
}
else
{
@@ -1394,14 +1394,14 @@ RTLFUNC(Replace)
if ( nArgCount == 6 )
bTextMode = rPar.Get(6)->GetInteger();
- USHORT nExpStrLen = aExpStr.Len();
- USHORT nFindStrLen = aFindStr.Len();
- USHORT nReplaceStrLen = aReplaceStr.Len();
+ sal_uInt16 nExpStrLen = aExpStr.Len();
+ sal_uInt16 nFindStrLen = aFindStr.Len();
+ sal_uInt16 nReplaceStrLen = aReplaceStr.Len();
if( lStartPos <= nExpStrLen )
{
- USHORT nPos = static_cast<USHORT>( lStartPos - 1 );
- USHORT nCounts = 0;
+ sal_uInt16 nPos = static_cast<sal_uInt16>( lStartPos - 1 );
+ sal_uInt16 nCounts = 0;
while( lCount == -1 || lCount > nCounts )
{
String aSrcStr( aExpStr );
@@ -1423,7 +1423,7 @@ RTLFUNC(Replace)
}
}
}
- rPar.Get(0)->PutString( aExpStr.Copy( static_cast<USHORT>(lStartPos - 1) ) );
+ rPar.Get(0)->PutString( aExpStr.Copy( static_cast<sal_uInt16>(lStartPos - 1) ) );
}
}
@@ -1437,7 +1437,7 @@ RTLFUNC(Right)
else
{
const String& rStr = rPar.Get(1)->GetString();
- INT32 lResultLen = rPar.Get(2)->GetLong();
+ sal_Int32 lResultLen = rPar.Get(2)->GetLong();
if( lResultLen > 0xffff )
{
lResultLen = 0xffff;
@@ -1447,8 +1447,8 @@ RTLFUNC(Right)
lResultLen = 0;
StarBASIC::Error( SbERR_BAD_ARGUMENT );
}
- USHORT nResultLen = (USHORT)lResultLen;
- USHORT nStrLen = rStr.Len();
+ sal_uInt16 nResultLen = (sal_uInt16)lResultLen;
+ sal_uInt16 nStrLen = rStr.Len();
if ( nResultLen > nStrLen )
nResultLen = nStrLen;
String aResultStr = rStr.Copy( nStrLen-nResultLen );
@@ -1489,7 +1489,7 @@ RTLFUNC(Sgn)
else
{
double aDouble = rPar.Get(1)->GetDouble();
- INT16 nResult = 0;
+ sal_Int16 nResult = 0;
if ( aDouble > 0 )
nResult = 1;
else if ( aDouble < 0 )
@@ -1508,7 +1508,7 @@ RTLFUNC(Space)
else
{
String aStr;
- aStr.Fill( (USHORT)(rPar.Get(1)->GetLong() ));
+ aStr.Fill( (sal_uInt16)(rPar.Get(1)->GetLong() ));
rPar.Get(0)->PutString( aStr );
}
}
@@ -1523,7 +1523,7 @@ RTLFUNC(Spc)
else
{
String aStr;
- aStr.Fill( (USHORT)(rPar.Get(1)->GetLong() ));
+ aStr.Fill( (sal_uInt16)(rPar.Get(1)->GetLong() ));
rPar.Get(0)->PutString( aStr );
}
}
@@ -1573,11 +1573,11 @@ RTLFUNC(Str)
const sal_Unicode* pBuf = aStr.GetBuffer();
bool bNeg = ( pBuf[0] == '-' );
- USHORT iZeroSearch = 0;
+ sal_uInt16 iZeroSearch = 0;
if( bNeg )
iZeroSearch++;
- USHORT iNext = iZeroSearch + 1;
+ sal_uInt16 iNext = iZeroSearch + 1;
if( pBuf[iZeroSearch] == '0' && nLen > iNext && pBuf[iNext] == '.' )
{
aStr.Erase( iZeroSearch, 1 );
@@ -1608,16 +1608,16 @@ RTLFUNC(StrComp)
const String& rStr2 = rPar.Get(2)->GetString();
SbiInstance* pInst = pINST;
- INT16 nTextCompare;
+ sal_Int16 nTextCompare;
bool bCompatibility = ( pInst && pInst->IsCompatibility() );
if( bCompatibility )
{
SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
- nTextCompare = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+ nTextCompare = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
}
else
{
- nTextCompare = TRUE;
+ nTextCompare = sal_True;
}
if ( rPar.Count() == 4 )
nTextCompare = rPar.Get(3)->GetInteger();
@@ -1653,7 +1653,7 @@ RTLFUNC(StrComp)
nRetValue = 1;
}
- rPar.Get(0)->PutInteger( sal::static_int_cast< INT16 >( nRetValue ) );
+ rPar.Get(0)->PutInteger( sal::static_int_cast< sal_Int16 >( nRetValue ) );
}
RTLFUNC(String)
@@ -1667,10 +1667,10 @@ RTLFUNC(String)
{
String aStr;
sal_Unicode aFiller;
- INT32 lCount = rPar.Get(1)->GetLong();
+ sal_Int32 lCount = rPar.Get(1)->GetLong();
if( lCount < 0 || lCount > 0xffff )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- USHORT nCount = (USHORT)lCount;
+ sal_uInt16 nCount = (sal_uInt16)lCount;
if( rPar.Get(2)->GetType() == SbxINTEGER )
aFiller = (sal_Unicode)rPar.Get(2)->GetInteger();
else
@@ -1728,7 +1728,7 @@ RTLFUNC(Val)
String aStr( rPar.Get(1)->GetString() );
// lt. Mikkysoft bei Kommas abbrechen!
-// for( USHORT n=0; n < aStr.Len(); n++ )
+// for( sal_uInt16 n=0; n < aStr.Len(); n++ )
// if( aStr[n] == ',' ) aStr[n] = '.';
FilterWhiteSpace( aStr );
@@ -1743,7 +1743,7 @@ RTLFUNC(Val)
if ( nRadix != 10 )
{
ByteString aByteStr( aStr, gsl_getSystemTextEncoding() );
- INT16 nlResult = (INT16)strtol( aByteStr.GetBuffer()+2, &pEndPtr, nRadix);
+ sal_Int16 nlResult = (sal_Int16)strtol( aByteStr.GetBuffer()+2, &pEndPtr, nRadix);
nResult = (double)nlResult;
}
}
@@ -1761,46 +1761,46 @@ RTLFUNC(Val)
// Helper functions for date conversion
-INT16 implGetDateDay( double aDate )
+sal_Int16 implGetDateDay( double aDate )
{
aDate -= 2.0; // normieren: 1.1.1900 => 0.0
Date aRefDate( 1, 1, 1900 );
if ( aDate >= 0.0 )
{
aDate = floor( aDate );
- aRefDate += (ULONG)aDate;
+ aRefDate += (sal_uIntPtr)aDate;
}
else
{
aDate = ceil( aDate );
- aRefDate -= (ULONG)(-1.0 * aDate);
+ aRefDate -= (sal_uIntPtr)(-1.0 * aDate);
}
- INT16 nRet = (INT16)( aRefDate.GetDay() );
+ sal_Int16 nRet = (sal_Int16)( aRefDate.GetDay() );
return nRet;
}
-INT16 implGetDateMonth( double aDate )
+sal_Int16 implGetDateMonth( double aDate )
{
Date aRefDate( 1,1,1900 );
long nDays = (long)aDate;
nDays -= 2; // normieren: 1.1.1900 => 0.0
aRefDate += nDays;
- INT16 nRet = (INT16)( aRefDate.GetMonth() );
+ sal_Int16 nRet = (sal_Int16)( aRefDate.GetMonth() );
return nRet;
}
-INT16 implGetDateYear( double aDate )
+sal_Int16 implGetDateYear( double aDate )
{
Date aRefDate( 1,1,1900 );
long nDays = (long) aDate;
nDays -= 2; // normieren: 1.1.1900 => 0.0
aRefDate += nDays;
- INT16 nRet = (INT16)( aRefDate.GetYear() );
+ sal_Int16 nRet = (sal_Int16)( aRefDate.GetYear() );
return nRet;
}
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet )
{
if ( nYear < 30 && SbiRuntime::isVBAEnabled() )
nYear += 2000;
@@ -1810,7 +1810,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
if ((nYear < 100 || nYear > 9999) )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- return FALSE;
+ return sal_False;
}
if ( !SbiRuntime::isVBAEnabled() )
{
@@ -1818,7 +1818,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
(nDay < 1 || nDay > 31 ) )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- return FALSE;
+ return sal_False;
}
}
else
@@ -1833,7 +1833,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
{
// inacurrate around leap year, don't use days to calculate,
// just modify the months directory
- INT16 nYearAdj = ( nMonth /12 ); // default to positive months inputed
+ sal_Int16 nYearAdj = ( nMonth /12 ); // default to positive months inputed
if ( nMonth <=0 )
nYearAdj = ( ( nMonth -12 ) / 12 );
aCurDate.SetYear( aCurDate.GetYear() + nYearAdj );
@@ -1850,7 +1850,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
long nDiffDays = GetDayDiff( aCurDate );
rdRet = (double)nDiffDays;
- return TRUE;
+ return sal_True;
}
// Function to convert date to ISO 8601 date format
@@ -1884,14 +1884,14 @@ RTLFUNC(CDateFromIso)
if ( rPar.Count() == 2 )
{
String aStr = rPar.Get(1)->GetString();
- INT16 iMonthStart = aStr.Len() - 4;
+ sal_Int16 iMonthStart = aStr.Len() - 4;
String aYearStr = aStr.Copy( 0, iMonthStart );
String aMonthStr = aStr.Copy( iMonthStart, 2 );
String aDayStr = aStr.Copy( iMonthStart+2, 2 );
double dDate;
- if( implDateSerial( (INT16)aYearStr.ToInt32(),
- (INT16)aMonthStr.ToInt32(), (INT16)aDayStr.ToInt32(), dDate ) )
+ if( implDateSerial( (sal_Int16)aYearStr.ToInt32(),
+ (sal_Int16)aMonthStr.ToInt32(), (sal_Int16)aDayStr.ToInt32(), dDate ) )
{
rPar.Get(0)->PutDate( dDate );
}
@@ -1910,9 +1910,9 @@ RTLFUNC(DateSerial)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nYear = rPar.Get(1)->GetInteger();
- INT16 nMonth = rPar.Get(2)->GetInteger();
- INT16 nDay = rPar.Get(3)->GetInteger();
+ sal_Int16 nYear = rPar.Get(1)->GetInteger();
+ sal_Int16 nMonth = rPar.Get(2)->GetInteger();
+ sal_Int16 nDay = rPar.Get(3)->GetInteger();
double dDate;
if( implDateSerial( nYear, nMonth, nDay, dDate ) )
@@ -1929,11 +1929,11 @@ RTLFUNC(TimeSerial)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nHour = rPar.Get(1)->GetInteger();
+ sal_Int16 nHour = rPar.Get(1)->GetInteger();
if ( nHour == 24 )
nHour = 0; // Wegen UNO DateTimes, die bis 24 Uhr gehen
- INT16 nMinute = rPar.Get(2)->GetInteger();
- INT16 nSecond = rPar.Get(3)->GetInteger();
+ sal_Int16 nMinute = rPar.Get(2)->GetInteger();
+ sal_Int16 nSecond = rPar.Get(3)->GetInteger();
if ((nHour < 0 || nHour > 23) ||
(nMinute < 0 || nMinute > 59 ) ||
(nSecond < 0 || nSecond > 59 ))
@@ -1942,7 +1942,7 @@ RTLFUNC(TimeSerial)
return;
}
- INT32 nSeconds = nHour;
+ sal_Int32 nSeconds = nHour;
nSeconds *= 3600;
nSeconds += nMinute * 60;
nSeconds += nSecond;
@@ -1972,7 +1972,7 @@ RTLFUNC(DateValue)
sal_uInt32 nIndex;
double fResult;
String aStr( rPar.Get(1)->GetString() );
- BOOL bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
+ sal_Bool bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
short nType = pFormatter->GetType( nIndex );
// DateValue("February 12, 1969") raises error if the system locale is not en_US
@@ -2033,7 +2033,7 @@ RTLFUNC(TimeValue)
sal_uInt32 nIndex;
double fResult;
- BOOL bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
+ sal_Bool bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
nIndex, fResult );
short nType = pFormatter->GetType(nIndex);
if(bSuccess && (nType==NUMBERFORMAT_TIME||nType==NUMBERFORMAT_DATETIME))
@@ -2064,7 +2064,7 @@ RTLFUNC(Day)
SbxVariableRef pArg = rPar.Get( 1 );
double aDate = pArg->GetDate();
- INT16 nDay = implGetDateDay( aDate );
+ sal_Int16 nDay = implGetDateDay( aDate );
rPar.Get(0)->PutInteger( nDay );
}
}
@@ -2078,19 +2078,19 @@ RTLFUNC(Year)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nYear = implGetDateYear( rPar.Get(1)->GetDate() );
+ sal_Int16 nYear = implGetDateYear( rPar.Get(1)->GetDate() );
rPar.Get(0)->PutInteger( nYear );
}
}
-INT16 implGetHour( double dDate )
+sal_Int16 implGetHour( double dDate )
{
if( dDate < 0.0 )
dDate *= -1.0;
double nFrac = dDate - floor( dDate );
nFrac *= 86400.0;
- INT32 nSeconds = (INT32)(nFrac + 0.5);
- INT16 nHour = (INT16)(nSeconds / 3600);
+ sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+ sal_Int16 nHour = (sal_Int16)(nSeconds / 3600);
return nHour;
}
@@ -2104,20 +2104,20 @@ RTLFUNC(Hour)
else
{
double nArg = rPar.Get(1)->GetDate();
- INT16 nHour = implGetHour( nArg );
+ sal_Int16 nHour = implGetHour( nArg );
rPar.Get(0)->PutInteger( nHour );
}
}
-INT16 implGetMinute( double dDate )
+sal_Int16 implGetMinute( double dDate )
{
if( dDate < 0.0 )
dDate *= -1.0;
double nFrac = dDate - floor( dDate );
nFrac *= 86400.0;
- INT32 nSeconds = (INT32)(nFrac + 0.5);
- INT16 nTemp = (INT16)(nSeconds % 3600);
- INT16 nMin = nTemp / 60;
+ sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+ sal_Int16 nTemp = (sal_Int16)(nSeconds % 3600);
+ sal_Int16 nMin = nTemp / 60;
return nMin;
}
@@ -2131,7 +2131,7 @@ RTLFUNC(Minute)
else
{
double nArg = rPar.Get(1)->GetDate();
- INT16 nMin = implGetMinute( nArg );
+ sal_Int16 nMin = implGetMinute( nArg );
rPar.Get(0)->PutInteger( nMin );
}
}
@@ -2145,24 +2145,24 @@ RTLFUNC(Month)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nMonth = implGetDateMonth( rPar.Get(1)->GetDate() );
+ sal_Int16 nMonth = implGetDateMonth( rPar.Get(1)->GetDate() );
rPar.Get(0)->PutInteger( nMonth );
}
}
-INT16 implGetSecond( double dDate )
+sal_Int16 implGetSecond( double dDate )
{
if( dDate < 0.0 )
dDate *= -1.0;
double nFrac = dDate - floor( dDate );
nFrac *= 86400.0;
- INT32 nSeconds = (INT32)(nFrac + 0.5);
- INT16 nTemp = (INT16)(nSeconds / 3600);
+ sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+ sal_Int16 nTemp = (sal_Int16)(nSeconds / 3600);
nSeconds -= nTemp * 3600;
- nTemp = (INT16)(nSeconds / 60);
+ nTemp = (sal_Int16)(nSeconds / 60);
nSeconds -= nTemp * 60;
- INT16 nRet = (INT16)nSeconds;
+ sal_Int16 nRet = (sal_Int16)nSeconds;
return nRet;
}
@@ -2176,7 +2176,7 @@ RTLFUNC(Second)
else
{
double nArg = rPar.Get(1)->GetDate();
- INT16 nSecond = implGetSecond( nArg );
+ sal_Int16 nSecond = implGetSecond( nArg );
rPar.Get(0)->PutInteger( nSecond );
}
}
@@ -2328,7 +2328,7 @@ RTLFUNC(IsArray)
if ( rPar.Count() < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
- rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? TRUE : FALSE );
+ rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? sal_True : sal_False );
}
RTLFUNC(IsObject)
@@ -2347,7 +2347,7 @@ RTLFUNC(IsObject)
SbxBase::ResetError();
SbUnoClass* pUnoClass;
- BOOL bObject;
+ sal_Bool bObject;
if( pObj && NULL != ( pUnoClass=PTR_CAST(SbUnoClass,pObj) ) )
{
bObject = pUnoClass->getUnoClass().is();
@@ -2369,14 +2369,14 @@ RTLFUNC(IsDate)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- // #46134 Nur String wird konvertiert, andere Typen ergeben FALSE
+ // #46134 Nur String wird konvertiert, andere Typen ergeben sal_False
SbxVariableRef xArg = rPar.Get( 1 );
SbxDataType eType = xArg->GetType();
- BOOL bDate = FALSE;
+ sal_Bool bDate = sal_False;
if( eType == SbxDATE )
{
- bDate = TRUE;
+ bDate = sal_True;
}
else if( eType == SbxSTRING )
{
@@ -2432,12 +2432,12 @@ RTLFUNC(IsNull)
// #51475 Wegen Uno-Objekten auch true liefern,
// wenn der pObj-Wert NULL ist
SbxVariableRef pArg = rPar.Get( 1 );
- BOOL bNull = rPar.Get(1)->IsNull();
+ sal_Bool bNull = rPar.Get(1)->IsNull();
if( !bNull && pArg->GetType() == SbxOBJECT )
{
SbxBase* pObj = pArg->GetObject();
if( !pObj )
- bNull = TRUE;
+ bNull = sal_True;
}
rPar.Get( 0 )->PutBool( bNull );
}
@@ -2577,7 +2577,7 @@ inline sal_Bool implCheckWildcard( const String& rName, SbiRTLData* pRTLData )
bool isRootDir( String aDirURLStr )
{
INetURLObject aDirURLObj( aDirURLStr );
- BOOL bRoot = FALSE;
+ sal_Bool bRoot = sal_False;
// Check if it's a root directory
sal_Int32 nCount = aDirURLObj.getSegmentCount();
@@ -2585,22 +2585,22 @@ bool isRootDir( String aDirURLStr )
// No segment means Unix root directory "file:///"
if( nCount == 0 )
{
- bRoot = TRUE;
+ bRoot = sal_True;
}
// Exactly one segment needs further checking, because it
// can be Unix "file:///foo/" -> no root
// or Windows "file:///c:/" -> root
else if( nCount == 1 )
{
- ::rtl::OUString aSeg1 = aDirURLObj.getName( 0, TRUE,
+ ::rtl::OUString aSeg1 = aDirURLObj.getName( 0, sal_True,
INetURLObject::DECODE_WITH_CHARSET );
if( aSeg1.getStr()[1] == (sal_Unicode)':' )
{
- bRoot = TRUE;
+ bRoot = sal_True;
}
}
// More than one segments can never be root
- // so bRoot remains FALSE
+ // so bRoot remains sal_False
return bRoot;
}
@@ -2612,7 +2612,7 @@ RTLFUNC(Dir)
String aPath;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount > 3 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -2667,7 +2667,7 @@ RTLFUNC(Dir)
rPar.Get(0)->PutString( aEmptyStr );
}
- USHORT nFlags = 0;
+ sal_uInt16 nFlags = 0;
if ( nParCount > 2 )
pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
else
@@ -2681,7 +2681,7 @@ RTLFUNC(Dir)
// #78651 Add "." and ".." directories for VB compatibility
if( bIncludeFolders )
{
- BOOL bRoot = isRootDir( aDirURLStr );
+ sal_Bool bRoot = isRootDir( aDirURLStr );
// If it's no root directory we flag the need for
// the "." and ".." directories by the value -2
@@ -2751,7 +2751,7 @@ RTLFUNC(Dir)
}
INetURLObject aURL( aFile );
- aPath = aURL.getName( INetURLObject::LAST_SEGMENT, TRUE,
+ aPath = aURL.getName( INetURLObject::LAST_SEGMENT, sal_True,
INetURLObject::DECODE_WITH_CHARSET );
}
@@ -2782,7 +2782,7 @@ RTLFUNC(Dir)
rPar.Get(0)->PutString( aEntry.GetName() );
return;
}
- USHORT nFlags = 0;
+ sal_uInt16 nFlags = 0;
if ( nParCount > 2 )
pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
else
@@ -2794,7 +2794,7 @@ RTLFUNC(Dir)
else
{
// Die richtige Auswahl treffen
- USHORT nMode = FSYS_KIND_FILE;
+ sal_uInt16 nMode = FSYS_KIND_FILE;
if( nFlags & Sb_ATTR_DIRECTORY )
nMode |= FSYS_KIND_DIR;
if( nFlags == Sb_ATTR_DIRECTORY )
@@ -2829,7 +2829,7 @@ RTLFUNC(Dir)
String aDirURL = implSetupWildcard( aFileParam, pRTLData );
- USHORT nFlags = 0;
+ sal_uInt16 nFlags = 0;
if ( nParCount > 2 )
pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
else
@@ -2851,7 +2851,7 @@ RTLFUNC(Dir)
pRTLData->nCurDirPos = 0;
if( bIncludeFolders )
{
- BOOL bRoot = isRootDir( aDirURL );
+ sal_Bool bRoot = isRootDir( aDirURL );
// If it's no root directory we flag the need for
// the "." and ".." directories by the value -2
@@ -2931,7 +2931,7 @@ RTLFUNC(GetAttr)
if ( rPar.Count() == 2 )
{
- INT16 nFlags = 0;
+ sal_Int16 nFlags = 0;
// In Windows, We want to use Windows API to get the file attributes
// for VBA interoperability.
@@ -2948,7 +2948,7 @@ RTLFUNC(GetAttr)
{
if (nRealFlags == FILE_ATTRIBUTE_NORMAL)
nRealFlags = 0;
- nFlags = (INT16) (nRealFlags);
+ nFlags = (sal_Int16) (nRealFlags);
}
else
StarBASIC::Error( SbERR_FILE_NOT_FOUND );
@@ -3114,7 +3114,7 @@ RTLFUNC(EOF)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
// nChannel--; // macht MD beim Oeffnen auch nicht
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3123,7 +3123,7 @@ RTLFUNC(EOF)
StarBASIC::Error( SbERR_BAD_CHANNEL );
return;
}
- BOOL bIsEof;
+ sal_Bool bIsEof;
SvStream* pSvStrm = pSbStrm->GetStrm();
if ( pSbStrm->IsText() )
{
@@ -3154,7 +3154,7 @@ RTLFUNC(FileAttr)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
// nChannel--;
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3163,9 +3163,9 @@ RTLFUNC(FileAttr)
StarBASIC::Error( SbERR_BAD_CHANNEL );
return;
}
- INT16 nRet;
+ sal_Int16 nRet;
if ( rPar.Get(2)->GetInteger() == 1 )
- nRet = (INT16)(pSbStrm->GetMode());
+ nRet = (sal_Int16)(pSbStrm->GetMode());
else
nRet = 0; // System file handle not supported
@@ -3182,7 +3182,7 @@ RTLFUNC(Loc)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
if ( !pSbStrm )
@@ -3191,7 +3191,7 @@ RTLFUNC(Loc)
return;
}
SvStream* pSvStrm = pSbStrm->GetStrm();
- ULONG nPos;
+ sal_uIntPtr nPos;
if( pSbStrm->IsRandom())
{
short nBlockLen = pSbStrm->GetBlockLen();
@@ -3206,7 +3206,7 @@ RTLFUNC(Loc)
nPos = ( pSvStrm->Tell()+1 ) / 128;
else
nPos = pSvStrm->Tell();
- rPar.Get(0)->PutLong( (INT32)nPos );
+ rPar.Get(0)->PutLong( (sal_Int32)nPos );
}
}
@@ -3220,7 +3220,7 @@ RTLFUNC(Lof)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
if ( !pSbStrm )
@@ -3229,10 +3229,10 @@ RTLFUNC(Lof)
return;
}
SvStream* pSvStrm = pSbStrm->GetStrm();
- ULONG nOldPos = pSvStrm->Tell();
- ULONG nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
+ sal_uIntPtr nOldPos = pSvStrm->Tell();
+ sal_uIntPtr nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
pSvStrm->Seek( nOldPos );
- rPar.Get(0)->PutLong( (INT32)nLen );
+ rPar.Get(0)->PutLong( (sal_Int32)nLen );
}
}
@@ -3249,7 +3249,7 @@ RTLFUNC(Seek)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
// nChannel--;
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3262,15 +3262,15 @@ RTLFUNC(Seek)
if ( nArgs == 2 ) // Seek-Function
{
- ULONG nPos = pStrm->Tell();
+ sal_uIntPtr nPos = pStrm->Tell();
if( pSbStrm->IsRandom() )
nPos = nPos / pSbStrm->GetBlockLen();
nPos++; // Basic zaehlt ab 1
- rPar.Get(0)->PutLong( (INT32)nPos );
+ rPar.Get(0)->PutLong( (sal_Int32)nPos );
}
else // Seek-Statement
{
- INT32 nPos = rPar.Get(2)->GetLong();
+ sal_Int32 nPos = rPar.Get(2)->GetLong();
if ( nPos < 1 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3280,7 +3280,7 @@ RTLFUNC(Seek)
pSbStrm->SetExpandOnWriteTo( 0 );
if ( pSbStrm->IsRandom() )
nPos *= pSbStrm->GetBlockLen();
- pStrm->Seek( (ULONG)nPos );
+ pStrm->Seek( (sal_uIntPtr)nPos );
pSbStrm->SetExpandOnWriteTo( nPos );
}
}
@@ -3290,7 +3290,7 @@ RTLFUNC(Format)
(void)pBasic;
(void)bWrite;
- USHORT nArgCount = (USHORT)rPar.Count();
+ sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
if ( nArgCount < 2 || nArgCount > 3 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -3314,11 +3314,11 @@ RTLFUNC(Randomize)
if ( rPar.Count() > 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- INT16 nSeed;
+ sal_Int16 nSeed;
if( rPar.Count() == 2 )
- nSeed = (INT16)rPar.Get(1)->GetInteger();
+ nSeed = (sal_Int16)rPar.Get(1)->GetInteger();
else
- nSeed = (INT16)rand();
+ nSeed = (sal_Int16)rand();
srand( nSeed );
}
@@ -3339,7 +3339,7 @@ RTLFUNC(Rnd)
//
-// Syntax: Shell("Path",[ Window-Style,[ "Params", [ bSync = FALSE ]]])
+// Syntax: Shell("Path",[ Window-Style,[ "Params", [ bSync = sal_False ]]])
//
// WindowStyles (VBA-kompatibel):
// 2 == Minimized
@@ -3363,7 +3363,7 @@ RTLFUNC(Shell)
return;
}
- ULONG nArgCount = rPar.Count();
+ sal_uIntPtr nArgCount = rPar.Count();
if ( nArgCount < 2 || nArgCount > 5 )
{
rPar.Get(0)->PutLong(0);
@@ -3371,7 +3371,7 @@ RTLFUNC(Shell)
}
else
{
- USHORT nOptions = vos::OProcess::TOption_SearchPath|
+ sal_uInt16 nOptions = vos::OProcess::TOption_SearchPath|
vos::OProcess::TOption_Detached;
String aCmdLine = rPar.Get(1)->GetString();
// Zusaetzliche Parameter anhaengen, es muss eh alles geparsed werden
@@ -3385,13 +3385,13 @@ RTLFUNC(Shell)
// Spezial-Behandlung (leere Liste) vermeiden
aCmdLine.AppendAscii( " " );
}
- USHORT nLen = aCmdLine.Len();
+ sal_uInt16 nLen = aCmdLine.Len();
// #55735 Wenn Parameter dabei sind, muessen die abgetrennt werden
// #72471 Auch die einzelnen Parameter trennen
std::list<String> aTokenList;
String aToken;
- USHORT i = 0;
+ sal_uInt16 i = 0;
sal_Unicode c;
while( i < nLen )
{
@@ -3405,7 +3405,7 @@ RTLFUNC(Shell)
if( c == '\"' || c == '\'' )
{
- USHORT iFoundPos = aCmdLine.Search( c, i + 1 );
+ sal_uInt16 iFoundPos = aCmdLine.Search( c, i + 1 );
// Wenn nichts gefunden wurde, Rest kopieren
if( iFoundPos == STRING_NOTFOUND )
@@ -3421,9 +3421,9 @@ RTLFUNC(Shell)
}
else
{
- USHORT iFoundSpacePos = aCmdLine.Search( ' ', i );
- USHORT iFoundTabPos = aCmdLine.Search( '\t', i );
- USHORT iFoundPos = Min( iFoundSpacePos, iFoundTabPos );
+ sal_uInt16 iFoundSpacePos = aCmdLine.Search( ' ', i );
+ sal_uInt16 iFoundTabPos = aCmdLine.Search( '\t', i );
+ sal_uInt16 iFoundPos = Min( iFoundSpacePos, iFoundTabPos );
// Wenn nichts gefunden wurde, Rest kopieren
if( iFoundPos == STRING_NOTFOUND )
@@ -3443,7 +3443,7 @@ RTLFUNC(Shell)
}
// #55735 / #72471 Ende
- INT16 nWinStyle = 0;
+ sal_Int16 nWinStyle = 0;
if( nArgCount >= 3 )
{
nWinStyle = rPar.Get(2)->GetInteger();
@@ -3460,7 +3460,7 @@ RTLFUNC(Shell)
break;
}
- BOOL bSync = FALSE;
+ sal_Bool bSync = sal_False;
if( nArgCount >= 5 )
bSync = rPar.Get(4)->GetBool();
if( bSync )
@@ -3478,7 +3478,7 @@ RTLFUNC(Shell)
iter++;
- USHORT nParamCount = sal::static_int_cast< USHORT >(
+ sal_uInt16 nParamCount = sal::static_int_cast< sal_uInt16 >(
aTokenList.size() - 1 );
::rtl::OUString* pArgumentList = NULL;
//const char** pParamList = NULL;
@@ -3486,7 +3486,7 @@ RTLFUNC(Shell)
{
pArgumentList = new ::rtl::OUString[ nParamCount ];
//pParamList = new const char*[ nParamCount ];
- USHORT iList = 0;
+ sal_uInt16 iList = 0;
while( iter != aTokenList.end() )
{
const String& rParamStr = (*iter);
@@ -3499,7 +3499,7 @@ RTLFUNC(Shell)
//const char* pParams = aParams.Len() ? aParams.GetStr() : 0;
vos::OProcess* pApp;
pApp = new vos::OProcess( aOUStrProgUNC );
- BOOL bSucc;
+ sal_Bool bSucc;
if( nParamCount == 0 )
{
bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
@@ -3515,7 +3515,7 @@ RTLFUNC(Shell)
pApp = new vos::OProcess( pProg );
else
pApp = new vos::OProcess( pProg, pParamList, nParamCount );
- BOOL bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
+ sal_Bool bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
*/
delete pApp;
@@ -3537,7 +3537,7 @@ RTLFUNC(VarType)
else
{
SbxDataType eType = rPar.Get(1)->GetType();
- rPar.Get(0)->PutInteger( (INT16)eType );
+ rPar.Get(0)->PutInteger( (sal_Int16)eType );
}
}
@@ -3587,7 +3587,7 @@ String getBasicTypeName( SbxDataType eType )
};
int nPos = ((int)eType) & 0x0FFF;
- USHORT nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* );
+ sal_uInt16 nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* );
if ( nPos < 0 || nPos >= nTypeNameCount )
nPos = nTypeNameCount - 1;
String aRetStr = String::CreateFromAscii( pTypeNames[nPos] );
@@ -3604,7 +3604,7 @@ RTLFUNC(TypeName)
else
{
SbxDataType eType = rPar.Get(1)->GetType();
- BOOL bIsArray = ( ( eType & SbxARRAY ) != 0 );
+ sal_Bool bIsArray = ( ( eType & SbxARRAY ) != 0 );
String aRetStr = getBasicTypeName( eType );
if( bIsArray )
aRetStr.AppendAscii( "()" );
@@ -3622,7 +3622,7 @@ RTLFUNC(Len)
else
{
const String& rStr = rPar.Get(1)->GetString();
- rPar.Get(0)->PutLong( (INT32)rStr.Len() );
+ rPar.Get(0)->PutLong( (sal_Int32)rStr.Len() );
}
}
@@ -3648,7 +3648,7 @@ RTLFUNC(DDEInitiate)
const String& rTopic = rPar.Get(2)->GetString();
SbiDdeControl* pDDE = pINST->GetDdeControl();
- INT16 nChannel;
+ sal_Int16 nChannel;
SbError nDdeErr = pDDE->Initiate( rApp, rTopic, nChannel );
if( nDdeErr )
StarBASIC::Error( nDdeErr );
@@ -3675,7 +3675,7 @@ RTLFUNC(DDETerminate)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
SbiDdeControl* pDDE = pINST->GetDdeControl();
SbError nDdeErr = pDDE->Terminate( nChannel );
if( nDdeErr )
@@ -3727,7 +3727,7 @@ RTLFUNC(DDERequest)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
const String& rItem = rPar.Get(2)->GetString();
SbiDdeControl* pDDE = pINST->GetDdeControl();
String aResult;
@@ -3757,7 +3757,7 @@ RTLFUNC(DDEExecute)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
const String& rCommand = rPar.Get(2)->GetString();
SbiDdeControl* pDDE = pINST->GetDdeControl();
SbError nDdeErr = pDDE->Execute( nChannel, rCommand );
@@ -3784,7 +3784,7 @@ RTLFUNC(DDEPoke)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
const String& rItem = rPar.Get(2)->GetString();
const String& rData = rPar.Get(3)->GetString();
SbiDdeControl* pDDE = pINST->GetDdeControl();
@@ -3824,7 +3824,7 @@ RTLFUNC(LBound)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount != 3 && nParCount != 2 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3834,7 +3834,7 @@ RTLFUNC(LBound)
SbxDimArray* pArr = PTR_CAST(SbxDimArray,pParObj);
if( pArr )
{
- INT32 nLower, nUpper;
+ sal_Int32 nLower, nUpper;
short nDim = (nParCount == 3) ? (short)rPar.Get(2)->GetInteger() : 1;
if( !pArr->GetDim32( nDim, nLower, nUpper ) )
StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -3850,7 +3850,7 @@ RTLFUNC(UBound)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount != 3 && nParCount != 2 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3861,7 +3861,7 @@ RTLFUNC(UBound)
SbxDimArray* pArr = PTR_CAST(SbxDimArray,pParObj);
if( pArr )
{
- INT32 nLower, nUpper;
+ sal_Int32 nLower, nUpper;
short nDim = (nParCount == 3) ? (short)rPar.Get(2)->GetInteger() : 1;
if( !pArr->GetDim32( nDim, nLower, nUpper ) )
StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -3883,10 +3883,10 @@ RTLFUNC(RGB)
return;
}
- ULONG nRed = rPar.Get(1)->GetInteger() & 0xFF;
- ULONG nGreen = rPar.Get(2)->GetInteger() & 0xFF;
- ULONG nBlue = rPar.Get(3)->GetInteger() & 0xFF;
- ULONG nRGB;
+ sal_uIntPtr nRed = rPar.Get(1)->GetInteger() & 0xFF;
+ sal_uIntPtr nGreen = rPar.Get(2)->GetInteger() & 0xFF;
+ sal_uIntPtr nBlue = rPar.Get(3)->GetInteger() & 0xFF;
+ sal_uIntPtr nRGB;
SbiInstance* pInst = pINST;
bool bCompatibility = ( pInst && pInst->IsCompatibility() );
@@ -3906,7 +3906,7 @@ RTLFUNC(QBColor)
(void)pBasic;
(void)bWrite;
- static const INT32 pRGB[] =
+ static const sal_Int32 pRGB[] =
{
0x000000,
0x800000,
@@ -3932,13 +3932,13 @@ RTLFUNC(QBColor)
return;
}
- INT16 nCol = rPar.Get(1)->GetInteger();
+ sal_Int16 nCol = rPar.Get(1)->GetInteger();
if( nCol < 0 || nCol > 15 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT32 nRGB = pRGB[ nCol ];
+ sal_Int32 nRGB = pRGB[ nCol ];
rPar.Get(0)->PutLong( nRGB );
}
@@ -3948,7 +3948,7 @@ RTLFUNC(StrConv)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if( nArgCount < 2 || nArgCount > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3956,16 +3956,16 @@ RTLFUNC(StrConv)
}
String aOldStr = rPar.Get(1)->GetString();
- INT32 nConversion = rPar.Get(2)->GetLong();
+ sal_Int32 nConversion = rPar.Get(2)->GetLong();
- USHORT nLanguage = LANGUAGE_SYSTEM;
+ sal_uInt16 nLanguage = LANGUAGE_SYSTEM;
if( nArgCount == 3 )
{
// LCID not supported now
//nLanguage = rPar.Get(3)->GetInteger();
}
- USHORT nOldLen = aOldStr.Len();
+ sal_uInt16 nOldLen = aOldStr.Len();
if( nOldLen == 0 )
{
// null string,return
@@ -3973,7 +3973,7 @@ RTLFUNC(StrConv)
return;
}
- INT32 nType = 0;
+ sal_Int32 nType = 0;
if ( (nConversion & 0x03) == 3 ) // vbProperCase
{
CharClass& rCharClass = GetCharClass();
@@ -4007,10 +4007,10 @@ RTLFUNC(StrConv)
if ( (nConversion & 0x40) == 64 ) // vbUnicode
{
// convert the string to byte string, preserving unicode (2 bytes per character)
- USHORT nSize = aNewStr.Len()*2;
+ sal_uInt16 nSize = aNewStr.Len()*2;
const sal_Unicode* pSrc = aNewStr.GetBuffer();
sal_Char* pChar = new sal_Char[nSize+1];
- for( USHORT i=0; i < nSize; i++ )
+ for( sal_uInt16 i=0; i < nSize; i++ )
{
pChar[i] = static_cast< sal_Char >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
if( i%2 )
@@ -4031,7 +4031,7 @@ RTLFUNC(StrConv)
// there is no concept about default codepage in unix. so it is incorrectly in unix
::rtl::OString aOStr = ::rtl::OUStringToOString(aNewStr,osl_getThreadTextEncoding());
const sal_Char* pChar = aOStr.getStr();
- USHORT nArraySize = static_cast< USHORT >( aOStr.getLength() );
+ sal_uInt16 nArraySize = static_cast< sal_uInt16 >( aOStr.getLength() );
SbxDimArray* pArray = new SbxDimArray(SbxBYTE);
bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );
if(nArraySize)
@@ -4046,7 +4046,7 @@ RTLFUNC(StrConv)
pArray->unoAddDim( 0, -1 );
}
- for( USHORT i=0; i< nArraySize; i++)
+ for( sal_uInt16 i=0; i< nArraySize; i++)
{
SbxVariable* pNew = new SbxVariable( SbxBYTE );
pNew->PutByte(*pChar);
@@ -4059,7 +4059,7 @@ RTLFUNC(StrConv)
}
SbxVariableRef refVar = rPar.Get(0);
- USHORT nFlags = refVar->GetFlags();
+ sal_uInt16 nFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nFlags );
@@ -4215,17 +4215,17 @@ RTLFUNC(MsgBox)
WB_YES_NO, // MB_YESNO
WB_RETRY_CANCEL // MB_RETRYCANCEL
};
- static const INT16 nButtonMap[] =
+ static const sal_Int16 nButtonMap[] =
{
- 2, // #define RET_CANCEL FALSE
- 1, // #define RET_OK TRUE
+ 2, // #define RET_CANCEL sal_False
+ 1, // #define RET_OK sal_True
6, // #define RET_YES 2
7, // #define RET_NO 3
4 // #define RET_RETRY 4
};
- USHORT nArgCount = (USHORT)rPar.Count();
+ sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
if( nArgCount < 2 || nArgCount > 6 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4292,11 +4292,11 @@ RTLFUNC(MsgBox)
pBox = new MessBox( pParent, nWinBits, aTitle, aMsg );
}
pBox->SetText( aTitle );
- USHORT nRet = (USHORT)pBox->Execute();
- if( nRet == TRUE )
+ sal_uInt16 nRet = (sal_uInt16)pBox->Execute();
+ if( nRet == sal_True )
nRet = 1;
- INT16 nMappedRet;
+ sal_Int16 nMappedRet;
if( nStyle == 2 )
{
nMappedRet = nRet;
@@ -4319,7 +4319,7 @@ RTLFUNC(SetAttr) // JSM
if ( rPar.Count() == 3 )
{
String aStr = rPar.Get(1)->GetString();
- INT16 nFlags = rPar.Get(2)->GetInteger();
+ sal_Int16 nFlags = rPar.Get(2)->GetInteger();
// <-- UCB
if( hasUno() )
@@ -4395,7 +4395,7 @@ RTLFUNC(DumpAllObjects)
(void)pBasic;
(void)bWrite;
- USHORT nArgCount = (USHORT)rPar.Count();
+ sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
if( nArgCount < 2 || nArgCount > 3 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else if( !pBasic )
@@ -4423,7 +4423,7 @@ RTLFUNC(FileExists)
if ( rPar.Count() == 2 )
{
String aStr = rPar.Get(1)->GetString();
- BOOL bExists = FALSE;
+ sal_Bool bExists = sal_False;
// <-- UCB
if( hasUno() )
@@ -4470,10 +4470,10 @@ RTLFUNC(Partition)
return;
}
- INT32 nNumber = rPar.Get(1)->GetLong();
- INT32 nStart = rPar.Get(2)->GetLong();
- INT32 nStop = rPar.Get(3)->GetLong();
- INT32 nInterval = rPar.Get(4)->GetLong();
+ sal_Int32 nNumber = rPar.Get(1)->GetLong();
+ sal_Int32 nStart = rPar.Get(2)->GetLong();
+ sal_Int32 nStop = rPar.Get(3)->GetLong();
+ sal_Int32 nInterval = rPar.Get(4)->GetLong();
if( nStart < 0 || nStop <= nStart || nInterval < 1 )
{
@@ -4490,9 +4490,9 @@ RTLFUNC(Partition)
// calculate the maximun number of characters before lowervalue and uppervalue
::rtl::OUString aBeforeStart = ::rtl::OUString::valueOf( nStart - 1 );
::rtl::OUString aAfterStop = ::rtl::OUString::valueOf( nStop + 1 );
- INT32 nLen1 = aBeforeStart.getLength();
- INT32 nLen2 = aAfterStop.getLength();
- INT32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
+ sal_Int32 nLen1 = aBeforeStart.getLength();
+ sal_Int32 nLen2 = aAfterStop.getLength();
+ sal_Int32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
::rtl::OUStringBuffer aRetStr( nLen * 2 + 1);
::rtl::OUString aLowerValue;
@@ -4507,8 +4507,8 @@ RTLFUNC(Partition)
}
else
{
- INT32 nLowerValue = nNumber;
- INT32 nUpperValue = nLowerValue;
+ sal_Int32 nLowerValue = nNumber;
+ sal_Int32 nUpperValue = nLowerValue;
if( nInterval > 1 )
{
nLowerValue = ((( nNumber - nStart ) / nInterval ) * nInterval ) + nStart;
@@ -4525,14 +4525,14 @@ RTLFUNC(Partition)
if( nLen > nLen1 )
{
// appending the leading spaces for the lowervalue
- for ( INT32 i= (nLen - nLen1) ; i > 0; --i )
+ for ( sal_Int32 i= (nLen - nLen1) ; i > 0; --i )
aRetStr.appendAscii(" ");
}
aRetStr.append( aLowerValue ).appendAscii(":");
if( nLen > nLen2 )
{
// appending the leading spaces for the uppervalue
- for ( INT32 i= (nLen - nLen2) ; i > 0; --i )
+ for ( sal_Int32 i= (nLen - nLen2) ; i > 0; --i )
aRetStr.appendAscii(" ");
}
aRetStr.append( aUpperValue );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 6b955fed3d8a..2f6d18685803 100755
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -117,13 +117,13 @@ RTLFUNC(CallByName)
(void)pBasic;
(void)bWrite;
- const INT16 vbGet = 2;
- const INT16 vbLet = 4;
- const INT16 vbMethod = 1;
- const INT16 vbSet = 8;
+ const sal_Int16 vbGet = 2;
+ const sal_Int16 vbLet = 4;
+ const sal_Int16 vbMethod = 1;
+ const sal_Int16 vbSet = 8;
// At least 3 parameter needed plus function itself -> 4
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount < 4 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -150,7 +150,7 @@ RTLFUNC(CallByName)
String aNameStr = rPar.Get(2)->GetString();
// 3. parameter is CallType
- INT16 nCallType = rPar.Get(3)->GetInteger();
+ sal_Int16 nCallType = rPar.Get(3)->GetInteger();
//SbxObject* pFindObj = NULL;
SbxVariable* pFindVar = pObj->Find( aNameStr, SbxCLASS_DONTCARE );
@@ -209,11 +209,11 @@ RTLFUNC(CallByName)
// Setup parameters
SbxArrayRef xArray;
- USHORT nMethParamCount = nParCount - 4;
+ sal_uInt16 nMethParamCount = nParCount - 4;
if( nMethParamCount > 0 )
{
xArray = new SbxArray;
- for( USHORT i = 0 ; i < nMethParamCount ; i++ )
+ for( sal_uInt16 i = 0 ; i < nMethParamCount ; i++ )
{
SbxVariable* pPar = rPar.Get( i + 4 );
xArray->Put( pPar, i + 1 );
@@ -238,7 +238,7 @@ RTLFUNC(CBool) // JSM
(void)pBasic;
(void)bWrite;
- BOOL bVal = FALSE;
+ sal_Bool bVal = sal_False;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -255,7 +255,7 @@ RTLFUNC(CByte) // JSM
(void)pBasic;
(void)bWrite;
- BYTE nByte = 0;
+ sal_uInt8 nByte = 0;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -356,7 +356,7 @@ RTLFUNC(CInt) // JSM
(void)pBasic;
(void)bWrite;
- INT16 nVal = 0;
+ sal_Int16 nVal = 0;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -373,7 +373,7 @@ RTLFUNC(CLng) // JSM
(void)pBasic;
(void)bWrite;
- INT32 nVal = 0;
+ sal_Int32 nVal = 0;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -399,7 +399,7 @@ RTLFUNC(CSng) // JSM
// AB #41690 , String holen
double dVal = 0.0;
String aScanStr = pSbxVariable->GetString();
- SbError Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/TRUE );
+ SbError Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/sal_True );
if( SbxBase::GetError() == SbxERR_OK && Error != SbxERR_OK )
StarBASIC::Error( Error );
nVal = (float)dVal;
@@ -454,7 +454,7 @@ RTLFUNC(CVErr)
(void)pBasic;
(void)bWrite;
- INT16 nErrCode = 0;
+ sal_Int16 nErrCode = 0;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -525,10 +525,10 @@ RTLFUNC(Red)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+ sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
nRGB &= 0x00FF0000;
nRGB >>= 16;
- rPar.Get(0)->PutInteger( (INT16)nRGB );
+ rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
}
}
@@ -541,10 +541,10 @@ RTLFUNC(Green)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+ sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
nRGB &= 0x0000FF00;
nRGB >>= 8;
- rPar.Get(0)->PutInteger( (INT16)nRGB );
+ rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
}
}
@@ -557,9 +557,9 @@ RTLFUNC(Blue)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+ sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
nRGB &= 0x000000FF;
- rPar.Get(0)->PutInteger( (INT16)nRGB );
+ rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
}
}
@@ -569,11 +569,11 @@ RTLFUNC(Switch)
(void)pBasic;
(void)bWrite;
- USHORT nCount = rPar.Count();
+ sal_uInt16 nCount = rPar.Count();
if( !(nCount & 0x0001 ))
// Anzahl der Argumente muss ungerade sein
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- USHORT nCurExpr = 1;
+ sal_uInt16 nCurExpr = 1;
while( nCurExpr < (nCount-1) )
{
if( rPar.Get( nCurExpr )->GetBool())
@@ -671,8 +671,8 @@ RTLFUNC(Choose)
if ( rPar.Count() < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- INT16 nIndex = rPar.Get(1)->GetInteger();
- USHORT nCount = rPar.Count();
+ sal_Int16 nIndex = rPar.Get(1)->GetInteger();
+ sal_uInt16 nCount = rPar.Count();
nCount--;
if( nCount == 1 || nIndex > (nCount-1) || nIndex < 1 )
{
@@ -704,7 +704,7 @@ RTLFUNC(GetSolarVersion)
(void)pBasic;
(void)bWrite;
- rPar.Get(0)->PutLong( (INT32)SUPD );
+ rPar.Get(0)->PutLong( (sal_Int32)SUPD );
}
RTLFUNC(TwipsPerPixelX)
@@ -712,7 +712,7 @@ RTLFUNC(TwipsPerPixelX)
(void)pBasic;
(void)bWrite;
- INT32 nResult = 0;
+ sal_Int32 nResult = 0;
Size aSize( 100,0 );
MapMode aMap( MAP_TWIP );
OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -729,7 +729,7 @@ RTLFUNC(TwipsPerPixelY)
(void)pBasic;
(void)bWrite;
- INT32 nResult = 0;
+ sal_Int32 nResult = 0;
Size aSize( 0,100 );
MapMode aMap( MAP_TWIP );
OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -756,7 +756,7 @@ bool IsBaseIndexOne()
bool result = false;
if ( pINST && pINST->pRun )
{
- USHORT res = pINST->pRun->GetBase();
+ sal_uInt16 res = pINST->pRun->GetBase();
if ( res )
result = true;
}
@@ -769,7 +769,7 @@ RTLFUNC(Array)
(void)bWrite;
SbxDimArray* pArray = new SbxDimArray( SbxVARIANT );
- USHORT nArraySize = rPar.Count() - 1;
+ sal_uInt16 nArraySize = rPar.Count() - 1;
// Option Base zunaechst ignorieren (kennt leider nur der Compiler)
bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );
@@ -786,10 +786,10 @@ RTLFUNC(Array)
}
// Parameter ins Array uebernehmen
- // ATTENTION: Using type USHORT for loop variable is
+ // ATTENTION: Using type sal_uInt16 for loop variable is
// mandatory to workaround a problem with the
// Solaris Intel compiler optimizer! See i104354
- for( USHORT i = 0 ; i < nArraySize ; i++ )
+ for( sal_uInt16 i = 0 ; i < nArraySize ; i++ )
{
SbxVariable* pVar = rPar.Get(i+1);
SbxVariable* pNew = new SbxVariable( *pVar );
@@ -802,7 +802,7 @@ RTLFUNC(Array)
// Array zurueckliefern
SbxVariableRef refVar = rPar.Get(0);
- USHORT nFlags = refVar->GetFlags();
+ sal_uInt16 nFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nFlags );
@@ -823,12 +823,12 @@ RTLFUNC(DimArray)
(void)bWrite;
SbxDimArray * pArray = new SbxDimArray( SbxVARIANT );
- USHORT nArrayDims = rPar.Count() - 1;
+ sal_uInt16 nArrayDims = rPar.Count() - 1;
if( nArrayDims > 0 )
{
- for( USHORT i = 0; i < nArrayDims ; i++ )
+ for( sal_uInt16 i = 0; i < nArrayDims ; i++ )
{
- INT32 ub = rPar.Get(i+1)->GetLong();
+ sal_Int32 ub = rPar.Get(i+1)->GetLong();
if( ub < 0 )
{
StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -842,7 +842,7 @@ RTLFUNC(DimArray)
// Array zurueckliefern
SbxVariableRef refVar = rPar.Get(0);
- USHORT nFlags = refVar->GetFlags();
+ sal_uInt16 nFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nFlags );
@@ -961,12 +961,12 @@ RTLFUNC(FindPropertyObject)
-BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
- BOOL bBinary, short nBlockLen, BOOL bIsArray )
+sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
+ sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
{
- ULONG nFPos = pStrm->Tell();
+ sal_uIntPtr nFPos = pStrm->Tell();
- BOOL bIsVariant = !rVar.IsFixed();
+ sal_Bool bIsVariant = !rVar.IsFixed();
SbxDataType eType = rVar.GetType();
switch( eType )
@@ -975,7 +975,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxCHAR:
case SbxBYTE:
if( bIsVariant )
- *pStrm << (USHORT)SbxBYTE; // VarType Id
+ *pStrm << (sal_uInt16)SbxBYTE; // VarType Id
*pStrm << rVar.GetByte();
break;
@@ -987,7 +987,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxINT:
case SbxUINT:
if( bIsVariant )
- *pStrm << (USHORT)SbxINTEGER; // VarType Id
+ *pStrm << (sal_uInt16)SbxINTEGER; // VarType Id
*pStrm << rVar.GetInteger();
break;
@@ -996,13 +996,13 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxLONG64:
case SbxULONG64:
if( bIsVariant )
- *pStrm << (USHORT)SbxLONG; // VarType Id
+ *pStrm << (sal_uInt16)SbxLONG; // VarType Id
*pStrm << rVar.GetLong();
break;
case SbxSINGLE:
if( bIsVariant )
- *pStrm << (USHORT)eType; // VarType Id
+ *pStrm << (sal_uInt16)eType; // VarType Id
*pStrm << rVar.GetSingle();
break;
@@ -1010,7 +1010,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxCURRENCY:
case SbxDATE:
if( bIsVariant )
- *pStrm << (USHORT)eType; // VarType Id
+ *pStrm << (sal_uInt16)eType; // VarType Id
*pStrm << rVar.GetDouble();
break;
@@ -1021,7 +1021,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
if( !bBinary || bIsArray )
{
if( bIsVariant )
- *pStrm << (USHORT)SbxSTRING;
+ *pStrm << (sal_uInt16)SbxSTRING;
pStrm->WriteByteString( rStr, gsl_getSystemTextEncoding() );
//*pStrm << rStr;
}
@@ -1038,31 +1038,31 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
default:
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- return FALSE;
+ return sal_False;
}
if( nBlockLen )
pStrm->Seek( nFPos + nBlockLen );
- return pStrm->GetErrorCode() ? FALSE : TRUE;
+ return pStrm->GetErrorCode() ? sal_False : sal_True;
}
-BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
- BOOL bBinary, short nBlockLen, BOOL bIsArray )
+sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
+ sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
{
(void)bBinary;
(void)bIsArray;
double aDouble;
- ULONG nFPos = pStrm->Tell();
+ sal_uIntPtr nFPos = pStrm->Tell();
- BOOL bIsVariant = !rVar.IsFixed();
+ sal_Bool bIsVariant = !rVar.IsFixed();
SbxDataType eVarType = rVar.GetType();
SbxDataType eSrcType = eVarType;
if( bIsVariant )
{
- USHORT nTemp;
+ sal_uInt16 nTemp;
*pStrm >> nTemp;
eSrcType = (SbxDataType)nTemp;
}
@@ -1073,7 +1073,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
case SbxCHAR:
case SbxBYTE:
{
- BYTE aByte;
+ sal_uInt8 aByte;
*pStrm >> aByte;
rVar.PutByte( aByte );
}
@@ -1087,7 +1087,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
case SbxINT:
case SbxUINT:
{
- INT16 aInt;
+ sal_Int16 aInt;
*pStrm >> aInt;
rVar.PutInteger( aInt );
}
@@ -1098,7 +1098,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
case SbxLONG64:
case SbxULONG64:
{
- INT32 aInt;
+ sal_Int32 aInt;
*pStrm >> aInt;
rVar.PutLong( aInt );
}
@@ -1138,23 +1138,23 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
default:
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- return FALSE;
+ return sal_False;
}
if( nBlockLen )
pStrm->Seek( nFPos + nBlockLen );
- return pStrm->GetErrorCode() ? FALSE : TRUE;
+ return pStrm->GetErrorCode() ? sal_False : sal_True;
}
// nCurDim = 1...n
-BOOL lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
- BOOL bBinary, short nCurDim, short* pOtherDims, BOOL bWrite )
+sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
+ sal_Bool bBinary, short nCurDim, short* pOtherDims, sal_Bool bWrite )
{
DBG_ASSERT( nCurDim > 0,"Bad Dim");
short nLower, nUpper;
if( !rArr.GetDim( nCurDim, nLower, nUpper ) )
- return FALSE;
+ return sal_False;
for( short nCur = nLower; nCur <= nUpper; nCur++ )
{
pOtherDims[ nCurDim-1 ] = nCur;
@@ -1163,19 +1163,19 @@ BOOL lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
else
{
SbxVariable* pVar = rArr.Get( (const short*)pOtherDims );
- BOOL bRet;
+ sal_Bool bRet;
if( bWrite )
- bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, TRUE );
+ bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, sal_True );
else
- bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, TRUE );
+ bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, sal_True );
if( !bRet )
- return FALSE;
+ return sal_False;
}
}
- return TRUE;
+ return sal_True;
}
-void PutGet( SbxArray& rPar, BOOL bPut )
+void PutGet( SbxArray& rPar, sal_Bool bPut )
{
// Wir brauchen 3 Parameter
if ( rPar.Count() != 4 )
@@ -1183,9 +1183,9 @@ void PutGet( SbxArray& rPar, BOOL bPut )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nFileNo = rPar.Get(1)->GetInteger();
+ sal_Int16 nFileNo = rPar.Get(1)->GetInteger();
SbxVariable* pVar2 = rPar.Get(2);
- BOOL bHasRecordNo = (BOOL)(pVar2->GetType() != SbxEMPTY);
+ sal_Bool bHasRecordNo = (sal_Bool)(pVar2->GetType() != SbxEMPTY);
long nRecordNo = pVar2->GetLong();
if ( nFileNo < 1 || ( bHasRecordNo && nRecordNo < 1 ) )
{
@@ -1203,7 +1203,7 @@ void PutGet( SbxArray& rPar, BOOL bPut )
}
SvStream* pStrm = pSbStrm->GetStrm();
- BOOL bRandom = pSbStrm->IsRandom();
+ sal_Bool bRandom = pSbStrm->IsRandom();
short nBlockLen = bRandom ? pSbStrm->GetBlockLen() : 0;
if( bPut )
@@ -1215,7 +1215,7 @@ void PutGet( SbxArray& rPar, BOOL bPut )
// auf die Startposition seeken
if( bHasRecordNo )
{
- ULONG nFilePos = bRandom ? (ULONG)(nBlockLen*nRecordNo) : (ULONG)nRecordNo;
+ sal_uIntPtr nFilePos = bRandom ? (sal_uIntPtr)(nBlockLen*nRecordNo) : (sal_uIntPtr)nRecordNo;
pStrm->Seek( nFilePos );
}
@@ -1227,11 +1227,11 @@ void PutGet( SbxArray& rPar, BOOL bPut )
pArr = PTR_CAST(SbxDimArray,pParObj);
}
- BOOL bRet;
+ sal_Bool bRet;
if( pArr )
{
- ULONG nFPos = pStrm->Tell();
+ sal_uIntPtr nFPos = pStrm->Tell();
short nDims = pArr->GetDims();
short* pDims = new short[ nDims ];
bRet = lcl_WriteReadSbxArray(*pArr,pStrm,!bRandom,nDims,pDims,bPut);
@@ -1242,9 +1242,9 @@ void PutGet( SbxArray& rPar, BOOL bPut )
else
{
if( bPut )
- bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, FALSE);
+ bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False);
else
- bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, FALSE);
+ bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False);
}
if( !bRet || pStrm->GetErrorCode() )
StarBASIC::Error( SbERR_IO_ERROR );
@@ -1255,7 +1255,7 @@ RTLFUNC(Put)
(void)pBasic;
(void)bWrite;
- PutGet( rPar, TRUE );
+ PutGet( rPar, sal_True );
}
RTLFUNC(Get)
@@ -1263,7 +1263,7 @@ RTLFUNC(Get)
(void)pBasic;
(void)bWrite;
- PutGet( rPar, FALSE );
+ PutGet( rPar, sal_False );
}
RTLFUNC(Environ)
@@ -1285,7 +1285,7 @@ RTLFUNC(Environ)
rPar.Get(0)->PutString( aResult );
}
-static double GetDialogZoomFactor( BOOL bX, long nValue )
+static double GetDialogZoomFactor( sal_Bool bX, long nValue )
{
OutputDevice* pDevice = Application::GetDefaultDevice();
double nResult = 0;
@@ -1325,7 +1325,7 @@ RTLFUNC(GetDialogZoomFactorX)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- rPar.Get(0)->PutDouble( GetDialogZoomFactor( TRUE, rPar.Get(1)->GetLong() ));
+ rPar.Get(0)->PutDouble( GetDialogZoomFactor( sal_True, rPar.Get(1)->GetLong() ));
}
RTLFUNC(GetDialogZoomFactorY)
@@ -1338,7 +1338,7 @@ RTLFUNC(GetDialogZoomFactorY)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- rPar.Get(0)->PutDouble( GetDialogZoomFactor( FALSE, rPar.Get(1)->GetLong()));
+ rPar.Get(0)->PutDouble( GetDialogZoomFactor( sal_False, rPar.Get(1)->GetLong()));
}
@@ -1407,7 +1407,7 @@ RTLFUNC(TypeLen)
else
{
SbxDataType eType = rPar.Get(1)->GetType();
- INT16 nLen = 0;
+ sal_Int16 nLen = 0;
switch( eType )
{
case SbxEMPTY:
@@ -1462,7 +1462,7 @@ RTLFUNC(TypeLen)
case SbxLPWSTR:
case SbxCoreSTRING:
case SbxSTRING:
- nLen = (INT16)rPar.Get(1)->GetString().Len();
+ nLen = (sal_Int16)rPar.Get(1)->GetString().Len();
break;
default:
@@ -1561,7 +1561,7 @@ RTLFUNC(EqualUnoObjects)
// Instanciate "com.sun.star.awt.UnoControlDialog" on basis
// of a DialogLibrary entry: Convert from XML-ByteSequence
// and attach events. Implemented in classes\eventatt.cxx
-void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
RTLFUNC(CreateUnoDialog)
{
@@ -1646,7 +1646,7 @@ RTLFUNC(Join)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount != 3 && nParCount != 2 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1687,7 +1687,7 @@ RTLFUNC(Split)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount < 2 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1705,7 +1705,7 @@ RTLFUNC(Split)
else
aDelim = String::CreateFromAscii( " " );
- INT32 nCount = -1;
+ sal_Int32 nCount = -1;
if( nParCount == 4 )
nCount = rPar.Get(3)->GetLong();
@@ -1759,7 +1759,7 @@ RTLFUNC(Split)
// Array zurueckliefern
SbxVariableRef refVar = rPar.Get(0);
- USHORT nFlags = refVar->GetFlags();
+ sal_uInt16 nFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nFlags );
@@ -1772,7 +1772,7 @@ RTLFUNC(MonthName)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount != 2 && nParCount != 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1788,14 +1788,14 @@ RTLFUNC(MonthName)
Sequence< CalendarItem > aMonthSeq = xCalendar->getMonths();
sal_Int32 nMonthCount = aMonthSeq.getLength();
- INT16 nVal = rPar.Get(1)->GetInteger();
+ sal_Int16 nVal = rPar.Get(1)->GetInteger();
if( nVal < 1 || nVal > nMonthCount )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- BOOL bAbbreviate = false;
+ sal_Bool bAbbreviate = false;
if( nParCount == 3 )
bAbbreviate = rPar.Get(2)->GetBool();
@@ -1812,7 +1812,7 @@ RTLFUNC(WeekdayName)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 2 || nParCount > 4 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1827,9 +1827,9 @@ RTLFUNC(WeekdayName)
}
Sequence< CalendarItem > aDaySeq = xCalendar->getDays();
- INT16 nDayCount = (INT16)aDaySeq.getLength();
- INT16 nDay = rPar.Get(1)->GetInteger();
- INT16 nFirstDay = 0;
+ sal_Int16 nDayCount = (sal_Int16)aDaySeq.getLength();
+ sal_Int16 nDay = rPar.Get(1)->GetInteger();
+ sal_Int16 nFirstDay = 0;
if( nParCount == 4 )
{
nFirstDay = rPar.Get(3)->GetInteger();
@@ -1840,7 +1840,7 @@ RTLFUNC(WeekdayName)
}
}
if( nFirstDay == 0 )
- nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+ nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
nDay = 1 + (nDay + nDayCount + nFirstDay - 2) % nDayCount;
if( nDay < 1 || nDay > nDayCount )
@@ -1849,7 +1849,7 @@ RTLFUNC(WeekdayName)
return;
}
- BOOL bAbbreviate = false;
+ sal_Bool bAbbreviate = false;
if( nParCount >= 3 )
{
SbxVariable* pPar2 = rPar.Get(2);
@@ -1864,16 +1864,16 @@ RTLFUNC(WeekdayName)
rPar.Get(0)->PutString( String(aRetStr) );
}
-INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay = 0 )
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 )
{
Date aRefDate( 1,1,1900 );
long nDays = (long) aDate;
nDays -= 2; // normieren: 1.1.1900 => 0
aRefDate += nDays;
DayOfWeek aDay = aRefDate.GetDayOfWeek();
- INT16 nDay;
+ sal_Int16 nDay;
if ( aDay != SUNDAY )
- nDay = (INT16)aDay + 2;
+ nDay = (sal_Int16)aDay + 2;
else
nDay = 1; // 1==Sonntag
@@ -1893,7 +1893,7 @@ INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay
StarBASIC::Error( SbERR_INTERNAL_ERROR );
return 0;
}
- nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+ nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
}
nDay = 1 + (nDay + 7 - nFirstDay) % 7;
}
@@ -1905,7 +1905,7 @@ RTLFUNC(Weekday)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -1913,13 +1913,13 @@ RTLFUNC(Weekday)
double aDate = rPar.Get(1)->GetDate();
bool bFirstDay = false;
- INT16 nFirstDay = 0;
+ sal_Int16 nFirstDay = 0;
if ( nParCount > 2 )
{
nFirstDay = rPar.Get(2)->GetInteger();
bFirstDay = true;
}
- INT16 nDay = implGetWeekDay( aDate, bFirstDay, nFirstDay );
+ sal_Int16 nDay = implGetWeekDay( aDate, bFirstDay, nFirstDay );
rPar.Get(0)->PutInteger( nDay );
}
}
@@ -1973,7 +1973,7 @@ static IntervalInfo pIntervalTable[] =
IntervalInfo* getIntervalInfo( const String& rStringCode )
{
IntervalInfo* pInfo = NULL;
- INT16 i = 0;
+ sal_Int16 i = 0;
while( (pInfo = pIntervalTable + i)->mpStringCode != NULL )
{
if( rStringCode.EqualsIgnoreCaseAscii( pInfo->mpStringCode ) )
@@ -1984,30 +1984,30 @@ IntervalInfo* getIntervalInfo( const String& rStringCode )
}
// From methods.cxx
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet );
-INT16 implGetDateDay( double aDate );
-INT16 implGetDateMonth( double aDate );
-INT16 implGetDateYear( double aDate );
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet );
+sal_Int16 implGetDateDay( double aDate );
+sal_Int16 implGetDateMonth( double aDate );
+sal_Int16 implGetDateYear( double aDate );
-INT16 implGetHour( double dDate );
-INT16 implGetMinute( double dDate );
-INT16 implGetSecond( double dDate );
+sal_Int16 implGetHour( double dDate );
+sal_Int16 implGetMinute( double dDate );
+sal_Int16 implGetSecond( double dDate );
-inline void implGetDayMonthYear( INT16& rnYear, INT16& rnMonth, INT16& rnDay, double dDate )
+inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate )
{
rnDay = implGetDateDay( dDate );
rnMonth = implGetDateMonth( dDate );
rnYear = implGetDateYear( dDate );
}
-inline INT16 limitToINT16( INT32 n32 )
+inline sal_Int16 limitToINT16( sal_Int32 n32 )
{
if( n32 > 32767 )
n32 = 32767;
else if( n32 < -32768 )
n32 = -32768;
- return (INT16)n32;
+ return (sal_Int16)n32;
}
RTLFUNC(DateAdd)
@@ -2015,7 +2015,7 @@ RTLFUNC(DateAdd)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount != 4 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2030,7 +2030,7 @@ RTLFUNC(DateAdd)
return;
}
- INT32 lNumber = rPar.Get(2)->GetLong();
+ sal_Int32 lNumber = rPar.Get(2)->GetLong();
double dDate = rPar.Get(3)->GetDate();
double dNewDate = 0;
if( pInfo->mbSimple )
@@ -2043,15 +2043,15 @@ RTLFUNC(DateAdd)
// Keep hours, minutes, seconds
double dHoursMinutesSeconds = dDate - floor( dDate );
- BOOL bOk = TRUE;
- INT16 nYear, nMonth, nDay;
- INT16 nTargetYear16 = 0, nTargetMonth = 0;
+ sal_Bool bOk = sal_True;
+ sal_Int16 nYear, nMonth, nDay;
+ sal_Int16 nTargetYear16 = 0, nTargetMonth = 0;
implGetDayMonthYear( nYear, nMonth, nDay, dDate );
switch( pInfo->meInterval )
{
case INTERVAL_YYYY:
{
- INT32 nTargetYear = lNumber + nYear;
+ sal_Int32 nTargetYear = lNumber + nYear;
nTargetYear16 = limitToINT16( nTargetYear );
nTargetMonth = nMonth;
bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, dNewDate );
@@ -2063,20 +2063,20 @@ RTLFUNC(DateAdd)
bool bNeg = (lNumber < 0);
if( bNeg )
lNumber = -lNumber;
- INT32 nYearsAdd;
- INT16 nMonthAdd;
+ sal_Int32 nYearsAdd;
+ sal_Int16 nMonthAdd;
if( pInfo->meInterval == INTERVAL_Q )
{
nYearsAdd = lNumber / 4;
- nMonthAdd = (INT16)( 3 * (lNumber % 4) );
+ nMonthAdd = (sal_Int16)( 3 * (lNumber % 4) );
}
else
{
nYearsAdd = lNumber / 12;
- nMonthAdd = (INT16)( lNumber % 12 );
+ nMonthAdd = (sal_Int16)( lNumber % 12 );
}
- INT32 nTargetYear;
+ sal_Int32 nTargetYear;
if( bNeg )
{
nTargetMonth = nMonth - nMonthAdd;
@@ -2085,7 +2085,7 @@ RTLFUNC(DateAdd)
nTargetMonth += 12;
nYearsAdd++;
}
- nTargetYear = (INT32)nYear - nYearsAdd;
+ nTargetYear = (sal_Int32)nYear - nYearsAdd;
}
else
{
@@ -2095,7 +2095,7 @@ RTLFUNC(DateAdd)
nTargetMonth -= 12;
nYearsAdd++;
}
- nTargetYear = (INT32)nYear + nYearsAdd;
+ nTargetYear = (sal_Int32)nYear + nYearsAdd;
}
nTargetYear16 = limitToINT16( nTargetYear );
bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, dNewDate );
@@ -2107,14 +2107,14 @@ RTLFUNC(DateAdd)
if( bOk )
{
// Overflow?
- INT16 nNewYear, nNewMonth, nNewDay;
+ sal_Int16 nNewYear, nNewMonth, nNewDay;
implGetDayMonthYear( nNewYear, nNewMonth, nNewDay, dNewDate );
if( nNewYear > 9999 || nNewYear < 100 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nCorrectionDay = nDay;
+ sal_Int16 nCorrectionDay = nDay;
while( nNewMonth > nTargetMonth )
{
nCorrectionDay--;
@@ -2140,7 +2140,7 @@ RTLFUNC(DateDiff)
// DateDiff(interval, date1, date2[, firstdayofweek[, firstweekofyear]])
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 4 || nParCount > 6 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2163,30 +2163,30 @@ RTLFUNC(DateDiff)
{
case INTERVAL_YYYY:
{
- INT16 nYear1 = implGetDateYear( dDate1 );
- INT16 nYear2 = implGetDateYear( dDate2 );
+ sal_Int16 nYear1 = implGetDateYear( dDate1 );
+ sal_Int16 nYear2 = implGetDateYear( dDate2 );
dRet = nYear2 - nYear1;
break;
}
case INTERVAL_Q:
{
- INT16 nYear1 = implGetDateYear( dDate1 );
- INT16 nYear2 = implGetDateYear( dDate2 );
- INT16 nQ1 = 1 + (implGetDateMonth( dDate1 ) - 1) / 3;
- INT16 nQ2 = 1 + (implGetDateMonth( dDate2 ) - 1) / 3;
- INT16 nQGes1 = 4 * nYear1 + nQ1;
- INT16 nQGes2 = 4 * nYear2 + nQ2;
+ sal_Int16 nYear1 = implGetDateYear( dDate1 );
+ sal_Int16 nYear2 = implGetDateYear( dDate2 );
+ sal_Int16 nQ1 = 1 + (implGetDateMonth( dDate1 ) - 1) / 3;
+ sal_Int16 nQ2 = 1 + (implGetDateMonth( dDate2 ) - 1) / 3;
+ sal_Int16 nQGes1 = 4 * nYear1 + nQ1;
+ sal_Int16 nQGes2 = 4 * nYear2 + nQ2;
dRet = nQGes2 - nQGes1;
break;
}
case INTERVAL_M:
{
- INT16 nYear1 = implGetDateYear( dDate1 );
- INT16 nYear2 = implGetDateYear( dDate2 );
- INT16 nMonth1 = implGetDateMonth( dDate1 );
- INT16 nMonth2 = implGetDateMonth( dDate2 );
- INT16 nMonthGes1 = 12 * nYear1 + nMonth1;
- INT16 nMonthGes2 = 12 * nYear2 + nMonth2;
+ sal_Int16 nYear1 = implGetDateYear( dDate1 );
+ sal_Int16 nYear2 = implGetDateYear( dDate2 );
+ sal_Int16 nMonth1 = implGetDateMonth( dDate1 );
+ sal_Int16 nMonth2 = implGetDateMonth( dDate2 );
+ sal_Int16 nMonthGes1 = 12 * nYear1 + nMonth1;
+ sal_Int16 nMonthGes2 = 12 * nYear2 + nMonth2;
dRet = nMonthGes2 - nMonthGes1;
break;
}
@@ -2205,7 +2205,7 @@ RTLFUNC(DateDiff)
double dDays2 = floor( dDate2 );
if( pInfo->meInterval == INTERVAL_WW )
{
- INT16 nFirstDay = 1; // Default
+ sal_Int16 nFirstDay = 1; // Default
if( nParCount >= 5 )
{
nFirstDay = rPar.Get(4)->GetInteger();
@@ -2222,17 +2222,17 @@ RTLFUNC(DateDiff)
StarBASIC::Error( SbERR_INTERNAL_ERROR );
return;
}
- nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+ nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
}
}
- INT16 nDay1 = implGetWeekDay( dDate1 );
- INT16 nDay1_Diff = nDay1 - nFirstDay;
+ sal_Int16 nDay1 = implGetWeekDay( dDate1 );
+ sal_Int16 nDay1_Diff = nDay1 - nFirstDay;
if( nDay1_Diff < 0 )
nDay1_Diff += 7;
dDays1 -= nDay1_Diff;
- INT16 nDay2 = implGetWeekDay( dDate2 );
- INT16 nDay2_Diff = nDay2 - nFirstDay;
+ sal_Int16 nDay2 = implGetWeekDay( dDate2 );
+ sal_Int16 nDay2_Diff = nDay2 - nFirstDay;
if( nDay2_Diff < 0 )
nDay2_Diff += 7;
dDays2 -= nDay2_Diff;
@@ -2267,7 +2267,7 @@ RTLFUNC(DateDiff)
}
double implGetDateOfFirstDayInFirstWeek
- ( INT16 nYear, INT16& nFirstDay, INT16& nFirstWeek, bool* pbError = NULL )
+ ( sal_Int16 nYear, sal_Int16& nFirstDay, sal_Int16& nFirstWeek, bool* pbError = NULL )
{
SbError nError = 0;
if( nFirstDay < 0 || nFirstDay > 7 )
@@ -2293,9 +2293,9 @@ double implGetDateOfFirstDayInFirstWeek
}
if( nFirstDay == 0 )
- nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+ nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
- INT16 nFirstWeekMinDays = 0; // Not used for vbFirstJan1 = default
+ sal_Int16 nFirstWeekMinDays = 0; // Not used for vbFirstJan1 = default
if( nFirstWeek == 0 )
{
nFirstWeekMinDays = xCalendar->getMinimumNumberOfDaysForFirstWeek();
@@ -2318,14 +2318,14 @@ double implGetDateOfFirstDayInFirstWeek
implDateSerial( nYear, 1, 1, dBaseDate );
double dRetDate = dBaseDate;
- INT16 nWeekDay0101 = implGetWeekDay( dBaseDate );
- INT16 nDayDiff = nWeekDay0101 - nFirstDay;
+ sal_Int16 nWeekDay0101 = implGetWeekDay( dBaseDate );
+ sal_Int16 nDayDiff = nWeekDay0101 - nFirstDay;
if( nDayDiff < 0 )
nDayDiff += 7;
if( nFirstWeekMinDays )
{
- INT16 nThisWeeksDaysInYearCount = 7 - nDayDiff;
+ sal_Int16 nThisWeeksDaysInYearCount = 7 - nDayDiff;
if( nThisWeeksDaysInYearCount < nFirstWeekMinDays )
nDayDiff -= 7;
}
@@ -2340,7 +2340,7 @@ RTLFUNC(DatePart)
// DatePart(interval, date[,firstdayofweek[, firstweekofyear]])
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 3 || nParCount > 5 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2357,7 +2357,7 @@ RTLFUNC(DatePart)
double dDate = rPar.Get(2)->GetDate();
- INT32 nRet = 0;
+ sal_Int32 nRet = 0;
switch( pInfo->meInterval )
{
case INTERVAL_YYYY:
@@ -2377,10 +2377,10 @@ RTLFUNC(DatePart)
}
case INTERVAL_Y:
{
- INT16 nYear = implGetDateYear( dDate );
+ sal_Int16 nYear = implGetDateYear( dDate );
double dBaseDate;
implDateSerial( nYear, 1, 1, dBaseDate );
- nRet = 1 + INT32( dDate - dBaseDate );
+ nRet = 1 + sal_Int32( dDate - dBaseDate );
break;
}
case INTERVAL_D:
@@ -2391,7 +2391,7 @@ RTLFUNC(DatePart)
case INTERVAL_W:
{
bool bFirstDay = false;
- INT16 nFirstDay = 1; // Default
+ sal_Int16 nFirstDay = 1; // Default
if( nParCount >= 4 )
{
nFirstDay = rPar.Get(3)->GetInteger();
@@ -2402,15 +2402,15 @@ RTLFUNC(DatePart)
}
case INTERVAL_WW:
{
- INT16 nFirstDay = 1; // Default
+ sal_Int16 nFirstDay = 1; // Default
if( nParCount >= 4 )
nFirstDay = rPar.Get(3)->GetInteger();
- INT16 nFirstWeek = 1; // Default
+ sal_Int16 nFirstWeek = 1; // Default
if( nParCount == 5 )
nFirstWeek = rPar.Get(4)->GetInteger();
- INT16 nYear = implGetDateYear( dDate );
+ sal_Int16 nYear = implGetDateYear( dDate );
bool bError = false;
double dYearFirstDay = implGetDateOfFirstDayInFirstWeek( nYear, nFirstDay, nFirstWeek, &bError );
if( !bError )
@@ -2430,7 +2430,7 @@ RTLFUNC(DatePart)
// Calculate week
double dDiff = dDate - dYearFirstDay;
- nRet = 1 + INT32( dDiff / 7 );
+ nRet = 1 + sal_Int32( dDiff / 7 );
}
break;
}
@@ -2461,7 +2461,7 @@ RTLFUNC(FormatDateTime)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 2 || nParCount > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2469,7 +2469,7 @@ RTLFUNC(FormatDateTime)
}
double dDate = rPar.Get(1)->GetDate();
- INT16 nNamedFormat = 0;
+ sal_Int16 nNamedFormat = 0;
if( nParCount > 2 )
{
nNamedFormat = rPar.Get(2)->GetInteger();
@@ -2519,7 +2519,7 @@ RTLFUNC(FormatDateTime)
}
LanguageType eLangType = GetpApp()->GetSettings().GetLanguage();
- ULONG nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
+ sal_uIntPtr nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
Color* pCol;
pFormatter->GetOutputString( dDate, nIndex, aRetStr, &pCol );
@@ -2564,7 +2564,7 @@ RTLFUNC(Round)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount != 2 && nParCount != 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2583,7 +2583,7 @@ RTLFUNC(Round)
dVal = -dVal;
}
- INT16 numdecimalplaces = 0;
+ sal_Int16 numdecimalplaces = 0;
if( nParCount == 3 )
{
numdecimalplaces = rPar.Get(2)->GetInteger();
@@ -2641,7 +2641,7 @@ RTLFUNC(CompatibilityMode)
(void)bWrite;
bool bEnabled = false;
- USHORT nCount = rPar.Count();
+ sal_uInt16 nCount = rPar.Count();
if ( nCount != 1 && nCount != 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2668,8 +2668,8 @@ RTLFUNC(Input)
return;
}
- USHORT nByteCount = rPar.Get(1)->GetUShort();
- INT16 nFileNumber = rPar.Get(2)->GetInteger();
+ sal_uInt16 nByteCount = rPar.Get(1)->GetUShort();
+ sal_Int16 nFileNumber = rPar.Get(2)->GetInteger();
SbiIoSystem* pIosys = pINST->GetIoSystem();
SbiStream* pSbStrm = pIosys->GetStream( nFileNumber );
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index 663d12fbcd72..032b687b987b 100644
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -34,8 +34,8 @@
#include "errobject.hxx"
-// Properties und Methoden legen beim Get (bWrite = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bWrite = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bWrite = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bWrite = sal_True) wird der Wert aus
// Element 0 gespeichert.
RTLFUNC(Erl)
@@ -59,9 +59,9 @@ RTLFUNC(Err)
{
if( bWrite )
{
- INT32 nVal = rPar.Get( 0 )->GetLong();
+ sal_Int32 nVal = rPar.Get( 0 )->GetLong();
if( nVal <= 65535L )
- StarBASIC::Error( StarBASIC::GetSfxFromVBError( (USHORT) nVal ) );
+ StarBASIC::Error( StarBASIC::GetSfxFromVBError( (sal_uInt16) nVal ) );
}
else
rPar.Get( 0 )->PutLong( StarBASIC::GetVBErrorCode( StarBASIC::GetErrBasic() ) );
@@ -73,7 +73,7 @@ RTLFUNC(False)
(void)pBasic;
(void)bWrite;
- rPar.Get(0)->PutBool( FALSE );
+ rPar.Get(0)->PutBool( sal_False );
}
RTLFUNC(Empty)
@@ -114,7 +114,7 @@ RTLFUNC(True)
(void)pBasic;
(void)bWrite;
- rPar.Get( 0 )->PutBool( TRUE );
+ rPar.Get( 0 )->PutBool( sal_True );
}
RTLFUNC(ATTR_NORMAL)
diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx
index ba7af48c8472..bb8687ee0db6 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -28,10 +28,10 @@
#include <basic/sbstar.hxx>
#include "sbtrace.hxx"
-#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
#define RTLNAME( name ) &SbRtl_##name
-typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, BOOL bWrite );
+typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, sal_Bool bWrite );
// Properties
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 62aa639e4c7e..10d25cc2292b 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -59,13 +59,13 @@ bool SbiRuntime::isVBAEnabled()
}
// #91147 Global reschedule flag
-static BOOL bStaticGlobalEnableReschedule = TRUE;
+static sal_Bool bStaticGlobalEnableReschedule = sal_True;
-void StarBASIC::StaticEnableReschedule( BOOL bReschedule )
+void StarBASIC::StaticEnableReschedule( sal_Bool bReschedule )
{
bStaticGlobalEnableReschedule = bReschedule;
}
-void StarBASIC::SetVBAEnabled( BOOL bEnabled )
+void StarBASIC::SetVBAEnabled( sal_Bool bEnabled )
{
if ( bDocBasic )
{
@@ -73,15 +73,15 @@ void StarBASIC::SetVBAEnabled( BOOL bEnabled )
}
}
-BOOL StarBASIC::isVBAEnabled()
+sal_Bool StarBASIC::isVBAEnabled()
{
if ( bDocBasic )
{
if( SbiRuntime::isVBAEnabled() )
- return TRUE;
+ return sal_True;
return bVBAEnabled;
}
- return FALSE;
+ return sal_False;
}
@@ -253,12 +253,12 @@ SbiRTLData::~SbiRTLData()
// (siehe auch step2.cxx, SbiRuntime::StepSTMNT() )
// Hilfsfunktion, um den BreakCallLevel gemaess der der Debug-Flags zu ermitteln
-void SbiInstance::CalcBreakCallLevel( USHORT nFlags )
+void SbiInstance::CalcBreakCallLevel( sal_uInt16 nFlags )
{
// Break-Flag wegfiltern
- nFlags &= ~((USHORT)SbDEBUG_BREAK);
+ nFlags &= ~((sal_uInt16)SbDEBUG_BREAK);
- USHORT nRet;
+ sal_uInt16 nRet;
switch( nFlags )
{
case SbDEBUG_STEPINTO:
@@ -291,8 +291,8 @@ SbiInstance::SbiInstance( StarBASIC* p )
nBreakCallLvl = 0;
nErr =
nErl = 0;
- bReschedule = TRUE;
- bCompatibility = FALSE;
+ bReschedule = sal_True;
+ bCompatibility = sal_False;
}
SbiInstance::~SbiInstance()
@@ -450,7 +450,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const String& rMsg )
{
if( !bWatchMode )
{
- SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+ SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
if ( !n )
n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
@@ -464,7 +464,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const String& rMsg )
void SbiInstance::setErrorVB( sal_Int32 nVBNumber, const String& rMsg )
{
- SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+ SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
if( !n )
n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
@@ -515,7 +515,7 @@ SbModule* SbiInstance::GetActiveModule()
return NULL;
}
-SbMethod* SbiInstance::GetCaller( USHORT nLevel )
+SbMethod* SbiInstance::GetCaller( sal_uInt16 nLevel )
{
SbiRuntime* p = pRun;
while( nLevel-- && p )
@@ -543,7 +543,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth )
// Achtung: pMeth kann auch NULL sein (beim Aufruf des Init-Codes)
-SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
+SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, sal_uInt32 nStart )
: rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ),
pMod( pm ), pMeth( pe ), pImg( pMod->pImage ), m_nLastTime(0)
{
@@ -558,11 +558,11 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
pRestart = NULL;
pNext = NULL;
pCode =
- pStmnt = (const BYTE* ) pImg->GetCode() + nStart;
+ pStmnt = (const sal_uInt8* ) pImg->GetCode() + nStart;
bRun =
- bError = TRUE;
- bInError = FALSE;
- bBlocked = FALSE;
+ bError = sal_True;
+ bInError = sal_False;
+ bBlocked = sal_False;
nLine = 0;
nCol1 = 0;
nCol2 = 0;
@@ -615,10 +615,10 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
refParams->Put( pMeth, 0 );
SbxInfo* pInfo = pMeth ? pMeth->GetInfo() : NULL;
- USHORT nParamCount = pParams ? pParams->Count() : 1;
+ sal_uInt16 nParamCount = pParams ? pParams->Count() : 1;
if( nParamCount > 1 )
{
- for( USHORT i = 1 ; i < nParamCount ; i++ )
+ for( sal_uInt16 i = 1 ; i < nParamCount ; i++ )
{
const SbxParamInfo* p = pInfo ? pInfo->GetParam( i ) : NULL;
@@ -626,9 +626,9 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
if( p && (p->nUserData & PARAM_INFO_PARAMARRAY) != 0 )
{
SbxDimArray* pArray = new SbxDimArray( SbxVARIANT );
- USHORT nParamArrayParamCount = nParamCount - i;
+ sal_uInt16 nParamArrayParamCount = nParamCount - i;
pArray->unoAddDim( 0, nParamArrayParamCount - 1 );
- for( USHORT j = i ; j < nParamCount ; j++ )
+ for( sal_uInt16 j = i ; j < nParamCount ; j++ )
{
SbxVariable* v = pParams->Get( j );
short nDimIndex = j - i;
@@ -646,16 +646,16 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
SbxVariable* v = pParams->Get( i );
// Methoden sind immer byval!
- BOOL bByVal = v->IsA( TYPE(SbxMethod) );
+ sal_Bool bByVal = v->IsA( TYPE(SbxMethod) );
SbxDataType t = v->GetType();
if( p )
{
- bByVal |= BOOL( ( p->eType & SbxBYREF ) == 0 );
+ bByVal |= sal_Bool( ( p->eType & SbxBYREF ) == 0 );
t = (SbxDataType) ( p->eType & 0x0FFF );
if( !bByVal && t != SbxVARIANT &&
(!v->IsFixed() || (SbxDataType)(v->GetType() & 0x0FFF ) != t) )
- bByVal = TRUE;
+ bByVal = sal_True;
}
if( bByVal )
{
@@ -701,7 +701,7 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
// Einen P-Code ausfuehren
-BOOL SbiRuntime::Step()
+sal_Bool SbiRuntime::Step()
{
if( bRun )
{
@@ -724,12 +724,12 @@ BOOL SbiRuntime::Step()
}
#ifdef DBG_TRACE_BASIC
- UINT32 nPC = ( pCode - (const BYTE* )pImg->GetCode() );
+ sal_uInt32 nPC = ( pCode - (const sal_uInt8* )pImg->GetCode() );
dbg_traceStep( pMod, nPC, pINST->nCallLvl );
#endif
SbiOpcode eOp = (SbiOpcode ) ( *pCode++ );
- UINT32 nOp1, nOp2;
+ sal_uInt32 nOp1, nOp2;
if( eOp <= SbOP0_END )
{
(this->*( aStep0[ eOp ] ) )();
@@ -784,7 +784,7 @@ BOOL SbiRuntime::Step()
// Im Error Handler? Dann Std-Error
if ( !bInError )
{
- bInError = TRUE;
+ bInError = sal_True;
if( !bError ) // On Error Resume Next
StepRESUME( 1 );
@@ -809,7 +809,7 @@ BOOL SbiRuntime::Step()
while( NULL != (pRt = pRt->pNext) )
{
// Gibt es einen Error-Handler?
- if( pRt->bError == FALSE || pRt->pError != NULL )
+ if( pRt->bError == sal_False || pRt->pError != NULL )
{
pRtErrHdl = pRt;
break;
@@ -832,7 +832,7 @@ BOOL SbiRuntime::Step()
// Fehler setzen
pRt->nError = err;
if( pRt != pRtErrHdl )
- pRt->bRun = FALSE;
+ pRt->bRun = sal_False;
// In Error-Stack eintragen
SbErrorStackEntry *pEntry = new SbErrorStackEntry
@@ -928,7 +928,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
{
// TEST, has to be vb here always
#ifdef DBG_UTIL
- SbError nTmp = StarBASIC::GetSfxFromVBError( (USHORT)nError );
+ SbError nTmp = StarBASIC::GetSfxFromVBError( (sal_uInt16)nError );
DBG_ASSERT( nTmp, "No VB error!" );
#endif
@@ -938,7 +938,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
rMsg = String( RTL_CONSTASCII_USTRINGPARAM("Internal Object Error:") );
}
// no num? most likely then it *is* really a vba err
- USHORT nVBErrorCode = StarBASIC::GetVBErrorCode( nError );
+ sal_uInt16 nVBErrorCode = StarBASIC::GetVBErrorCode( nError );
sal_Int32 nVBAErrorNumber = ( nVBErrorCode == 0 ) ? nError : nVBErrorCode;
return nVBAErrorNumber;
}
@@ -999,7 +999,7 @@ SbxVariableRef SbiRuntime::PopVar()
return xVar;
}
-BOOL SbiRuntime::ClearExprStack()
+sal_Bool SbiRuntime::ClearExprStack()
{
// Achtung: Clear() reicht nicht, da Methods geloescht werden muessen
while ( nExprLvl )
@@ -1007,7 +1007,7 @@ BOOL SbiRuntime::ClearExprStack()
PopVar();
}
refExprStk->Clear();
- return FALSE;
+ return sal_False;
}
// Variable auf dem Expression-Stack holen, ohne sie zu entfernen
@@ -1023,7 +1023,7 @@ SbxVariable* SbiRuntime::GetTOS( short n )
return new SbxVariable;
}
#endif
- return refExprStk->Get( (USHORT) n );
+ return refExprStk->Get( (sal_uInt16) n );
}
// Sicherstellen, dass TOS eine temporaere Variable ist
@@ -1041,7 +1041,7 @@ void SbiRuntime::TOSMakeTemp()
// Der GOSUB-Stack nimmt Returnadressen fuer GOSUBs auf
-void SbiRuntime::PushGosub( const BYTE* pc )
+void SbiRuntime::PushGosub( const sal_uInt8* pc )
{
if( ++nGosubLvl > MAXRECURSION )
StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
@@ -1248,7 +1248,7 @@ void SbiRuntime::DllCall
const String& aDLLName, // Name der DLL
SbxArray* pArgs, // Parameter (ab Index 1, kann NULL sein)
SbxDataType eResType, // Returnwert
- BOOL bCDecl ) // TRUE: nach C-Konventionen
+ sal_Bool bCDecl ) // sal_True: nach C-Konventionen
{
// No DllCall for "virtual" portal users
if( needSecurityRestrictions() )
@@ -1275,13 +1275,13 @@ void SbiRuntime::DllCall
Error( nErr );
PushVar( pRes );
}
-USHORT
-SbiRuntime::GetImageFlag( USHORT n ) const
+
+sal_uInt16 SbiRuntime::GetImageFlag( sal_uInt16 n ) const
{
return pImg->GetFlag( n );
}
-USHORT
-SbiRuntime::GetBase()
+
+sal_uInt16 SbiRuntime::GetBase()
{
return pImg->GetBase();
}
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 39f92afdea4a..ecc0dfb3321b 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -66,7 +66,7 @@ struct Methods {
SbxDataType eType; // Datentyp
short nArgs; // Argumente und Flags
RtlCall pFunc; // Function Pointer
- USHORT nHash; // Hashcode
+ sal_uInt16 nHash; // Hashcode
};
static Methods aMethods[] = {
@@ -673,11 +673,11 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
if( !pVar )
{
// sonst suchen
- USHORT nHash_ = SbxVariable::MakeHashCode( rName );
+ sal_uInt16 nHash_ = SbxVariable::MakeHashCode( rName );
Methods* p = aMethods;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
short nIndex = 0;
- USHORT nSrchMask = _TYPEMASK;
+ sal_uInt16 nSrchMask = _TYPEMASK;
switch( t )
{
case SbxCLASS_METHOD: nSrchMask = _METHOD; break;
@@ -691,12 +691,12 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
&& ( p->nHash == nHash_ )
&& ( rName.EqualsIgnoreCaseAscii( p->pName ) ) )
{
- bFound = TRUE;
+ bFound = sal_True;
if( p->nArgs & _COMPTMASK )
{
SbiInstance* pInst = pINST;
if( !pInst || !pInst->IsCompatibility() )
- bFound = FALSE;
+ bFound = sal_False;
}
break;
}
@@ -726,7 +726,7 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
}
// SetModified muß bei der RTL abgklemmt werden
-void SbiStdObject::SetModified( BOOL )
+void SbiStdObject::SetModified( sal_Bool )
{
}
@@ -741,17 +741,17 @@ void SbiStdObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- ULONG t = pHint->GetId();
- USHORT nCallId = (USHORT) pVar->GetUserData();
+ sal_uIntPtr t = pHint->GetId();
+ sal_uInt16 nCallId = (sal_uInt16) pVar->GetUserData();
if( nCallId )
{
if( t == SBX_HINT_INFOWANTED )
pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
else
{
- BOOL bWrite = FALSE;
+ sal_Bool bWrite = sal_False;
if( t == SBX_HINT_DATACHANGED )
- bWrite = TRUE;
+ bWrite = sal_True;
if( t == SBX_HINT_DATAWANTED || bWrite )
{
RtlCall p = (RtlCall) aMethods[ nCallId-1 ].pFunc;
@@ -786,7 +786,7 @@ SbxInfo* SbiStdObject::GetInfo( short nIdx )
{
p++;
String aName_ = String::CreateFromAscii( p->pName );
- USHORT nFlags_ = ( p->nArgs >> 8 ) & 0x03;
+ sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03;
if( p->nArgs & _OPT )
nFlags_ |= SBX_OPTIONAL;
pInfo_->AddParam( aName_, p->eType, nFlags_ );
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 94b7973c7e77..29cbf16125c7 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -71,7 +71,7 @@ SbxObject* SbStdFactory::CreateObject( const String& rClassName )
-void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
{
@@ -80,7 +80,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
}
GraphicType eType = aGraphic.GetType();
- INT16 nType = 0;
+ sal_Int16 nType = 0;
if( eType == GRAPHIC_BITMAP )
nType = 1;
@@ -92,7 +92,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
}
-void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
{
@@ -104,10 +104,10 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, BOOL bWrite )
aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
- pVar->PutInteger( (INT16)aSize.Width() );
+ pVar->PutInteger( (sal_Int16)aSize.Width() );
}
-void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
{
@@ -119,7 +119,7 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, BOOL bWrite )
aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
- pVar->PutInteger( (INT16)aSize.Height() );
+ pVar->PutInteger( (sal_Int16)aSize.Height() );
}
@@ -169,8 +169,8 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- USHORT nWhich = (USHORT)pVar->GetUserData();
- BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+ sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData();
+ sal_Bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
// Propteries
switch( nWhich )
@@ -186,7 +186,7 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
//-----------------------------------------------------------------------------
-void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetBold( pVar->GetBool() );
@@ -194,7 +194,7 @@ void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, BOOL bWrite )
pVar->PutBool( IsBold() );
}
-void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetItalic( pVar->GetBool() );
@@ -202,7 +202,7 @@ void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, BOOL bWrite )
pVar->PutBool( IsItalic() );
}
-void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetStrikeThrough( pVar->GetBool() );
@@ -210,7 +210,7 @@ void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, BOOL bWrite )
pVar->PutBool( IsStrikeThrough() );
}
-void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetUnderline( pVar->GetBool() );
@@ -218,15 +218,15 @@ void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, BOOL bWrite )
pVar->PutBool( IsUnderline() );
}
-void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
- SetSize( (USHORT)pVar->GetInteger() );
+ SetSize( (sal_uInt16)pVar->GetInteger() );
else
- pVar->PutInteger( (INT16)GetSize() );
+ pVar->PutInteger( (sal_Int16)GetSize() );
}
-void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetFontName( pVar->GetString() );
@@ -291,8 +291,8 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- USHORT nWhich = (USHORT)pVar->GetUserData();
- BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+ sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData();
+ sal_Bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
// Propteries
switch( nWhich )
@@ -348,7 +348,7 @@ sal_Bool TransferableHelperImpl::GetData( const ::com::sun::star::datatransfer::
}
*/
-void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, sal_Bool )
{
if( pPar_ && (pPar_->Count() > 1) )
{
@@ -359,7 +359,7 @@ void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, BOOL )
//Clipboard::Clear();
}
-void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
(void)pVar;
@@ -369,7 +369,7 @@ void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
return;
}
- USHORT nFormat = pPar_->Get(1)->GetInteger();
+ sal_uInt16 nFormat = pPar_->Get(1)->GetInteger();
if( !nFormat || nFormat > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -392,7 +392,7 @@ void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
*/
}
-void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
if( !pPar_ || (pPar_->Count() != 2) )
{
@@ -400,18 +400,18 @@ void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL )
return;
}
- USHORT nFormat = pPar_->Get(1)->GetInteger();
+ sal_uInt16 nFormat = pPar_->Get(1)->GetInteger();
if( !nFormat || nFormat > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- pVar->PutBool( FALSE );
+ pVar->PutBool( sal_False );
//pVar->PutBool( Clipboard::HasFormat( nFormat ) );
}
-void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
if( pPar_ && (pPar_->Count() > 1) )
{
@@ -423,7 +423,7 @@ void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
//pVar->PutString( Clipboard::PasteString() );
}
-void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
(void)pVar;
@@ -433,7 +433,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
return;
}
- USHORT nFormat = pPar_->Get(2)->GetInteger();
+ sal_uInt16 nFormat = pPar_->Get(2)->GetInteger();
if( !nFormat || nFormat > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -457,7 +457,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
*/
}
-void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
(void)pVar;
@@ -530,8 +530,8 @@ void SbStdClipboard::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- USHORT nWhich = (USHORT)pVar->GetUserData();
- BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+ sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData();
+ sal_Bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
// Methods
switch( nWhich )
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index c686b0ed80ed..43c930e975d2 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -147,7 +147,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
if( !pTRUE )
{
pTRUE = new SbxVariable;
- pTRUE->PutBool( TRUE );
+ pTRUE->PutBool( sal_True );
pTRUE->AddRef();
}
PushVar( pTRUE );
@@ -157,7 +157,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
if( !pFALSE )
{
pFALSE = new SbxVariable;
- pFALSE->PutBool( FALSE );
+ pFALSE->PutBool( sal_False );
pFALSE->AddRef();
}
PushVar( pFALSE );
@@ -320,7 +320,7 @@ void SbiRuntime::StepIS()
eType2 = refVar2->GetType();
}
- BOOL bRes = BOOL( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
+ sal_Bool bRes = sal_Bool( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
if ( bVBAEnabled && !bRes )
Error( SbERR_INVALID_USAGE_OBJECT );
bRes = ( bRes && refVar1->GetObject() == refVar2->GetObject() );
@@ -379,11 +379,11 @@ void SbiRuntime::StepPUT()
SbxVariableRef refVal = PopVar();
SbxVariableRef refVar = PopVar();
// Store auf die eigene Methode (innerhalb einer Function)?
- BOOL bFlagsChanged = FALSE;
- USHORT n = 0;
+ sal_Bool bFlagsChanged = sal_False;
+ sal_uInt16 n = 0;
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
{
- bFlagsChanged = TRUE;
+ bFlagsChanged = sal_True;
n = refVar->GetFlags();
refVar->SetFlag( SBX_WRITE );
}
@@ -515,11 +515,11 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
else
{
// Store auf die eigene Methode (innerhalb einer Function)?
- BOOL bFlagsChanged = FALSE;
- USHORT n = 0;
+ sal_Bool bFlagsChanged = sal_False;
+ sal_uInt16 n = 0;
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
{
- bFlagsChanged = TRUE;
+ bFlagsChanged = sal_True;
n = refVar->GetFlags();
refVar->SetFlag( SBX_WRITE );
}
@@ -569,13 +569,13 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
}
// Handle Dim As New
- BOOL bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
+ sal_Bool bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
SbxBaseRef xPrevVarObj;
if( bDimAsNew )
xPrevVarObj = refVar->GetObject();
// Handle withevents
- BOOL bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
+ sal_Bool bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
if ( bWithEvents )
{
Reference< XInterface > xComListener;
@@ -704,14 +704,14 @@ void SbiRuntime::StepLSET()
else
{
// Store auf die eigene Methode (innerhalb einer Function)?
- USHORT n = refVar->GetFlags();
+ sal_uInt16 n = refVar->GetFlags();
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
refVar->SetFlag( SBX_WRITE );
String aRefVarString = refVar->GetString();
String aRefValString = refVal->GetString();
- USHORT nVarStrLen = aRefVarString.Len();
- USHORT nValStrLen = aRefValString.Len();
+ sal_uInt16 nVarStrLen = aRefVarString.Len();
+ sal_uInt16 nValStrLen = aRefValString.Len();
String aNewStr;
if( nVarStrLen > nValStrLen )
{
@@ -740,14 +740,14 @@ void SbiRuntime::StepRSET()
else
{
// Store auf die eigene Methode (innerhalb einer Function)?
- USHORT n = refVar->GetFlags();
+ sal_uInt16 n = refVar->GetFlags();
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
refVar->SetFlag( SBX_WRITE );
String aRefVarString = refVar->GetString();
String aRefValString = refVal->GetString();
- USHORT nPos = 0;
- USHORT nVarStrLen = aRefVarString.Len();
+ sal_uInt16 nPos = 0;
+ sal_uInt16 nVarStrLen = aRefVarString.Len();
if( nVarStrLen > aRefValString.Len() )
{
aRefVarString.Fill(nVarStrLen,' ');
@@ -797,10 +797,10 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
// AB 2.4.1996, auch Arrays ohne Dimensionsangaben zulassen (VB-komp.)
if( pDims )
{
- for( USHORT i = 1; i < pDims->Count(); )
+ for( sal_uInt16 i = 1; i < pDims->Count(); )
{
- INT32 lb = pDims->Get( i++ )->GetLong();
- INT32 ub = pDims->Get( i++ )->GetLong();
+ sal_Int32 lb = pDims->Get( i++ )->GetLong();
+ sal_Int32 ub = pDims->Get( i++ )->GetLong();
if( ub < lb )
Error( SbERR_OUT_OF_RANGE ), ub = lb;
pArray->AddDim32( lb, ub );
@@ -814,7 +814,7 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
// Uno-Sequences der Laenge 0 eine Dimension anlegen
pArray->unoAddDim( 0, -1 );
}
- USHORT nSavFlags = refVar->GetFlags();
+ sal_uInt16 nSavFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nSavFlags );
@@ -876,7 +876,7 @@ void SbiRuntime::StepREDIMP()
short nDimsNew = pNewArray->GetDims();
short nDimsOld = pOldArray->GetDims();
short nDims = nDimsNew;
- BOOL bRangeError = FALSE;
+ sal_Bool bRangeError = sal_False;
// Store dims to use them for copying later
sal_Int32* pLowerBounds = new sal_Int32[nDims];
@@ -885,7 +885,7 @@ void SbiRuntime::StepREDIMP()
if( nDimsOld != nDimsNew )
{
- bRangeError = TRUE;
+ bRangeError = sal_True;
}
else
{
@@ -902,7 +902,7 @@ void SbiRuntime::StepREDIMP()
// All bounds but the last have to be the same
if( i < nDims && ( lBoundNew != lBoundOld || uBoundNew != uBoundOld ) )
{
- bRangeError = TRUE;
+ bRangeError = sal_True;
break;
}
else
@@ -961,7 +961,7 @@ void SbiRuntime::StepREDIMP_ERASE()
}
// As in ERASE
- USHORT nSavFlags = refVar->GetFlags();
+ sal_uInt16 nSavFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->SetType( SbxDataType(eType & 0x0FFF) );
refVar->SetFlags( nSavFlags );
@@ -976,7 +976,7 @@ void SbiRuntime::StepREDIMP_ERASE()
void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
{
- USHORT nSavFlags = refVar->GetFlags();
+ sal_uInt16 nSavFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->SetType( SbxDataType(eType & 0x0FFF) );
refVar->SetFlags( nSavFlags );
@@ -1148,7 +1148,7 @@ void SbiRuntime::StepINPUT()
// zu fuellen, dann mit einem Stringwert
if( !pVar->IsFixed() || pVar->IsNumeric() )
{
- USHORT nLen = 0;
+ sal_uInt16 nLen = 0;
if( !pVar->Scan( s, &nLen ) )
{
err = SbxBase::GetError();
@@ -1271,7 +1271,7 @@ void SbiRuntime::StepENDCASE()
void SbiRuntime::StepSTDERROR()
{
- pError = NULL; bError = TRUE;
+ pError = NULL; bError = sal_True;
pInst->aErrorMsg = String();
pInst->nErr = 0L;
pInst->nErl = 0;
@@ -1286,14 +1286,14 @@ void SbiRuntime::StepNOERROR()
pInst->nErl = 0;
nError = 0L;
SbxErrObject::getUnoErrObject()->Clear();
- bError = FALSE;
+ bError = sal_False;
}
// UP verlassen
void SbiRuntime::StepLEAVE()
{
- bRun = FALSE;
+ bRun = sal_False;
// If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
if ( bInError && pError )
SbxErrObject::getUnoErrObject()->Clear();
@@ -1428,7 +1428,7 @@ void SbiRuntime::StepEMPTY()
void SbiRuntime::StepERROR()
{
SbxVariableRef refCode = PopVar();
- USHORT n = refCode->GetUShort();
+ sal_uInt16 n = refCode->GetUShort();
SbError error = StarBASIC::GetSfxFromVBError( n );
if ( bVBAEnabled )
pInst->Error( error );
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index e23ef864218e..0a9572906cc8 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -43,14 +43,14 @@ bool checkUnoObjectType( SbUnoObject* refVal,
// Laden einer numerischen Konstanten (+ID)
-void SbiRuntime::StepLOADNC( UINT32 nOp1 )
+void SbiRuntime::StepLOADNC( sal_uInt32 nOp1 )
{
SbxVariable* p = new SbxVariable( SbxDOUBLE );
// #57844 Lokalisierte Funktion benutzen
String aStr = pImg->GetString( static_cast<short>( nOp1 ) );
// Auch , zulassen !!!
- USHORT iComma = aStr.Search( ',' );
+ sal_uInt16 iComma = aStr.Search( ',' );
if( iComma != STRING_NOTFOUND )
{
String aStr1 = aStr.Copy( 0, iComma );
@@ -67,7 +67,7 @@ void SbiRuntime::StepLOADNC( UINT32 nOp1 )
// Laden einer Stringkonstanten (+ID)
-void SbiRuntime::StepLOADSC( UINT32 nOp1 )
+void SbiRuntime::StepLOADSC( sal_uInt32 nOp1 )
{
SbxVariable* p = new SbxVariable;
p->PutString( pImg->GetString( static_cast<short>( nOp1 ) ) );
@@ -76,16 +76,16 @@ void SbiRuntime::StepLOADSC( UINT32 nOp1 )
// Immediate Load (+Wert)
-void SbiRuntime::StepLOADI( UINT32 nOp1 )
+void SbiRuntime::StepLOADI( sal_uInt32 nOp1 )
{
SbxVariable* p = new SbxVariable;
- p->PutInteger( static_cast<INT16>( nOp1 ) );
+ p->PutInteger( static_cast<sal_Int16>( nOp1 ) );
PushVar( p );
}
// Speichern eines named Arguments in Argv (+Arg-Nr ab 1!)
-void SbiRuntime::StepARGN( UINT32 nOp1 )
+void SbiRuntime::StepARGN( sal_uInt32 nOp1 )
{
if( !refArgv )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -100,13 +100,13 @@ void SbiRuntime::StepARGN( UINT32 nOp1 )
// Konvertierung des Typs eines Arguments in Argv fuer DECLARE-Fkt. (+Typ)
-void SbiRuntime::StepARGTYP( UINT32 nOp1 )
+void SbiRuntime::StepARGTYP( sal_uInt32 nOp1 )
{
if( !refArgv )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
else
{
- BOOL bByVal = (nOp1 & 0x8000) != 0; // Ist BYVAL verlangt?
+ sal_Bool bByVal = (nOp1 & 0x8000) != 0; // Ist BYVAL verlangt?
SbxDataType t = (SbxDataType) (nOp1 & 0x7FFF);
SbxVariable* pVar = refArgv->Get( refArgv->Count() - 1 ); // letztes Arg
@@ -145,7 +145,7 @@ void SbiRuntime::StepARGTYP( UINT32 nOp1 )
// String auf feste Laenge bringen (+Laenge)
-void SbiRuntime::StepPAD( UINT32 nOp1 )
+void SbiRuntime::StepPAD( sal_uInt32 nOp1 )
{
SbxVariable* p = GetTOS();
String& s = (String&)(const String&) *p;
@@ -157,20 +157,20 @@ void SbiRuntime::StepPAD( UINT32 nOp1 )
// Sprung (+Target)
-void SbiRuntime::StepJUMP( UINT32 nOp1 )
+void SbiRuntime::StepJUMP( sal_uInt32 nOp1 )
{
#ifdef DBG_UTIL
// #QUESTION shouln't this be
- // if( (BYTE*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
+ // if( (sal_uInt8*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
if( nOp1 >= pImg->GetCodeSize() )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
#endif
- pCode = (const BYTE*) pImg->GetCode() + nOp1;
+ pCode = (const sal_uInt8*) pImg->GetCode() + nOp1;
}
// TOS auswerten, bedingter Sprung (+Target)
-void SbiRuntime::StepJUMPT( UINT32 nOp1 )
+void SbiRuntime::StepJUMPT( sal_uInt32 nOp1 )
{
SbxVariableRef p = PopVar();
if( p->GetBool() )
@@ -179,7 +179,7 @@ void SbiRuntime::StepJUMPT( UINT32 nOp1 )
// TOS auswerten, bedingter Sprung (+Target)
-void SbiRuntime::StepJUMPF( UINT32 nOp1 )
+void SbiRuntime::StepJUMPF( sal_uInt32 nOp1 )
{
SbxVariableRef p = PopVar();
if( !p->GetBool() )
@@ -194,36 +194,36 @@ void SbiRuntime::StepJUMPF( UINT32 nOp1 )
// ...
//Falls im Operanden 0x8000 gesetzt ist, Returnadresse pushen (ON..GOSUB)
-void SbiRuntime::StepONJUMP( UINT32 nOp1 )
+void SbiRuntime::StepONJUMP( sal_uInt32 nOp1 )
{
SbxVariableRef p = PopVar();
- INT16 n = p->GetInteger();
+ sal_Int16 n = p->GetInteger();
if( nOp1 & 0x8000 )
{
nOp1 &= 0x7FFF;
//PushGosub( pCode + 3 * nOp1 );
PushGosub( pCode + 5 * nOp1 );
}
- if( n < 1 || static_cast<UINT32>(n) > nOp1 )
- n = static_cast<INT16>( nOp1 + 1 );
- //nOp1 = (UINT32) ( (const char*) pCode - pImg->GetCode() ) + 3 * --n;
- nOp1 = (UINT32) ( (const char*) pCode - pImg->GetCode() ) + 5 * --n;
+ if( n < 1 || static_cast<sal_uInt32>(n) > nOp1 )
+ n = static_cast<sal_Int16>( nOp1 + 1 );
+ //nOp1 = (sal_uInt32) ( (const char*) pCode - pImg->GetCode() ) + 3 * --n;
+ nOp1 = (sal_uInt32) ( (const char*) pCode - pImg->GetCode() ) + 5 * --n;
StepJUMP( nOp1 );
}
// UP-Aufruf (+Target)
-void SbiRuntime::StepGOSUB( UINT32 nOp1 )
+void SbiRuntime::StepGOSUB( sal_uInt32 nOp1 )
{
PushGosub( pCode );
if( nOp1 >= pImg->GetCodeSize() )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
- pCode = (const BYTE*) pImg->GetCode() + nOp1;
+ pCode = (const sal_uInt8*) pImg->GetCode() + nOp1;
}
// UP-Return (+0 oder Target)
-void SbiRuntime::StepRETURN( UINT32 nOp1 )
+void SbiRuntime::StepRETURN( sal_uInt32 nOp1 )
{
PopGosub();
if( nOp1 )
@@ -232,7 +232,7 @@ void SbiRuntime::StepRETURN( UINT32 nOp1 )
// FOR-Variable testen (+Endlabel)
-void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
+void SbiRuntime::StepTESTFOR( sal_uInt32 nOp1 )
{
if( !pForStk )
{
@@ -295,7 +295,7 @@ void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
{
BasicCollection* pCollection = (BasicCollection*)(SbxVariable*)pForStk->refEnd;
SbxArrayRef xItemArray = pCollection->xItemArray;
- INT32 nCount = xItemArray->Count32();
+ sal_Int32 nCount = xItemArray->Count32();
if( pForStk->nCurCollectionIndex < nCount )
{
SbxVariable* pRes = xItemArray->Get32( pForStk->nCurCollectionIndex );
@@ -334,7 +334,7 @@ void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
// Tos+1 <= Tos+2 <= Tos, 2xremove (+Target)
-void SbiRuntime::StepCASETO( UINT32 nOp1 )
+void SbiRuntime::StepCASETO( sal_uInt32 nOp1 )
{
if( !refCaseStk || !refCaseStk->Count() )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -350,9 +350,9 @@ void SbiRuntime::StepCASETO( UINT32 nOp1 )
// Fehler-Handler
-void SbiRuntime::StepERRHDL( UINT32 nOp1 )
+void SbiRuntime::StepERRHDL( sal_uInt32 nOp1 )
{
- const BYTE* p = pCode;
+ const sal_uInt8* p = pCode;
StepJUMP( nOp1 );
pError = pCode;
pCode = p;
@@ -365,7 +365,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 )
// Resume nach Fehlern (+0=statement, 1=next or Label)
-void SbiRuntime::StepRESUME( UINT32 nOp1 )
+void SbiRuntime::StepRESUME( sal_uInt32 nOp1 )
{
// AB #32714 Resume ohne Error? -> Fehler
if( !bInError )
@@ -376,8 +376,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
if( nOp1 )
{
// Code-Zeiger auf naechstes Statement setzen
- USHORT n1, n2;
- pCode = pMod->FindNextStmnt( pErrCode, n1, n2, TRUE, pImg );
+ sal_uInt16 n1, n2;
+ pCode = pMod->FindNextStmnt( pErrCode, n1, n2, sal_True, pImg );
}
else
pCode = pErrStmnt;
@@ -390,7 +390,7 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
pInst->nErr = 0;
pInst->nErl = 0;
nError = 0;
- bInError = FALSE;
+ bInError = sal_False;
// Error-Stack loeschen
SbErrorStack*& rErrStack = GetSbData()->pErrStack;
@@ -399,7 +399,7 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
}
// Kanal schliessen (+Kanal, 0=Alle)
-void SbiRuntime::StepCLOSE( UINT32 nOp1 )
+void SbiRuntime::StepCLOSE( sal_uInt32 nOp1 )
{
SbError err;
if( !nOp1 )
@@ -418,7 +418,7 @@ void SbiRuntime::StepCLOSE( UINT32 nOp1 )
// Zeichen ausgeben (+char)
-void SbiRuntime::StepPRCHAR( UINT32 nOp1 )
+void SbiRuntime::StepPRCHAR( sal_uInt32 nOp1 )
{
ByteString s( (char) nOp1 );
pIosys->Write( s );
@@ -509,7 +509,7 @@ bool SbiRuntime::checkClass_Impl( const SbxVariableRef& refVal,
return bOk;
}
-void SbiRuntime::StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt )
+void SbiRuntime::StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt )
{
SbxVariableRef refVal = PopVar();
SbxVariableRef refVar = PopVar();
@@ -520,17 +520,17 @@ void SbiRuntime::StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt )
StepSET_Impl( refVal, refVar, bHandleDflt ); // don't do handle dflt prop for a "proper" set
}
-void SbiRuntime::StepVBASETCLASS( UINT32 nOp1 )
+void SbiRuntime::StepVBASETCLASS( sal_uInt32 nOp1 )
{
StepSETCLASS_impl( nOp1, false );
}
-void SbiRuntime::StepSETCLASS( UINT32 nOp1 )
+void SbiRuntime::StepSETCLASS( sal_uInt32 nOp1 )
{
StepSETCLASS_impl( nOp1, true );
}
-void SbiRuntime::StepTESTCLASS( UINT32 nOp1 )
+void SbiRuntime::StepTESTCLASS( sal_uInt32 nOp1 )
{
SbxVariableRef xObjVal = PopVar();
String aClass( pImg->GetString( static_cast<short>( nOp1 ) ) );
@@ -544,7 +544,7 @@ void SbiRuntime::StepTESTCLASS( UINT32 nOp1 )
// Library fuer anschliessenden Declare-Call definieren
-void SbiRuntime::StepLIB( UINT32 nOp1 )
+void SbiRuntime::StepLIB( sal_uInt32 nOp1 )
{
aLibName = pImg->GetString( static_cast<short>( nOp1 ) );
}
@@ -553,14 +553,14 @@ void SbiRuntime::StepLIB( UINT32 nOp1 )
// Dieser Opcode wird vor DIM/REDIM-Anweisungen gepusht,
// wenn nur ein Index angegeben wurde.
-void SbiRuntime::StepBASED( UINT32 nOp1 )
+void SbiRuntime::StepBASED( sal_uInt32 nOp1 )
{
SbxVariable* p1 = new SbxVariable;
SbxVariableRef x2 = PopVar();
// #109275 Check compatiblity mode
bool bCompatible = ((nOp1 & 0x8000) != 0);
- USHORT uBase = static_cast<USHORT>(nOp1 & 1); // Can only be 0 or 1
+ sal_uInt16 uBase = static_cast<sal_uInt16>(nOp1 & 1); // Can only be 0 or 1
p1->PutInteger( uBase );
if( !bCompatible )
x2->Compute( SbxPLUS, *p1 );
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 64a9d86ab940..02b22a35b732 100755
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -58,7 +58,7 @@ SbxVariable* getVBAConstant( const String& rName );
// 0x8000 - Argv ist belegt
SbxVariable* SbiRuntime::FindElement
- ( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal, BOOL bStatic )
+ ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
{
bool bIsVBAInterOp = SbiRuntime::isVBAEnabled();
if( bIsVBAInterOp )
@@ -76,7 +76,7 @@ SbxVariable* SbiRuntime::FindElement
}
else
{
- BOOL bFatalError = FALSE;
+ sal_Bool bFatalError = sal_False;
SbxDataType t = (SbxDataType) nOp2;
String aName( pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) ) );
// Hacky capture of Evaluate [] syntax
@@ -109,8 +109,8 @@ SbxVariable* SbiRuntime::FindElement
if( !pElem )
{
// Die RTL brauchen wir nicht mehr zu durchsuchen!
- BOOL bSave = rBasic.bNoRtl;
- rBasic.bNoRtl = TRUE;
+ sal_Bool bSave = rBasic.bNoRtl;
+ rBasic.bNoRtl = sal_True;
pElem = pObj->Find( aName, SbxCLASS_DONTCARE );
// #110004, #112015: Make private really private
@@ -181,14 +181,14 @@ SbxVariable* SbiRuntime::FindElement
// Nicht da und nicht im Objekt?
// Hat das Ding Parameter, nicht einrichten!
if( nOp1 & 0x8000 )
- bFatalError = TRUE;
+ bFatalError = sal_True;
// ALT: StarBASIC::FatalError( nNotFound );
// Sonst, falls keine Parameter sind, anderen Error Code verwenden
if( !bLocal || pImg->GetFlag( SBIMG_EXPLICIT ) )
{
// #39108 Bei explizit und als ELEM immer ein Fatal Error
- bFatalError = TRUE;
+ bFatalError = sal_True;
// Falls keine Parameter sind, anderen Error Code verwenden
if( !( nOp1 & 0x8000 ) && nNotFound == SbERR_PROC_UNDEFINED )
@@ -233,19 +233,19 @@ SbxVariable* SbiRuntime::FindElement
{
// Soll der Typ konvertiert werden?
SbxDataType t2 = pElem->GetType();
- BOOL bSet = FALSE;
+ sal_Bool bSet = sal_False;
if( !( pElem->GetFlags() & SBX_FIXED ) )
{
if( t != SbxVARIANT && t != t2 &&
t >= SbxINTEGER && t <= SbxSTRING )
- pElem->SetType( t ), bSet = TRUE;
+ pElem->SetType( t ), bSet = sal_True;
}
// pElem auf eine Ref zuweisen, um ggf. eine Temp-Var zu loeschen
SbxVariableRef refTemp = pElem;
// Moegliche Reste vom letzten Aufruf der SbxMethod beseitigen
// Vorher Schreiben freigeben, damit kein Error gesetzt wird.
- USHORT nSavFlags = pElem->GetFlags();
+ sal_uInt16 nSavFlags = pElem->GetFlags();
pElem->SetFlag( SBX_READWRITE | SBX_NO_BROADCAST );
pElem->SbxValue::Clear();
pElem->SetFlags( nSavFlags );
@@ -314,8 +314,8 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
SbxInfo* pInfo = pMeth->GetInfo();
if( pInfo && refParams )
{
- USHORT nParamCount = refParams->Count();
- USHORT j = 1;
+ sal_uInt16 nParamCount = refParams->Count();
+ sal_uInt16 j = 1;
const SbxParamInfo* pParam = pInfo->GetParam( j );
while( pParam )
{
@@ -342,8 +342,8 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
if( !pElem )
{
// RTL nicht durchsuchen!
- BOOL bSave = rBasic.bNoRtl;
- rBasic.bNoRtl = TRUE;
+ sal_Bool bSave = rBasic.bNoRtl;
+ rBasic.bNoRtl = sal_True;
pElem = pMod->Find( rName, SbxCLASS_DONTCARE );
rBasic.bNoRtl = bSave;
}
@@ -355,20 +355,20 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
// Dabei auch die Argumente umsetzen, falls benannte Parameter
// verwendet wurden
-void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
+void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 )
{
if( nOp1 & 0x8000 )
{
if( !refArgv )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
- BOOL bHasNamed = FALSE;
- USHORT i;
- USHORT nArgCount = refArgv->Count();
+ sal_Bool bHasNamed = sal_False;
+ sal_uInt16 i;
+ sal_uInt16 nArgCount = refArgv->Count();
for( i = 1 ; i < nArgCount ; i++ )
{
if( refArgv->GetAlias( i ).Len() )
{
- bHasNamed = TRUE; break;
+ bHasNamed = sal_True; break;
}
}
if( bHasNamed )
@@ -395,7 +395,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
{
bError_ = false;
- USHORT nCurPar = 1;
+ sal_uInt16 nCurPar = 1;
AutomationNamedArgsSbxArray* pArg =
new AutomationNamedArgsSbxArray( nArgCount );
::rtl::OUString* pNames = pArg->getNames().getArray();
@@ -444,7 +444,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
}
else
{
- USHORT nCurPar = 1;
+ sal_uInt16 nCurPar = 1;
SbxArray* pArg = new SbxArray;
for( i = 1 ; i < nArgCount ; i++ )
{
@@ -453,7 +453,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
if( rName.Len() )
{
// nCurPar wird auf den gefundenen Parameter gesetzt
- USHORT j = 1;
+ sal_uInt16 j = 1;
const SbxParamInfo* pParam = pInfo->GetParam( j );
while( pParam )
{
@@ -544,7 +544,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
// Haben wir Index-Access?
if( xIndexAccess.is() )
{
- UINT32 nParamCount = (UINT32)pPar->Count() - 1;
+ sal_uInt32 nParamCount = (sal_uInt32)pPar->Count() - 1;
if( nParamCount != 1 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -552,7 +552,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
}
// Index holen
- INT32 nIndex = pPar->Get( 1 )->GetLong();
+ sal_Int32 nIndex = pPar->Get( 1 )->GetLong();
Reference< XInterface > xRet;
try
{
@@ -635,13 +635,13 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
// Laden eines Elements aus der Runtime-Library (+StringID+Typ)
-void SbiRuntime::StepRTL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepRTL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, FALSE ) );
+ PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_False ) );
}
void
-SbiRuntime::StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal, BOOL bStatic )
+SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
{
if( !refLocals )
refLocals = new SbxArray;
@@ -649,34 +649,34 @@ SbiRuntime::StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nN
}
// Laden einer lokalen/globalen Variablen (+StringID+Typ)
-void SbiRuntime::StepFIND( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE );
+ StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
}
// Search inside a class module (CM) to enable global search in time
-void SbiRuntime::StepFIND_CM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_CM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
SbClassModuleObject* pClassModuleObject = PTR_CAST(SbClassModuleObject,pMod);
if( pClassModuleObject )
pMod->SetFlag( SBX_GBLSEARCH );
- StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE );
+ StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
if( pClassModuleObject )
pMod->ResetFlag( SBX_GBLSEARCH );
}
-void SbiRuntime::StepFIND_STATIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_STATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE, TRUE );
+ StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True, sal_True );
}
// Laden eines Objekt-Elements (+StringID+Typ)
// Das Objekt liegt auf TOS
-void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepELEM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
// Liegt auf dem TOS ein Objekt?
SbxVariableRef pObjVar = PopVar();
@@ -695,7 +695,7 @@ void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
if( pObj )
SaveRef( (SbxVariable*)pObj );
- PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, FALSE ) );
+ PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, sal_False ) );
}
// Laden eines Parameters (+Offset+Typ)
@@ -703,17 +703,17 @@ void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
// Der Datentyp SbxEMPTY zeigt an, daa kein Parameter angegeben ist.
// Get( 0 ) darf EMPTY sein
-void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPARAM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- USHORT i = static_cast<USHORT>( nOp1 & 0x7FFF );
+ sal_uInt16 i = static_cast<sal_uInt16>( nOp1 & 0x7FFF );
SbxDataType t = (SbxDataType) nOp2;
SbxVariable* p;
// #57915 Missing sauberer loesen
- USHORT nParamCount = refParams->Count();
+ sal_uInt16 nParamCount = refParams->Count();
if( i >= nParamCount )
{
- INT16 iLoop = i;
+ sal_Int16 iLoop = i;
while( iLoop >= nParamCount )
{
p = new SbxVariable();
@@ -739,7 +739,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
//if( p->GetType() == SbxEMPTY && ( i ) )
{
// Wenn ein Parameter fehlt, kann er OPTIONAL sein
- BOOL bOpt = FALSE;
+ sal_Bool bOpt = sal_False;
if( pMeth )
{
SbxInfo* pInfo = pMeth->GetInfo();
@@ -749,7 +749,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
if( pParam && ( (pParam->nFlags & SBX_OPTIONAL) != 0 ) )
{
// Default value?
- USHORT nDefaultId = sal::static_int_cast< USHORT >(
+ sal_uInt16 nDefaultId = sal::static_int_cast< sal_uInt16 >(
pParam->nUserData & 0xffff );
if( nDefaultId > 0 )
{
@@ -758,11 +758,11 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
p->PutString( aDefaultStr );
refParams->Put( p, i );
}
- bOpt = TRUE;
+ bOpt = sal_True;
}
}
}
- if( bOpt == FALSE )
+ if( bOpt == sal_False )
Error( SbERR_NOT_OPTIONAL );
}
else if( t != SbxVARIANT && (SbxDataType)(p->GetType() & 0x0FFF ) != t )
@@ -778,7 +778,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
// Case-Test (+True-Target+Test-Opcode)
-void SbiRuntime::StepCASEIS( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCASEIS( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( !refCaseStk || !refCaseStk->Count() )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -794,13 +794,13 @@ void SbiRuntime::StepCASEIS( UINT32 nOp1, UINT32 nOp2 )
// Aufruf einer DLL-Prozedur (+StringID+Typ)
// Auch hier zeigt das MSB des StringIDs an, dass Argv belegt ist
-void SbiRuntime::StepCALL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCALL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aName = pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) );
SbxArray* pArgs = NULL;
if( nOp1 & 0x8000 )
pArgs = refArgv;
- DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, FALSE );
+ DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_False );
aLibName = String();
if( nOp1 & 0x8000 )
PopArgv();
@@ -809,13 +809,13 @@ void SbiRuntime::StepCALL( UINT32 nOp1, UINT32 nOp2 )
// Aufruf einer DLL-Prozedur nach CDecl (+StringID+Typ)
// Auch hier zeigt das MSB des StringIDs an, dass Argv belegt ist
-void SbiRuntime::StepCALLC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCALLC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aName = pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) );
SbxArray* pArgs = NULL;
if( nOp1 & 0x8000 )
pArgs = refArgv;
- DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, TRUE );
+ DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_True );
aLibName = String();
if( nOp1 & 0x8000 )
PopArgv();
@@ -824,14 +824,14 @@ void SbiRuntime::StepCALLC( UINT32 nOp1, UINT32 nOp2 )
// Beginn eines Statements (+Line+Col)
-void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepSTMNT( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
// Wenn der Expr-Stack am Anfang einen Statements eine Variable enthaelt,
// hat ein Trottel X als Funktion aufgerufen, obwohl es eine Variable ist!
- BOOL bFatalExpr = FALSE;
+ sal_Bool bFatalExpr = sal_False;
String sUnknownMethodName;
if( nExprLvl > 1 )
- bFatalExpr = TRUE;
+ bFatalExpr = sal_True;
else if( nExprLvl )
{
SbxVariable* p = refExprStk->Get( 0 );
@@ -839,7 +839,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
&& refLocals.Is() && refLocals->Find( p->GetName(), p->GetClass() ) )
{
sUnknownMethodName = p->GetName();
- bFatalExpr = TRUE;
+ bFatalExpr = sal_True;
}
}
// Der Expr-Stack ist nun nicht mehr notwendig
@@ -859,7 +859,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
return;
}
pStmnt = pCode - 9;
- USHORT nOld = nLine;
+ sal_uInt16 nOld = nLine;
nLine = static_cast<short>( nOp1 );
// #29955 & 0xFF, um for-Schleifen-Ebene wegzufiltern
@@ -871,8 +871,8 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
// around the final column of this statement to set
nCol2 = 0xffff;
- USHORT n1, n2;
- const BYTE* p = pMod->FindNextStmnt( pCode, n1, n2 );
+ sal_uInt16 n1, n2;
+ const sal_uInt8* p = pMod->FindNextStmnt( pCode, n1, n2 );
if( p )
{
if( n1 == nOp1 )
@@ -886,7 +886,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
if( !bInError )
{
// (Bei Sprüngen aus Schleifen tritt hier eine Differenz auf)
- USHORT nExspectedForLevel = static_cast<USHORT>( nOp2 / 0x100 );
+ sal_uInt16 nExspectedForLevel = static_cast<sal_uInt16>( nOp2 / 0x100 );
if( pGosubStk )
nExspectedForLevel = nExspectedForLevel + pGosubStk->nStartForLvl;
@@ -902,7 +902,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
//if( nFlags & SbDEBUG_STEPINTO )
{
StarBASIC* pStepBasic = GetCurrentBasic( &rBasic );
- USHORT nNewFlags = pStepBasic->StepPoint( nLine, nCol1, nCol2 );
+ sal_uInt16 nNewFlags = pStepBasic->StepPoint( nLine, nCol1, nCol2 );
// Neuen BreakCallLevel ermitteln
pInst->CalcBreakCallLevel( nNewFlags );
@@ -911,10 +911,10 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
// Breakpoints nur bei STMNT-Befehlen in neuer Zeile!
else if( ( nOp1 != nOld )
&& ( nFlags & SbDEBUG_BREAK )
- && pMod->IsBP( static_cast<USHORT>( nOp1 ) ) )
+ && pMod->IsBP( static_cast<sal_uInt16>( nOp1 ) ) )
{
StarBASIC* pBreakBasic = GetCurrentBasic( &rBasic );
- USHORT nNewFlags = pBreakBasic->BreakPoint( nLine, nCol1, nCol2 );
+ sal_uInt16 nNewFlags = pBreakBasic->BreakPoint( nLine, nCol1, nCol2 );
// Neuen BreakCallLevel ermitteln
pInst->CalcBreakCallLevel( nNewFlags );
@@ -929,7 +929,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
// Kanalnummer
// Dateiname
-void SbiRuntime::StepOPEN( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepOPEN( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
SbxVariableRef pName = PopVar();
SbxVariableRef pChan = PopVar();
@@ -944,7 +944,7 @@ void SbiRuntime::StepOPEN( UINT32 nOp1, UINT32 nOp2 )
// Objekt kreieren (+StringID+StringID)
-void SbiRuntime::StepCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aClass( pImg->GetString( static_cast<short>( nOp2 ) ) );
SbxObject *pObj = SbxBase::CreateObject( aClass );
@@ -962,12 +962,12 @@ void SbiRuntime::StepCREATE( UINT32 nOp1, UINT32 nOp2 )
}
}
-void SbiRuntime::StepDCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
StepDCREATE_IMPL( nOp1, nOp2 );
}
-void SbiRuntime::StepDCREATE_REDIMP( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE_REDIMP( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
StepDCREATE_IMPL( nOp1, nOp2 );
}
@@ -994,7 +994,7 @@ void implCopyDimArray_DCREATE( SbxDimArray* pNewArray, SbxDimArray* pOldArray, s
}
// #56204 Objekt-Array kreieren (+StringID+StringID), DCREATE == Dim-Create
-void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
SbxVariableRef refVar = PopVar();
@@ -1016,11 +1016,11 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
// Dimensionen auswerten
short nDims = pArray->GetDims();
- INT32 nTotalSize = 0;
+ sal_Int32 nTotalSize = 0;
// es muss ein eindimensionales Array sein
- INT32 nLower, nUpper, nSize;
- INT32 i;
+ sal_Int32 nLower, nUpper, nSize;
+ sal_Int32 i;
for( i = 0 ; i < nDims ; i++ )
{
pArray->GetDim32( i+1, nLower, nUpper );
@@ -1058,7 +1058,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
short nDimsNew = pArray->GetDims();
short nDimsOld = pOldArray->GetDims();
short nDims = nDimsNew;
- BOOL bRangeError = FALSE;
+ sal_Bool bRangeError = sal_False;
// Store dims to use them for copying later
sal_Int32* pLowerBounds = new sal_Int32[nDims];
@@ -1066,7 +1066,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
sal_Int32* pActualIndices = new sal_Int32[nDims];
if( nDimsOld != nDimsNew )
{
- bRangeError = TRUE;
+ bRangeError = sal_True;
}
else
{
@@ -1109,7 +1109,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
SbxObject* createUserTypeImpl( const String& rClassName ); // sb.cxx
-void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepTCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
String aClass( pImg->GetString( static_cast<short>( nOp2 ) ) );
@@ -1123,7 +1123,7 @@ void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 )
PushVar( pNew );
}
-void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, UINT32 nOp2 )
+void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, sal_uInt32 nOp2 )
{
bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
if( bWithEvents )
@@ -1136,7 +1136,7 @@ void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, UINT32 nO
bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
if( bFixedString )
{
- USHORT nCount = static_cast<USHORT>( nOp2 >> 17 ); // len = all bits above 0x10000
+ sal_uInt16 nCount = static_cast<sal_uInt16>( nOp2 >> 17 ); // len = all bits above 0x10000
String aStr;
aStr.Fill( nCount, 0 );
pVar->PutString( aStr );
@@ -1145,7 +1145,7 @@ void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, UINT32 nO
// Einrichten einer lokalen Variablen (+StringID+Typ)
-void SbiRuntime::StepLOCAL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepLOCAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( !refLocals.Is() )
refLocals = new SbxArray;
@@ -1162,11 +1162,11 @@ void SbiRuntime::StepLOCAL( UINT32 nOp1, UINT32 nOp2 )
// Einrichten einer modulglobalen Variablen (+StringID+Typ)
-void SbiRuntime::StepPUBLIC_Impl( UINT32 nOp1, UINT32 nOp2, bool bUsedForClassModule )
+void SbiRuntime::StepPUBLIC_Impl( sal_uInt32 nOp1, sal_uInt32 nOp2, bool bUsedForClassModule )
{
String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
SbxDataType t = (SbxDataType)(SbxDataType)(nOp2 & 0xffff);;
- BOOL bFlag = pMod->IsSet( SBX_NO_MODIFY );
+ sal_Bool bFlag = pMod->IsSet( SBX_NO_MODIFY );
pMod->SetFlag( SBX_NO_MODIFY );
SbxVariableRef p = pMod->Find( aName, SbxCLASS_PROPERTY );
if( p.Is() )
@@ -1186,12 +1186,12 @@ void SbiRuntime::StepPUBLIC_Impl( UINT32 nOp1, UINT32 nOp2, bool bUsedForClassMo
}
}
-void SbiRuntime::StepPUBLIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPUBLIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
StepPUBLIC_Impl( nOp1, nOp2, false );
}
-void SbiRuntime::StepPUBLIC_P( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPUBLIC_P( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
// Creates module variable that isn't reinitialised when
// between invocations ( for VBASupport & document basic only )
@@ -1204,7 +1204,7 @@ void SbiRuntime::StepPUBLIC_P( UINT32 nOp1, UINT32 nOp2 )
// Einrichten einer globalen Variablen (+StringID+Typ)
-void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepGLOBAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( pImg->GetFlag( SBIMG_CLASSMODULE ) )
StepPUBLIC_Impl( nOp1, nOp2, true );
@@ -1222,7 +1222,7 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
pMod->AddVarName( aName );
}
- BOOL bFlag = pStorage->IsSet( SBX_NO_MODIFY );
+ sal_Bool bFlag = pStorage->IsSet( SBX_NO_MODIFY );
rBasic.SetFlag( SBX_NO_MODIFY );
SbxVariableRef p = pStorage->Find( aName, SbxCLASS_PROPERTY );
if( p.Is() )
@@ -1242,7 +1242,7 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
// Creates global variable that isn't reinitialised when
// basic is restarted, P=PERSIST (+StringID+Typ)
-void SbiRuntime::StepGLOBAL_P( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepGLOBAL_P( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( pMod->pImage->bFirstInit )
{
@@ -1254,7 +1254,7 @@ void SbiRuntime::StepGLOBAL_P( UINT32 nOp1, UINT32 nOp2 )
// Searches for global variable, behavior depends on the fact
// if the variable is initialised for the first time
-void SbiRuntime::StepFIND_G( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_G( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( pMod->pImage->bFirstInit )
{
@@ -1292,7 +1292,7 @@ SbxVariable* SbiRuntime::StepSTATIC_Impl( String& aName, SbxDataType& t )
return p;
}
// Einrichten einer statischen Variablen (+StringID+Typ)
-void SbiRuntime::StepSTATIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepSTATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
SbxDataType t = (SbxDataType) nOp2;
generated by cgit (git 2.34.1) at 2024-07-26 07:31:55 +0000