summaryrefslogtreecommitdiff
path: root/automation/source/testtool
diff options
context:
space:
mode:
Diffstat (limited to 'automation/source/testtool')
-rw-r--r--automation/source/testtool/cmdstrm.cxx94
-rw-r--r--automation/source/testtool/cmdstrm.hxx8
-rw-r--r--automation/source/testtool/comm_bas.cxx50
-rw-r--r--automation/source/testtool/comm_bas.hxx24
-rw-r--r--automation/source/testtool/cretstrm.cxx2
-rw-r--r--automation/source/testtool/cretstrm.hxx4
-rw-r--r--automation/source/testtool/filter.pl2
-rw-r--r--automation/source/testtool/httprequest.cxx10
-rw-r--r--automation/source/testtool/httprequest.hxx2
-rw-r--r--automation/source/testtool/objtest.cxx164
-rw-r--r--automation/source/testtool/objtest.hxx238
-rw-r--r--automation/source/testtool/registry_win.cxx6
-rw-r--r--automation/source/testtool/registry_win.hxx2
-rw-r--r--automation/source/testtool/sysdir_win.cxx12
-rw-r--r--automation/source/testtool/sysdir_win.hxx2
-rw-r--r--automation/source/testtool/tcommuni.cxx6
-rw-r--r--automation/source/testtool/tcommuni.hxx2
17 files changed, 314 insertions, 314 deletions
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index a860948c6b04..71d94993fbec 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -65,14 +65,14 @@ CmdStream::~CmdStream()
#define PUT_CHAR(ch) \
- USHORT nMCode = nModify + ch; \
- USHORT _Code = 1; \
- if ( (nMCode & 0xFF) == 0 ) \
- _Code |= 2; \
- if ( (nMCode >> 8) == 0 ) \
- _Code |= 4; \
- Result += (char) _Code; \
- Result += (char) ( nMCode & 0xFF ); \
+ USHORT nMCode = nModify + ch; \
+ USHORT _Code = 1; \
+ if ( (nMCode & 0xFF) == 0 ) \
+ _Code |= 2; \
+ if ( (nMCode >> 8) == 0 ) \
+ _Code |= 4; \
+ Result += (char) _Code; \
+ Result += (char) ( nMCode & 0xFF ); \
Result += (char) ( nMCode >> 8 )
@@ -90,7 +90,7 @@ String CmdStream::WandleKeyEventString( String aKeys )
if ( nPos2 != STRING_NOTFOUND )
{
String Work = aKeys.Copy(nPos1+1,nPos2-nPos1+1-2);
- aKeys.Erase(nPos1,nPos2-nPos1+1); // Inclusive Spitze Klammern weg
+ aKeys.Erase(nPos1,nPos2-nPos1+1); // Inclusive Spitze Klammern weg
String Result, Token;
USHORT nModify = 0;
while ( Work.Len() > 0 )
@@ -122,21 +122,21 @@ String CmdStream::WandleKeyEventString( String aKeys )
{
switch ( nCode )
{
- case KEY_SPACE: Token = ' '; break;
- case KEY_ADD: Token = '+'; break;
- case KEY_SUBTRACT: Token = '-'; break;
- case KEY_MULTIPLY: Token = '*'; break;
- case KEY_DIVIDE: Token = '/'; break;
- case KEY_POINT: Token = '.'; break;
- case KEY_COMMA: Token = ','; break;
- case KEY_LESS: Token = '<'; break;
- case KEY_GREATER: Token = '>'; break;
- case KEY_EQUAL: Token = '='; break;
+ case KEY_SPACE: Token = ' '; break;
+ case KEY_ADD: Token = '+'; break;
+ case KEY_SUBTRACT: Token = '-'; break;
+ case KEY_MULTIPLY: Token = '*'; break;
+ case KEY_DIVIDE: Token = '/'; break;
+ case KEY_POINT: Token = '.'; break;
+ case KEY_COMMA: Token = ','; break;
+ case KEY_LESS: Token = '<'; break;
+ case KEY_GREATER: Token = '>'; break;
+ case KEY_EQUAL: Token = '='; break;
default:
-// if ( nModify == 0 )
-// Token.ToLower();
-// else
-// Token.ToUpper();
+// if ( nModify == 0 )
+// Token.ToLower();
+// else
+// Token.ToUpper();
;
}
Result += Token;
@@ -181,7 +181,7 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString )
{
switch (rPar->Get( i )->GetType())
{
- case SbxLONG: // alles immer als Short �bertragen
+ case SbxLONG: // alles immer als Short �bertragen
case SbxULONG:
case SbxLONG64:
case SbxULONG64:
@@ -215,7 +215,7 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString )
else
SbxBase::SetError( SbxERR_WRONG_ARGS );
break;
- case SbxOBJECT: // whenever a control is passed. TabPage, MenuBar
+ case SbxOBJECT: // whenever a control is passed. TabPage, MenuBar
{
SbxProperty *pMember = NULL;
if ( rPar->Get( i )->ISA( SbxObject ) )
@@ -296,15 +296,15 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString )
}
}
Write (nParams);
- if( nParams & PARAM_USHORT_1 ) Write( nNr1 );
- if( nParams & PARAM_USHORT_2 ) Write( nNr2 );
- if( nParams & PARAM_USHORT_3 ) Write( nNr3 );
- if( nParams & PARAM_USHORT_4 ) Write( nNr4 );
- if( nParams & PARAM_ULONG_1 ) Write( nLNr1 );
- if( nParams & PARAM_STR_1 ) Write( aString1, IsKeyString );
- if( nParams & PARAM_STR_2 ) Write( aString2, IsKeyString );
- if( nParams & PARAM_BOOL_1 ) Write( bBool1 );
- if( nParams & PARAM_BOOL_2 ) Write( bBool2 );
+ if( nParams & PARAM_USHORT_1 ) Write( nNr1 );
+ if( nParams & PARAM_USHORT_2 ) Write( nNr2 );
+ if( nParams & PARAM_USHORT_3 ) Write( nNr3 );
+ if( nParams & PARAM_USHORT_4 ) Write( nNr4 );
+ if( nParams & PARAM_ULONG_1 ) Write( nLNr1 );
+ if( nParams & PARAM_STR_1 ) Write( aString1, IsKeyString );
+ if( nParams & PARAM_STR_2 ) Write( aString2, IsKeyString );
+ if( nParams & PARAM_BOOL_1 ) Write( bBool1 );
+ if( nParams & PARAM_BOOL_2 ) Write( bBool2 );
}
void CmdStream::GenCmdCommand( USHORT nNr, SbxArray* rPar )
@@ -320,15 +320,15 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar )
Write(nNr);
if (rPar)
{
- USHORT nAnz = (rPar->Count()-1) >> 1; // Geteilt durch 2
+ USHORT nAnz = (rPar->Count()-1) >> 1; // Geteilt durch 2
Write(nAnz);
BOOL bWriteUnoSlot = rPar->Get( 1 )->GetType() == SbxSTRING;
for (USHORT n = 1 ; n <= nAnz ; n++)
{
/// #59513# nicht mehr ben�tigt
-// ULONG nUserData = rPar->Get( 2*n-1 )->GetUserData();
-// rPar->Get( 2*n-1 )->SetUserData(ID_DoNothing); // Verhindert Ausf�hrung der Slots, die als Parameter �bergeben sind.
+// ULONG nUserData = rPar->Get( 2*n-1 )->GetUserData();
+// rPar->Get( 2*n-1 )->SetUserData(ID_DoNothing); // Verhindert Ausf�hrung der Slots, die als Parameter �bergeben sind.
if ( bWriteUnoSlot )
Write(rPar->Get( 2*n-1 )->GetString());
@@ -372,7 +372,7 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar )
}
/// #59513# nicht mehr ben�tigt ( siehe oben )
-// rPar->Get( 2*n-1 )->SetUserData(nUserData); // Und wieder zur�cksetzen, so da� auch alles sauber ist.
+// rPar->Get( 2*n-1 )->SetUserData(nUserData); // Und wieder zur�cksetzen, so da� auch alles sauber ist.
}
}
else
@@ -382,20 +382,20 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar )
void CmdStream::GenCmdUNOSlot( const String &aURL )
{
Write( USHORT(SIUnoSlot) );
-/* Write( USHORT(0) ); // Hier wird im Office die SID_OPENURL Eingetragen.
+/* Write( USHORT(0) ); // Hier wird im Office die SID_OPENURL Eingetragen.
// Dies mu� nat�rlich im Office hart verdratet werden und nicht hier,
// da sich die ID ja mal �ndern kann.
// Da auch die ID f�r das PoolItem im Office entnommen werden mu� hier also kein PoolItem
// gesendet werden.
- Write( USHORT(0) ); // Anzahl PoolItems
+ Write( USHORT(0) ); // Anzahl PoolItems
// Stattdessen wird noch eine extra String gesendet, der dann Officeseitig in ein
// SfxStringItem mit entsprechender ID gewandelt wird.
- Write( aURL ); // String f�r das PoolItem*/
+ Write( aURL ); // String f�r das PoolItem*/
- Write( aURL ); // Die UNO URL eben
+ Write( aURL ); // Die UNO URL eben
}
void CmdStream::GenCmdControl( comm_ULONG nUId, USHORT nMethodId, SbxArray* rPar )
@@ -418,14 +418,14 @@ void CmdStream::GenCmdFlow( USHORT nArt )
{
Write(USHORT(SIFlow));
Write(nArt);
- Write(USHORT(PARAM_NONE)); // Typ der folgenden Parameter
+ Write(USHORT(PARAM_NONE)); // Typ der folgenden Parameter
}
void CmdStream::GenCmdFlow( USHORT nArt, USHORT nNr1 )
{
Write(USHORT(SIFlow));
Write(nArt);
- Write(USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter
+ Write(USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter
Write(nNr1);
}
@@ -433,7 +433,7 @@ void CmdStream::GenCmdFlow( USHORT nArt, comm_ULONG nNr1 )
{
Write(USHORT(SIFlow));
Write(nArt);
- Write(USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter
+ Write(USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter
Write(nNr1);
}
@@ -441,7 +441,7 @@ void CmdStream::GenCmdFlow( USHORT nArt, String aString1 )
{
Write(USHORT(SIFlow));
Write(nArt);
- Write(USHORT(PARAM_STR_1)); // Typ der folgenden Parameter
+ Write(USHORT(PARAM_STR_1)); // Typ der folgenden Parameter
Write(aString1);
}
diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx
index fb8b49f6106e..a9eb8b876487 100644
--- a/automation/source/testtool/cmdstrm.hxx
+++ b/automation/source/testtool/cmdstrm.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ public:
void GenCmdUNOSlot( const String &aURL );
void GenCmdControl( comm_ULONG nUId, USHORT nMethodId, SbxArray* rPar );
- void GenCmdControl( String aUId, USHORT nMethodId, SbxArray* rPar );
+ void GenCmdControl( String aUId, USHORT nMethodId, SbxArray* rPar );
void GenCmdFlow( USHORT nArt );
@@ -59,11 +59,11 @@ public:
SvMemoryStream* GetStream();
- static CNames *pKeyCodes; // Namen der Sondertasten MOD1, F1, LEFT ...
+ static CNames *pKeyCodes; // Namen der Sondertasten MOD1, F1, LEFT ...
static ControlDefLoad __READONLY_DATA arKeyCodes [];
private:
- String WandleKeyEventString( String aKeys ); // Nutzt pKeyCodes. <RETURN> <SHIFT LEFT LEFT>
+ String WandleKeyEventString( String aKeys ); // Nutzt pKeyCodes. <RETURN> <SHIFT LEFT LEFT>
using CmdBaseStream::Write;
void Write( comm_USHORT nNr ){CmdBaseStream::Write( nNr );}
diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx
index 8c206b108926..b33fa293fe5a 100644
--- a/automation/source/testtool/comm_bas.cxx
+++ b/automation/source/testtool/comm_bas.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -43,21 +43,21 @@
// Keine
// 2) Methoden:
// CommunicationLink StartCommunication( Host, Port )
-// StopAllCommunication // Alle Kommunikation wird abgebrochen
-// BOOL IsCommunicationRunning // Läuft noch irgendwas
-// String GetMyName Der eigene Name
-// BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig
-// SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event
+// StopAllCommunication // Alle Kommunikation wird abgebrochen
+// BOOL IsCommunicationRunning // Läuft noch irgendwas
+// String GetMyName Der eigene Name
+// BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig
+// SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event
// Der CommunicationLink hat folgende Elemente:
// 1) Properties:
// Keine
// 2) Methoden:
-// StopCommunication Die Kommunikation wird abgebrochen
-// String GetMyName Der eigene Name
-// String GetHostName Der Name des Anderen
-// Send(String ) String an den Partner schicken
-// String GetString Ergebnis des letzten Empfangs
+// StopCommunication Die Kommunikation wird abgebrochen
+// String GetMyName Der eigene Name
+// String GetHostName Der Name des Anderen
+// Send(String ) String an den Partner schicken
+// String GetString Ergebnis des letzten Empfangs
// Diese Implementation ist ein Beispiel fuer eine tabellengesteuerte
@@ -74,7 +74,7 @@
#define _BWRITE 0x0200 // kann as Lvalue verwendet werden
#define _LVALUE _BWRITE // kann as Lvalue verwendet werden
#define _READWRITE 0x0300 // beides
-#define _OPT 0x0400 // TRUE: optionaler Parameter
+#define _OPT 0x0400 // TRUE: optionaler Parameter
#define _METHOD 0x1000 // Masken-Bit fuer eine Methode
#define _PROPERTY 0x2000 // Masken-Bit fuer eine Property
#define _COLL 0x4000 // Masken-Bit fuer eine Collection
@@ -145,7 +145,7 @@ CommunicationWrapper::CommunicationWrapper( const String& rClass ) : SbxObject(
, m_bCatchOpen( FALSE )
, m_pNewLink( NULL )
{
-// SetName( CUniString("Manager") );
+// SetName( CUniString("Manager") );
m_pMethods = &aManagerMethods[0];
m_pManager = new CommunicationManagerClientViaSocket;
m_pManager->SetConnectionOpenedHdl( LINK( this, CommunicationWrapper, Open ) );
@@ -323,7 +323,7 @@ void CommunicationWrapper::Events( String aType, CommunicationLink* pLink )
Call( m_aEventHandlerName, pPar );
}
else
- delete pLink->GetServiceData(); // Stream wegschmeissen um nicht zu blockieren
+ delete pLink->GetServiceData(); // Stream wegschmeissen um nicht zu blockieren
}
@@ -352,28 +352,28 @@ void CommunicationWrapper::MStartCommunication( SbxVariable* pVar, SbxArray* pPa
}
void CommunicationWrapper::MStopAllCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ // StopAllCommunication // Alle Kommunikation wird abgebrochen
+{ // StopAllCommunication // Alle Kommunikation wird abgebrochen
m_pManager->StopCommunication();
}
void CommunicationWrapper::MIsCommunicationRunning( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ // BOOL IsCommunicationRunning // Läuft noch irgendwas
+{ // BOOL IsCommunicationRunning // Läuft noch irgendwas
pVar->PutBool( m_pManager->IsCommunicationRunning() );
}
void CommunicationWrapper::MGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ // String GetMyName Der eigene Name
+{ // String GetMyName Der eigene Name
pVar->PutString( UniString( m_pManager->GetMyName( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) );
}
void CommunicationWrapper::MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, BOOL /*bWrite*/ )
-{ // BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig
+{ // BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig
CommunicationWrapper *pWrapper = (CommunicationWrapper*)(pPar->Get( 1 )->GetObject());
pVar->PutBool( m_pManager->IsLinkValid( pWrapper->GetCommunicationLink() ) );
}
void CommunicationWrapper::MSetCommunicationEventHandler( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*bWrite*/ )
-{ // SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event
+{ // SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event
m_aEventHandlerName = pPar->Get( 1 )->GetString();
}
@@ -381,24 +381,24 @@ void CommunicationWrapper::MSetCommunicationEventHandler( SbxVariable* /*pVar*/,
-// Link
+// Link
void CommunicationWrapper::LStopCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ // StopCommunication Die Kommunikation wird abgebrochen
+{ // StopCommunication Die Kommunikation wird abgebrochen
m_pLink->StopCommunication();
}
void CommunicationWrapper::LGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ // String GetMyName Der eigene Name
+{ // String GetMyName Der eigene Name
pVar->PutString( UniString( m_pLink->GetMyName( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) );
}
void CommunicationWrapper::LGetHostName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ // String GetHostName Der Name des Anderen
+{ // String GetHostName Der Name des Anderen
pVar->PutString( UniString( m_pLink->GetCommunicationPartner( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) );
}
void CommunicationWrapper::LSend( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*bWrite*/ )
-{ // Send(String ) String an den Partner schicken
+{ // Send(String ) String an den Partner schicken
SvStream *pSendStream = m_pLink->GetBestCommunicationStream();
String aSendString = pPar->Get( 1 )->GetString();
pSendStream->WriteByteString( aSendString, RTL_TEXTENCODING_UTF8 );
@@ -407,7 +407,7 @@ void CommunicationWrapper::LSend( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*
}
void CommunicationWrapper::LGetString( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ // String GetString Ergebnis des letzten Empfangs
+{ // String GetString Ergebnis des letzten Empfangs
SvStream *pReceiveStream = m_pLink->GetServiceData();
if ( pReceiveStream )
{
diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx
index 3587efcc4806..ce994324f889 100644
--- a/automation/source/testtool/comm_bas.hxx
+++ b/automation/source/testtool/comm_bas.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
class CommunicationManagerClientViaSocket;
class CommunicationLink;
-class CommunicationWrapper : public SbxObject // Einer für Manager und Links
+class CommunicationWrapper : public SbxObject // Einer für Manager und Links
{
// Definition eines Tabelleneintrags. Dies wird hier gemacht,
// da dadurch die Methoden und Properties als private deklariert
@@ -51,17 +51,17 @@ private:
#endif
struct Methods {
- const char* pName; // Name des Eintrags
- SbxDataType eType; // Datentyp
- pMeth pFunc; // Function Pointer
- short nArgs; // Argumente und Flags
+ const char* pName; // Name des Eintrags
+ SbxDataType eType; // Datentyp
+ pMeth pFunc; // Function Pointer
+ short nArgs; // Argumente und Flags
};
- static Methods aManagerMethods[]; // Methodentabelle
- static Methods aLinkMethods[]; // Methodentabelle
- Methods *m_pMethods; // Aktuelle Methodentabelle
+ static Methods aManagerMethods[]; // Methodentabelle
+ static Methods aLinkMethods[]; // Methodentabelle
+ Methods *m_pMethods; // Aktuelle Methodentabelle
// Methoden
- // Manager
+ // Manager
void MStartCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
void MStopAllCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
void MIsCommunicationRunning( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
@@ -69,7 +69,7 @@ private:
void MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
void MSetCommunicationEventHandler( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- // Link
+ // Link
void LStopCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
void LGetMyName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
void LGetHostName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
@@ -79,7 +79,7 @@ private:
// Interne Member und Methoden
CommunicationManagerClientViaSocket *m_pManager;
CommunicationLink *m_pLink;
- BOOL m_bIsManager; // Ist es kein Manager, so ist es ein Link
+ BOOL m_bIsManager; // Ist es kein Manager, so ist es ein Link
// Kram für Manager
DECL_LINK( Open, CommunicationLink* );
diff --git a/automation/source/testtool/cretstrm.cxx b/automation/source/testtool/cretstrm.cxx
index 0f9781c73970..b07271b4b311 100644
--- a/automation/source/testtool/cretstrm.cxx
+++ b/automation/source/testtool/cretstrm.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx
index 206d74db33ba..7aa09a3d4c78 100644
--- a/automation/source/testtool/cretstrm.hxx
+++ b/automation/source/testtool/cretstrm.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ public:
using CmdBaseStream::Read;
void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );}
void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
-// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );}
+// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );}
virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );}
void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
// new
diff --git a/automation/source/testtool/filter.pl b/automation/source/testtool/filter.pl
index 8f45073b0934..7542dea9ce41 100644
--- a/automation/source/testtool/filter.pl
+++ b/automation/source/testtool/filter.pl
@@ -2,7 +2,7 @@
#*************************************************************************
#*
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/testtool/httprequest.cxx b/automation/source/testtool/httprequest.cxx
index beb8f4c4d0d7..11c1e4d484b0 100644
--- a/automation/source/testtool/httprequest.cxx
+++ b/automation/source/testtool/httprequest.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -91,13 +91,13 @@ BOOL HttpRequest::Execute()
}
TimeValue aTV;
- aTV.Seconds = 10; // Warte 10 Sekunden
+ aTV.Seconds = 10; // Warte 10 Sekunden
aTV.Nanosec = 0;
pOutSocket = new osl::ConnectorSocket();
if ( pOutSocket->connect( aConnectAddr, &aTV ) == osl_Socket_Ok )
{
-// pOutSocket->setTcpNoDelay( 1 );
+// pOutSocket->setTcpNoDelay( 1 );
}
else
{
@@ -128,7 +128,7 @@ BOOL HttpRequest::Execute()
SendString( pOutSocket, "Connection: Keep-Alive\n" );
}
-
+
SendString( pOutSocket, "User-Agent: Mozilla/4.7 [de] (Linux; I)" );
SendString( pOutSocket, "Host: " );
SendString( pOutSocket, aRequestHost );
@@ -156,7 +156,7 @@ BOOL HttpRequest::Execute()
pOutSocket->close();
pStream->Seek( 0 );
-
+
ByteString aLine;
BOOL bInsideHeader = TRUE;
while ( bInsideHeader )
diff --git a/automation/source/testtool/httprequest.hxx b/automation/source/testtool/httprequest.hxx
index af8ad673a17d..02cc206dedcc 100644
--- a/automation/source/testtool/httprequest.hxx
+++ b/automation/source/testtool/httprequest.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 8143700f7cd8..df6f22761355 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -104,7 +104,7 @@ static CommunicationFactory aComManFac;
#define cMyDelim ' '
#define P_FEHLERLISTE pFehlerListe
-#define KEEP_SEQUENCES 100 // Keep Names of last 100 Calls
+#define KEEP_SEQUENCES 100 // Keep Names of last 100 Calls
ControlDefLoad __READONLY_DATA Controls::arClasses [] =
@@ -114,7 +114,7 @@ CNames *Controls::pClasses = NULL;
ControlDefLoad __READONLY_DATA TestToolObj::arR_Cmds [] =
#include "r_cmds.hxx"
CNames *TestToolObj::pRCommands = NULL;
-CErrors *TestToolObj::pFehlerListe = NULL; // Hier werden die Fehler des Testtools gespeichert
+CErrors *TestToolObj::pFehlerListe = NULL; // Hier werden die Fehler des Testtools gespeichert
DBG_NAME( ControlItem )
@@ -354,7 +354,7 @@ TestToolObj::TestToolObj( String aName, String aFilePath ) // Inter
pImpl = new ImplTestToolObj;
pImpl->ProgParam = String();
pImpl->aFileBase = DirEntry(aFilePath);
-// pImpl->aLogFileBase = DirEntry();
+// pImpl->aLogFileBase = DirEntry();
pImpl->aHIDDir = DirEntry(aFilePath);
pImpl->bIsStart = FALSE;
pImpl->pMyBasic = NULL;
@@ -395,17 +395,17 @@ TestToolObj::TestToolObj( String aName, MyBasic* pBas ) // Aufruf
pCommunicationManager->SetDataReceivedHdl( LINK( this, TestToolObj, ReturnResultsLink ));
}
-void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die durch den ConfigDialog ge�ndert werden k�nnen
+void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die durch den ConfigDialog ge�ndert werden k�nnen
{
-#define GETSET(aVar, KeyName, Dafault) \
- { \
- ByteString __##aVar##__; \
- __##aVar##__ = aConf.ReadKey(KeyName); \
- if ( !__##aVar##__.Len() ) \
- { \
- __##aVar##__ = Dafault; \
- aConf.WriteKey(KeyName, __##aVar##__); \
- } \
+#define GETSET(aVar, KeyName, Dafault) \
+ { \
+ ByteString __##aVar##__; \
+ __##aVar##__ = aConf.ReadKey(KeyName); \
+ if ( !__##aVar##__.Len() ) \
+ { \
+ __##aVar##__ = Dafault; \
+ aConf.WriteKey(KeyName, __##aVar##__); \
+ } \
aVar = UniString( __##aVar##__, RTL_TEXTENCODING_UTF8 );\
}
@@ -541,7 +541,7 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d
void TestToolObj::InitTestToolObj()
{
- pImpl->nNumBorders = 0; // F�r Profiling mit k�stchen
+ pImpl->nNumBorders = 0; // F�r Profiling mit k�stchen
pImpl->nMinRemoteCommandDelay = 0;
pImpl->nMaxRemoteCommandDelay = 0;
@@ -597,8 +597,8 @@ void TestToolObj::InitTestToolObj()
MAKE_TT_KEYWORD( "Kontext", SbxCLASS_METHOD, SbxNULL, ID_Kontext );
MAKE_TT_KEYWORD( "GetNextError", SbxCLASS_VARIABLE, SbxVARIANT, ID_GetError );
MAKE_TT_KEYWORD( "Start", SbxCLASS_METHOD, SbxSTRING, ID_Start );
-// pMeth = Make( "Kill", SbxCLASS_METHOD, SbxNULL );
-// pMeth->SetUserData( ID_Kill );
+// pMeth = Make( "Kill", SbxCLASS_METHOD, SbxNULL );
+// pMeth->SetUserData( ID_Kill );
/* pMeth = Make( "TestReset", SbxCLASS_METHOD, SbxNULL );
pMeth->SetUserData( ID_Reset );*/
MAKE_TT_KEYWORD( "Use", SbxCLASS_METHOD, SbxNULL, ID_Use );
@@ -615,11 +615,11 @@ void TestToolObj::InitTestToolObj()
MAKE_TT_KEYWORD( "MaybeAddErr", SbxCLASS_METHOD, SbxNULL, ID_MaybeAddErr );
MAKE_TT_KEYWORD( "ClearError", SbxCLASS_METHOD, SbxNULL, ID_ClearError );
MAKE_TT_KEYWORD( "SaveIDs", SbxCLASS_METHOD, SbxBOOL, ID_SaveIDs );
- MAKE_TT_KEYWORD( "AutoExecute", SbxCLASS_PROPERTY, SbxBOOL, ID_AutoExecute ); // Achtung! PROPERTY Also eine Variable
+ MAKE_TT_KEYWORD( "AutoExecute", SbxCLASS_PROPERTY, SbxBOOL, ID_AutoExecute ); // Achtung! PROPERTY Also eine Variable
MAKE_TT_KEYWORD( "Execute", SbxCLASS_METHOD, SbxNULL, ID_Execute );
MAKE_TT_KEYWORD( "StopOnSyntaxError", SbxCLASS_PROPERTY, SbxBOOL, ID_StopOnSyntaxError );
-/* Dialog Handler werden gebraucht, wenn im internen Testtool ein Dialog
+/* Dialog Handler werden gebraucht, wenn im internen Testtool ein Dialog
hochgerissen wird. Nach versenden der Remote-Kommandos wird IdleHandler aktiviert.
Er testet, ob das Reschedule zum WaitForAnswer zur�ckkehrt. Bleibt das aus, so
wird erst der RemoteHandler zur�ckgesetzt und dann die Handler-Sub im Basic
@@ -1007,7 +1007,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
if (aShortname.CompareIgnoreCaseToAscii("*Active") == COMPARE_EQUAL)
aUId = SmartId( UID_ACTIVE );
else if ( !bUnoName && !bMozillaName )
- { // Bestimmen der ID aus der Hid.Lst
+ { // Bestimmen der ID aus der Hid.Lst
ControlDef WhatName(aLongname,SmartId());
if (pUIds->Seek_Entry(&WhatName,&nElement))
aUId = pUIds->GetObject(nElement)->pData->aUId;
@@ -1253,7 +1253,7 @@ void TestToolObj::WaitForAnswer ()
while ( !bReturnOK && Ende > Time() )
{
-// pTemp = PlugInApplication::GetPlugInApp()->GetReturnFromExecute();
+// pTemp = PlugInApplication::GetPlugInApp()->GetReturnFromExecute();
if ( pTemp )
{
ReturnResults( pTemp );
@@ -1327,7 +1327,7 @@ void TestToolObj::SendViaSocket()
if ( !pCommunicationManager->IsCommunicationRunning() )
{
- // first try to run basic sub "startTheOffice" see i86540
+ // first try to run basic sub "startTheOffice" see i86540
SbxVariable* pMeth = pImpl->pMyBasic->Find( CUniString( "startTheOffice" ), SbxCLASS_DONTCARE);
if( !pImpl->bIsStart && pMeth && pMeth->ISA(SbxMethod) )
{
@@ -1373,7 +1373,7 @@ void TestToolObj::EndBlock()
{
if (IsBlock)
{
- pImpl->LocalStarttime = Time::GetSystemTicks(); // Setzen der Anfangszeit f�r Performancemessung
+ pImpl->LocalStarttime = Time::GetSystemTicks(); // Setzen der Anfangszeit f�r Performancemessung
In->GenCmdFlow (F_EndCommandBlock);
@@ -1398,7 +1398,7 @@ void TestToolObj::EndBlock()
SendViaSocket();
else
{
-// PlugInApplication::GetPlugInApp()->ExecuteRemoteStatements( In->GetStream() );
+// PlugInApplication::GetPlugInApp()->ExecuteRemoteStatements( In->GetStream() );
bReturnOK = FALSE;
if ( aDialogHandlerName.Len() > 0 )
GetpApp()->InsertIdleHdl( LINK( this, TestToolObj, IdleHdl ), 1 );
@@ -1518,7 +1518,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
{
pNewDef->Sons(new CNames());
- pNewDef2 = new ControlDef(aName,aUId); // Noch einen machen
+ pNewDef2 = new ControlDef(aName,aUId); // Noch einen machen
if (!pNewDef->SonInsert(pNewDef2)) // Dialog in eigenen Namespace eintragen
{
delete pNewDef2;
@@ -1770,10 +1770,10 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
while ( pCommunicationManager->IsCommunicationRunning() )
Application::Reschedule();
- SingleCommandBlock = TRUE; // Bug 57188
+ SingleCommandBlock = TRUE; // Bug 57188
IsBlock = FALSE;
-// pCommunicationManager->StartCommunication();
+// pCommunicationManager->StartCommunication();
for (USHORT i=0;i<VAR_POOL_SIZE;i++)
{
@@ -2113,7 +2113,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
// Das ist total rotten und mu� wohl komplett neu!!
-/* BOOL bWasBlock = IsBlock;
+/* BOOL bWasBlock = IsBlock;
if ( !IsBlock ) // Impliziter call bei Aufruf mit Methode
if ( SingleCommandBlock )
BeginBlock();
@@ -2194,7 +2194,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
switch ( ((SbxTransportMethod*)pVar)->nValue )
{
case RC_WinTree:
-// ::svt::OStringTransfer::CopyString(pVar->GetString(), pSomeWindowIDontHave );
+// ::svt::OStringTransfer::CopyString(pVar->GetString(), pSomeWindowIDontHave );
break;
}
@@ -2290,9 +2290,9 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
// Hier wird der Remote UNO Kram gestartet
// Eintrag in die Konfiguration unter
// org.openoffice.Office.Common/Start/Connection
- // socket,host=0,port=12345;iiop;XBla
+ // socket,host=0,port=12345;iiop;XBla
// oder
- // socket,host=0,port=12345;urp;;XBla
+ // socket,host=0,port=12345;urp;;XBla
String aString;
aString.AppendAscii( "socket,host=" );
@@ -2305,7 +2305,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
{
Reference< XMultiServiceFactory > xSMgr = comphelper::getProcessServiceFactory();
// is allways there
-/* if ( ! xSMgr.is() )
+/* if ( ! xSMgr.is() )
{
xSMgr = ::cppu::createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")), sal_True );
if ( xSMgr.is() )
@@ -2323,12 +2323,12 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
OUString(), OUString( RTL_CONSTASCII_USTRINGPARAM("urp") ),
xConnection, Reference< XInstanceProvider >() ) );
- // Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ) );
+ // Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ) );
Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) );
- // Reference< XNamingService > xNamingService(xRet, UNO_QUERY);
+ // Reference< XNamingService > xNamingService(xRet, UNO_QUERY);
- // Reference< XInterface > smgr = xNamingService->getRegisteredObject( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager" ) ) );
+ // Reference< XInterface > smgr = xNamingService->getRegisteredObject( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager" ) ) );
smgr_xMultiserviceFactory = Reference< XMultiServiceFactory >(xRet, UNO_QUERY);
//MBA fragen!!
@@ -2345,7 +2345,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if( smgr_xMultiserviceFactory.is() )
{
Any aAny;
-// aAny <<= xBridge;
+// aAny <<= xBridge;
aAny <<= smgr_xMultiserviceFactory;
SbxObjectRef xMySbxObj = GetSbUnoObject( CUniString("RemoteUnoAppFuerTesttool"), aAny );
@@ -2359,15 +2359,15 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
// Hier wird der Remote UNO Kram gestartet
String aString;
-// aString += GetHostConfig();
-// aString.AppendAscii( ":" );
-// aString += String::CreateFromInt32( GetUnoPortConfig() );
+// aString += GetHostConfig();
+// aString.AppendAscii( ":" );
+// aString += String::CreateFromInt32( GetUnoPortConfig() );
Reference< XMultiServiceFactory > xSMgr /* = comphelper::getProcessServiceFactory()*/;
-// if ( ! xSMgr.is() )
+// if ( ! xSMgr.is() )
{
xSMgr = ::cppu::createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\iserverproxy.rdb")), sal_True);
-// comphelper::setProcessServiceFactory( xSMgr );
+// comphelper::setProcessServiceFactory( xSMgr );
}
OUString aURL( aString );
@@ -2384,12 +2384,12 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("XIServerProxy")) ) );
-/* Reference< XIServerProxy > xIS( xRet, UNO_QUERY );
+/* Reference< XIServerProxy > xIS( xRet, UNO_QUERY );
if ( xIS.is() )
{
String aHost( xIS->getIServerHost() );
-// Reference < XInformationClient > xIC = xIS->createIServerClient( "XInformationClient" );
+// Reference < XInformationClient > xIC = xIS->createIServerClient( "XInformationClient" );
Reference < XInformationClient > xIC = xIS->createInformationClient();
xIC->getTree(OUString::createFromAscii("r:\\b_server\\config\\stand.lst"), OUString() );
@@ -2419,7 +2419,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
{
switch (rPar->Get( 1 )->GetType())
{
- case SbxLONG: // alles immer als Short �bertragen
+ case SbxLONG: // alles immer als Short �bertragen
case SbxULONG:
case SbxLONG64:
case SbxULONG64:
@@ -2768,7 +2768,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if ( pImpl->nErrorCount )
{
ADD_WARNING_LOG( GEN_RES_STR1( S_ERRORS_DETECTED, String::CreateFromInt32( pImpl->nErrorCount ) ) );
- pImpl->nWarningCount--; // Anpassen, da diese Warnung nicht in die Statistik soll
+ pImpl->nWarningCount--; // Anpassen, da diese Warnung nicht in die Statistik soll
}
else
ADD_MESSAGE_LOG( GEN_RES_STR0( S_NO_ERRORS_DETECTED ) );
@@ -2901,7 +2901,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
delete pWhatName;
pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), SmartId() );
if ( m_pSIds->Seek_Entry( pWhatName, &nElement ) )
- { // Nach slots suchen
+ { // Nach slots suchen
SbxVariable *pReturn = new SbxVariable;
delete pWhatName;
pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) );
@@ -2961,13 +2961,13 @@ void TestToolObj::CalcPosition( String const &aSource, xub_StrLen nPos, xub_StrL
}
-#define CATCH_LABEL CUniString( "ctch" )
-#define CATCHRES_LABEL CUniString( "ctchres" )
-#define ENDCATCH_LABEL CUniString( "endctch" )
+#define CATCH_LABEL CUniString( "ctch" )
+#define CATCHRES_LABEL CUniString( "ctchres" )
+#define ENDCATCH_LABEL CUniString( "endctch" )
BOOL IsAlphaChar( sal_Unicode cChar )
{
- return ( cChar >= 'a' && cChar <= 'z' ) ||
+ return ( cChar >= 'a' && cChar <= 'z' ) ||
( cChar >= 'A' && cChar <= 'Z' );
}
@@ -3037,7 +3037,7 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_
xub_StrLen nTry2 = 0;
while ( !WasPrecompilerError() && (nTry2 = ImplSearch( aSource, nStart, nEnd, CUniString("try"), nTry+1 )) != STRING_NOTFOUND )
- { // Wir rekursieren erstmal mit dem 2. Try
+ { // Wir rekursieren erstmal mit dem 2. Try
if ( nTry2 < nCatch )
nEnd += PreCompilePart( aSource, nTry2, nEndcatch+8, aCatchLabel, nLabelCount ) - nEndcatch-8;
else
@@ -3060,7 +3060,7 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_
}
String aReplacement;
- int nTotalLength = -3 -5 -8; // try, catch und endcatch fallen raus
+ int nTotalLength = -3 -5 -8; // try, catch und endcatch fallen raus
aReplacement.AppendAscii( "on error goto " );
aReplacement += aCatchLabel;
@@ -3068,14 +3068,14 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_
nTotalLength += aReplacement.Len();
-// on error goto endcse
-// goto endctchXX
-// ctchXX:
-// if err = 35 or err = 18 then : resume : endif :
-// MaybeAddErr
-// on error goto endcse
-// resume ctchresXX
-// ctchresXX:
+// on error goto endcse
+// goto endctchXX
+// ctchXX:
+// if err = 35 or err = 18 then : resume : endif :
+// MaybeAddErr
+// on error goto endcse
+// resume ctchresXX
+// ctchresXX:
aReplacement.Erase();
aReplacement.AppendAscii( "on error goto " );
aReplacement += aFinalErrorLabel;
@@ -3316,7 +3316,7 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive )
m_pReverseControls->DeleteAndDestroy( nNr );
// um VorlagenLaden/UntergeordneteIniDatei/SpeichernDlg/OrdnerDlg/OeffnenDlg/MessageBox/LetzteVersion/GrafikEinfuegenDlg/FarbeDlg/ExportierenDlg/DruckerEinrichten/DruckenDlg/DateiEinfuegenDlg/Active zu verhindern
}
-/* if ( m_pReverseControlsSon->Seek_Entry( pZeroItem, &nNr ) )
+/* if ( m_pReverseControlsSon->Seek_Entry( pZeroItem, &nNr ) )
{
m_pReverseControlsSon->DeleteAndDestroy( nNr );
// um VorlagenLaden/UntergeordneteIniDatei/SpeichernDlg/OrdnerDlg/OeffnenDlg/MessageBox/LetzteVersion/GrafikEinfuegenDlg/FarbeDlg/ExportierenDlg/DruckerEinrichten/DruckenDlg/DateiEinfuegenDlg/Active zu verhindern
@@ -3413,9 +3413,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
else
pImpl->pNextReturn->PutULong( nLNr1 );
}
- 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_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 )
{
SbxValues aValues( SbxDATE );
@@ -3550,7 +3550,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
{
switch ( nUId )
{
- case S_ProfileReset: // nLNr1 = Anzahl Borders
+ case S_ProfileReset: // nLNr1 = Anzahl Borders
{
pImpl->nNumBorders = (USHORT)nLNr1; // Borders are 0 to 4
USHORT i;
@@ -3565,15 +3565,15 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
break;
}
- case S_ProfileBorder1: // nLNr1 = Border1 in ms
- case S_ProfileBorder2: // nLNr1 = Border2 in ms
- case S_ProfileBorder3: // nLNr1 = Border3 in ms
- case S_ProfileBorder4: // nLNr1 = Border4 in ms
+ case S_ProfileBorder1: // nLNr1 = Border1 in ms
+ case S_ProfileBorder2: // nLNr1 = Border2 in ms
+ case S_ProfileBorder3: // nLNr1 = Border3 in ms
+ case S_ProfileBorder4: // nLNr1 = Border4 in ms
{
pImpl->naValBorders[ nUId - S_ProfileBorder1 ] = nLNr1;
break;
}
- case S_ProfileTime: // nLNr1 = remote Zeit des Befehls
+ case S_ProfileTime: // nLNr1 = remote Zeit des Befehls
{
USHORT i;
for ( i=0 ; i<pImpl->nNumBorders &&
@@ -3601,9 +3601,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
break;
}
- case S_ProfileDump: // Gibt die daten aus.
+ case S_ProfileDump: // Gibt die daten aus.
{
- if ( pImpl->nNumBorders == 0 ) // Also keine alte R�ckmeldung vom Office
+ if ( pImpl->nNumBorders == 0 ) // Also keine alte R�ckmeldung vom Office
break;
DirEntry FilePath = pImpl->aLogFileBase + DirEntry(DirEntry(aLogFileName).GetBase().AppendAscii(".prf"));
SvFileStream aStrm( FilePath.GetFull(), STREAM_STD_WRITE );
@@ -3671,8 +3671,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
case S_AssertError:
{
ADD_ASSERTION_LOG( aString1 );
-// ADD_ERROR_LOG( aString1, aRun.GetModuleName(SbxNAME_SHORT_TYPES),
-// aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2() );
+// ADD_ERROR_LOG( aString1, aRun.GetModuleName(SbxNAME_SHORT_TYPES),
+// aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2() );
}
break;
case S_QAError:
@@ -4121,11 +4121,11 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] =
SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl )
{
- if ( rSymbol.CompareToAscii( "try" ) == COMPARE_EQUAL
- || rSymbol.CompareToAscii( "catch" ) == COMPARE_EQUAL
- || rSymbol.CompareToAscii( "endcatch" ) == COMPARE_EQUAL
- || rSymbol.CompareToAscii( "testcase" ) == COMPARE_EQUAL
- || rSymbol.CompareToAscii( "endcase" ) == COMPARE_EQUAL )
+ if ( rSymbol.CompareToAscii( "try" ) == COMPARE_EQUAL
+ || rSymbol.CompareToAscii( "catch" ) == COMPARE_EQUAL
+ || rSymbol.CompareToAscii( "endcatch" ) == COMPARE_EQUAL
+ || rSymbol.CompareToAscii( "testcase" ) == COMPARE_EQUAL
+ || rSymbol.CompareToAscii( "endcase" ) == COMPARE_EQUAL )
{
return TT_KEYWORD;
}
@@ -4175,7 +4175,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl )
return TT_LOCALCMD;
}
- return SB_SYMBOL; // Alles was hier landet ist vom Typ SB_SYMBOL und bleibt es auch
+ return SB_SYMBOL; // Alles was hier landet ist vom Typ SB_SYMBOL und bleibt es auch
}
@@ -4247,9 +4247,9 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType)
String TTFormat::ms2s( ULONG nMilliSeconds )
{
- if ( nMilliSeconds < 100000 ) // 100 Sekunden
+ if ( nMilliSeconds < 100000 ) // 100 Sekunden
return String::CreateFromInt64( nMilliSeconds );
- if ( nMilliSeconds < 100000*60 ) // 100 Minuten
+ if ( nMilliSeconds < 100000*60 ) // 100 Minuten
return String::CreateFromInt32( nMilliSeconds / 1000 ).AppendAscii("Sec");
return String::CreateFromInt32( nMilliSeconds / 1000 / 60 ).AppendAscii("Min");
}
diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx
index f60732b5d3fa..b2478d3a85e7 100644
--- a/automation/source/testtool/objtest.hxx
+++ b/automation/source/testtool/objtest.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -41,39 +41,39 @@
#include <map>
-// #define ID_BeginBlock 1
-// #define ID_EndBlock 2
-#define ID_Kontext 3
-#define ID_GetError 4
-#define ID_ErrorDummy 5 // Intern zum Behandlen von Fehlenden Controls und Methoden
-#define ID_RecordError 6
-#define ID_Start 7
-//#define ID_Kill 8
-//#define ID_Reset 9
-// #define ID_AppAbort 10
-#define ID_Dispatch 11
-#define ID_UNODispatch 12
-#define ID_Control 13
-#define ID_StartUse 14
-#define ID_Use 15
-#define ID_FinishUse 16
-#define ID_CaseLog 17
-#define ID_ExceptLog 18
-#define ID_PrintLog 19
-#define ID_WarnLog 20
-#define ID_ErrorLog 21
+// #define ID_BeginBlock 1
+// #define ID_EndBlock 2
+#define ID_Kontext 3
+#define ID_GetError 4
+#define ID_ErrorDummy 5 // Intern zum Behandlen von Fehlenden Controls und Methoden
+#define ID_RecordError 6
+#define ID_Start 7
+//#define ID_Kill 8
+//#define ID_Reset 9
+// #define ID_AppAbort 10
+#define ID_Dispatch 11
+#define ID_UNODispatch 12
+#define ID_Control 13
+#define ID_StartUse 14
+#define ID_Use 15
+#define ID_FinishUse 16
+#define ID_CaseLog 17
+#define ID_ExceptLog 18
+#define ID_PrintLog 19
+#define ID_WarnLog 20
+#define ID_ErrorLog 21
#define ID_EnableQaErrors 22
-#define ID_QAErrorLog 23
-#define ID_MaybeAddErr 24
-#define ID_ClearError 25
-#define ID_GetNextCloseWindow 26
+#define ID_QAErrorLog 23
+#define ID_MaybeAddErr 24
+#define ID_ClearError 25
+#define ID_GetNextCloseWindow 26
#define ID_RemoteCommand 27
-#define ID_SaveIDs 28
-#define ID_AutoExecute 29
-#define ID_Execute 30
+#define ID_SaveIDs 28
+#define ID_AutoExecute 29
+#define ID_Execute 30
#define ID_DialogHandler 31
-#define ID_GetUnoApp 32
-#define ID_GetIServer 33
+#define ID_GetUnoApp 32
+#define ID_GetIServer 33
#define ID_RemoteCommandDelay 34
#define ID_GetApplicationPath 35
#define ID_GetCommonApplicationPath 36
@@ -121,7 +121,7 @@ public:
ControlItem( const char *Name, SmartId aUIdP );
ControlItem( const String &Name, SmartId aUIdP );
-// ControlItem( const String &Name, const String &URL, const URLType aType );
+// ControlItem( const String &Name, const String &URL, const URLType aType );
// ControlItem( const String &Name, const String &URL, const ULONG nUId );
// ControlItem( const char *Name, const String &URL, const ULONG nUId );
ControlItem( ControlData *pDataP );
@@ -131,7 +131,7 @@ DBG_DTOR(ControlItem,0);
}
virtual BOOL operator < (const ControlItem &rPar)=0;
virtual BOOL operator == (const ControlItem &rPar)=0;
-// void Write( SvStream &aStream );
+// void Write( SvStream &aStream );
};
SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10)
@@ -144,12 +144,12 @@ SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10)
class ControlSon
{
protected:
- CNames *pSons; // um sicherzustelle, daß nur Söhne des richtien Type reinkommen
+ CNames *pSons; // um sicherzustelle, daß nur Söhne des richtien Type reinkommen
public:
ControlSon() : pSons( NULL ) {};
~ControlSon();
-// void Write( SvStream &aStream );
+// void Write( SvStream &aStream );
USHORT Son_Count() { return pSons->Count(); }
void Sons( CNames *pNewSons ) { pSons = pNewSons; }
@@ -162,10 +162,10 @@ public:
ControlItemSon(const char *Name, SmartId aUIdP )
: ControlItem( Name, aUIdP ) {}
ControlItemSon(const String &Name, SmartId aUIdP );
-// ControlItemSon(const String &Name, const String &URL, const URLType aType );
+// ControlItemSon(const String &Name, const String &URL, const URLType aType );
// ControlItemSon(const String &Name, const String &URL, const ULONG nUId );
// ControlItemSon(const char *Name, const String &URL, const ULONG nUId );
-// void Write( SvStream &aStream );
+// void Write( SvStream &aStream );
};
class ControlDef : public ControlItemSon
@@ -174,7 +174,7 @@ public:
ControlDef(const char *Name, SmartId aUIdP )
: ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);}
ControlDef(const String &Name, SmartId aUIdP );
-// ControlDef(const String &Name, const String &URL, const URLType aType );
+// ControlDef(const String &Name, const String &URL, const URLType aType );
ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE );
~ControlDef() {DBG_DTOR(ControlDef,0);}
virtual BOOL operator < (const ControlItem &rPar);
@@ -234,7 +234,7 @@ public:
void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
virtual SbxVariable* Find( const String&, SbxClassType );
- SbxTransportMethodRef pMethodVar; // zum Transport von Find nach Notify
+ SbxTransportMethodRef pMethodVar; // zum Transport von Find nach Notify
static CNames *pClasses;
static ControlDefLoad __READONLY_DATA arClasses [];
};
@@ -245,18 +245,18 @@ typedef std::map< String, String > Environment;
class ImplTestToolObj
{
public:
-// ImplTestToolObj()
-// ~ImplTestToolObj()
+// ImplTestToolObj()
+// ~ImplTestToolObj()
- String ProgParam; // Parameter der zu Testenden APP; Gesetzt über Start
+ String ProgParam; // Parameter der zu Testenden APP; Gesetzt über Start
- DirEntry aFileBase; // Grundpfad für die *.sid und *.win Dateien (Aus Configdatei)
- DirEntry aLogFileBase; // Grundpfad für die *.res Dateien (Aus Configdatei)
- DirEntry aHIDDir; // Verzeichnis, in dem die hid.lst gesucht wird
+ DirEntry aFileBase; // Grundpfad für die *.sid und *.win Dateien (Aus Configdatei)
+ DirEntry aLogFileBase; // Grundpfad für die *.res Dateien (Aus Configdatei)
+ DirEntry aHIDDir; // Verzeichnis, in dem die hid.lst gesucht wird
- SbxTransportMethodRef pNextReturn; // Verweis auf die Var, die den Returnwert aufnimmt.
+ SbxTransportMethodRef pNextReturn; // Verweis auf die Var, die den Returnwert aufnimmt.
- ControlsRef pControlsObj; // Jeweiliges Objekt, an dem Methoden aufgerufen weden.
+ ControlsRef pControlsObj; // Jeweiliges Objekt, an dem Methoden aufgerufen weden.
#define VAR_POOL_SIZE 8
SbxTransportMethodRef pMyVars[VAR_POOL_SIZE]; // Falls in Ausdrücken mehrere verwendet werden
@@ -276,7 +276,7 @@ public:
ULONG nMaxRemoteCommandDelay;
BOOL bDoRemoteCommandDelay;
- BOOL bLnaguageExtensionLoaded; // Wurde über 'use' was geladen? Für syntax highlighting
+ BOOL bLnaguageExtensionLoaded; // Wurde über 'use' was geladen? Für syntax highlighting
SfxBroadcaster *pTTSfxBroadcaster;
ULONG nErrorCount;
@@ -316,89 +316,89 @@ public:
#define ADD_TO_LOG( aLogTypep, aMsgp, aFilenamep, nLinep, nCol1p, nCol2p, aRevisionp, pLogList )\
-{ \
- TTLogMsg *pLogMsg = new TTLogMsg(); \
- pLogMsg->aDebugData.aMsg = aMsgp; \
- pLogMsg->aLogFileName = (pImpl->aLogFileBase + DirEntry(aLogFileName)).GetFull(); \
- pLogMsg->aDebugData.aFilename = aFilenamep; \
- pLogMsg->aDebugData.nLine = nLinep; \
- pLogMsg->aDebugData.nCol1 = nCol1p; \
- pLogMsg->aDebugData.nCol2 = nCol2p; \
- pLogMsg->aDebugData.aLogType = aLogTypep; \
- aLogHdl.Call( pLogMsg ); \
+{ \
+ TTLogMsg *pLogMsg = new TTLogMsg(); \
+ pLogMsg->aDebugData.aMsg = aMsgp; \
+ pLogMsg->aLogFileName = (pImpl->aLogFileBase + DirEntry(aLogFileName)).GetFull(); \
+ pLogMsg->aDebugData.aFilename = aFilenamep; \
+ pLogMsg->aDebugData.nLine = nLinep; \
+ pLogMsg->aDebugData.nCol1 = nCol1p; \
+ pLogMsg->aDebugData.nCol2 = nCol2p; \
+ pLogMsg->aDebugData.aLogType = aLogTypep; \
+ aLogHdl.Call( pLogMsg ); \
void* pDummyForWarningAboutNULL = pLogList; \
- if( pDummyForWarningAboutNULL ) \
- { \
- SbxDimArray* pLogArray = (SbxDimArray*)pLogList; \
- SbxVariable* pLogLine = new SbxVariable( SbxSTRING ); \
- String aCollect; \
- aCollect.Append( pLogMsg->aDebugData.aFilename ); \
- aCollect.AppendAscii( ";" ); \
- aCollect.Append( String::CreateFromInt32( nLinep ) ); \
- aCollect.AppendAscii( ";" ); \
- aCollect.Append( aRevisionp ); \
- aCollect.AppendAscii( ";" ); \
- aCollect.Append( pLogMsg->aDebugData.aMsg ); \
- pLogLine->PutString( aCollect ); \
- pLogArray->Insert( pLogLine, pLogArray->Count() ); \
- } \
- delete pLogMsg; \
-} \
-
-
-#define ADD_RUN_LOG() \
- ADD_TO_LOG(LOG_RUN, String(), String(), 0, 0, 0, String(), NULL) \
-
-#define ADD_ERROR_LOG(aMsg, aFilename, nLine, nCol1, nCol2, aRevision) \
-{ \
+ if( pDummyForWarningAboutNULL ) \
+ { \
+ SbxDimArray* pLogArray = (SbxDimArray*)pLogList; \
+ SbxVariable* pLogLine = new SbxVariable( SbxSTRING ); \
+ String aCollect; \
+ aCollect.Append( pLogMsg->aDebugData.aFilename ); \
+ aCollect.AppendAscii( ";" ); \
+ aCollect.Append( String::CreateFromInt32( nLinep ) ); \
+ aCollect.AppendAscii( ";" ); \
+ aCollect.Append( aRevisionp ); \
+ aCollect.AppendAscii( ";" ); \
+ aCollect.Append( pLogMsg->aDebugData.aMsg ); \
+ pLogLine->PutString( aCollect ); \
+ pLogArray->Insert( pLogLine, pLogArray->Count() ); \
+ } \
+ delete pLogMsg; \
+} \
+
+
+#define ADD_RUN_LOG() \
+ ADD_TO_LOG(LOG_RUN, String(), String(), 0, 0, 0, String(), NULL) \
+
+#define ADD_ERROR_LOG(aMsg, aFilename, nLine, nCol1, nCol2, aRevision) \
+{ \
ADD_TO_LOG(LOG_ERROR, aMsg, aFilename, nLine, nCol1, nCol2, aRevision, &pImpl->xErrorList) \
- pImpl->nErrorCount++; \
+ pImpl->nErrorCount++; \
}
-#define ADD_CALL_STACK_LOG(aMsg, aFilename, nLine, nCol1, nCol2) \
- ADD_TO_LOG(LOG_CALL_STACK, aMsg, aFilename, nLine, nCol1, nCol2, String(), NULL) \
-
-
-#define ADD_AUTO_LOG(aLogType, aMsg, pLogList) \
-{ \
- if ( BasicRuntimeAccess::HasRuntime() ) \
- { \
- BasicRuntime aRun = BasicRuntimeAccess::GetRuntime(); \
- ADD_TO_LOG(aLogType, aMsg, aRun.GetModuleName(SbxNAME_SHORT_TYPES), \
- aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2(), aRun.GetSourceRevision(), pLogList) \
- } \
- else \
- { \
- ADD_TO_LOG(aLogType, aMsg, UniString(), 0, 0, STRING_LEN, String(), pLogList) \
- } \
-} \
-
-#define ADD_CASE_LOG(aMsg) \
- ADD_AUTO_LOG(LOG_TEST_CASE, aMsg, NULL) \
-
-#define ADD_MESSAGE_LOG(aMsg) \
- ADD_AUTO_LOG(LOG_MESSAGE, aMsg, NULL) \
-
-#define ADD_WARNING_LOG(aMsg) \
-{ \
- ADD_AUTO_LOG(LOG_WARNING, aMsg, &pImpl->xWarningList) \
- pImpl->nWarningCount++; \
+#define ADD_CALL_STACK_LOG(aMsg, aFilename, nLine, nCol1, nCol2) \
+ ADD_TO_LOG(LOG_CALL_STACK, aMsg, aFilename, nLine, nCol1, nCol2, String(), NULL) \
+
+
+#define ADD_AUTO_LOG(aLogType, aMsg, pLogList) \
+{ \
+ if ( BasicRuntimeAccess::HasRuntime() ) \
+ { \
+ BasicRuntime aRun = BasicRuntimeAccess::GetRuntime(); \
+ ADD_TO_LOG(aLogType, aMsg, aRun.GetModuleName(SbxNAME_SHORT_TYPES), \
+ aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2(), aRun.GetSourceRevision(), pLogList) \
+ } \
+ else \
+ { \
+ ADD_TO_LOG(aLogType, aMsg, UniString(), 0, 0, STRING_LEN, String(), pLogList) \
+ } \
+} \
+
+#define ADD_CASE_LOG(aMsg) \
+ ADD_AUTO_LOG(LOG_TEST_CASE, aMsg, NULL) \
+
+#define ADD_MESSAGE_LOG(aMsg) \
+ ADD_AUTO_LOG(LOG_MESSAGE, aMsg, NULL) \
+
+#define ADD_WARNING_LOG(aMsg) \
+{ \
+ ADD_AUTO_LOG(LOG_WARNING, aMsg, &pImpl->xWarningList) \
+ pImpl->nWarningCount++; \
}
-#define ADD_WARNING_LOG2(aMsg, aFilename, nLine ) \
-{ \
+#define ADD_WARNING_LOG2(aMsg, aFilename, nLine ) \
+{ \
ADD_TO_LOG(LOG_WARNING, aMsg, aFilename, nLine, 0, STRING_LEN, String(), &pImpl->xWarningList) \
- pImpl->nWarningCount++; \
+ pImpl->nWarningCount++; \
}
-#define ADD_ASSERTION_LOG(aMsg) \
- ADD_AUTO_LOG(LOG_ASSERTION, aMsg, NULL) \
+#define ADD_ASSERTION_LOG(aMsg) \
+ ADD_AUTO_LOG(LOG_ASSERTION, aMsg, NULL) \
-#define ADD_QA_ERROR_LOG(aMsg) \
+#define ADD_QA_ERROR_LOG(aMsg) \
if ( pImpl->bEnableQaErrors ) \
{ \
- ADD_AUTO_LOG(LOG_QA_ERROR, aMsg, &pImpl->xQAErrorList) \
- pImpl->nQAErrorCount++; \
+ ADD_AUTO_LOG(LOG_QA_ERROR, aMsg, &pImpl->xQAErrorList) \
+ pImpl->nQAErrorCount++; \
}
#endif
diff --git a/automation/source/testtool/registry_win.cxx b/automation/source/testtool/registry_win.cxx
index 264a68aae257..0e7779086b2a 100644
--- a/automation/source/testtool/registry_win.cxx
+++ b/automation/source/testtool/registry_win.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
////////////////////////////////////////////////////////////////////////////
////
-//// Windows ONLY
+//// Windows ONLY
////
////////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@ String ReadRegistry( String aKey, String aValueName )
&hRegKey ) == ERROR_SUCCESS )
{
LONG lRet;
- sal_Unicode PathW[_MAX_PATH];
+ sal_Unicode PathW[_MAX_PATH];
DWORD lSize = sizeof(PathW) / sizeof( sal_Unicode );
DWORD Type = REG_SZ;
diff --git a/automation/source/testtool/registry_win.hxx b/automation/source/testtool/registry_win.hxx
index 4a9492d80d2b..9174e0682aa9 100644
--- a/automation/source/testtool/registry_win.hxx
+++ b/automation/source/testtool/registry_win.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/testtool/sysdir_win.cxx b/automation/source/testtool/sysdir_win.cxx
index 44cb8bef2fe1..560a367ee82c 100644
--- a/automation/source/testtool/sysdir_win.cxx
+++ b/automation/source/testtool/sysdir_win.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
////////////////////////////////////////////////////////////////////////////
////
-//// Windows ONLY
+//// Windows ONLY
////
////////////////////////////////////////////////////////////////////////////
@@ -61,7 +61,7 @@
void _SHFree( void *pv )
{
- IMalloc *pMalloc;
+ IMalloc *pMalloc;
if( NOERROR == SHGetMalloc(&pMalloc) )
{
pMalloc->Free( pv );
@@ -75,9 +75,9 @@ void _SHFree( void *pv )
UniString _SHGetSpecialFolder( int nFolderID )
{
- LPITEMIDLIST pidl;
- HRESULT hHdl = SHGetSpecialFolderLocation( NULL, nFolderID, &pidl );
- UniString aFolder;
+ LPITEMIDLIST pidl;
+ HRESULT hHdl = SHGetSpecialFolderLocation( NULL, nFolderID, &pidl );
+ UniString aFolder;
if( hHdl == NOERROR )
{
diff --git a/automation/source/testtool/sysdir_win.hxx b/automation/source/testtool/sysdir_win.hxx
index c27e3e434e75..ceab5d359eff 100644
--- a/automation/source/testtool/sysdir_win.hxx
+++ b/automation/source/testtool/sysdir_win.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx
index bc0e94f76728..478a4a0b2081 100644
--- a/automation/source/testtool/tcommuni.cxx
+++ b/automation/source/testtool/tcommuni.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -84,7 +84,7 @@ BOOL CommunicationManagerClientViaSocketTT::RetryConnect()
if ( bSucc )
{
- aFirstRetryCall = Time() + Time( 0, 1 ); // Max eine Minute Zeit
+ aFirstRetryCall = Time() + Time( 0, 1 ); // Max eine Minute Zeit
for ( int i = 10 ; i-- ; )
GetpApp()->Reschedule();
}
@@ -159,7 +159,7 @@ ULONG GetTTPortConfig()
#endif
)
{
- aPortToTalk = Application::GetCommandLineParam( i ).Copy(6);
+ aPortToTalk = Application::GetCommandLineParam( i ).Copy(6);
return (ULONG)aPortToTalk.ToInt64();
}
}
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index e92a93eb36a5..8c1d1115cfc7 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite