summaryrefslogtreecommitdiff
path: root/automation/source/testtool/objtest.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'automation/source/testtool/objtest.cxx')
-rw-r--r--automation/source/testtool/objtest.cxx610
1 files changed, 354 insertions, 256 deletions
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index ca65865ff9d2..7569c69f3be3 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -117,7 +117,7 @@ CErrors *TestToolObj::pFehlerListe = NULL; // Hier werden die Fehler des Te
DBG_NAME( ControlItem )
DBG_NAME( ControlDef )
-ControlItem::ControlItem( const sal_Char *Name, SmartId aUIdP )
+ControlItem::ControlItem( const sal_Char *Name, rtl::OString aUIdP )
{
DBG_CTOR(ControlItem,0);
InitData();
@@ -125,7 +125,7 @@ DBG_CTOR(ControlItem,0);
pData->aUId = aUIdP;
}
-ControlItem::ControlItem( const String &Name, SmartId aUIdP )
+ControlItem::ControlItem( const String &Name, rtl::OString aUIdP )
{
DBG_CTOR(ControlItem,0);
InitData();
@@ -148,43 +148,48 @@ ControlSon::~ControlSon()
}
}
-ControlItemSon::ControlItemSon(const String &Name, SmartId aUIdP )
+ControlItemSon::ControlItemSon(const String &Name, rtl::OString aUIdP )
: ControlItem( Name, aUIdP )
{}
-BOOL ControlDef::operator < (const ControlItem &rPar)
+sal_Bool ControlDef::operator < (const ControlItem &rPar)
{
return pData->Kurzname.CompareIgnoreCaseToAscii(rPar.pData->Kurzname) == COMPARE_LESS;
}
-BOOL ControlDef::operator == (const ControlItem &rPar)
+sal_Bool ControlDef::operator == (const ControlItem &rPar)
{
return pData->Kurzname.CompareIgnoreCaseToAscii(rPar.pData->Kurzname) == COMPARE_EQUAL;
}
void ControlDef::Write( SvStream &aStream )
{
+ // FIXME: HELPID
+ #if 0
if ( pSons )
aStream.WriteByteString( String('*').Append( pData->Kurzname ), RTL_TEXTENCODING_UTF8 );
else
aStream.WriteByteString( pData->Kurzname, RTL_TEXTENCODING_UTF8 );
- aStream << ((USHORT)pData->aUId.HasNumeric());
+ aStream << ((sal_uInt16)pData->aUId.HasNumeric());
if ( pData->aUId.HasString() )
aStream.WriteByteString( pData->aUId.GetStr(), RTL_TEXTENCODING_UTF8 );
else
- aStream << static_cast<comm_ULONG>(pData->aUId.GetNum()); //GetNum() ULONG != comm_ULONG on 64bit
+ aStream << static_cast<comm_ULONG>(pData->aUId.GetNum()); //GetNum() sal_uLong != comm_ULONG on 64bit
if ( pSons )
- for ( USHORT i = 0 ; pSons->Count() > i ; i++ )
+ for ( sal_uInt16 i = 0 ; pSons->Count() > i ; i++ )
((ControlDef*)(*pSons)[i])->Write(aStream);
+ #else
+ (void)aStream;
+ #endif
}
-ControlDef::ControlDef(const String &Name, SmartId aUIdP )
+ControlDef::ControlDef(const String &Name, rtl::OString aUIdP )
: ControlItemSon( Name, aUIdP)
{
DBG_CTOR(ControlDef,0);
}
-ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons )
+ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, sal_Bool bWithSons )
: ControlItemSon("", pOriginal->pData->aUId)
{
DBG_CTOR(ControlDef,0);
@@ -196,10 +201,10 @@ ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDe
if ( bWithSons && pOriginal->pSons )
{
pSons = new CNames();
- for ( USHORT i = 0; i < pOriginal->pSons->Count() ; i++)
+ for ( sal_uInt16 i = 0; i < pOriginal->pSons->Count() ; i++)
{
ControlDef *pNewDef;
- pNewDef = new ControlDef( aOldName, aNewName, pOriginal->SonGetObject(i) ,TRUE );
+ pNewDef = new ControlDef( aOldName, aNewName, pOriginal->SonGetObject(i) ,sal_True );
if (! SonInsert(pNewDef))
{
OSL_FAIL("Name Doppelt im CopyConstructor. Neuer Name = Controlname!!");
@@ -212,22 +217,22 @@ ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDe
pSons = NULL;
}
-BOOL ControlItemUId::operator < (const ControlItem &rPar)
+sal_Bool ControlItemUId::operator < (const ControlItem &rPar)
{
return pData->aUId < rPar.pData->aUId;
}
-BOOL ControlItemUId::operator == (const ControlItem &rPar)
+sal_Bool ControlItemUId::operator == (const ControlItem &rPar)
{
return pData->aUId == rPar.pData->aUId;
}
SV_IMPL_OP_PTRARR_SORT( CNames, ControlItem* )
-void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq )
+void CRevNames::Insert( String aName, rtl::OString aUId, sal_uLong nSeq )
{
ControlItem *pRN = new ReverseName(aName,aUId,nSeq);
- USHORT nPos;
+ sal_uInt16 nPos;
if ( Seek_Entry(pRN,&nPos) )
DeleteAndDestroy(nPos);
@@ -239,27 +244,32 @@ void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq )
}
-String CRevNames::GetName( SmartId aUId )
+String CRevNames::GetName( rtl::OString aUId )
{
ReverseName *pRN = new ReverseName(UniString(),aUId,0);
- USHORT nPos;
- BOOL bSeekOK = Seek_Entry(pRN,&nPos);
+ sal_uInt16 nPos;
+ sal_Bool bSeekOK = Seek_Entry(pRN,&nPos);
delete pRN;
if ( bSeekOK )
return GetObject(nPos)->pData->Kurzname;
else
{
+ // FIXME: HELPID
+ #if 0
if ( aUId.Matches( UID_ACTIVE ) )
return CUniString("Active");
else
return GEN_RES_STR1( S_NAME_NOT_THERE, aUId.GetText() );
+ #else
+ return String();
+ #endif
}
}
-void CRevNames::Invalidate ( ULONG nSeq )
+void CRevNames::Invalidate ( sal_uLong nSeq )
{
- USHORT i;
+ sal_uInt16 i;
for (i = 0; i < Count() ;)
{
if (((ReverseName*)GetObject(i))->LastSequence < nSeq)
@@ -282,12 +292,12 @@ SbxTransportMethod::SbxTransportMethod( SbxDataType DT )
TestToolObj::TestToolObj( String aName, String aFilePath ) // Interner Aufruf
: SbxObject( aName )
-, bUseIPC(FALSE)
-, bReturnOK(TRUE)
+, bUseIPC(sal_False)
+, bReturnOK(sal_True)
, nSequence(KEEP_SEQUENCES)
, ProgPath()
-, IsBlock(FALSE)
-, SingleCommandBlock(TRUE)
+, IsBlock(sal_False)
+, SingleCommandBlock(sal_True)
, m_pControls(NULL)
, m_pNameKontext(NULL)
, m_pSIds(NULL)
@@ -304,7 +314,7 @@ TestToolObj::TestToolObj( String aName, String aFilePath ) // Inter
pImpl->ProgParam = String();
pImpl->aFileBase = DirEntry(aFilePath);
pImpl->aHIDDir = DirEntry(aFilePath);
- pImpl->bIsStart = FALSE;
+ pImpl->bIsStart = sal_False;
pImpl->pMyBasic = NULL;
pImpl->aServerTimeout = Time(0,1,00); // 1:00 Minuten fest
@@ -313,12 +323,12 @@ TestToolObj::TestToolObj( String aName, String aFilePath ) // Inter
TestToolObj::TestToolObj( String aName, MyBasic* pBas ) // Aufruf im Testtool
: SbxObject( aName )
-, bUseIPC(TRUE)
-, bReturnOK(TRUE)
+, bUseIPC(sal_True)
+, bReturnOK(sal_True)
, nSequence(KEEP_SEQUENCES)
, ProgPath()
-, IsBlock(FALSE)
-, SingleCommandBlock(TRUE)
+, IsBlock(sal_False)
+, SingleCommandBlock(sal_True)
, m_pControls(NULL)
, m_pNameKontext(NULL)
, m_pSIds(NULL)
@@ -333,7 +343,7 @@ TestToolObj::TestToolObj( String aName, MyBasic* pBas ) // Aufruf
{
pImpl = new ImplTestToolObj;
pImpl->ProgParam = String();
- pImpl->bIsStart = FALSE;
+ pImpl->bIsStart = sal_False;
pImpl->pMyBasic = pBas;
LoadIniFile();
@@ -398,7 +408,7 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d
String aST;
GETSET( aST, "ServerTimeout", ByteString::CreateFromInt64(Time(0,0,45).GetTime()) ); // 45 Sekunden Initial
- pImpl->aServerTimeout = Time(ULONG(aST.ToInt64()));
+ pImpl->aServerTimeout = Time(sal_uLong(aST.ToInt64()));
String aSOSE;
aCurrentProfile = aConf.ReadKey( "CurrentProfile", "Misc" );
@@ -478,7 +488,7 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d
pMeth->SetUserData( nID ); \
}
-// SetUserData muß irgendwas sein, sonst wird es im Find rausgefiltert!!!
+// SetUserData mu� irgendwas sein, sonst wird es im Find rausgefiltert!!!
#define MAKE_USHORT_CONSTANT(cName, nValue) \
{ \
SbxProperty *pVal = new SbxProperty( CUniString( cName) , SbxINTEGER ); \
@@ -495,9 +505,9 @@ void TestToolObj::InitTestToolObj()
pImpl->nMinRemoteCommandDelay = 0;
pImpl->nMaxRemoteCommandDelay = 0;
- pImpl->bDoRemoteCommandDelay = FALSE;
+ pImpl->bDoRemoteCommandDelay = sal_False;
- pImpl->bLnaguageExtensionLoaded= FALSE;
+ pImpl->bLnaguageExtensionLoaded= sal_False;
pImpl->pTTSfxBroadcaster = NULL;
pImpl->nErrorCount = 0;
@@ -512,8 +522,8 @@ void TestToolObj::InitTestToolObj()
pImpl->nTestCaseLineNr = 0;
- pImpl->bEnableQaErrors = TRUE;
- pImpl->bDebugFindNoErrors = FALSE;
+ pImpl->bEnableQaErrors = sal_True;
+ pImpl->bDebugFindNoErrors = sal_False;
pImpl->pChildEnv = new Environment;
@@ -536,8 +546,8 @@ void TestToolObj::InitTestToolObj()
pWait = pRTLObject->Make( CUniString("Wait"), SbxCLASS_METHOD, SbxNULL );
pWait->SetUserData( ID_Wait );
// change listener here
- pRTLObject->EndListening( pWait->GetBroadcaster(), TRUE );
- StartListening( pWait->GetBroadcaster(), TRUE );
+ pRTLObject->EndListening( pWait->GetBroadcaster(), sal_True );
+ StartListening( pWait->GetBroadcaster(), sal_True );
}
else
{
@@ -615,15 +625,20 @@ void TestToolObj::InitTestToolObj()
// Load the Remote Commands from list
if ( !pRCommands ) // Ist static, wird also nur einmal geladen
ReadFlatArray( arR_Cmds, pRCommands );
- USHORT i;
+ sal_uInt16 i;
for ( i = 0 ; i < pRCommands->Count() ; i++ )
{
SbxTransportMethod *pMeth = new SbxTransportMethod( SbxVARIANT );
pMeth->SetName( pRCommands->GetObject( i )->pData->Kurzname );
pMeth->SetUserData( ID_RemoteCommand );
+ // FIXME: HELPID
+ #if 0
pMeth->nValue = pRCommands->GetObject( i )->pData->aUId.GetNum();
+ #else
+ pMeth->nValue = 0;
+ #endif
Insert( pMeth );
- StartListening( pMeth->GetBroadcaster(), TRUE );
+ StartListening( pMeth->GetBroadcaster(), sal_True );
}
// Konstanten f�r SetControlType
@@ -741,7 +756,7 @@ SfxBroadcaster& TestToolObj::GetTTBroadcaster()
return *pImpl->pTTSfxBroadcaster;
}
-void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, BOOL bIsFlat )
+void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, sal_Bool bIsFlat )
{
/*******************************************************************************
**
@@ -757,9 +772,9 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
SvFileStream Stream;
String aLine,aShortname,aLongname;
- SmartId aUId;
+ rtl::OString aUId;
xub_StrLen nLineNr;
- USHORT nElement;
+ sal_uInt16 nElement;
ControlDef *pNewDef, *pNewDef2;
ControlDef *pFatherDef = NULL;
@@ -772,10 +787,10 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_LONGNAMES)), aFileName );
GetTTBroadcaster().Broadcast( aHint );
}
- ReadFlat( aFileName ,pUIds, TRUE );
+ ReadFlat( aFileName ,pUIds, sal_True );
if ( !pUIds )
return;
- pNewDef = new ControlDef("Active",SmartId(0));
+ pNewDef = new ControlDef("Active",rtl::OString());
const ControlItem *pItem = pNewDef;
if (! pUIds->Insert(pItem))
{
@@ -838,12 +853,12 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
aFirstAllowedExtra.AssignAscii("+*");
aAllowed.AssignAscii("_");
xub_StrLen nIndex = 0;
- BOOL bOK = TRUE;
+ sal_Bool bOK = sal_True;
while ( bOK && nIndex < aShortname.Len() )
{
sal_Unicode aChar = aShortname.GetChar( nIndex );
- BOOL bOKThis = FALSE;
+ sal_Bool bOKThis = sal_False;
bOKThis |= ( aAllowed.Search( aChar ) != STRING_NOTFOUND );
if ( !nIndex )
bOKThis |= ( aFirstAllowedExtra.Search( aChar ) != STRING_NOTFOUND );
@@ -860,7 +875,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
continue;
}
- BOOL bUnoName = ( aLongname.Copy( 0, 5 ).EqualsIgnoreCaseAscii( ".uno:" )
+ sal_Bool bUnoName = ( aLongname.Copy( 0, 5 ).EqualsIgnoreCaseAscii( ".uno:" )
|| aLongname.Copy( 0, 4 ).EqualsIgnoreCaseAscii( "http" )
|| aLongname.Copy( 0, 15 ).EqualsIgnoreCaseAscii( "private:factory" )
|| aLongname.Copy( 0, 8 ).EqualsIgnoreCaseAscii( "service:" )
@@ -869,20 +884,20 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
// generic method to mark longnames as symbolic
if ( aLongname.Copy( 0, 4 ).EqualsIgnoreCaseAscii( "sym:" ) )
{
- bUnoName = TRUE;
+ bUnoName = sal_True;
aLongname.Erase( 0, 4 );
}
- BOOL bMozillaName = ( !bIsFlat && aLongname.Copy( 0, 4 ).EqualsIgnoreCaseAscii( ".moz" ) );
+ sal_Bool bMozillaName = ( !bIsFlat && aLongname.Copy( 0, 4 ).EqualsIgnoreCaseAscii( ".moz" ) );
if ( aShortname.GetChar(0) == '+' ) // Kompletten Eintrag kopieren
{
aShortname.Erase(0,1);
- ControlDef WhatName(aLongname,SmartId());
+ ControlDef WhatName(aLongname,rtl::OString());
ControlDef *OldTree;
if (pNames->Seek_Entry(&WhatName,&nElement))
{
OldTree = (ControlDef*)pNames->GetObject(nElement);
- pNewDef = new ControlDef(aLongname,aShortname,OldTree,TRUE);
+ pNewDef = new ControlDef(aLongname,aShortname,OldTree,sal_True);
const ControlItem *pItem = pNewDef;
if (! pNames->Insert(pItem))
@@ -906,11 +921,15 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
else
{
+ // FIXME: HELPID
+ #if 0
if (aShortname.CompareIgnoreCaseToAscii("*Active") == COMPARE_EQUAL)
- aUId = SmartId( UID_ACTIVE );
- else if ( !bUnoName && !bMozillaName )
+ aUId = rtl::OString( UID_ACTIVE );
+ else
+ #endif
+ if ( !bUnoName && !bMozillaName )
{ // Bestimmen der ID aus der Hid.Lst
- ControlDef WhatName(aLongname,SmartId());
+ ControlDef WhatName(aLongname,rtl::OString());
if (pUIds->Seek_Entry(&WhatName,&nElement))
aUId = pUIds->GetObject(nElement)->pData->aUId;
else
@@ -921,14 +940,17 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
}
else
{
+ // FIXME: HELPID
+ #if 0
if ( bUnoName )
- aUId = SmartId( aLongname );
+ aUId = rtl::OString( aLongname );
else if ( bMozillaName )
- aUId = SmartId( aLongname );
+ aUId = rtl::OString( aLongname );
else
{
OSL_FAIL("Unknown URL schema");
}
+ #endif
}
@@ -1007,15 +1029,15 @@ void TestToolObj::AddName(String &aBisher, String &aNeu )
}
-void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName )
-// Wenn bSortByName == FALSE, dann nach UId Sortieren (ControlItemUId statt ControlDef)
+void TestToolObj::ReadFlat( String Filename, CNames *&pNames, sal_Bool bSortByName )
+// Wenn bSortByName == sal_False, dann nach UId Sortieren (ControlItemUId statt ControlDef)
{
SvFileStream Stream;
String aLine,aLongname;
- SmartId aUId;
+ rtl::OString aUId;
xub_StrLen nLineNr;
ControlItem *pNewItem;
- USHORT nDoubleCount = 0;
+ sal_uInt16 nDoubleCount = 0;
Stream.Open(Filename, STREAM_STD_READ);
@@ -1053,7 +1075,8 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName )
}
aLongname = aLine.GetToken(0,cMyDelim);
- aUId = SmartId( (ULONG)aLine.GetToken(1,cMyDelim).ToInt64() );
+ // FIXME: HELPID
+ aUId = rtl::OUStringToOString( aLine.GetToken(1,cMyDelim), RTL_TEXTENCODING_UTF8 );
if ( bSortByName )
pNewItem = new ControlDef( aLongname, aUId );
@@ -1070,7 +1093,7 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName )
}
else
{
- USHORT nNr;
+ sal_uInt16 nNr;
pNames->Seek_Entry( pNewItem, &nNr );
AddName( pNames->GetObject(nNr)->pData->Kurzname, pNewItem->pData->Kurzname );
}
@@ -1088,14 +1111,15 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName )
void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames )
{
- USHORT nIndex = 0;
+ sal_uInt16 nIndex = 0;
if ( !pNames )
pNames = new CNames();
while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 )
{
- SmartId aUId (arWas[nIndex].nUId);
+ // FIXME: HELPID
+ rtl::OString aUId;// (arWas[nIndex].nUId);
const ControlItem *pX = new ControlDef( arWas[nIndex].Kurzname, aUId);
pNames->C40_PTR_INSERT(ControlItem, pX);
nIndex++;
@@ -1106,7 +1130,7 @@ void TestToolObj::WaitForAnswer ()
{
if ( bUseIPC )
{
- BOOL bWasRealWait = !bReturnOK;
+ sal_Bool bWasRealWait = !bReturnOK;
BasicRuntime aRun( NULL );
if ( BasicRuntimeAccess::HasRuntime() )
aRun = BasicRuntimeAccess::GetRuntime();
@@ -1142,7 +1166,7 @@ void TestToolObj::WaitForAnswer ()
if ( pTemp )
{
ReturnResults( pTemp );
- bReturnOK = TRUE;
+ bReturnOK = sal_True;
}
else
{
@@ -1156,7 +1180,7 @@ void TestToolObj::WaitForAnswer ()
if ( !bReturnOK )
{
ADD_ERROR(ERR_EXEC_TIMEOUT,GEN_RES_STR1(S_TIMOUT_WAITING, String::CreateFromInt64(nSequence)));
- bReturnOK = TRUE;
+ bReturnOK = sal_True;
nSequence++;
}
}
@@ -1180,7 +1204,7 @@ IMPL_LINK( TestToolObj, CallDialogHandler, Application*, EMPTYARG )
String aHandlerName(aDialogHandlerName);
aDialogHandlerName.Erase();
- ULONG nRememberSequence = nSequence; // Da sich die Sequence im DialogHandler �ndert
+ sal_uLong nRememberSequence = nSequence; // Da sich die Sequence im DialogHandler �ndert
((StarBASIC*)GetParent())->Call( aHandlerName );
nSequence = nRememberSequence;
// Die Sequenznummern werden dann zwar doppelt vergeben, aber wen k�mmerts.
@@ -1198,7 +1222,7 @@ void TestToolObj::BeginBlock()
DBG_ASSERT(!IsBlock,"BeginBlock innerhalb eines Blockes");
In->Reset(nSequence);
- IsBlock = TRUE;
+ IsBlock = sal_True;
}
@@ -1235,21 +1259,21 @@ void TestToolObj::SendViaSocket()
}
}
- bReturnOK = FALSE;
+ bReturnOK = sal_False;
if ( pCommunicationManager->GetLastNewLink() )
{
if ( !pCommunicationManager->GetLastNewLink()->TransferDataStream( In->GetStream() ) )
{
ADD_ERROR(ERR_SEND_TIMEOUT,GEN_RES_STR1(S_TIMOUT_SENDING, String::CreateFromInt64(nSequence)));
nSequence++;
- bReturnOK = TRUE; // Kein Return zu erwarten
+ bReturnOK = sal_True; // Kein Return zu erwarten
}
}
else
{
ADD_ERROR(ERR_SEND_TIMEOUT,GEN_RES_STR1(S_NO_CONNECTION, String::CreateFromInt64(nSequence)));
nSequence++;
- bReturnOK = TRUE; // Kein Return zu erwarten
+ bReturnOK = sal_True; // Kein Return zu erwarten
}
}
@@ -1264,7 +1288,7 @@ void TestToolObj::EndBlock()
if ( pImpl->bDoRemoteCommandDelay )
{
- ULONG nTimeWait = pImpl->nMinRemoteCommandDelay;
+ sal_uLong nTimeWait = pImpl->nMinRemoteCommandDelay;
if ( pImpl->nMaxRemoteCommandDelay != pImpl->nMinRemoteCommandDelay )
nTimeWait += Time::GetSystemTicks() % ( pImpl->nMaxRemoteCommandDelay - pImpl->nMinRemoteCommandDelay );
Timer aTimer;
@@ -1283,11 +1307,11 @@ void TestToolObj::EndBlock()
SendViaSocket();
else
{
- bReturnOK = FALSE;
+ bReturnOK = sal_False;
if ( aDialogHandlerName.Len() > 0 )
GetpApp()->InsertIdleHdl( LINK( this, TestToolObj, IdleHdl ), 1 );
}
- IsBlock = FALSE;
+ IsBlock = sal_False;
}
else
{
@@ -1296,14 +1320,14 @@ void TestToolObj::EndBlock()
}
-BOOL TestToolObj::Load( String aFileName, SbModule *pMod )
+sal_Bool TestToolObj::Load( String aFileName, SbModule *pMod )
{
- BOOL bOk = TRUE;
+ sal_Bool bOk = sal_True;
SvFileStream aStrm( aFileName, STREAM_STD_READ );
if( aStrm.IsOpen() )
{
String aText, aLine;
- BOOL bIsFirstLine = TRUE;
+ sal_Bool bIsFirstLine = sal_True;
rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
while( !aStrm.IsEof() && bOk )
{
@@ -1315,10 +1339,10 @@ BOOL TestToolObj::Load( String aFileName, SbModule *pMod )
if ( !bIsFirstLine )
aText += '\n';
aText += aLine;
- bIsFirstLine = FALSE;
+ bIsFirstLine = sal_False;
}
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
}
aText.ConvertLineEnd();
pMod->SetName(CUniString("--").Append(aFileName));
@@ -1332,20 +1356,20 @@ BOOL TestToolObj::Load( String aFileName, SbModule *pMod )
MyBasic::SetCompileModule( pOldModule );
if ( WasPrecompilerError() )
- bOk = FALSE;
+ bOk = sal_False;
}
else
- bOk = FALSE;
+ bOk = sal_False;
return bOk;
}
-BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pControls )
+sal_Bool TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pControls )
{
SvFileStream aStream;
String aName,aURL;
- SmartId aUId;
+ rtl::OString aUId;
ControlDef *pNewDef, *pNewDef2;
ControlDef *pFatherDef = NULL;
@@ -1354,7 +1378,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
if (!aStream.IsOpen())
{
ADD_ERROR(ERR_NO_FILE,GEN_RES_STR1(S_CANNOT_OPEN_FILE, Filename));
- return FALSE;
+ return sal_False;
}
if ( !pSIds )
@@ -1367,29 +1391,32 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
GetTTBroadcaster().Broadcast( aHint );
}
- USHORT nAnz;
+ sal_uInt16 nAnz;
aStream >> nAnz;
CNames *pNames = pSIds; // first read all the slots
- BOOL bIsFlat = TRUE; // Slots do not have children
+ sal_Bool bIsFlat = sal_True; // Slots do not have children
while ( nAnz && !aStream.IsEof() )
{
aStream.ReadByteString( aName, RTL_TEXTENCODING_UTF8 );
- USHORT nType;
+ sal_uInt16 nType;
aStream >> nType;
if ( !nType /* HasNumeric() */)
{
String aStrId;
aStream.ReadByteString( aStrId, RTL_TEXTENCODING_UTF8 );
- aUId = SmartId( aStrId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( aStrId );
+ #endif
}
else
{
comm_ULONG nUId;
aStream >> nUId;
- aUId = SmartId( nUId );
+ aUId = rtl::OString();// nUId;
}
if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId)
@@ -1445,7 +1472,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
{
aStream >> nAnz;
pNames = pControls; // Now read the controls
- bIsFlat = FALSE; // Controls *do* have children
+ bIsFlat = sal_False; // Controls *do* have children
}
@@ -1457,17 +1484,17 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
}
aStream.Close();
- return TRUE;
+ return sal_True;
}
-BOOL TestToolObj::WriteNamesBin( String Filename, CNames *pSIds, CNames *pControls )
+sal_Bool TestToolObj::WriteNamesBin( String Filename, CNames *pSIds, CNames *pControls )
{
- BOOL bOk = TRUE;
+ sal_Bool bOk = sal_True;
SvFileStream aStrm( String(Filename).AppendAscii(".bin"), STREAM_STD_WRITE );
if( aStrm.IsOpen() )
{
- USHORT i;
+ sal_uInt16 i;
if ( pSIds )
{
aStrm << pSIds->Count();
@@ -1475,11 +1502,11 @@ BOOL TestToolObj::WriteNamesBin( String Filename, CNames *pSIds, CNames *pContro
{
((ControlDef*)(*pSIds)[i])->Write(aStrm);
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
}
}
else
- aStrm << USHORT( 0 );
+ aStrm << sal_uInt16( 0 );
if ( pControls )
{
@@ -1488,14 +1515,14 @@ BOOL TestToolObj::WriteNamesBin( String Filename, CNames *pSIds, CNames *pContro
{
((ControlDef*)(*pControls)[i])->Write(aStrm);
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
}
}
else
- aStrm << USHORT( 0 );
+ aStrm << sal_uInt16( 0 );
}
else
- bOk = FALSE;
+ bOk = sal_False;
return bOk;
}
@@ -1511,8 +1538,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
SbxVariable* pVar = p->GetVar();
SbxArray* rPar = pVar->GetParameters();
- ULONG nHintId = p->GetId();
- ULONG nHintUserData = pVar->GetUserData();
+ sal_uLong nHintId = p->GetId();
+ sal_uLong nHintUserData = pVar->GetUserData();
if( nHintId == SBX_HINT_DATAWANTED )
{
nMyVar = 0;
@@ -1524,23 +1551,23 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
m_pNameKontext = m_pControls;
// So da� nicht immer mal wieder was aus einem alten Kontext dazwischenhaut
- for (USHORT i=0;i<VAR_POOL_SIZE;i++)
+ for (sal_uInt16 i=0;i<VAR_POOL_SIZE;i++)
{
pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(UniString::CreateFromInt32(i)) );
}
}
else if ( rPar && rPar->Count() == 2 )
{
- USHORT nElement;
+ sal_uInt16 nElement;
SbxVariableRef pArg = rPar->Get( 1 );
String aKontext = pArg->GetString();
- ControlDef WhatName(aKontext,SmartId());
+ ControlDef WhatName(aKontext,rtl::OString());
if (m_pControls && m_pControls->Seek_Entry(&WhatName,&nElement))
{
m_pNameKontext = ((ControlDef*)m_pControls->GetObject(nElement))->GetSons();
// So da� nicht immer mal wieder was aus einem alten Kontext dazwischenhaut
- for (USHORT i=0;i<VAR_POOL_SIZE;i++)
+ for (sal_uInt16 i=0;i<VAR_POOL_SIZE;i++)
{
pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(UniString::CreateFromInt32(i)) );
}
@@ -1570,10 +1597,10 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
GetTTBroadcaster().Broadcast( aHint );
}
- pImpl->bIsStart = TRUE;
+ pImpl->bIsStart = sal_True;
BeginBlock();
EndBlock();
- pImpl->bIsStart = FALSE;
+ pImpl->bIsStart = sal_False;
{
TTExecutionStatusHint aHint( TT_EXECUTION_HIDE_ACTION );
GetTTBroadcaster().Broadcast( aHint );
@@ -1652,10 +1679,10 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
while ( pCommunicationManager->IsCommunicationRunning() )
Application::Reschedule();
- SingleCommandBlock = TRUE;
- IsBlock = FALSE;
+ SingleCommandBlock = sal_True;
+ IsBlock = sal_False;
- for (USHORT i=0;i<VAR_POOL_SIZE;i++)
+ for (sal_uInt16 i=0;i<VAR_POOL_SIZE;i++)
{
pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(UniString::CreateFromInt32(i)) );
}
@@ -1697,19 +1724,19 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
m_pReverseUIds = NULL;
}
m_pNameKontext = m_pControls;
- pImpl->bLnaguageExtensionLoaded = FALSE;
+ pImpl->bLnaguageExtensionLoaded = sal_False;
SfxSimpleHint aHint( SBX_HINT_LANGUAGE_EXTENSION_LOADED );
GetTTBroadcaster().Broadcast( aHint );
pImpl->nMinRemoteCommandDelay = 0;
pImpl->nMaxRemoteCommandDelay = 0;
- pImpl->bDoRemoteCommandDelay = FALSE;
+ pImpl->bDoRemoteCommandDelay = sal_False;
pImpl->aTestCaseName.Erase();
pImpl->aTestCaseFileName.Erase();
pImpl->nTestCaseLineNr = 0;
- pImpl->bEnableQaErrors = TRUE;
- pImpl->bDebugFindNoErrors = FALSE;
+ pImpl->bEnableQaErrors = sal_True;
+ pImpl->bDebugFindNoErrors = sal_False;
pImpl->pChildEnv->clear();
@@ -1734,21 +1761,21 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if ( Ext.CompareIgnoreCaseToAscii("Win") == COMPARE_EQUAL )
{
ReadNames( FilePath.GetFull(),m_pControls,pUIds);
- pImpl->bLnaguageExtensionLoaded = TRUE;
+ pImpl->bLnaguageExtensionLoaded = sal_True;
SfxSimpleHint aHint( SBX_HINT_LANGUAGE_EXTENSION_LOADED );
GetTTBroadcaster().Broadcast( aHint );
}
else if ( Ext.CompareIgnoreCaseToAscii("Sid") == COMPARE_EQUAL )
{
ReadNames( FilePath.GetFull(),m_pSIds,pUIds,FLAT);
- pImpl->bLnaguageExtensionLoaded = TRUE;
+ pImpl->bLnaguageExtensionLoaded = sal_True;
SfxSimpleHint aHint( SBX_HINT_LANGUAGE_EXTENSION_LOADED );
GetTTBroadcaster().Broadcast( aHint );
}
else if ( Ext.CompareIgnoreCaseToAscii("Bin") == COMPARE_EQUAL )
{
ReadNamesBin( FilePath.GetFull(), m_pSIds, m_pControls );
- pImpl->bLnaguageExtensionLoaded = TRUE;
+ pImpl->bLnaguageExtensionLoaded = sal_True;
SfxSimpleHint aHint( SBX_HINT_LANGUAGE_EXTENSION_LOADED );
GetTTBroadcaster().Broadcast( aHint );
}
@@ -1828,7 +1855,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
case ID_CaseLog:
if ( rPar ) // rPar != NULL <=> Es gibt Parameter
{
- USHORT n;
+ sal_uInt16 n;
String aX;
for ( n = 1; n < rPar->Count(); n++ )
{
@@ -1856,16 +1883,16 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if ( IS_ERROR() )
{
BasicRuntime aRun = BasicRuntimeAccess::GetRuntime();
- BOOL bWasNewError = FALSE;
+ sal_Bool bWasNewError = sal_False;
if ( BasicRuntimeAccess::HasStack() )
{
- for ( USHORT i = 0 ; i < BasicRuntimeAccess::GetStackEntryCount() -1 ; i++ )
+ for ( sal_uInt16 i = 0 ; i < BasicRuntimeAccess::GetStackEntryCount() -1 ; i++ )
{
BasicErrorStackEntry aThisEntry = BasicRuntimeAccess::GetStackEntry(i);
if ( !bWasNewError )
{
- bWasNewError = TRUE;
+ bWasNewError = sal_True;
ADD_ERROR_LOG( GET_ERROR()->aText, aThisEntry.GetModuleName(SbxNAME_SHORT_TYPES),
aThisEntry.GetLine(), aThisEntry.GetCol1(), aThisEntry.GetCol2(), aThisEntry.GetSourceRevision() );
}
@@ -1878,7 +1905,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
BasicRuntimeAccess::DeleteStack();
}
- BOOL bIsFirst = TRUE;
+ sal_Bool bIsFirst = sal_True;
while ( aRun.IsValid() )
{
xub_StrLen nErrLn;
@@ -1886,7 +1913,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
xub_StrLen nCol2;
if ( bIsFirst )
{
- bIsFirst = FALSE;
+ bIsFirst = sal_False;
nErrLn = GET_ERROR()->nLine;
nCol1 = GET_ERROR()->nCol1;
nCol2 = GET_ERROR()->nCol2;
@@ -1900,7 +1927,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if ( !bWasNewError )
{
- bWasNewError = TRUE;
+ bWasNewError = sal_True;
ADD_ERROR_LOG( GET_ERROR()->aText, aRun.GetModuleName(SbxNAME_SHORT_TYPES),
nErrLn, nCol1, nCol2, aRun.GetSourceRevision() );
}
@@ -1933,7 +1960,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
case ID_QAErrorLog:
if ( rPar ) // rPar != NULL <=> Es gibt Parameter
{
- USHORT n;
+ sal_uInt16 n;
String aSammel;
for ( n = 1; n < rPar->Count(); n++ )
{
@@ -1946,7 +1973,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
case ID_PrintLog:
if ( rPar ) // rPar != NULL <=> Es gibt Parameter
{
- USHORT n;
+ sal_uInt16 n;
String aSammel;
for ( n = 1; n < rPar->Count(); n++ )
{
@@ -1959,7 +1986,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
case ID_WarnLog:
if ( rPar ) // rPar != NULL <=> Es gibt Parameter
{
- USHORT n;
+ sal_uInt16 n;
String aSammel;
for ( n = 1; n < rPar->Count(); n++ )
{
@@ -2002,15 +2029,16 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
SetError( SbxERR_NOTIMP );
}
if ( !IsError() )
- In->GenCmdCommand ((USHORT)(((SbxTransportMethod*)pVar)->nValue),rPar);
+ In->GenCmdCommand ((sal_uInt16)(((SbxTransportMethod*)pVar)->nValue),rPar);
if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN )
{
pImpl->pNextReturn = ((SbxTransportMethod*)pVar);
- aNextReturnId = SmartId( ((SbxTransportMethod*)pVar)->nValue );
+ // FIXME: HELPID
+ aNextReturnId = rtl::OString();// ((SbxTransportMethod*)pVar)->nValue );
}
if ( SingleCommandBlock )
EndBlock();
- if ( !IsError() && (USHORT)((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN )
+ if ( !IsError() && (sal_uInt16)((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN )
{
WaitForAnswer();
}
@@ -2029,8 +2057,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if ( SingleCommandBlock )
BeginBlock();
if ( !IsError() )
- In->GenCmdSlot ( (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar );
- pVar->PutInteger( (USHORT)((SbxTransportMethod*)pVar)->nValue );
+ In->GenCmdSlot ( (sal_uInt16)((SbxTransportMethod*)pVar)->nValue, rPar );
+ pVar->PutInteger( (sal_uInt16)((SbxTransportMethod*)pVar)->nValue );
if ( SingleCommandBlock )
EndBlock();
}
@@ -2077,14 +2105,18 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if ( nHintUserData == ID_Control )
{
In->GenCmdControl (pMember->GetULong(),
- (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar);
- aNextReturnId = SmartId( pMember->GetULong() );
+ (sal_uInt16)((SbxTransportMethod*)pVar)->nValue, rPar);
+ // FIXME: HELPID
+ aNextReturnId = rtl::OString();// pMember->GetULong() );
}
else
{
In->GenCmdControl (pMember->GetString(),
- (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar);
- aNextReturnId = SmartId( pMember->GetString() );
+ (sal_uInt16)((SbxTransportMethod*)pVar)->nValue, rPar);
+ // FIXME: HELPID
+ #if 0
+ aNextReturnId = rtl::OString( pMember->GetString() );
+ #endif
}
}
@@ -2095,13 +2127,13 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
else
{
pImpl->pNextReturn = NULL;
- aNextReturnId = SmartId();
+ aNextReturnId = rtl::OString();
}
}
if ( SingleCommandBlock )
EndBlock();
- if ( !IsError() && (USHORT)((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN )
+ if ( !IsError() && (sal_uInt16)((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN )
{
WaitForAnswer();
}
@@ -2543,7 +2575,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
delete pFehlerListe;
pFehlerListe = new CErrors;
- for (USHORT i=0;i<VAR_POOL_SIZE;i++)
+ for (sal_uInt16 i=0;i<VAR_POOL_SIZE;i++)
{
pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(UniString::CreateFromInt32(i)) );
}
@@ -2594,7 +2626,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
}
}
-void TestToolObj::DebugFindNoErrors( BOOL bDebugFindNoErrors )
+void TestToolObj::DebugFindNoErrors( sal_Bool bDebugFindNoErrors )
{
pImpl->bDebugFindNoErrors = bDebugFindNoErrors;
}
@@ -2617,8 +2649,8 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
else
{
- USHORT nElement;
- ControlDef *pWhatName = new ControlDef(aStr,SmartId());
+ sal_uInt16 nElement;
+ ControlDef *pWhatName = new ControlDef(aStr,rtl::OString());
/// nach Controls suchen
if (m_pNameKontext && m_pNameKontext->Seek_Entry(pWhatName,&nElement))
@@ -2633,9 +2665,12 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
// Will be set on method-child further down
+ // FIXME: HELPID
+ #if 0
if ( pWhatName->pData->aUId.HasNumeric() )
pImpl->pControlsObj->SetUserData( ID_Control );
else
+ #endif
pImpl->pControlsObj->SetUserData( ID_StringControl );
pShortNames->Insert(pWhatName->pData->Kurzname,pWhatName->pData->aUId,nSequence);
@@ -2648,10 +2683,13 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
pImpl->pControlsObj->SetDfltProperty(pID);
pMember = pID;
}
+ // FIXME: HELPID
+ #if 0
if ( pWhatName->pData->aUId.HasNumeric() )
pMember->PutULong(pWhatName->pData->aUId.GetNum());
else
pMember->PutString(pWhatName->pData->aUId.GetStr());
+ #endif
pMember = pImpl->pControlsObj->Find(CUniString("name"),SbxCLASS_DONTCARE);
if ( pMember != NULL )
@@ -2671,6 +2709,8 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) );
pMyVar->SetName( pWhatName->pData->Kurzname );
+ // FIXME: HELPID
+ #if 0
if ( pWhatName->pData->aUId.HasNumeric() )
{
pMyVar->SetUserData( ID_Dispatch );
@@ -2682,6 +2722,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
pMyVar->SetUserData( ID_UNODispatch );
pMyVar->aUnoSlot = pWhatName->pData->aUId.GetStr();
}
+ #endif
return pMyVar;
}
@@ -2689,7 +2730,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
if ( aStr.Copy( aStr.Len()-3, 3 ).CompareIgnoreCaseToAscii("_ID") == COMPARE_EQUAL && m_pSIds )
{
delete pWhatName;
- pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), SmartId() );
+ pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), rtl::OString() );
if ( m_pSIds->Seek_Entry( pWhatName, &nElement ) )
{ // Nach slots suchen
SbxVariable *pReturn = new SbxVariable;
@@ -2697,10 +2738,13 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) );
pReturn->SetName( pWhatName->pData->Kurzname );
+ // FIXME: HELPID
+ #if 0
if ( pWhatName->pData->aUId.HasNumeric() )
pReturn->PutULong(pWhatName->pData->aUId.GetNum());
else
pReturn->PutString(pWhatName->pData->aUId.GetStr());
+ #endif
return pReturn;
}
}
@@ -2722,18 +2766,18 @@ String TestToolObj::GetRevision( String const &aSourceIn )
return String::CreateFromAscii("No Revision found");
}
-BOOL TestToolObj::CError( ULONG code, const String& rMsg, xub_StrLen l, xub_StrLen c1, xub_StrLen c2 )
+sal_Bool TestToolObj::CError( sal_uLong code, const String& rMsg, xub_StrLen l, xub_StrLen c1, xub_StrLen c2 )
{
- bWasPrecompilerError = TRUE;
+ bWasPrecompilerError = sal_True;
if ( aCErrorHdl.IsSet() )
{
ErrorEntry aErrorEntry( code, rMsg, l, c1, c2 );
- return (BOOL)aCErrorHdl.Call( &aErrorEntry );
+ return (sal_Bool)aCErrorHdl.Call( &aErrorEntry );
}
else
{
ADD_ERROR( code, rMsg )
- return TRUE;
+ return sal_True;
}
}
@@ -2755,15 +2799,15 @@ void TestToolObj::CalcPosition( String const &aSource, xub_StrLen nPos, xub_StrL
#define CATCHRES_LABEL CUniString( "ctchres" )
#define ENDCATCH_LABEL CUniString( "endctch" )
-BOOL IsAlphaChar( sal_Unicode cChar )
+sal_Bool IsAlphaChar( sal_Unicode cChar )
{
return ( cChar >= 'a' && cChar <= 'z' ) ||
( cChar >= 'A' && cChar <= 'Z' );
}
-BOOL IsInsideString( const String& aSource, const xub_StrLen nStart )
+sal_Bool IsInsideString( const String& aSource, const xub_StrLen nStart )
{
- BOOL bInside = FALSE;
+ sal_Bool bInside = sal_False;
xub_StrLen nPos = nStart-1;
while ( nPos && aSource.GetChar(nPos) != _CR && aSource.GetChar(nPos) != _LF )
@@ -2775,7 +2819,7 @@ BOOL IsInsideString( const String& aSource, const xub_StrLen nStart )
return bInside;
}
-BOOL IsValidHit( const String& aSource, const xub_StrLen nStart, const xub_StrLen nEnd )
+sal_Bool IsValidHit( const String& aSource, const xub_StrLen nStart, const xub_StrLen nEnd )
{
return !IsAlphaChar( aSource.GetChar(nStart-1) ) && !IsAlphaChar( aSource.GetChar(nEnd+1))
&& !IsInsideString( aSource, nStart );
@@ -2796,7 +2840,7 @@ xub_StrLen TestToolObj::ImplSearch( const String &aSource, const xub_StrLen nSta
}
}
-xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_StrLen nEnd, String aFinalErrorLabel, USHORT &nLabelCount )
+xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_StrLen nEnd, String aFinalErrorLabel, sal_uInt16 &nLabelCount )
{
xub_StrLen nTry,nCatch,nEndcatch;
if( (nTry = ImplSearch( aSource, nStart, nEnd, CUniString("try"), nStart )) == STRING_NOTFOUND )
@@ -2896,7 +2940,7 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_
void TestToolObj::PreCompileDispatchParts( String &aSource, String aStart, String aEnd, String aFinalLable )
{
- USHORT nLabelCount = 0;
+ sal_uInt16 nLabelCount = 0;
xub_StrLen nPartPos = 0;
while ( !WasPrecompilerError() && (nPartPos = ImplSearch( aSource, nPartPos, aSource.Len(), aStart )) != STRING_NOTFOUND )
@@ -2910,7 +2954,7 @@ void TestToolObj::PreCompileDispatchParts( String &aSource, String aStart, Strin
}
-BOOL TestToolObj::WasPrecompilerError()
+sal_Bool TestToolObj::WasPrecompilerError()
{
return bWasPrecompilerError;
}
@@ -2918,13 +2962,13 @@ BOOL TestToolObj::WasPrecompilerError()
String TestToolObj::PreCompile( String const &aSourceIn )
{
// Im CTOR zu fr�h, und hier grade nicg rechtzeitig. Start und Stop von Programmausf�hrung
- StartListening( ((StarBASIC*)GetParent())->GetBroadcaster(), TRUE );
+ StartListening( ((StarBASIC*)GetParent())->GetBroadcaster(), sal_True );
xub_StrLen nTestCase;
xub_StrLen nEndCase;
xub_StrLen nStartPos = 0;
String aSource(aSourceIn);
- bWasPrecompilerError = FALSE;
+ bWasPrecompilerError = sal_False;
HACK("Ich gestehe alles: Ich war zu faul das richtig zu machen.")
aSource = String(' ').Append( aSource ); // Da Schl�sselworte an Position 0 sonst nicht gefunden werden
@@ -2935,7 +2979,7 @@ HACK("Ich gestehe alles: Ich war zu faul das richtig zu machen.")
xub_StrLen nComment;
while ( (nComment = aSource.SearchAscii("'",nStartPos)) != STRING_NOTFOUND )
{
- USHORT nStringEndCount = 0;
+ sal_uInt16 nStringEndCount = 0;
xub_StrLen nIndex = nComment;
while ( nIndex && aSource.GetChar(nIndex) != '\n' )
{
@@ -2986,7 +3030,7 @@ HACK("Ich gestehe alles: Ich war zu faul das richtig zu machen.")
if ( aSource.SearchAscii(":",nTestCase) < nTcEnd )
nTcEnd = aSource.SearchAscii(":",nTestCase) -1;
String aSuffix = aSource.Copy(nTestCase+8,nTcEnd-nTestCase-8);
- USHORT nOldLen;
+ sal_uInt16 nOldLen;
do
{
nOldLen = aSuffix.Len();
@@ -3014,7 +3058,7 @@ HACK("Ich gestehe alles: Ich war zu faul das richtig zu machen.")
void TestToolObj::AddToListByNr( CNames *&pControls, ControlItemUId *&pNewItem )
{
- USHORT nNr;
+ sal_uInt16 nNr;
if ( pControls->Seek_Entry( pNewItem, &nNr ) )
{
AddName( pControls->GetObject(nNr)->pData->Kurzname, pNewItem->pData->Kurzname );
@@ -3045,7 +3089,7 @@ void TestToolObj::ReadHidLstByNumber()
GetTTBroadcaster().Broadcast( aHint );
}
- ReadFlat( aName, m_pReverseUIds, FALSE );
+ ReadFlat( aName, m_pReverseUIds, sal_False );
{
TTExecutionStatusHint aHint( TT_EXECUTION_HIDE_ACTION );
@@ -3054,14 +3098,14 @@ void TestToolObj::ReadHidLstByNumber()
}
}
-void TestToolObj::SortControlsByNumber( BOOL bIncludeActive )
+void TestToolObj::SortControlsByNumber( sal_Bool bIncludeActive )
{
// Die Controls einmal hirarchisch und einmal alle flach nach nummer sortiert
if ( !m_pReverseControls && !m_pReverseControlsSon && m_pControls )
{
m_pReverseControls = new CNames;
m_pReverseControlsSon = new CNames;
- USHORT nWin,nCont;
+ sal_uInt16 nWin,nCont;
const String aSl('/');
for ( nWin = 0 ; nWin < m_pControls->Count() ; nWin++ )
{
@@ -3090,8 +3134,9 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive )
}
if ( !bIncludeActive )
{
- ControlItem *pZeroItem = new ControlItemUId( UniString(), SmartId(0) );
- USHORT nNr;
+ // FIXME: HELPID
+ ControlItem *pZeroItem = new ControlItemUId( UniString(), rtl::OString() );
+ sal_uInt16 nNr;
if ( m_pReverseControls->Seek_Entry( pZeroItem, &nNr ) )
{
m_pReverseControls->DeleteAndDestroy( nNr );
@@ -3103,12 +3148,12 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive )
}
-BOOL TestToolObj::ReturnResults( SvStream *pIn )
+sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
{
- USHORT nId;
- ULONG nClearSequence = 0;
- BOOL bSequenceOK = TRUE;
+ sal_uInt16 nId;
+ sal_uLong nClearSequence = 0;
+ sal_Bool bSequenceOK = sal_True;
CNames *pReverseControlsKontext = NULL;
CRetStream *pRetStream = new CRetStream(pIn);
@@ -3120,27 +3165,33 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
{
case SIReturn:
{
- USHORT nRet,nParams;
- SmartId aUId;
+ sal_uInt16 nRet,nParams;
+ rtl::OString aUId;
pRetStream->Read(nRet);
if ( pRetStream->GetNextType() == BinString )
{
String aUStrId; // UniqueStringID Used for Mozilla Integration
pRetStream->Read( aUStrId );
- aUId = SmartId( aUStrId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( aUStrId );
+ #endif
}
else
{
comm_ULONG nUId;
pRetStream->Read( nUId ); // bei Sequence einfach die Sequence
- aUId = SmartId( nUId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( nUId );
+ #endif
}
pRetStream->Read(nParams);
- USHORT nNr1 = 0;
+ sal_uInt16 nNr1 = 0;
comm_ULONG nLNr1 = 0;
String aString1;
- BOOL bBool1 = FALSE;
+ sal_Bool bBool1 = sal_False;
SbxValueRef xValue1 = new SbxValue;
if( nParams & PARAM_USHORT_1 )
@@ -3162,24 +3213,27 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
{
case RET_Sequence:
{
- ULONG nUId = aUId.GetNum();
+ // FIXME: HELPID
+ #if 0
+ sal_uLong nUId = aUId.GetNum();
if ( nSequence != nUId )
{
- bSequenceOK = FALSE;
+ bSequenceOK = sal_False;
ADD_ERROR(SbxERR_BAD_ACTION, GEN_RES_STR2(S_RETURN_SEQUENCE_MISSMATCH, String::CreateFromInt64(nUId), String::CreateFromInt64(nSequence)) );
}
else
{
nClearSequence = nUId;
}
+ #endif
}
break;
case RET_Value:
if ( pImpl->pNextReturn )
{
- if ( aNextReturnId.Matches( aUId ) )
+ if ( aNextReturnId.equals( aUId ) )
{
- if( nParams & PARAM_ULONG_1 )
+ if( nParams & PARAM_ULONG_1 ) // FIXME this is to allow negative numbers, hoping that no large numbers are interpreted wrong. should have new PARAM_LONG_1 instead
{
if ( nLNr1 > 0x7fffffff )
pImpl->pNextReturn->PutLong( long(nLNr1 - 0xffffffff) -1 );
@@ -3189,7 +3243,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if( nParams & PARAM_USHORT_1 ) pImpl->pNextReturn->PutUShort( nNr1 );
if( nParams & PARAM_STR_1 ) pImpl->pNextReturn->PutString( aString1 );
if( nParams & PARAM_BOOL_1 ) pImpl->pNextReturn->PutBool( bBool1 );
- if( nParams & PARAM_SBXVALUE_1 )
+ if( nParams & PARAM_SBXVALUE_1 ) // FIXME: allow generic datatype
{
SbxValues aValues( SbxDATE );
xValue1->Get( aValues );
@@ -3219,7 +3273,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if ( !m_pReverseSlots && m_pSIds )
{
m_pReverseSlots = new CNames;
- USHORT nWin;
+ sal_uInt16 nWin;
const String aSl('/');
for ( nWin = 0 ; nWin < m_pSIds->Count() ; nWin++ )
{
@@ -3229,8 +3283,11 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
WinInfoRec *pWinInfo = new WinInfoRec;
+ // FIXME: HELPID
+ #if 0
pWinInfo->aUId = aUId.GetText();
- pWinInfo->nRType = (USHORT)nLNr1; // just ULONG for Transport, data is always USHORT
+ #endif
+ pWinInfo->nRType = (sal_uInt16)nLNr1; // just sal_uLong for Transport, data is always USHORT
pWinInfo->aRName = aString1;
pWinInfo->bIsReset = bBool1;
pWinInfo->aKurzname.Erase();
@@ -3239,7 +3296,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
// eventuell den Kontext feststellen. Passiert nur beim ersten Eintrag nach reset
if ( !pReverseControlsKontext && m_pReverseControlsSon )
{
- USHORT nNr;
+ sal_uInt16 nNr;
ControlItem *pNewItem = new ControlItemUId( String(), aUId );
if ( m_pReverseControlsSon->Seek_Entry(pNewItem,&nNr) )
{
@@ -3261,7 +3318,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
// Kurzname feststellen
if ( pReverseControlsKontext )
{
- USHORT nNr;
+ sal_uInt16 nNr;
ControlItem *pNewItem = new ControlItemUId( String(), aUId );
if ( pReverseControlsKontext->Seek_Entry(pNewItem,&nNr) )
{
@@ -3273,7 +3330,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
// Slotname feststellen
if ( m_pReverseSlots )
{
- USHORT nNr;
+ sal_uInt16 nNr;
ControlItem *pNewItem = new ControlItemUId( String(), aUId );
if ( m_pReverseSlots->Seek_Entry(pNewItem,&nNr) )
pWinInfo->aSlotname = m_pReverseSlots->GetObject(nNr)->pData->Kurzname;
@@ -3281,6 +3338,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
// Langname feststellen
+ // FIXME: HELPID
+ #if 0
if ( aUId.HasString() )
{ // use the String ID since there is no LongName in hid.lst
pWinInfo->aLangname = aUId.GetStr();
@@ -3289,13 +3348,14 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
{
if ( m_pReverseUIds )
{
- USHORT nNr;
+ sal_uInt16 nNr;
ControlItem *pNewItem = new ControlItemUId( String(), aUId );
if ( m_pReverseUIds->Seek_Entry(pNewItem,&nNr) )
pWinInfo->aLangname = m_pReverseUIds->GetObject(nNr)->pData->Kurzname;
delete pNewItem;
}
}
+ #endif
aWinInfoHdl.Call( pWinInfo );
@@ -3304,7 +3364,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
break;
case RET_ProfileInfo:
{
- ULONG nUId = aUId.GetNum();
+ // FIXME: HELPID
+ #if 0
+ sal_uLong nUId = aUId.GetNum();
if ( nParams & PARAM_STR_1 )
{
DirEntry FilePath = pImpl->aLogFileBase + DirEntry(DirEntry(aLogFileName).GetBase().AppendAscii(".prf"));
@@ -3323,8 +3385,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
{
case S_ProfileReset: // nLNr1 = Anzahl Borders
{
- pImpl->nNumBorders = (USHORT)nLNr1; // Borders are 0 to 4
- USHORT i;
+ pImpl->nNumBorders = (sal_uInt16)nLNr1; // Borders are 0 to 4
+ sal_uInt16 i;
for ( i=0 ; i<4 ; i++ )
pImpl->naValBorders[i] = 0;
@@ -3346,7 +3408,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
case S_ProfileTime: // nLNr1 = remote Zeit des Befehls
{
- USHORT i;
+ sal_uInt16 i;
for ( i=0 ; i<pImpl->nNumBorders &&
pImpl->naValBorders[i] <= nLNr1 ; i++ ) {};
@@ -3381,7 +3443,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if( aStrm.IsOpen() )
{
String aProfile;
- USHORT i;
+ sal_uInt16 i;
aProfile += String().Expand(15);
for ( i=0 ; i<pImpl->nNumBorders ; i++ )
@@ -3432,11 +3494,14 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
break;
}
}
+ #endif
}
break;
case RET_DirectLoging:
{
- ULONG nUId = aUId.GetNum();
+ // FIXME: HELPID
+ #if 0
+ sal_uLong nUId = aUId.GetNum();
switch ( nUId )
{
case S_AssertError:
@@ -3452,19 +3517,20 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
default:
;
}
+ #endif
}
break;
case RET_MacroRecorder:
{
- SortControlsByNumber( TRUE );
+ SortControlsByNumber( sal_True );
String aCommand,aControls,aControl,aULongNames,aULongName;
- BOOL bWriteNewKontext = FALSE;
+ sal_Bool bWriteNewKontext = sal_False;
aControls.Erase();
// Kurzname feststellen
if ( m_pReverseControls )
{
- USHORT nNr;
+ sal_uInt16 nNr;
ControlItem *pNewItem = new ControlItemUId( String(), aUId );
if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) )
aControls = m_pReverseControls->GetObject(nNr)->pData->Kurzname;
@@ -3481,8 +3547,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
{
if ( m_pReverseControls )
{
- USHORT nNr;
- ControlItem *pNewItem = new ControlItemUId( String(), SmartId( nLNr1 ) );
+ sal_uInt16 nNr;
+ // FIXME: HELPID
+ ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( /*nLNr1*/ ) );
if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) )
aULongNames = m_pReverseControls->GetObject(nNr)->pData->Kurzname;
delete pNewItem;
@@ -3494,8 +3561,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
// now determin the best common kontext
- USHORT i,j;
- BOOL bFoundUlongName = FALSE, bFoundControl = FALSE;
+ sal_uInt16 i,j;
+ sal_Bool bFoundUlongName = sal_False, bFoundControl = sal_False;
// check for current kontext
for ( i = 0 ; !bFoundUlongName && i < aULongNames.GetTokenCount('/') ; i++ )
bFoundUlongName = aLastRecordedKontext.Equals( aULongNames.GetToken(i,'/').GetToken( 0,':') );
@@ -3510,7 +3577,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
else
{ // see if we can find common kontext
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
String aCurrentKontext;
for ( i = 0 ; !bFound && i < aULongNames.GetTokenCount('/') ; i++ )
@@ -3521,19 +3588,19 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
{
if ( aCurrentKontext.Equals( aControls.GetToken(j,'/').GetToken( 0,':') ) )
{
- bFound = TRUE;
+ bFound = sal_True;
aULongName = aULongNames.GetToken(i,'/').GetToken( 1,':');
aControl = aControls.GetToken(j,'/').GetToken( 1,':');
aLastRecordedKontext = aCurrentKontext;
- bWriteNewKontext = TRUE;
+ bWriteNewKontext = sal_True;
}
}
}
if ( !bFound )
{
// check if both contain toplevel
- bFoundUlongName = FALSE;
- bFoundControl = FALSE;
+ bFoundUlongName = sal_False;
+ bFoundControl = sal_False;
for ( i = 0 ; !bFoundUlongName && i < aULongNames.GetTokenCount('/') ; i++ )
bFoundUlongName = aULongNames.GetToken(i,'/').GetToken( 0,':').Equals( aULongNames.GetToken(i,'/').GetToken( 1,':') );
@@ -3547,7 +3614,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if ( aLastRecordedKontext.Len() )
{
aLastRecordedKontext.Erase();
- bWriteNewKontext = TRUE;
+ bWriteNewKontext = sal_True;
}
}
else
@@ -3565,8 +3632,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
else
{ // we only have a Control
- USHORT i;
- BOOL bFoundControl = FALSE;
+ sal_uInt16 i;
+ sal_Bool bFoundControl = sal_False;
// check for current kontext
for ( i = 0 ; !bFoundControl && i < aControls.GetTokenCount('/') ; i++ )
bFoundControl = aLastRecordedKontext.Equals( aControls.GetToken(i,'/').GetToken( 0,':') );
@@ -3575,7 +3642,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
else
{
aLastRecordedKontext = aControls.GetToken(0,'/').GetToken( 0,':');
- bWriteNewKontext = TRUE;
+ bWriteNewKontext = sal_True;
aControl = aControls.GetToken(0,'/').GetToken( 1,':');
}
@@ -3602,35 +3669,35 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
aCommand += '.';
aCommand += aMethod;
- BOOL bWasParam = FALSE;
+ sal_Bool bWasParam = sal_False;
if( nParams & PARAM_STR_1 )
{
- bWasParam = TRUE;
+ bWasParam = sal_True;
aCommand.AppendAscii( " \"" );
if ( nNr1 & M_KEY_STRING )
{
- USHORT nModify = 0;
- BOOL bIsProsa = FALSE;
+ sal_uInt16 nModify = 0;
+ sal_Bool bIsProsa = sal_False;
xub_StrLen i;
for ( i = 0; i < aString1.Len(); i++ )
{
- if ( ((USHORT)aString1.GetChar(i)) == 1 ) // we have a spechial char
+ if ( ((sal_uInt16)aString1.GetChar(i)) == 1 ) // we have a spechial char
{
i++;
if ( !bIsProsa )
{
aCommand.AppendAscii( "<" );
- bIsProsa = TRUE;
+ bIsProsa = sal_True;
}
else
aCommand.AppendAscii( " " );
- USHORT nKeyCode = (USHORT)aString1.GetChar(i) & KEY_CODE;
- USHORT nNewModify = (USHORT)aString1.GetChar(i) & KEY_MODTYPE;
+ sal_uInt16 nKeyCode = (sal_uInt16)aString1.GetChar(i) & KEY_CODE;
+ sal_uInt16 nNewModify = (sal_uInt16)aString1.GetChar(i) & KEY_MODTYPE;
if ( nNewModify != nModify )
{ // generate modifiers
- USHORT nChanged = ( nNewModify ^ nModify );
+ sal_uInt16 nChanged = ( nNewModify ^ nModify );
if ( nChanged & KEY_SHIFT )
{
aCommand += GetKeyName( KEY_SHIFT );
@@ -3655,7 +3722,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if ( bIsProsa )
{
aCommand.AppendAscii( ">" );
- bIsProsa = FALSE;
+ bIsProsa = sal_False;
}
aCommand += aString1.GetChar(i);
nModify = 0;
@@ -3664,7 +3731,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if ( bIsProsa )
{
aCommand.AppendAscii( ">" );
- bIsProsa = FALSE;
+ bIsProsa = sal_False;
}
}
else
@@ -3679,7 +3746,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
aCommand.AppendAscii( ", " );
else
aCommand.AppendAscii( " " );
- bWasParam = TRUE;
+ bWasParam = sal_True;
if ( nNr1 & M_RET_NUM_CONTROL )
{
aCommand.Append( aULongName );
@@ -3695,7 +3762,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
aCommand.AppendAscii( ", " );
else
aCommand.AppendAscii( " " );
- bWasParam = TRUE;
+ bWasParam = sal_True;
if ( bBool1 )
aCommand.AppendAscii( "true" );
else
@@ -3717,18 +3784,24 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
case SIReturnError:
{
String aString;
- SmartId aUId;
+ rtl::OString aUId;
if ( pRetStream->GetNextType() == BinString )
{
String aUStrId; // UniqueStringID Used for Mozilla Integration
pRetStream->Read( aUStrId );
- aUId = SmartId( aUStrId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( aUStrId );
+ #endif
}
else
{
comm_ULONG nUId;
pRetStream->Read( nUId ); // bei Sequence einfach die Sequence
- aUId = SmartId( nUId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( nUId );
+ #endif
}
pRetStream->Read( aString );
ReplaceNumbers (aString);
@@ -3762,35 +3835,47 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
pShortNames->Invalidate( nClearSequence - KEEP_SEQUENCES );
}
- bReturnOK = TRUE;
+ bReturnOK = sal_True;
- return TRUE;
+ return sal_True;
} // RetService::Request()
-String TestToolObj::GetMethodName( ULONG nMethodId )
+String TestToolObj::GetMethodName( sal_uLong nMethodId )
{
- USHORT nElement;
+ sal_uInt16 nElement;
if ( !Controls::pClasses ) // Ist static, wird also nur einmal geladen
ReadFlatArray( Controls::arClasses, Controls::pClasses );
if ( Controls::pClasses )
{
+ // FIXME: HELPID
+ #if 0
for ( nElement = 0 ; nElement < Controls::pClasses->Count() ; nElement++ )
if ( Controls::pClasses->GetObject(nElement)->pData->aUId.Matches( nMethodId ) )
return Controls::pClasses->GetObject(nElement)->pData->Kurzname;
+ #else
+ (void)nElement;
+ (void)nMethodId;
+ #endif
}
return String();
}
-String TestToolObj::GetKeyName( USHORT nKeyCode )
+String TestToolObj::GetKeyName( sal_uInt16 nKeyCode )
{
- USHORT nElement;
+ sal_uInt16 nElement;
if ( !CmdStream::pKeyCodes ) // Ist static, wird also nur einmal geladen
ReadFlatArray( CmdStream::arKeyCodes, CmdStream::pKeyCodes );
if ( CmdStream::pKeyCodes )
{
+ // FIXME: HELPID
+ #if 0
for ( nElement = 0 ; nElement < CmdStream::pKeyCodes->Count() ; nElement++ )
if ( CmdStream::pKeyCodes->GetObject(nElement)->pData->aUId.Matches( nKeyCode ) )
return CmdStream::pKeyCodes->GetObject(nElement)->pData->Kurzname;
+ #else
+ (void)nElement;
+ (void)nKeyCode;
+ #endif
}
return CUniString( "UnknownKeyCode" );
}
@@ -3805,74 +3890,86 @@ static ControlDefLoad const arRes_Type [] =
xub_StrLen nGleich = STRING_NOTFOUND;
xub_StrLen nEnd = STRING_NOTFOUND;
xub_StrLen nStartPos = 0;
- ULONG nNumber;
+ sal_uLong nNumber;
String aType;
String aResult;
- BOOL bFound;
+ sal_Bool bFound;
while ( (nStart = aText.Search(StartKenn,nStartPos)) != STRING_NOTFOUND &&
(nGleich = aText.SearchAscii("=",nStart+StartKenn.Len())) != STRING_NOTFOUND &&
(nEnd = aText.Search(EndKenn,nGleich+1)) != STRING_NOTFOUND)
{
aType = aText.Copy(nStart,nGleich-nStart);
- nNumber = (ULONG)aText.Copy(nGleich+1,nEnd-nGleich-1).ToInt64();
- bFound = FALSE;
+ nNumber = (sal_uLong)aText.Copy(nGleich+1,nEnd-nGleich-1).ToInt64();
+ bFound = sal_False;
if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL )
{
- aResult = pShortNames->GetName(SmartId(nNumber));
- bFound = TRUE;
+ // FIXME: HELPID
+ aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
+ bFound = sal_True;
}
if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL )
{
- bFound = TRUE;
+ bFound = sal_True;
aResult = GetMethodName( nNumber );
}
if ( aType.CompareTo(RcKenn ) == COMPARE_EQUAL )
{
- bFound = TRUE;
+ bFound = sal_True;
if ( !pRCommands ) // Ist static, wird also nur einmal geladen
ReadFlatArray( arR_Cmds, pRCommands );
- USHORT nElement;
+ sal_uInt16 nElement;
if ( pRCommands )
{
+ // FIXME: HELPID
+ #if 0
for ( nElement = 0 ; nElement < pRCommands->Count() ; nElement++ )
if ( pRCommands->GetObject(nElement)->pData->aUId.Matches( nNumber ) )
{
aResult = pRCommands->GetObject(nElement)->pData->Kurzname;
nElement = pRCommands->Count();
}
+ #else
+ (void)nElement;
+ #endif
}
}
if ( aType.CompareTo(TypeKenn ) == COMPARE_EQUAL )
{
- bFound = TRUE;
+ bFound = sal_True;
if ( !pRTypes ) // Ist static, wird also nur einmal geladen
ReadFlatArray( arRes_Type, pRTypes );
- USHORT nElement;
+ sal_uInt16 nElement;
if ( pRTypes )
{
+ // FIXME: HELPID
+ #if 0
for ( nElement = 0 ; nElement < pRTypes->Count() ; nElement++ )
if ( pRTypes->GetObject(nElement)->pData->aUId.Matches( nNumber ) )
{
aResult = pRTypes->GetObject(nElement)->pData->Kurzname;
nElement = pRTypes->Count();
}
+ #else
+ (void)nElement;
+ #endif
}
}
if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL )
{
- aResult = pShortNames->GetName(SmartId(nNumber));
- bFound = TRUE;
+ // FIXME: HELPID
+ aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
+ bFound = sal_True;
}
if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL )
{
if ( nNumber > nStart )
- aResult.Fill( (USHORT)nNumber - nStart +1 );
+ aResult.Fill( (sal_uInt16)nNumber - nStart +1 );
else
aResult = CUniString(" ");
- bFound = TRUE;
+ bFound = sal_True;
}
nStartPos = nStart;
@@ -3888,7 +3985,7 @@ static ControlDefLoad const arRes_Type [] =
}
-SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl )
+SbTextType TestToolObj::GetSymbolType( const String &rSymbol, sal_Bool bWasControl )
{
if ( rSymbol.CompareToAscii( "try" ) == COMPARE_EQUAL
|| rSymbol.CompareToAscii( "catch" ) == COMPARE_EQUAL
@@ -3900,7 +3997,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl )
}
- ControlDef WhatName( rSymbol, SmartId() );
+ ControlDef WhatName( rSymbol, rtl::OString() );
if ( bWasControl )
{
@@ -3918,7 +4015,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl )
// Die Controls durchsuchen
if ( m_pControls )
{
- USHORT nWin;
+ sal_uInt16 nWin;
for ( nWin = 0 ; nWin < m_pControls->Count() ; nWin++ )
{
@@ -3966,8 +4063,8 @@ Controls::~Controls()
void Controls::ChangeListener( SbxObject* parent )
{
- EndListening( pMethodVar->GetBroadcaster(), TRUE );
- parent->StartListening( pMethodVar->GetBroadcaster(), TRUE );
+ EndListening( pMethodVar->GetBroadcaster(), sal_True );
+ parent->StartListening( pMethodVar->GetBroadcaster(), sal_True );
}
void Controls::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
@@ -3989,12 +4086,13 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType)
}
- USHORT nElement;
- ControlDef WhatName(aStr,SmartId());
+ sal_uInt16 nElement;
+ ControlDef WhatName(aStr,rtl::OString());
if (pClasses && pClasses->Seek_Entry(&WhatName,&nElement))
{
pMethodVar->SetName(aStr);
- ULONG nUId = pClasses->GetObject(nElement)->pData->aUId.GetNum();
+ // FIXME: HELPID
+ sal_uLong nUId = 0;//pClasses->GetObject(nElement)->pData->aUId.GetNum();
pMethodVar->nValue = nUId;
pMethodVar->SetUserData( GetUserData() );
@@ -4013,7 +4111,7 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType)
}
-String TTFormat::ms2s( ULONG nMilliSeconds )
+String TTFormat::ms2s( sal_uLong nMilliSeconds )
{
if ( nMilliSeconds < 100000 ) // 100 Sekunden
return String::CreateFromInt64( nMilliSeconds );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 12:48:39 +0000