summaryrefslogtreecommitdiff
path: root/automation/source/testtool
diff options
context:
space:
mode:
Diffstat (limited to 'automation/source/testtool')
-rw-r--r--automation/source/testtool/comm_bas.cxx1
-rw-r--r--automation/source/testtool/comm_bas.hxx4
-rw-r--r--automation/source/testtool/cretstrm.hxx2
-rw-r--r--automation/source/testtool/httprequest.hxx6
-rw-r--r--automation/source/testtool/objtest.cxx43
-rw-r--r--automation/source/testtool/objtest.hxx13
-rw-r--r--automation/source/testtool/registry_win.cxx5
-rw-r--r--automation/source/testtool/sysdir_win.cxx4
8 files changed, 26 insertions, 52 deletions
diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx
index 8c206b108926..10cb95570804 100644
--- a/automation/source/testtool/comm_bas.cxx
+++ b/automation/source/testtool/comm_bas.cxx
@@ -145,7 +145,6 @@ CommunicationWrapper::CommunicationWrapper( const String& rClass ) : SbxObject(
, m_bCatchOpen( FALSE )
, m_pNewLink( NULL )
{
-// SetName( CUniString("Manager") );
m_pMethods = &aManagerMethods[0];
m_pManager = new CommunicationManagerClientViaSocket;
m_pManager->SetConnectionOpenedHdl( LINK( this, CommunicationWrapper, Open ) );
diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx
index 3587efcc4806..0754e0e23667 100644
--- a/automation/source/testtool/comm_bas.hxx
+++ b/automation/source/testtool/comm_bas.hxx
@@ -41,12 +41,12 @@ 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
// werden koennen.
-#if defined ( ICC ) || defined ( HPUX ) || defined ( C50 ) || defined ( C52 )
+#if defined ( ICC ) || defined ( C50 ) || defined ( C52 )
public:
#endif
typedef void( CommunicationWrapper::*pMeth )
( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
-#if defined ( ICC ) || defined ( HPUX )
+#if defined ( ICC )
private:
#endif
diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx
index 206d74db33ba..f7cbe3309865 100644
--- a/automation/source/testtool/cretstrm.hxx
+++ b/automation/source/testtool/cretstrm.hxx
@@ -45,10 +45,8 @@ 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 );}
virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );}
void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
-// new
void Read( String &aString );
void Read( SbxValue &aValue );
};
diff --git a/automation/source/testtool/httprequest.hxx b/automation/source/testtool/httprequest.hxx
index af8ad673a17d..d7ec34fe7b85 100644
--- a/automation/source/testtool/httprequest.hxx
+++ b/automation/source/testtool/httprequest.hxx
@@ -73,11 +73,11 @@ public:
BOOL Execute();
void Abort();
- ByteString GetHeader() { return aHeader; }
+ ByteString GetHeader() const { return aHeader; }
SvMemoryStream* GetBody();
- ByteString GetContentType() { return aContentType; }
- USHORT GetResultId() { return nResultId; }
+ ByteString GetContentType() const { return aContentType; }
+ USHORT GetResultId() const { return nResultId; }
USHORT GetStatus();
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index d98869bc97af..d061dcdf2e0b 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -61,8 +61,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::frame;
using namespace com::sun::star::bridge;
using namespace com::sun::star::connection;
-using namespace rtl;
+using ::rtl::OUString;
#include <svtools/svmedit.hxx>
@@ -202,7 +202,7 @@ ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDe
pNewDef = new ControlDef( aOldName, aNewName, pOriginal->SonGetObject(i) ,TRUE );
if (! SonInsert(pNewDef))
{
- DBG_ERROR("Name Doppelt im CopyConstructor. Neuer Name = Controlname!!");
+ OSL_FAIL("Name Doppelt im CopyConstructor. Neuer Name = Controlname!!");
delete pNewDef;
}
}
@@ -233,7 +233,7 @@ void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq )
if ( !CNames::C40_PTR_INSERT( ControlItem, pRN) )
{
- DBG_ERROR("Interner Fehler beim Speichern der Lokalen KurzNamen");
+ OSL_FAIL("Interner Fehler beim Speichern der Lokalen KurzNamen");
delete pRN;
}
@@ -417,16 +417,12 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d
abGP.Append( "502" ); // Windows on x64
#elif defined SOLARIS && defined SPARC
abGP.Append( "01" ); // Solaris SPARC
-#elif defined SCO
- abGP.Append( "02" ); // SCO UNIX
#elif defined LINUX && defined INTEL
abGP.Append( "03" ); // Linux
#elif defined AIX
abGP.Append( "04" );
#elif defined SOLARIS && defined INTEL
abGP.Append( "05" ); // Solaris x86
-#elif defined HPUX
- abGP.Append( "07" );
#elif defined FREEBSD
abGP.Append( "08" );
#elif defined MACOSX
@@ -459,6 +455,10 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d
abGP.Append( "25" ); // OpenBSD/i386
#elif defined OPENBSD && defined X86_64
abGP.Append( "26" ); // OpenBSD/amd64
+#elif defined DRAGONFLY && defined X86
+ abGP.Append( "27" ); // DragonFly/i386
+#elif defined DRAGONFLY && defined X86_64
+ abGP.Append( "28" ); // DragonFly/x86-64
#else
#error ("unknown platform. please request an ID for your platform on qa/dev")
#endif
@@ -541,7 +541,7 @@ void TestToolObj::InitTestToolObj()
}
else
{
- DBG_ERROR("Testtool: Could not replace Wait method");
+ OSL_FAIL("Testtool: Could not replace Wait method");
}
MAKE_TT_KEYWORD( "Kontext", SbxCLASS_METHOD, SbxNULL, ID_Kontext );
@@ -927,7 +927,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
aUId = SmartId( aLongname );
else
{
- DBG_ERROR("Unknown URL schema");
+ OSL_FAIL("Unknown URL schema");
}
}
@@ -948,7 +948,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
if (!pNewDef->SonInsert( pNewDef2 )) // Dialog in eigenen Namespace eintragen
{
delete pNewDef2;
- DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!");
+ OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!");
}
}
@@ -1106,15 +1106,6 @@ void TestToolObj::WaitForAnswer ()
{
if ( bUseIPC )
{
- #ifdef DBG_UTILx
- USHORT nSysWinModeMemo = GetpApp()->GetSystemWindowMode();
- GetpApp()->SetSystemWindowMode( 0 );
- ModelessDialog aDlg(NULL);
- aDlg.SetOutputSizePixel(Size(200,0));
- aDlg.SetText(CUniString("Waiting for Answer"));
- aDlg.Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
- GetpApp()->SetSystemWindowMode( nSysWinModeMemo );
- #endif
BOOL bWasRealWait = !bReturnOK;
BasicRuntime aRun( NULL );
if ( BasicRuntimeAccess::HasRuntime() )
@@ -1215,7 +1206,7 @@ void TestToolObj::SendViaSocket()
{
if ( !pCommunicationManager )
{
- DBG_ERROR("Kein CommunicationManager vorhanden!!");
+ OSL_FAIL("Kein CommunicationManager vorhanden!!");
return;
}
@@ -1300,7 +1291,7 @@ void TestToolObj::EndBlock()
}
else
{
- DBG_ERROR("EndBlock au�erhalb eines Blockes");
+ OSL_FAIL("EndBlock au�erhalb eines Blockes");
}
}
@@ -1415,14 +1406,14 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
if (!pNewDef->SonInsert(pNewDef2)) // Dialog in eigenen Namespace eintragen
{
delete pNewDef2;
- DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!");
+ OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!");
}
}
const ControlItem *pItem = pNewDef;
if (! pNames->Insert(pItem))
{
- DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!");
+ OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!");
delete pNewDef;
pFatherDef = NULL;
}
@@ -1435,7 +1426,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
{
if (!pFatherDef)
{
- DBG_ERROR( "Internal Error: Erster Kurzname mu� mit * beginnen. �berspringe." );
+ OSL_FAIL( "Internal Error: Erster Kurzname mu� mit * beginnen. �berspringe." );
}
else
{
@@ -1443,7 +1434,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
if (! pFatherDef->SonInsert(pNewDef))
{
delete pNewDef;
- DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!");
+ OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!");
}
}
}
@@ -3759,7 +3750,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
pRetStream->Read( nId );
else
{
- DBG_ERROR( "truncated input stream" );
+ OSL_FAIL( "truncated input stream" );
}
}
diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx
index f70270a77a6d..a7297ad79a32 100644
--- a/automation/source/testtool/objtest.hxx
+++ b/automation/source/testtool/objtest.hxx
@@ -121,9 +121,6 @@ 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 ULONG nUId );
-// ControlItem( const char *Name, const String &URL, const ULONG nUId );
ControlItem( ControlData *pDataP );
virtual ~ControlItem() {
DBG_DTOR(ControlItem,0);
@@ -131,7 +128,6 @@ DBG_DTOR(ControlItem,0);
}
virtual BOOL operator < (const ControlItem &rPar)=0;
virtual BOOL operator == (const ControlItem &rPar)=0;
-// void Write( SvStream &aStream );
};
SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10)
@@ -149,7 +145,6 @@ protected:
public:
ControlSon() : pSons( NULL ) {};
~ControlSon();
-// void Write( SvStream &aStream );
USHORT Son_Count() { return pSons->Count(); }
void Sons( CNames *pNewSons ) { pSons = pNewSons; }
@@ -162,10 +157,6 @@ 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 ULONG nUId );
-// ControlItemSon(const char *Name, const String &URL, const ULONG nUId );
-// void Write( SvStream &aStream );
};
class ControlDef : public ControlItemSon
@@ -174,7 +165,6 @@ 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 &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE );
~ControlDef() {DBG_DTOR(ControlDef,0);}
virtual BOOL operator < (const ControlItem &rPar);
@@ -245,9 +235,6 @@ typedef std::map< String, String > Environment;
class ImplTestToolObj
{
public:
-// ImplTestToolObj()
-// ~ImplTestToolObj()
-
String ProgParam; // Parameter der zu Testenden APP; Gesetzt über Start
DirEntry aFileBase; // Grundpfad für die *.sid und *.win Dateien (Aus Configdatei)
diff --git a/automation/source/testtool/registry_win.cxx b/automation/source/testtool/registry_win.cxx
index 5b204b41286a..b599342b0854 100644
--- a/automation/source/testtool/registry_win.cxx
+++ b/automation/source/testtool/registry_win.cxx
@@ -36,9 +36,8 @@
////////////////////////////////////////////////////////////////////////////
-#include <tools/prewin.h>
-#include "winreg.h"
-#include <tools/postwin.h>
+#include <prewin.h>
+#include <postwin.h>
// as we define it ourselves further down the line we remove it here
#ifdef IS_ERROR
// #undef IS_ERROR
diff --git a/automation/source/testtool/sysdir_win.cxx b/automation/source/testtool/sysdir_win.cxx
index 44cb8bef2fe1..370bac572d82 100644
--- a/automation/source/testtool/sysdir_win.cxx
+++ b/automation/source/testtool/sysdir_win.cxx
@@ -36,7 +36,7 @@
////////////////////////////////////////////////////////////////////////////
-#include <tools/prewin.h>
+#include <prewin.h>
#ifndef _SHOBJ_H
#if defined _MSC_VER
#pragma warning(push, 1)
@@ -47,7 +47,7 @@
#pragma warning(pop)
#endif
#endif
-#include <tools/postwin.h>
+#include <postwin.h>
// as we define it ourselves further down the line we remove it here
#ifdef IS_ERROR
#undef IS_ERROR
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 16:22:45 +0000