merge with m61

7 files changed, 8 insertions, 13 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]
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index f96910a01325..8d68000c7c5a 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -157,7 +157,6 @@ APP1STDLIBS+= \
             $(SVLLIB) \
             $(VCLLIB) \
             $(SALLIB) \
-            $(SJLIB) \
             $(VOSLIB) \
             $(UCBHELPERLIB) \
             $(COMPHELPERLIB) \
@@ -221,8 +220,7 @@ APP3STDLIBS= \
             $(SALLIB) \
             $(TOOLSLIB) \
             $(SVTOOLLIB) \
-            $(VCLLIB) \
-            $(SJLIB)
+            $(VCLLIB)
 
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
diff --git a/automation/util/manually_added_ids.hid b/automation/util/manually_added_ids.hid
index 1a76246e5128..7372dc0d9879 100755
--- a/automation/util/manually_added_ids.hid
+++ b/automation/util/manually_added_ids.hid
@@ -3,11 +3,6 @@ MSC_Super_ID 123456
 MSC_Super_ID2 1234567
 MSC_Super_ID3 12345678
 
-HID_OPTIONS_JAVA_LIST 39997
-
-PDF1TBO 867876864
-PDF2TBO 867860480
-
 FontWork1TBO 40026
 FontWork2TBO 40027