Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
	automation/source/communi/communi.cxx
	automation/source/server/recorder.cxx
	automation/source/server/server.cxx
	basctl/source/basicide/basobj2.cxx

1 files changed, 7 insertions, 7 deletions

diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index 575f79c549fb..6d3f9af6ed5f 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -41,14 +41,14 @@ public:
     CommunicationManagerClientViaSocketTT();
 
     using CommunicationManagerClientViaSocket::StartCommunication;
-    virtual BOOL StartCommunication();
-    virtual BOOL StartCommunication( String aApp, String aParams, Environment *pChildEnv );
+    virtual sal_Bool StartCommunication();
+    virtual sal_Bool StartCommunication( String aApp, String aParams, Environment *pChildEnv );
 
-    BOOL KillApplication();
+    sal_Bool KillApplication();
 
 protected:
-    virtual BOOL RetryConnect();
-    BOOL bApplicationStarted;
+    virtual sal_Bool RetryConnect();
+    sal_Bool bApplicationStarted;
     Time aFirstRetryCall;
     String aAppPath;
     String aAppParams;
@@ -58,7 +58,7 @@ protected:
 
 
 String GetHostConfig();
-ULONG GetTTPortConfig();
-ULONG GetUnoPortConfig();
+sal_uLong GetTTPortConfig();
+sal_uLong GetUnoPortConfig();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */