diff options
Diffstat (limited to 'automation')
29 files changed, 62 insertions, 304 deletions
diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx index 91a44f17f639..775265c31f89 100644 --- a/automation/inc/automation/simplecm.hxx +++ b/automation/inc/automation/simplecm.hxx @@ -99,15 +99,6 @@ typedef USHORT CM_InfoType; class CommunicationLink; -/*#undef PRV_SV_DECL_REF_LOCK -#define PRV_SV_DECL_REF_LOCK(ClassName, Ref) \ -protected: \ - ClassName * pObj; \ -public: \ -PRV_SV_DECL_REF_SIGNATURE(ClassName, Ref) \ - inline ClassName##Ref( void * pObjP ){ClassName##Ref ((ClassName *) pObjP);} \ -*/ - SV_DECL_REF( CommunicationLink ) class InfoString : public ByteString diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx index f19b095449ff..7f44e1cf032f 100644 --- a/automation/source/communi/communi.cxx +++ b/automation/source/communi/communi.cxx @@ -56,7 +56,7 @@ _SV_IMPL_SORTAR_ALG( nm,AE )\ if( nL ) {\ DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\ for( USHORT n=nP; n < nP + nL; n++ ) \ - DBG_ERROR("Das Element der Liste wurde nicht gelöscht"); \ + OSL_FAIL("Das Element der Liste wurde nicht gelöscht"); \ SvPtrarr::Remove( nP, nL ); \ } \ } \ diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx index f3609b9de3d9..afc3bd8c4e74 100644 --- a/automation/source/inc/rcontrol.hxx +++ b/automation/source/inc/rcontrol.hxx @@ -37,10 +37,8 @@ #ifndef _RCONTROL_HXX #define _RCONTROL_HXX - #define UID_ACTIVE 0 - #define SI_IPCCommandBlock 1 #define SI_SocketCommandBlock SI_IPCCommandBlock // Zumindest erstmal #define SI_DirectCommandBlock 2 @@ -62,7 +60,6 @@ #define BinBool 13 #define BinSbxValue 15 - // Classes // !!!Diese Defines duerfen niemals geaendert werden!!! #define C_NoType -1 @@ -117,7 +114,6 @@ #define C_Window 47 - #define C_PatternBox 60 #define C_ToolBox 61 #define C_ValueSet 62 @@ -130,9 +126,6 @@ #define C_Dialog 68 - - - #define M_WITH_RETURN 0x0200 // Die Variable wird zum Aufnehmen des Wertes gespeichert #define M_KEY_STRING 0x0400 // Key Befehle werden umgewandelt i.e. "<return><up>" #define M_SOFFICE 0x0800 // Command valid for Star/Open Office @@ -173,8 +166,6 @@ #define M_Dock 47 #define M_Undock 48 - - #define M_TypeKeys ( M_KEY_STRING | 50 ) #define M_MouseDown 51 #define M_MouseUp 52 @@ -207,7 +198,6 @@ #define M_Pin 82 #define M_UseMenu 83 // Use the menu of the next possible parent of given Window - #define M_OpenMenu 84 // MenuButtons and Menus in ToolBoxes #define M_Restore 85 // Window Control together with M_Maximize and M_Minimize @@ -260,7 +250,6 @@ #define M_StatusGetItemCount ( M_WITH_RETURN | 34 ) #define M_StatusGetItemId ( M_WITH_RETURN | 35 ) -// #define M_GetMouseStyle ( M_WITH_RETURN | 36 ) // support for Messagebox with checkbox @@ -273,11 +262,9 @@ // Dieser befehl wird nur intern im Controller (sts library) verwendet. Sie tauchen nicht im Testtool auf! #define _M_IsEnabled ( M_WITH_RETURN | 50 ) - #define M_GetFixedTextCount ( M_WITH_RETURN | 51 ) #define M_GetFixedText ( M_WITH_RETURN | 52 ) - #define M_IsMin ( M_WITH_RETURN | 53 ) #define M_IsRestore ( M_WITH_RETURN | 54 ) @@ -293,7 +280,6 @@ //#define M_SOFFICE 0x0800 // Command valid for Star/Open Office //#define M_MOZILLA 0x1000 // Command valid for Mozilla - // RemoteCommands #define RC_AppAbort ( M_SOFFICE | M_MOZILLA | 1 ) #define RC_SetClipboard ( M_SOFFICE | M_MOZILLA | 2 ) @@ -316,23 +302,14 @@ #define RC_CaptureAssertions (M_SOFFICE | M_MOZILLA | 17 ) #define RC_Assert ( M_SOFFICE | M_MOZILLA | 18 ) - #define RC_MenuOpen ( M_SOFFICE | M_MOZILLA | 19 ) - #define RC_TypeKeysDelay ( M_SOFFICE | M_MOZILLA | 20 ) - #define RC_ShowBar ( M_MOZILLA | 21 ) - #define RC_LoadURL ( M_MOZILLA | 22 ) - #define RC_CloseSysDialog ( M_SOFFICE | 23 ) - #define RC_SAXRelease ( M_SOFFICE | 24 ) - #define RC_RecordMacro ( M_SOFFICE | 25 ) - #define RC_ActivateDocument ( M_SOFFICE | 26 ) - #define RC_CatchGPF ( M_SOFFICE | 27 ) #define _RC_LAST_NO_RETURN 27 @@ -408,8 +385,6 @@ #define RET_DirectLoging 136 // Direktes Übertragen von Informationen in das Log #define RET_MacroRecorder 137 // MakroRecorder Befehl übertragen - - // Subcodes die in nUId geliefert werden // für F_ProfileInfo #define S_ProfileReset 201 // nNr1 = Anzahl Borders @@ -428,8 +403,6 @@ #define S_AssertTrace 222 #define S_QAError 223 - - // Constants which are available in VCLTestTool scripts // Different types of controls recognized via RTTI @@ -485,7 +458,6 @@ // Zusätzliche Beschreibung!! wird auch mit dem Rest verodert //#define PARAM_STR_RAW 0x8000 // Der Zeichensatz der Strings wird nicht konvertiert(für Fareastern) - #define ERR_SEND_TIMEOUT 100 #define ERR_EXEC_TIMEOUT 101 #define ERR_RESTART_FAIL 102 diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx index 6675753a67f9..c60365f18033 100644 --- a/automation/source/miniapp/testapp.cxx +++ b/automation/source/miniapp/testapp.cxx @@ -52,12 +52,13 @@ using namespace comphelper; using namespace cppu; -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::ucb; +using ::rtl::OUString; + static ResMgr* pAppMgr = NULL; MainWindow::MainWindow(MyApp *pAppl) diff --git a/automation/source/mozillaserver/makefile.mk b/automation/source/mozillaserver/makefile.mk index 064f4284fd36..fcd7e1cc6c49 100644 --- a/automation/source/mozillaserver/makefile.mk +++ b/automation/source/mozillaserver/makefile.mk @@ -43,8 +43,6 @@ LIBTARGET=NO PACKAGE := com$/sun$/star$/testtool TARGET := com_sun_star_testtool - -#RDB=$(SOLARBINDIR)$/applicat.rdb RDB=$(BIN)$/mozillatesttool.rdb @@ -61,8 +59,6 @@ GENJAVACLASSFILES = \ TYPES={$(subst,.class, $(subst,$/,. $(subst,$(CLASSDIR)$/,-T $(GENJAVACLASSFILES))))} GENJAVAFILES = {$(subst,.class,.java $(subst,$/class, $(GENJAVACLASSFILES)))} -#JAVAFILES= $(GENJAVAFILES) - UNOUCRDEP=$(RDB) @@ -94,34 +90,6 @@ UNOTYPES= \ com.sun.star.testtool.ResultType \ com.sun.star.testtool.XMozillaTesttoolServer - - -#SLOFILES= \ -# $(SLO)$/iserverproxy.obj \ -# $(SLO)$/broadcastclient.obj \ -# $(SLO)$/genericinformation.obj \ -# $(SLO)$/informationclient.obj - -# ---- test ---- - -#LIB1TARGET=$(SLB)$/iserverproxy.lib -#LIB1OBJFILES=$(SLOFILES) - -#SHL1TARGET=iserverproxy -#SHL1STDLIBS= \ -# $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \ -# $(CPPULIB) \ -# $(CPPUHELPERLIB) \ -# $(UNOLIB) \ -# $(SVTOOLLIB) \ -# $(SALLIB) \ -# $(BOOTSTRP) - -#SHL1LIBS= $(LIB1TARGET) $(LB)$/ico.lib -#SHL1DEF= $(MISC)$/$(SHL1TARGET).def -#DEF1NAME= $(SHL1TARGET) -#DEF1EXPORTFILE= exports.dxp - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx index c6a24756ae50..8de072898297 100644 --- a/automation/source/server/XMLParser.cxx +++ b/automation/source/server/XMLParser.cxx @@ -49,7 +49,8 @@ using namespace com::sun::star::xml::sax; using namespace com::sun::star::io; using namespace com::sun::star::uno; using namespace com::sun::star::util; -using namespace rtl; + +using ::rtl::OUString; class SVInputStream : public cppu::WeakImplHelper1< XInputStream > { @@ -177,7 +178,7 @@ ElementNode::ElementNode( const String& aName, Reference < XAttributeList > xAtt xAttributeList = Reference < XAttributeList > ( xAttributeCloner->createClone() , UNO_QUERY ); else { - DBG_ERROR("Unable to clone AttributeList"); + OSL_FAIL("Unable to clone AttributeList"); } } }; diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 1e670a6e4d6a..2e15e18794f2 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -37,6 +37,7 @@ * ************************************************************************/ #include <osl/endian.h> +#include <osl/diagnose.h> #include "cmdbasestream.hxx" #include "rcontrol.hxx" @@ -281,23 +282,23 @@ void CmdBaseStream::Write( comm_BOOL bBool ) void CmdBaseStream::Read ( comm_String* &pString ) { (void) pString; /* avoid warning about unused parameter */ - DBG_ERROR("Read ( comm_String* &pString ) Not Implemented"); + OSL_FAIL("Read ( comm_String* &pString ) Not Implemented"); } void CmdBaseStream::Read ( SmartId* &pId ) { (void) pId; /* avoid warning about unused parameter */ - DBG_ERROR("Read ( SmartId* &pId ) Not Implemented"); + OSL_FAIL("Read ( SmartId* &pId ) Not Implemented"); } void CmdBaseStream::Write( comm_String *pString ) { (void) pString; /* avoid warning about unused parameter */ - DBG_ERROR("Write( comm_String *pString ) Not Implemented"); + OSL_FAIL("Write( comm_String *pString ) Not Implemented"); } void CmdBaseStream::Write( SmartId* pId ) { (void) pId; /* avoid warning about unused parameter */ - DBG_ERROR("Write( SmartId* pId ) Not Implemented"); + OSL_FAIL("Write( SmartId* pId ) Not Implemented"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/source/server/profiler.cxx b/automation/source/server/profiler.cxx index 95d7c00a6b7e..1f9a63c18bd9 100644 --- a/automation/source/server/profiler.cxx +++ b/automation/source/server/profiler.cxx @@ -252,7 +252,7 @@ String TTProfiler::Dec( ULONG nNr ) return aRet; } -String TTProfiler::Pad( const String aS, xub_StrLen nLen ) +String TTProfiler::Pad( const String &aS, xub_StrLen nLen ) { if ( nLen > aS.Len() ) return UniString().Fill( nLen - aS.Len() ).Append( aS ); diff --git a/automation/source/server/profiler.hxx b/automation/source/server/profiler.hxx index c7d0537d6225..cd6f309844a4 100644 --- a/automation/source/server/profiler.hxx +++ b/automation/source/server/profiler.hxx @@ -112,7 +112,7 @@ private: // String Hex( ULONG nNr ); String Dec( ULONG nNr ); // Ergebnis = nNr / 100 mit 2 Dezimalen - String Pad( const String aS, xub_StrLen nLen ); // Fügt blanks links an den String an + String Pad( const String &aS, xub_StrLen nLen ); // Fügt blanks links an den String an /* Ab hier werden die Methoden Systemabhängig in den entsprechenden cxx implementiert Sie werden von den oberen Methoden gerufen. diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx index aebbfb40d9a8..d233dede5164 100644 --- a/automation/source/server/recorder.cxx +++ b/automation/source/server/recorder.cxx @@ -236,7 +236,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case STATE_NOCHECK: nMethod = M_UnCheck; aMethod = CUniString("UnCheck"); break; case STATE_DONTKNOW: nMethod = M_TriState; aMethod = CUniString("TriState"); break; default: nMethod = M_Check; - DBG_ERROR( "Unknown state in TriStateBox::GetState()" ); + OSL_FAIL( "Unknown state in TriStateBox::GetState()" ); } if ( m_bRecord ) { @@ -395,7 +395,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case WINDOW_CANCELBUTTON: nMethod = M_Cancel; aMethod = CUniString("Cancel"); break; case WINDOW_HELPBUTTON: nMethod = M_Help; aMethod = CUniString("Help"); break; default: nMethod = M_Default;aMethod = CUniString("Unknown Button"); - DBG_ERROR( "Unknown Button" ); + OSL_FAIL( "Unknown Button" ); } if ( m_bRecord ) { @@ -452,7 +452,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_SPINFIELD_FIRST: nMethod = M_ToMin; aMethod = CUniString("ToMin"); break; case VCLEVENT_SPINFIELD_LAST: nMethod = M_ToMax; aMethod = CUniString("ToMax"); break; default: nMethod = M_ToMin; aMethod = CUniString("Unknown"); - DBG_ERROR( "Unknown EventID in Spinfield" ); + OSL_FAIL( "Unknown EventID in Spinfield" ); } if ( m_bRecord ) { diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index ed620a4f6751..fb66ef3bfa74 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -42,8 +42,6 @@ public: ~RetStream(); using CmdBaseStream::GenError; -// void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );} -// new void GenError( SmartId aUId, String aString ); using CmdBaseStream::GenReturn; @@ -55,7 +53,6 @@ public: void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );} void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );} -// new void GenReturn( USHORT nRet, SmartId aUId, String aString ); void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue ); void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool ); @@ -72,7 +69,6 @@ public: void Write( comm_USHORT nNr ){CmdBaseStream::Write( nNr );} void Write( comm_ULONG nNr ){CmdBaseStream::Write( nNr );} void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );} -// new void Write( SbxValue &aValue ); // Complex Datatypes to be handled system dependent diff --git a/automation/source/server/scmdstrm.hxx b/automation/source/server/scmdstrm.hxx index d578909ad3ab..e2725b6f0070 100644 --- a/automation/source/server/scmdstrm.hxx +++ b/automation/source/server/scmdstrm.hxx @@ -49,9 +49,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_BOOL &bBool ){CmdBaseStream::Read ( bBool );} -// new void Read ( String &aString ); void Read ( SfxPoolItem *&pItem ); void Read ( ::com::sun::star::beans::PropertyValue &rItem ); diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index dd2e4cbd0129..322d70522fe3 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -342,7 +342,6 @@ void ExtraIdle::Timeout() { #if OSL_DEBUG_LEVEL > 1 -//#define TT_NO_DECRYPT #define TT_CODE #else #define TT_CODE @@ -485,11 +484,7 @@ void ExtraIdle::Timeout() "1EIGpcw0WfiaOul1s19ZIECoLBx-#S"; -//#if OSL_DEBUG_LEVEL > 1 -// SvFileStream aStream( "d:\\gh_writeback.jpg" , STREAM_STD_READWRITE | STREAM_TRUNC ); -//#else SvMemoryStream aStream; -//#endif xub_StrLen c; xub_StrLen cRest = 0; @@ -529,43 +524,6 @@ void ExtraIdle::Timeout() ::svt::OStringTransfer::CopyString( CUniString("\nSorry! no bitmap"), StatementList::GetFirstDocFrame() ); } -/*********************************************************************** -// USHORT nBC = pBmp->GetBitCount(); -// pBmp->Scale( 0.02, 0.02 ); -// nBC = pBmp->GetBitCount(); -// SvMemoryStream aStream; - SvFileStream aStream( "d:\gh_small50.jpg", STREAM_STD_READ ); - - aStream.Seek( 0 ); - xub_StrLen c; - String aOut; - String aDreierGruppe; - xub_StrLen cRest=0; - aStream >> c; - while ( !aStream.IsEof() ) - { - cRest <<= 2; // Im ersten Durchgang egal, da immer 0 - cRest |= ( c & 0x03 ); - c >>= 2; - aDreierGruppe += aTr.GetChar( c ); - - if ( aDreierGruppe.Len() == 3 ) - { - aOut += aTr.GetChar( cRest ); - aOut += aDreierGruppe; - cRest = 0; - aDreierGruppe = ""; - } - aStream >> c; - } - if ( aDreierGruppe.Len() ) - { - aOut += cRest; - aOut += aDreierGruppe; - } - ::svt::OStringTransfer::CopyString( aOut ); -**********************************************************************************/ - new StatementSlot( StatementList::pTTProperties->nSidPaste ); return; } @@ -646,9 +604,6 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) #endif StatementList *pC = StatementList::pFirst; -// MessBox MB( pMainWin, WB_DEF_OK|WB_OK, "Pause ...", "... und Weiter" ); -// MB.Execute(); - if ( !StatementList::bCatchGPF ) { if (!pC->CheckWindowWait() || !pC->Execute()) @@ -682,7 +637,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) pDlg->SetOutputSizePixel(Size(150,0)); pDlg->SetText( String ( TTProperties::GetSvtResId( TT_GPF ) ) ); pDlg->Show(); - DBG_ERROR("GPF"); + OSL_FAIL("GPF"); pC->ReportError( GEN_RES_STR0( S_GPF_ABORT ) ); StatementList::bDying = TRUE; while ( StatementList::pFirst ) // Kommandos werden übersprungen @@ -697,24 +652,11 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) } } -/* #i46293# remove reschedules - for (int xx = 1;xx < 20;xx++) - StatementList::NormalReschedule(); -*/ m_bInsideExecutionLoop = FALSE; } StatementList::aWindowWaitUId = SmartId(); // Warten rücksetzen, da handler sowieso verlassen wird -/* if( StatementList::pFirst && !StatementList::bReadingCommands ) - // Abfrage nötig, da andere CommandHdl aktiv sein können oder - // neue Commands gelesen werden können - { - delete StatementList::pFirst; // Löscht die gesamte Liste !! - StatementList::pFirst = NULL; - StatementList::pCurrent = NULL; // Nur zur Sicherheit, sollte hier sowieso NULL sein - }*/ - #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Leaving CommandHdl\n" ); #endif @@ -731,7 +673,6 @@ IMPL_LINK( ImplRemoteControl, QueCommandsEvent, CommunicationLink*, pCL ) BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) { -// return TRUE; USHORT nId; if( !m_bIdleInserted ) @@ -803,7 +744,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) if( !pIn->IsEof() ) pCmdStream->Read( nId ); else { - DBG_ERROR( "truncated input stream" ); + OSL_FAIL( "truncated input stream" ); } } diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index 756cfa980114..fbc046cddf42 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -129,12 +129,6 @@ TTSettings* GetTTSettings() #define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 )) -/* -UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } -UniString GEN_RES_STR1( ULONG nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } -UniString GEN_RES_STR2( ULONG nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } -UniString GEN_RES_STR3( ULONG nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );} -*/ StatementList::StatementList() : nRetryCount(MAX_RETRIES) , bStatementInQue(FALSE) @@ -301,8 +295,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB while ( pPParent->GET_REAL_PARENT() ) pPParent = pPParent->GET_REAL_PARENT(); -// if ( !IsFirstDocFrame( pPParent ) ) -// { // get overlap window. Will be dialog else document itself pBase = pBase->GetWindow( WINDOW_OVERLAP ); @@ -321,16 +313,11 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB if ( pControl ) return pControl; -// } } } pBase = Application::GetFirstTopLevelWindow(); - // Skip FirstDocFrame -// if ( bSearchFocusFirst && IsFirstDocFrame( pBase ) ) -// pBase = Application::GetNextTopLevelWindow( pBase ); - while ( pBase ) { pControl = SearchAllWin( pBase, aSearch ); @@ -338,9 +325,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB return pControl; pBase = Application::GetNextTopLevelWindow( pBase ); - // Skip FirstDocFrame -// if ( bSearchFocusFirst && IsFirstDocFrame( pBase ) ) -// pBase = Application::GetNextTopLevelWindow( pBase ); } return NULL; } @@ -351,9 +335,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB if ( pResult ) return pResult; -// if ( pBase->GetType() != WINDOW_BORDERWINDOW ) -// return NULL; - if ( !aSearch.HasSearchFlag( SEARCH_NOOVERLAP ) ) { if ( pBase->GetWindow( WINDOW_FIRSTOVERLAP ) ) @@ -553,8 +534,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) return pBaseMenu; USHORT i; -// while ( pBaseMenu ) -// { i = 0; while ( i < pBaseMenu->GetItemCount() ) { @@ -572,7 +551,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) else i++; } -// } } else { @@ -618,7 +596,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) BOOL SearchActive::IsWinOK( Window *pWin ) { -// return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ) && (nRT == WINDOW_FILEDIALOG || nRT == WINDOW_PATHDIALOG || nRT == WINDOW_PRINTDIALOG || nRT == WINDOW_PRINTERSETUPDIALOG || nRT == WINDOW_COLORDIALOG || ((SystemWindow*)pWin)->IsActive()); // only matches ResID due to problems with UNIX Window Managers return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ); } @@ -1147,10 +1124,6 @@ void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } else { - // DragManager* pDragManager = DragManager::GetDragManager(); - // if ( pDragManager ) - // pDragManager->MouseMove( aMEvnt, pWin ); - // else if ( pWin->IsTracking() ) { TrackingEvent aTEvt( aMEvnt ); @@ -1191,10 +1164,6 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } else { - // DragManager* pDragManager = DragManager::GetDragManager(); - // if ( pDragManager ) - // pDragManager->ButtonUp( aMEvnt, pWin ); - // else if ( pWin->IsTracking() ) { // siehe #64693 die Position ist für Toolboxen relevant diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 315e669ab81c..e363f83c5195 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -187,7 +187,7 @@ void StatementFlow::SendViaSocket() #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "SendViaSocket called recursively. Aborted!!!\n" ); #endif - DBG_ERROR("SendViaSocket called recursively. Aborted!!!"); + OSL_FAIL("SendViaSocket called recursively. Aborted!!!"); return; } bSending = TRUE; @@ -199,7 +199,7 @@ void StatementFlow::SendViaSocket() else { // Macht nix. Wenn das Basic nicht mehr da ist, ist sowiso alles egal - DBG_ERROR("Cannot send results to TestTool"); + OSL_FAIL("Cannot send results to TestTool"); } pRet->Reset(); @@ -263,7 +263,7 @@ BOOL StatementFlow::Execute() break; default: - DBG_ERROR( "Unknown Flowcontrol" ); + OSL_FAIL( "Unknown Flowcontrol" ); break; } @@ -2417,7 +2417,7 @@ BOOL StatementCommand::Execute() break; } default: - DBG_ERROR( "Unknown Windowtype" ); + OSL_FAIL( "Unknown Windowtype" ); REPORT_WIN_CLOSEDc(pControl, "Unknown Windowtype"); ReportError( GEN_RES_STR0( S_RESETAPPLICATION_FAILED_UNKNOWN ), pControl->GetType() ); #if OSL_DEBUG_LEVEL > 1 @@ -3448,7 +3448,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) } else { - DBG_ERROR( "Wrong ControlType" ); + OSL_FAIL( "Wrong ControlType" ); } pCmdIn->Read( nMethodId ); @@ -4155,10 +4155,6 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( (pControl->GetType() == WINDOW_TOOLBOX) && pTB->IsMenuEnabled() ) { pTB->ExecuteCustomMenu(); -/* Rectangle aRect = pTB->GetMenubuttonRect(); - AnimateMouse( pControl, aRect.Center() ); - MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT); - ImplMouseButtonDown( pTB, aMEvnt );*/ } else { @@ -4657,10 +4653,6 @@ BOOL StatementControl::Execute() for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.Matches( aWantedID ) ; anz++ ) { pTControl->SelectTabPage( pTControl->GetPageId(i) ); - /*if (pTControl->GetCurPageId()) - pTControl->DeactivatePage(); - pTControl->SetCurPageId( pTControl->GetPageId(i) ); - pTControl->ActivatePage();*/ aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId(); i++; if ( i >= pTControl->GetPageCount() ) @@ -4671,10 +4663,6 @@ BOOL StatementControl::Execute() if ( !aID.Matches( aWantedID ) ) { pTControl->SelectTabPage( nActive ); - /*if (pTControl->GetCurPageId()) - pTControl->DeactivatePage(); - pTControl->SetCurPageId( nActive ); - pTControl->ActivatePage();*/ ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) ); } } @@ -5841,10 +5829,6 @@ BOOL StatementControl::Execute() else pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pELB->getSelIndex() +1)); break; -/* xxxcase M_SetNoSelection : - ((ListBox*)pControl)->SetNoSelection(); - ((ListBox*)pControl)->Select(); - break; */ default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "RoadMap" ) ); break; @@ -5875,22 +5859,11 @@ BOOL StatementControl::Execute() { ::svt::table::PTableModel pModel = pTC->GetModel(); Any aCell = pModel->getCellContent()[nNr2-1][nNr1-1]; - /* doesn't work ATM since it gets casted to SbxDATE in VCLTestTool unfortunately - SbxVariableRef xRes = new SbxVariable( SbxVARIANT ); - unoToSbxValue( xRes, aCell ); - pRet->GenReturn ( RET_Value, aUId, *xRes );*/ Type aType = aCell.getValueType(); TypeClass eTypeClass = aType.getTypeClass(); switch( eTypeClass ) { - /*case TypeClass_ENUM: - { - sal_Int32 nEnum = 0; - enum2int( nEnum, aValue ); - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)nEnum ); - } - break;*/ case TypeClass_BOOLEAN: pRet->GenReturn ( RET_Value, aUId, *(sal_Bool*)aCell.getValue() ); break; @@ -5986,18 +5959,6 @@ BOOL StatementControl::Execute() if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRows().size() ) ) pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRows()[nNr1-1] +1 ) ); break; -/* case M_GetSelText : - if ( ! (nParams & PARAM_USHORT_1) ) - nNr1 = 1; - if ( ValueOK(aUId, CUniString("GetSelText"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) ) - { - nNr1--; - COUNT_LBOX( FirstSelected, NextSelected, nNr1); - GetFirstValidTextItem( pThisEntry ); - pRet->GenReturn ( RET_Value, aUId, pItem->GetText() ); - } - break; - */ default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "TableControl" ) ); break; @@ -6068,7 +6029,7 @@ BOOL StatementControl::Execute() pFloat = pControl->GET_REAL_PARENT(); else { - DBG_ERROR("FloatingMode set but Parent is no FloatingWindow"); + OSL_FAIL("FloatingMode set but Parent is no FloatingWindow"); } } if ( pFloat && pFloat->GetType() == WINDOW_FLOATINGWINDOW ) @@ -6414,7 +6375,7 @@ BOOL StatementControl::Execute() break; } default: - DBG_ERROR( "Unknown Objekttype from UId or Method not suported" ); + OSL_FAIL( "Unknown Objekttype from UId or Method not suported" ); ReportError( aUId, GEN_RES_STR2( S_UNKNOWN_TYPE, UniString::CreateFromInt32( nRT ), MethodString(nMethodId) ) ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( " Unknown Objekttype from UId or Method not suported" ); diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index a4d2b76f5632..63385b804ed4 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -31,12 +31,6 @@ ** Es gibt immer nur eine Statementliste, die verpointert ist. ** jederzeit kann das der Anfang der Kette abgefragt werden. ** -** -** -** -** -** -** ***************************************************************************/ #ifndef _STATEMNT_HXX #define _STATEMNT_HXX @@ -117,7 +111,6 @@ BOOL IsDialog(Window *pWin); // Ist *pWin von SystemWindow abgeleitet (Ka BOOL IsAccessable(Window *pWin); // Ist *pWin Zugreifbar (über IsEnabled und Parents geprüft) -//class SafePointer : CriticalSection class SafePointer { SafePointer *pSelf; @@ -125,8 +118,6 @@ public: SafePointer() { pSelf = this; } virtual ~SafePointer() { DBG_ASSERT(pSelf==this,"Destructor von Nicht existierendem Objekt aufgerufen"); pSelf = NULL; } -// static BOOL IsValid( SafePointer *pThis ) { return pThis == pThis->pSelf; } -// virtual operator -> (); { DBG_ASSERT(pMyself == this,"-> von Nicht existierendem Objekt aufgerufen"); } }; @@ -216,7 +207,6 @@ public: if ( pLastFocusWindow != GetpApp()->GetFocusWindow() || ( Application::GetModalModeCount() > nModalCount ) -// || ( DragManager::GetDragManager() && !bWasDragManager ) || ( PopupMenu::GetActivePopupMenu() && !bWasPopupMenu ) || ( StarBASIC::IsRunning() && !bBasicWasRunning ) ) { @@ -256,8 +246,6 @@ protected: USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu ); public: -// void AddStatement( StatementList *pNewStatement ); - virtual ~StatementList(); void Advance(); virtual BOOL Execute() = 0; diff --git a/automation/source/simplecm/communiio.hxx b/automation/source/simplecm/communiio.hxx index c0625ed8b2c6..65466a26b271 100644 --- a/automation/source/simplecm/communiio.hxx +++ b/automation/source/simplecm/communiio.hxx @@ -50,7 +50,7 @@ public: virtual ~ITransmiter() {} virtual comm_USHORT TransferBytes( const void* pBuffer, comm_UINT32 nLen ) = 0; - comm_ULONG GetLastSent() { return nLastSent; } + comm_ULONG GetLastSent() const { return nLastSent; } }; class IReceiver @@ -62,7 +62,7 @@ public: virtual ~IReceiver() {;} virtual comm_USHORT ReceiveBytes( void* pBuffer, comm_UINT32 nLen ) = 0; - comm_ULONG GetLastReceived() { return nLastReceived; } + comm_ULONG GetLastReceived() const { return nLastReceived; } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx index 034143d2cba6..b691b6f5ffd1 100644 --- a/automation/source/simplecm/packethandler.cxx +++ b/automation/source/simplecm/packethandler.cxx @@ -41,6 +41,7 @@ #include <automation/commtypes.hxx> #include <automation/commdefines.hxx> #include "communiio.hxx" +#include <osl/diagnose.h> /** Forces switch to multichannel headers even for old communication Method @@ -143,7 +144,7 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen ) break; default: { - DBG_ERROR("Unbekannter Headertyp in der Kommunikation"); + OSL_FAIL("Unbekannter Headertyp in der Kommunikation"); bWasError = TRUE; } @@ -285,7 +286,7 @@ comm_BOOL PacketHandler::SendHandshake( HandshakeType aHandshakeType, const void nBuffer += 0 ; // one word extradata for options break; default: - DBG_ERROR("Unknown HandshakeType"); + OSL_FAIL("Unknown HandshakeType"); } if ( pData ) diff --git a/automation/source/simplecm/packethandler.hxx b/automation/source/simplecm/packethandler.hxx index 31081b2e949a..d4da137196ca 100644 --- a/automation/source/simplecm/packethandler.hxx +++ b/automation/source/simplecm/packethandler.hxx @@ -59,8 +59,8 @@ protected: public: PacketHandler( ITransmiter* pTransmitter_, IReceiver* pReceiver_, comm_BOOL bMC = FALSE ); - comm_UINT16 GetReceiveProtocol() { return nReceiveProtocol; } - comm_UINT16 GetReceiveHeaderType() { return nReceiveHeaderType; } + comm_UINT16 GetReceiveProtocol() const { return nReceiveProtocol; } + comm_UINT16 GetReceiveHeaderType() const { return nReceiveHeaderType; } comm_BOOL ReceiveData( void* &pData, comm_UINT32 &nLen ); /// Recieve DataPacket from Socket virtual comm_BOOL SendHandshake( HandshakeType aHandshakeType, const void* pData = NULL, comm_UINT32 nLen = 0 ); diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx index 26c8d6af0585..d71df2e7237d 100644 --- a/automation/source/simplecm/simplecm.cxx +++ b/automation/source/simplecm/simplecm.cxx @@ -33,6 +33,7 @@ #define ENABLE_BYTESTRING_STREAM_OPERATORS #include <tools/solar.h> #include <automation/simplecm.hxx> +#include <osl/diagnose.h> #include <automation/commdefines.hxx> #include "packethandler.hxx" @@ -45,7 +46,7 @@ void debug_printf( const char *chars ) static BOOL bPrint = (getenv("DEBUG") != NULL); if ( bPrint ) { - printf( chars ); + printf( "%c\n", chars ); fflush( stdout ); } } @@ -336,7 +337,7 @@ BOOL SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeTy case CH_SetApplication: break; default: - DBG_ERROR("Unknown HandshakeType"); + OSL_FAIL("Unknown HandshakeType"); } } return !bWasError; @@ -484,7 +485,7 @@ void CommunicationManager::CallDataReceived( CommunicationLink* pCL ) // should be impossible but happens for mysterious reasons if ( !pCL->pServiceData ) { - DBG_ERROR( "Datastream is NULL" ); + OSL_FAIL( "Datastream is NULL" ); pCL->FinishCallback(); return; } 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 diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index 8747ff4c4b0e..046f6e043dea 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -214,14 +214,9 @@ APP3STDLIBS= \ $(VCLLIB) .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="MACOSX" -APP3STDLIBS+= \ - $(SALLIB) $(LIBSTLPORT) -.ELSE APP3STDLIBS+= \ $(SALLIB) .ENDIF -.ENDIF # $(AUTOMATIONLIB) is build in SHL1TARGET .IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") APP3DEPN=$(SHL1TARGETN) |