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, 10 insertions, 10 deletions

diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx
index 547f80bcc26e..d9c3cec49c73 100644
--- a/automation/source/testtool/cmdstrm.hxx
+++ b/automation/source/testtool/cmdstrm.hxx
@@ -38,22 +38,22 @@ public:
     CmdStream();
     ~CmdStream();
 
-    void WriteSortedParams( SbxArray* rPar, BOOL IsKeyString = FALSE );
+    void WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString = sal_False );
 
-    void GenCmdCommand( USHORT nNr, SbxArray* rPar );
+    void GenCmdCommand( sal_uInt16 nNr, SbxArray* rPar );
 
-    void GenCmdSlot( USHORT nNr, SbxArray* rPar );
+    void GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar );
 
     void GenCmdUNOSlot( const String &aURL );
 
-    void GenCmdControl( comm_ULONG nUId, USHORT nMethodId, SbxArray* rPar );
-    void GenCmdControl( String aUId, USHORT nMethodId, SbxArray* rPar );
+    void GenCmdControl( comm_ULONG nUId, sal_uInt16 nMethodId, SbxArray* rPar );
+    void GenCmdControl( String aUId, sal_uInt16 nMethodId, SbxArray* rPar );
 
 
-    void GenCmdFlow( USHORT nArt );
-    void GenCmdFlow( USHORT nArt, USHORT nNr1 );
-    void GenCmdFlow( USHORT nArt, comm_ULONG nNr1 );
-    void GenCmdFlow( USHORT nArt, String aString1 );
+    void GenCmdFlow( sal_uInt16 nArt );
+    void GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 );
+    void GenCmdFlow( sal_uInt16 nArt, comm_ULONG nNr1 );
+    void GenCmdFlow( sal_uInt16 nArt, String aString1 );
 
     void Reset(comm_ULONG nSequence);
 
@@ -71,7 +71,7 @@ private:
     void Write( const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::Write( aString, nLenInChars );}
     void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );}
 //  new
-    void Write( String aString, BOOL IsKeyString = FALSE );
+    void Write( String aString, sal_Bool IsKeyString = sal_False );
 
     SvMemoryStream *pSammel;
 };