diff options
Diffstat (limited to 'automation/source')
-rw-r--r-- | automation/source/communi/communi.cxx | 2 | ||||
-rw-r--r-- | automation/source/server/server.cxx | 2 | ||||
-rw-r--r-- | automation/source/testtool/makefile.mk | 5 | ||||
-rw-r--r-- | automation/source/testtool/tcommuni.cxx | 1 | ||||
-rw-r--r-- | automation/source/testtool/testtool.ini | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx index 55b72e1031e2..6f79551ecd72 100644 --- a/automation/source/communi/communi.cxx +++ b/automation/source/communi/communi.cxx @@ -260,7 +260,7 @@ long CommunicationLinkViaSocket::DataReceived( void* EMPTYARG ) IMPL_LINK( CommunicationLinkViaSocket, PutDataReceivedHdl, CommunicationLinkViaSocket*, EMPTYARG ) { - nDataReceivedEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationLinkViaSocket, DataReceived ) ); + nDataReceivedEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationLink, DataReceived ) ); return 0; } diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 5d84cb6cd75d..988f4055a2eb 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -805,7 +805,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) break; } default: - DBG_ERROR1( "Unbekannter Request Nr:%il", nId ); + DBG_ERROR1( "Unbekannter Request Nr:%i", nId ); break; } if( !pIn->IsEof() ) diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk index 4cb27a48ddd4..79a811fdaee7 100644 --- a/automation/source/testtool/makefile.mk +++ b/automation/source/testtool/makefile.mk @@ -103,12 +103,15 @@ $(MISC)$/xfilter.pl : filter.pl .IF "$(GUI)"=="UNX" INIFILESUFFIX=rc +BRANDPATH=none .ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" INIFILESUFFIX=.ini +BRANDPATH=.. .END $(BIN)$/testtool$(INIFILESUFFIX): testtool.ini - $(SED) -e s/$(EMQ)!INIFILESUFFIX$(EMQ)!/$(INIFILESUFFIX)/ < $< > $@ + $(SED) -e s/$(EMQ)!INIFILESUFFIX$(EMQ)!/$(INIFILESUFFIX)/ \ + -e s/$(EMQ)!BRANDPATH$(EMQ)!/$(BRANDPATH)/ < $< > $@ ALLTAR: \ $(BIN)$/testtool$(INIFILESUFFIX) diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx index f341bd3efe36..3ac135829f6d 100644 --- a/automation/source/testtool/tcommuni.cxx +++ b/automation/source/testtool/tcommuni.cxx @@ -36,7 +36,6 @@ #include <vcl/svapp.hxx> #include <tools/time.hxx> #include <tools/debug.hxx> -#include <vos/process.hxx> #include <vcl/timer.hxx> #ifndef _BASIC_TTRESHLP_HXX diff --git a/automation/source/testtool/testtool.ini b/automation/source/testtool/testtool.ini index bf1b54c8777e..ff2e43f5c0f6 100644 --- a/automation/source/testtool/testtool.ini +++ b/automation/source/testtool/testtool.ini @@ -1,7 +1,7 @@ [Bootstrap] URE_BOOTSTRAP=${ORIGIN}/fundamentalbasis!INIFILESUFFIX! OOO_BASE_DIR=${ORIGIN}/.. -BRAND_BASE_DIR=${OOO_BASE_DIR}/none +BRAND_BASE_DIR=${OOO_BASE_DIR}/!BRANDPATH! UserInstallation=${SYSUSERCONFIG}/.oootesttool [Misc] |