PARAM_USHORT_->PARAM_UINT16_ && PARAM_ULONG_->PARAM_UINT32_

6 files changed, 129 insertions, 129 deletions

diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx
index 586c3bd6a255..14a26feded42 100644
--- a/automation/source/inc/rcontrol.hxx
+++ b/automation/source/inc/rcontrol.hxx
@@ -443,12 +443,12 @@
 // Beschreibt die Parametertypen als Bitfeld  Reihenfolge immer!
 // wie hier Aufgelistet
 #define PARAM_NONE              0x0000
-#define PARAM_USHORT_1          0x0001
-#define PARAM_USHORT_2          0x0002
-#define PARAM_USHORT_3          0x0100      // Nicht in der Reihe!!
-#define PARAM_USHORT_4          0x0200      // Nicht in der Reihe!!
-#define PARAM_ULONG_1           0x0004
-#define PARAM_ULONG_2           0x0008
+#define PARAM_UINT16_1          0x0001
+#define PARAM_UINT16_2          0x0002
+#define PARAM_UINT16_3          0x0100      // Nicht in der Reihe!!
+#define PARAM_UINT16_4          0x0200      // Nicht in der Reihe!!
+#define PARAM_UINT32_1          0x0004
+#define PARAM_UINT32_2          0x0008
 #define PARAM_STR_1             0x0010
 #define PARAM_STR_2             0x0020
 #define PARAM_BOOL_1            0x0040
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 12d8c985431f..e153ebf8d8e4 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -524,7 +524,7 @@ void StatementCommand::HandleSAXParser()
                             break;
                         case RC_SAXGetAttributeName:
                             {
-                                if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
+                                if( (nParams & PARAM_UINT16_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
                                 {
                                     String aRet( xAttributeList->getNameByIndex( nNr1-1 ) );
                                     pRet->GenReturn ( RET_Value, nMethodId, aRet );
@@ -536,7 +536,7 @@ void StatementCommand::HandleSAXParser()
                         case RC_SAXGetAttributeValue:
                             // Number or String
                             {
-                                if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
+                                if( (nParams & PARAM_UINT16_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
                                 {
                                     String aRet( xAttributeList->getValueByIndex( nNr1-1 ) );
                                     pRet->GenReturn ( RET_Value, nMethodId, aRet );
@@ -578,7 +578,7 @@ void StatementCommand::HandleSAXParser()
             {
                 sal_Bool bCheckOnly = nMethodId == RC_SAXHasElement;
 
-                if( (nParams & PARAM_USHORT_1) && !(nParams & PARAM_STR_1) )
+                if( (nParams & PARAM_UINT16_1) && !(nParams & PARAM_STR_1) )
                 {
                     if ( nNr1 == 0 )
                     {
@@ -623,7 +623,7 @@ void StatementCommand::HandleSAXParser()
                     else if ( pElementNode )
                     {
                         sal_uInt16 nNthOccurrence;
-                        if( (nParams & PARAM_USHORT_1) )
+                        if( (nParams & PARAM_UINT16_1) )
                             nNthOccurrence = nNr1;
                         else
                             nNthOccurrence = 1;
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 0f7c5e1f886b..e7e576f4d4bd 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -74,7 +74,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32
         Write(comm_UINT32(0));
     else
         Write(pUId);
-    Write(comm_UINT16(PARAM_ULONG_1));          // Typ der folgenden Parameter
+    Write(comm_UINT16(PARAM_UINT32_1));         // Typ der folgenden Parameter
     Write(nNr);
 }
 
@@ -110,7 +110,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32
         Write(comm_UINT32(0));
     else
         Write(pUId);
-    Write(comm_UINT16(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1));     // Typ der folgenden Parameter
+    Write(comm_UINT16(PARAM_UINT32_1|PARAM_STR_1|PARAM_BOOL_1));        // Typ der folgenden Parameter
     Write(nNr);
     Write(pString);
     Write(bBool);
@@ -121,7 +121,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT3
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
-    Write(comm_UINT16(PARAM_ULONG_1));          // Typ der folgenden Parameter
+    Write(comm_UINT16(PARAM_UINT32_1));         // Typ der folgenden Parameter
     Write(nNr);
 }
 
@@ -148,7 +148,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT1
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
-    Write(comm_UINT16(PARAM_USHORT_1));         // Typ der folgenden Parameter
+    Write(comm_UINT16(PARAM_UINT16_1));         // Typ der folgenden Parameter
     Write(nNr);
 }
 
@@ -159,7 +159,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_UINT16(PARAM_USHORT_1));     // Typ der folgenden Parameter
+    Write(comm_UINT16(PARAM_UINT16_1));     // Typ der folgenden Parameter
     Write(nMethod);
 }
 
@@ -168,7 +168,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_UINT16(PARAM_USHORT_1|PARAM_STR_1));     // Typ der folgenden Parameter
+    Write(comm_UINT16(PARAM_UINT16_1|PARAM_STR_1));     // Typ der folgenden Parameter
     Write(nMethod);
     Write(pString);
 }
@@ -178,7 +178,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_UINT16(PARAM_USHORT_1|PARAM_STR_1|PARAM_BOOL_1));        // Typ der folgenden Parameter
+    Write(comm_UINT16(PARAM_UINT16_1|PARAM_STR_1|PARAM_BOOL_1));        // Typ der folgenden Parameter
     Write(nMethod);
     Write(pString);
     Write(bBool);
@@ -189,7 +189,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_UINT16(PARAM_USHORT_1|PARAM_BOOL_1));        // Typ der folgenden Parameter
+    Write(comm_UINT16(PARAM_UINT16_1|PARAM_BOOL_1));        // Typ der folgenden Parameter
     Write(nMethod);
     Write(bBool);
 }
@@ -199,7 +199,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_UINT16(PARAM_USHORT_1|PARAM_ULONG_1));       // Typ der folgenden Parameter
+    Write(comm_UINT16(PARAM_UINT16_1|PARAM_UINT32_1));      // Typ der folgenden Parameter
     Write(nMethod);
     Write(nNr);
 }
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 3cd50d3803b0..8b5e5f489326 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -161,8 +161,8 @@ StatementFlow::StatementFlow( sal_uLong nServiceId, SCmdStream *pCmdIn, ImplRemo
     pCmdIn->Read( nArt );
     pCmdIn->Read( nParams );
 
-    if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nSNr1 );
-    if( nParams & PARAM_ULONG_1 )  pCmdIn->Read( nLNr1 );
+    if( nParams & PARAM_UINT16_1 ) pCmdIn->Read( nSNr1 );
+    if( nParams & PARAM_UINT32_1 )  pCmdIn->Read( nLNr1 );
     if( nParams & PARAM_STR_1 )    pCmdIn->Read( aString1 );
     if( nParams & PARAM_BOOL_1 )   pCmdIn->Read( bBool1 );// Should NEVER happen
 
@@ -170,8 +170,8 @@ StatementFlow::StatementFlow( sal_uLong nServiceId, SCmdStream *pCmdIn, ImplRemo
     m_pDbgWin->AddText( "Reading FlowControl: " );
     m_pDbgWin->AddText( String::CreateFromInt32( nArt ) );
     m_pDbgWin->AddText( " Params:" );
-    if( nParams & PARAM_USHORT_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nSNr1 ) );}
-    if( nParams & PARAM_ULONG_1 )   {m_pDbgWin->AddText( " l1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+    if( nParams & PARAM_UINT16_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nSNr1 ) );}
+    if( nParams & PARAM_UINT32_1 )   {m_pDbgWin->AddText( " l1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
     if( nParams & PARAM_STR_1 )     {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
     if( nParams & PARAM_BOOL_1 )    {m_pDbgWin->AddText( " b2:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
     m_pDbgWin->AddText( "\n" );
@@ -687,11 +687,11 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, sal_uInt16 Method
     m_pDbgWin->AddText( " Methode: " );
     m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
     m_pDbgWin->AddText( " Params:" );
-    if( nParams & PARAM_USHORT_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
-    if( nParams & PARAM_USHORT_2 )  {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
-    if( nParams & PARAM_USHORT_3 )  {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
-    if( nParams & PARAM_USHORT_4 )  {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
-    if( nParams & PARAM_ULONG_1 )   {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+    if( nParams & PARAM_UINT16_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+    if( nParams & PARAM_UINT16_2 )  {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+    if( nParams & PARAM_UINT16_3 )  {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+    if( nParams & PARAM_UINT16_4 )  {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+    if( nParams & PARAM_UINT32_1 )  {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
     if( nParams & PARAM_STR_1 )     {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
     if( nParams & PARAM_STR_2 )     {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
     if( nParams & PARAM_BOOL_1 )    {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
@@ -718,11 +718,11 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
     pCmdIn->Read( nMethodId );
     pCmdIn->Read( nParams );
 
-    if( nParams & PARAM_USHORT_1 )  pCmdIn->Read( nNr1 );
-    if( nParams & PARAM_USHORT_2 )  pCmdIn->Read( nNr2 );
-    if( nParams & PARAM_USHORT_3 )  pCmdIn->Read( nNr3 );
-    if( nParams & PARAM_USHORT_4 )  pCmdIn->Read( nNr4 );
-    if( nParams & PARAM_ULONG_1 )   pCmdIn->Read( nLNr1 );
+    if( nParams & PARAM_UINT16_1 )  pCmdIn->Read( nNr1 );
+    if( nParams & PARAM_UINT16_2 )  pCmdIn->Read( nNr2 );
+    if( nParams & PARAM_UINT16_3 )  pCmdIn->Read( nNr3 );
+    if( nParams & PARAM_UINT16_4 )  pCmdIn->Read( nNr4 );
+    if( nParams & PARAM_UINT32_1 )  pCmdIn->Read( nLNr1 );
     if( nParams & PARAM_STR_1 )     pCmdIn->Read( aString1 );
     if( nParams & PARAM_STR_2 )     pCmdIn->Read( aString2 );
     if( nParams & PARAM_BOOL_1 )    pCmdIn->Read( bBool1 );
@@ -733,11 +733,11 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
     m_pDbgWin->AddText( " Methode: " );
     m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
     m_pDbgWin->AddText( " Params:" );
-    if( nParams & PARAM_USHORT_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
-    if( nParams & PARAM_USHORT_2 )  {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
-    if( nParams & PARAM_USHORT_3 )  {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
-    if( nParams & PARAM_USHORT_4 )  {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
-    if( nParams & PARAM_ULONG_1 )   {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+    if( nParams & PARAM_UINT16_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+    if( nParams & PARAM_UINT16_2 )  {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+    if( nParams & PARAM_UINT16_3 )  {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+    if( nParams & PARAM_UINT16_4 )  {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+    if( nParams & PARAM_UINT32_1 )  {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
     if( nParams & PARAM_STR_1 )     {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
     if( nParams & PARAM_STR_2 )     {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
     if( nParams & PARAM_BOOL_1 )    {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
@@ -1365,7 +1365,7 @@ sal_Bool StatementCommand::DisplayHID()
         bBool2 = sal_True;              // Wir sind initialisiert.
         GetTTSettings()->pDisplayInstance = this;   // Und haben die Macht (Alle anderen beenden sich)
 
-        if ( !(nParams & PARAM_ULONG_1) )
+        if ( !(nParams & PARAM_UINT32_1) )
         {
             if( GetTTSettings()->pDisplayHidWin )   // Nichts ver�ndern
                 nLNr1 = GetTTSettings()->pDisplayHidWin->GetConfig();
@@ -2465,7 +2465,7 @@ sal_Bool StatementCommand::Execute()
             break;
         case RC_WaitSlot:
             {
-                if ( ! (nParams & PARAM_USHORT_1) )
+                if ( ! (nParams & PARAM_UINT16_1) )
                     nNr1 = 1000;    // defaults to 1000 = 1 Sec.
                 if ( !bBool1 )
                 {
@@ -2593,7 +2593,7 @@ sal_Bool StatementCommand::Execute()
                     InitProfile();
                 }
 
-                if( !(nParams & PARAM_BOOL_1) && (nParams & PARAM_USHORT_1) )
+                if( !(nParams & PARAM_BOOL_1) && (nParams & PARAM_UINT16_1) )
                 {   // Autoprofiling: Profile nNr
                     if ( pProfiler->IsProfilingPerCommand() )
                     {
@@ -2604,13 +2604,13 @@ sal_Bool StatementCommand::Execute()
                     // Der Header ist abh�ngig vom Modus
                     pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() );
                 }
-                else if ( nParams & PARAM_USHORT_1 )
+                else if ( nParams & PARAM_UINT16_1 )
                 {   // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr]
                     comm_UINT32 nAnzahl=0;
-                    if ( nParams & PARAM_USHORT_1 ) { nAnzahl++; };
-                    if ( nParams & PARAM_USHORT_2 ) { nAnzahl++; };
-                    if ( nParams & PARAM_USHORT_3 ) { nAnzahl++; };
-                    if ( nParams & PARAM_USHORT_4 ) { nAnzahl++; };
+                    if ( nParams & PARAM_UINT16_1 ) { nAnzahl++; };
+                    if ( nParams & PARAM_UINT16_2 ) { nAnzahl++; };
+                    if ( nParams & PARAM_UINT16_3 ) { nAnzahl++; };
+                    if ( nParams & PARAM_UINT16_4 ) { nAnzahl++; };
 
                     // Hier werden die Parameter ans Testtool zur�ck �bertragen.
                     // Das ist zwar etwas eigenartig, aber ansonsten m�sste man im Testtool
@@ -2618,10 +2618,10 @@ sal_Bool StatementCommand::Execute()
                     pRet->GenReturn( RET_ProfileInfo, S_ProfileReset, nAnzahl );
 
                     // Und die einzelnen Grenzen
-                    if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_UINT32)nNr1 ); };
-                    if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_UINT32)nNr2 ); };
-                    if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_UINT32)nNr3 ); };
-                    if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_UINT32)nNr4 ); };
+                    if ( nParams & PARAM_UINT16_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_UINT32)nNr1 ); };
+                    if ( nParams & PARAM_UINT16_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_UINT32)nNr2 ); };
+                    if ( nParams & PARAM_UINT16_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_UINT32)nNr3 ); };
+                    if ( nParams & PARAM_UINT16_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_UINT32)nNr4 ); };
 
                     pProfiler->StartPartitioning();
                 }
@@ -2940,7 +2940,7 @@ sal_Bool StatementCommand::Execute()
                                 else
                                 {
                                     sal_uInt16 nFlags = 0;
-                                    if ( (nParams & PARAM_USHORT_1) )
+                                    if ( (nParams & PARAM_UINT16_1) )
                                         nDirFlags = nFlags = nNr1;
                                     else
                                         nDirFlags = nFlags = Sb_ATTR_HIDDEN | Sb_ATTR_SYSTEM | Sb_ATTR_DIRECTORY;
@@ -3109,10 +3109,10 @@ sal_Bool StatementCommand::Execute()
                 {
                     bDoTypeKeysDelay = bBool1;
                 }
-                else if( nParams & PARAM_USHORT_1 )
+                else if( nParams & PARAM_UINT16_1 )
                 {
                     nMinTypeKeysDelay = nNr1;
-                    if( nParams & PARAM_USHORT_2 )
+                    if( nParams & PARAM_UINT16_2 )
                         nMaxTypeKeysDelay = nNr2;
                     else
                         nMaxTypeKeysDelay = nMinTypeKeysDelay;
@@ -3171,7 +3171,7 @@ sal_Bool StatementCommand::Execute()
         case RC_CloseSysDialog:
         case RC_ExistsSysDialog:
             {
-                if( (nParams & PARAM_USHORT_1) )
+                if( (nParams & PARAM_UINT16_1) )
                 {
                     Reference < ::com::sun::star::util::XCancellable > xPicker;
                     switch( nNr1 )
@@ -3247,7 +3247,7 @@ sal_Bool StatementCommand::Execute()
             break;
         case RC_ActivateDocument :
             {
-                if( nParams & PARAM_USHORT_1 )
+                if( nParams & PARAM_UINT16_1 )
                 {
                     if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, GetDocWinCount() ) )
                     {
@@ -3386,11 +3386,11 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, sal_uInt16 nControlIdTyp
     pCmdIn->Read( nMethodId );
     pCmdIn->Read( nParams );
 
-    if( nParams & PARAM_USHORT_1 )  pCmdIn->Read( nNr1 );
-    if( nParams & PARAM_USHORT_2 )  pCmdIn->Read( nNr2 );
-    if( nParams & PARAM_USHORT_3 )  pCmdIn->Read( nNr3 );
-    if( nParams & PARAM_USHORT_4 )  pCmdIn->Read( nNr4 );
-    if( nParams & PARAM_ULONG_1 )   pCmdIn->Read( nLNr1 );
+    if( nParams & PARAM_UINT16_1 )  pCmdIn->Read( nNr1 );
+    if( nParams & PARAM_UINT16_2 )  pCmdIn->Read( nNr2 );
+    if( nParams & PARAM_UINT16_3 )  pCmdIn->Read( nNr3 );
+    if( nParams & PARAM_UINT16_4 )  pCmdIn->Read( nNr4 );
+    if( nParams & PARAM_UINT32_1 )  pCmdIn->Read( nLNr1 );
     if( nParams & PARAM_STR_1 )     pCmdIn->Read( aString1 );
     if( nParams & PARAM_STR_2 )     pCmdIn->Read( aString2 );
     if( nParams & PARAM_BOOL_1 )    pCmdIn->Read( bBool1 );
@@ -3402,11 +3402,11 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, sal_uInt16 nControlIdTyp
     m_pDbgWin->AddText( " Methode: " );
     m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
     m_pDbgWin->AddText( " Params:" );
-    if( nParams & PARAM_USHORT_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
-    if( nParams & PARAM_USHORT_2 )  {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
-    if( nParams & PARAM_USHORT_3 )  {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
-    if( nParams & PARAM_USHORT_4 )  {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
-    if( nParams & PARAM_ULONG_1 )   {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+    if( nParams & PARAM_UINT16_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+    if( nParams & PARAM_UINT16_2 )  {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+    if( nParams & PARAM_UINT16_3 )  {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+    if( nParams & PARAM_UINT16_4 )  {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+    if( nParams & PARAM_UINT32_1 )  {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
     if( nParams & PARAM_STR_1 )     {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
     if( nParams & PARAM_STR_2 )     {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
     m_pDbgWin->AddText( "\n" );
@@ -3742,12 +3742,12 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
                 if ( pControl->GetType() == WINDOW_WORKWINDOW )
                 {
                     Point aStart = pControl->GetPosPixel();
-                    if ( !(nParams & PARAM_USHORT_4) )
+                    if ( !(nParams & PARAM_UINT16_4) )
                     {
-                        nParams |= PARAM_USHORT_1;
-                        nParams |= PARAM_USHORT_2;
-                        nParams |= PARAM_USHORT_3;
-                        nParams |= PARAM_USHORT_4;
+                        nParams |= PARAM_UINT16_1;
+                        nParams |= PARAM_UINT16_2;
+                        nParams |= PARAM_UINT16_3;
+                        nParams |= PARAM_UINT16_4;
                         nNr1 = (sal_uInt16)-aStart.X();
                         nNr2 = (sal_uInt16)-aStart.Y();
                         nNr3 = (sal_uInt16)pControl->GetSizePixel().Width() + 2*(sal_uInt16)aStart.X();
@@ -3758,7 +3758,7 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
                     nNr3 = std::min((sal_uInt16)(pControl->GetSizePixel().Width() + 2*(sal_uInt16)aStart.X()),nNr3);
                     nNr4 = std::min((sal_uInt16)(pControl->GetSizePixel().Height() + 2*(sal_uInt16)aStart.Y()),nNr4);
                 }
-                if( nParams & PARAM_USHORT_4 )
+                if( nParams & PARAM_UINT16_4 )
                 {   // Zuschneiden
                     Point aPt(-nNr1,-nNr2);
                     Size aSz(nNr3,nNr4);
@@ -3784,7 +3784,7 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetFixedText:
             {
-                if( ( nParams & PARAM_USHORT_1 ) == 0 )
+                if( ( nParams & PARAM_UINT16_1 ) == 0 )
                     nNr1 = 1;
 
                 FixedText* pFixedText = (FixedText*)GetWinByRT( pControl, WINDOW_FIXEDTEXT, sal_True, nNr1-1 );
@@ -3828,7 +3828,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
             break;
         case M_TypeKeys:
             {
-                if( !(nParams & PARAM_USHORT_1) )   // Anzahl wiederholungen
+                if( !(nParams & PARAM_UINT16_1) )   // Anzahl wiederholungen
                     nNr1 = 1;
                 if( !(nParams & PARAM_BOOL_1) )     // Follow Focus
                     bBool1 = sal_False;     // so bleibt das bisherige Verhalten
@@ -3954,7 +3954,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
 
 #define CalcMouseButton\
     sal_uInt16 nButton = MOUSE_LEFT;\
-    if ( (nParams & PARAM_USHORT_3) )\
+    if ( (nParams & PARAM_UINT16_3) )\
     {\
         switch ( nNr3 )\
         {\
@@ -4127,7 +4127,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
         case M_IsPin:
             {
                 WindowAlign aWindowAlign = WINDOWALIGN_LEFT;
-                if ( (nParams & PARAM_USHORT_1) )
+                if ( (nParams & PARAM_UINT16_1) )
                 {
                     switch ( nNr1 )
                     {
@@ -4219,7 +4219,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
                 {
                     case M_StatusGetText:
                         {
-                            if ( (nParams & PARAM_USHORT_1) )
+                            if ( (nParams & PARAM_UINT16_1) )
                             {
                                 if ( pStatus->AreItemsVisible() )
                                     pRet->GenReturn ( RET_Value, aUId, String(pStatus->GetItemText(nNr1)));
@@ -4265,13 +4265,13 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
         case M_HasScrollBar:
         case M_IsScrollBarEnabled:
             {
-                if ( (nParams | PARAM_USHORT_1) != PARAM_USHORT_1 )     // so there are other params
+                if ( (nParams | PARAM_UINT16_1) != PARAM_UINT16_1 )     // so there are other params
                 {
                     ReportError( aUId, GEN_RES_STR0( S_INVALID_PARAMETERS ) );
                     break;
                 }
 
-                if( !(nParams & PARAM_USHORT_1) )
+                if( !(nParams & PARAM_UINT16_1) )
                     nNr1 = CONST_ALIGN_RIGHT;       // default is right Scrollbar(vertical)
 
                 if ( (nNr1 != CONST_ALIGN_RIGHT) && (nNr1 != CONST_ALIGN_BOTTOM) )
@@ -4354,7 +4354,7 @@ sal_Bool StatementControl::Execute()
     else
     {
         sal_Bool bSearchButtonOnToolbox = (nParams == PARAM_NONE) && ((M_Click == nMethodId) || (M_TearOff == nMethodId) || (M_IsEnabled == nMethodId) || (M_OpenMenu == nMethodId));
-        bSearchButtonOnToolbox |= (nParams == PARAM_USHORT_1) && (M_GetState == nMethodId);
+        bSearchButtonOnToolbox |= (nParams == PARAM_UINT16_1) && (M_GetState == nMethodId);
         if ( nMethodId == M_TypeKeys || nMethodId == M_MouseDown
             || nMethodId == M_MouseUp || nMethodId ==  M_MouseMove
             || nMethodId == M_SnapShot )
@@ -4399,7 +4399,7 @@ sal_Bool StatementControl::Execute()
             {
                 bBool2 = sal_True;
                 nNr2 = aSeconds;
-                if( !(nParams & PARAM_USHORT_1) )
+                if( !(nParams & PARAM_UINT16_1) )
                     nNr1 = 0;       // defaultm��ig sofort zur�ck
             }
             if ( aSeconds < nNr2 )          // Falls die Stunde umgesprungen ist
@@ -4531,7 +4531,7 @@ sal_Bool StatementControl::Execute()
                     switch( nMethodId )
                     {
                         case M_GetPageId:
-                            if ( (nParams & PARAM_USHORT_1) )
+                            if ( (nParams & PARAM_UINT16_1) )
                             {
                                 if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,((TabControl*)pControl)->GetPageCount() ) )
                                     pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)((TabControl*)pControl)->GetPageId(nNr1-1));
@@ -4567,8 +4567,8 @@ sal_Bool StatementControl::Execute()
                                 sal_uInt16 i,anz;
                                 rtl::OString aID;
                                 rtl::OString aWantedID;
-                                //HELPID BACKWARD (No numbers please (remove PARAM_ULONG_1 part)
-                                if ( (nParams & PARAM_ULONG_1) )
+                                //HELPID BACKWARD (No numbers please (remove PARAM_UINT32_1 part)
+                                if ( (nParams & PARAM_UINT32_1) )
                                 {
                                     ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) );
                                 }
@@ -4726,7 +4726,7 @@ sal_Bool StatementControl::Execute()
                             pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetSelectEntryCount()));
                             break;
                         case M_GetSelIndex :
-                            if ( ! (nParams & PARAM_USHORT_1) )
+                            if ( ! (nParams & PARAM_UINT16_1) )
                             {
                                 if ( ((ListBox*)pControl)->GetSelectEntryCount() == 0 )
                                 {
@@ -4739,7 +4739,7 @@ sal_Bool StatementControl::Execute()
                             pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetSelectEntryPos(nNr1-1)) +1);
                             break;
                         case M_GetSelText :
-                            if ( ! (nParams & PARAM_USHORT_1) )
+                            if ( ! (nParams & PARAM_UINT16_1) )
                                 nNr1 = 1;
                             pRet->GenReturn ( RET_Value, aUId, ((ListBox*)pControl)->GetSelectEntry(nNr1-1));
                             break;
@@ -4847,7 +4847,7 @@ sal_Bool StatementControl::Execute()
                             pRet->GenReturn ( RET_Value, aUId, (comm_BOOL) !((ComboBox*)pControl)->IsReadOnly() );
                             break;
                         case M_Select :
-                            if( nParams & PARAM_USHORT_1 )
+                            if( nParams & PARAM_UINT16_1 )
                             {
                                 if ( !ValueOK(aUId, MethodString( nMethodId ),nNr1,((ComboBox*)pControl)->GetEntryCount()) )
                                     break;
@@ -4954,7 +4954,7 @@ sal_Bool StatementControl::Execute()
                             break;
                         case M_More :
                             {
-                                if ( !(nParams & PARAM_USHORT_1) )
+                                if ( !(nParams & PARAM_UINT16_1) )
                                     nNr1 = 1;
                                 for (int i = 1; i<= nNr1; i++)
                                 {
@@ -4966,7 +4966,7 @@ sal_Bool StatementControl::Execute()
                             break;
                         case M_Less :
                             {
-                                if ( !(nParams & PARAM_USHORT_1) )
+                                if ( !(nParams & PARAM_UINT16_1) )
                                     nNr1 = 1;
                                 for (int i = 1; i<= nNr1; i++)
                                 {
@@ -5038,7 +5038,7 @@ sal_Bool StatementControl::Execute()
                         ToolBox *pTB = ((ToolBox*)pControl);
                         if ( !aUId.equals( pTB->GetUniqueOrHelpId() ) ) // So we found a Button on the ToolBox
                         {
-                            if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) )
+                            if ( (nParams == PARAM_NONE) || (nParams == PARAM_UINT16_1) )
                             {           // Wir f�lschen einen Parameter
                                 nParams |= PARAM_STR_1;
                                 aString1 = Id2Str( aUId );
@@ -5122,7 +5122,7 @@ sal_Bool StatementControl::Execute()
                                             aSubMenuId3 = 0;
                                             pMenuWindow = NULL;
 
-                                            new StatementCommand( this, RC_MenuSelect, PARAM_USHORT_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START );
+                                            new StatementCommand( this, RC_MenuSelect, PARAM_UINT16_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START );
                                         }
                                         else
                                         {
@@ -5283,7 +5283,7 @@ sal_Bool StatementControl::Execute()
                             {                          // should get removed some time
                                 SvTreeListBox *pTree = (SvTreeListBox*)pControl;
                                 SvLBoxEntry *pThisEntry = pTree->GetCurEntry();
-                                if ( ! (nParams & PARAM_USHORT_1) )
+                                if ( ! (nParams & PARAM_UINT16_1) )
                                     nNr1 = 1;
                                 if ( pThisEntry )
                                 {
@@ -5317,7 +5317,7 @@ sal_Bool StatementControl::Execute()
                             pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((SvLBox*)pControl)->GetVisibleCount()) );
                             break;
                         case M_GetSelIndex :
-                            if ( ! (nParams & PARAM_USHORT_1) )
+                            if ( ! (nParams & PARAM_UINT16_1) )
                                 nNr1 = 1;
                             if ( ValueOK(aUId, CUniString("GetSelIndex"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) )
                             {
@@ -5343,9 +5343,9 @@ sal_Bool StatementControl::Execute()
                             }
                             break;
                         case M_GetSelText :
-                            if ( ! (nParams & PARAM_USHORT_1) )
+                            if ( ! (nParams & PARAM_UINT16_1) )
                                 nNr1 = 1;
-                            if ( ! (nParams & PARAM_USHORT_2) )
+                            if ( ! (nParams & PARAM_UINT16_2) )
                                 nNr2 = 1;
                             if ( ValueOK(aUId, CUniString("GetSelText"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) )
                             {
@@ -5354,7 +5354,7 @@ sal_Bool StatementControl::Execute()
                                 if ( ValueOK( aUId, MethodString( nMethodId ),nNr2,pThisEntry->ItemCount() ) )
                                 {
                                     SvLBoxString* pItem = NULL;
-                                    if ( ! (nParams & PARAM_USHORT_2) )
+                                    if ( ! (nParams & PARAM_UINT16_2) )
                                         pItem = (SvLBoxString*)pThisEntry->GetFirstItem( SV_ITEM_ID_LBOXSTRING );
                                     else
                                     {
@@ -5374,12 +5374,12 @@ sal_Bool StatementControl::Execute()
                             if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,((SvLBox*)pControl)->GetVisibleCount()) )
                             {
                                 SvLBoxEntry *pThisEntry = (SvLBoxEntry*)((SvTreeListBox*)pControl)->GetEntryAtVisPos( nNr1-1 );
-                                if ( ! (nParams & PARAM_USHORT_2) )
+                                if ( ! (nParams & PARAM_UINT16_2) )
                                     nNr2 = 1;
                                 if ( ValueOK( aUId, MethodString( nMethodId ),nNr2,pThisEntry->ItemCount() ) )
                                 {
                                     SvLBoxString* pItem = NULL;
-                                    if ( ! (nParams & PARAM_USHORT_2) )
+                                    if ( ! (nParams & PARAM_UINT16_2) )
                                         pItem = (SvLBoxString*)pThisEntry->GetFirstItem( SV_ITEM_ID_LBOXSTRING );
                                     else
                                     {
@@ -5405,7 +5405,7 @@ sal_Bool StatementControl::Execute()
                                 SvTreeListBox *pTree = (SvTreeListBox*)pControl;
                                 SvLBoxEntry *pThisEntry = NULL;
 
-                                if ( ! (nParams & PARAM_USHORT_1) )
+                                if ( ! (nParams & PARAM_UINT16_1) )
                                 {
                                     pThisEntry = pTree->GetCurEntry();
                                     if ( !pThisEntry )
@@ -5419,7 +5419,7 @@ sal_Bool StatementControl::Execute()
                                     }
                                 }
 
-                                if ( ! (nParams & PARAM_USHORT_2) )
+                                if ( ! (nParams & PARAM_UINT16_2) )
                                     nNr2 = 1;
 
                                 if ( pThisEntry )
@@ -5427,7 +5427,7 @@ sal_Bool StatementControl::Execute()
                                     if ( ValueOK( aUId, MethodString( nMethodId ),nNr2,pThisEntry->ItemCount() ) )
                                     {
                                         SvLBoxButton* pItem = NULL;
-                                        if ( ! (nParams & PARAM_USHORT_2) )
+                                        if ( ! (nParams & PARAM_UINT16_2) )
                                             pItem = (SvLBoxButton*)pThisEntry->GetFirstItem( SV_ITEM_ID_LBOXBUTTON );
                                         else
                                         {
@@ -5489,7 +5489,7 @@ sal_Bool StatementControl::Execute()
                                 SvTreeListBox *pTree = (SvTreeListBox*)pControl;
                                 SvLBoxEntry *pThisEntry = NULL;
 
-                                if ( ! (nParams & PARAM_USHORT_1) )
+                                if ( ! (nParams & PARAM_UINT16_1) )
                                 {
                                     pThisEntry = pTree->GetCurEntry();
                                     if ( !pThisEntry )
@@ -5505,7 +5505,7 @@ sal_Bool StatementControl::Execute()
 
                                 if ( pThisEntry )
                                 {
-                                    if ( ! (nParams & PARAM_USHORT_2) )
+                                    if ( ! (nParams & PARAM_UINT16_2) )
                                         nNr2 = 1;
                                     if ( ValueOK( aUId, MethodString( nMethodId ),nNr2,pThisEntry->ItemCount() ) )
                                     {
@@ -5718,7 +5718,7 @@ sal_Bool StatementControl::Execute()
                                                 }
                                             break;
                                         case M_Select:
-                                            if ( (nParams & PARAM_USHORT_1) )
+                                            if ( (nParams & PARAM_UINT16_1) )
                                             {
                                                 if ( ValueOK( aUId, MethodString( nMethodId ), nNr1, pELB->getItemCount() ))
                                                 {
@@ -5879,7 +5879,7 @@ sal_Bool StatementControl::Execute()
                                                 pRet->GenReturn ( RET_Value, aUId, comm_UINT16( pTC->GetSelectedRowCount() ));
                                                 break;
                                             case M_GetSelIndex :
-                                                if ( ! (nParams & PARAM_USHORT_1) )
+                                                if ( ! (nParams & PARAM_UINT16_1) )
                                                     nNr1 = 1;
                                                 if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRowCount() ) )
                                                     pRet->GenReturn ( RET_Value, aUId, comm_UINT16( pTC->GetSelectedRowIndex( nNr1-1 ) +1 ) );
@@ -6267,7 +6267,7 @@ sal_Bool StatementControl::Execute()
                                 pRet->GenReturn ( RET_Value, aUId, pControl->GetText());
                                 break;
                             case M_Click:
-                                if ( nParams & PARAM_USHORT_1 )
+                                if ( nParams & PARAM_UINT16_1 )
                                 {
                                     if ( pBD->GetPushButton( nNr1 ) )
                                     {
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index 6960d41cf15e..475f94dbc6df 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -193,24 +193,24 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString )
                 case SbxINT:
                 case SbxUINT:
                 case SbxSINGLE:
-                    if ( (nParams & PARAM_USHORT_1) == 0 )
+                    if ( (nParams & PARAM_UINT16_1) == 0 )
                     {
-                        nParams |= PARAM_USHORT_1;
+                        nParams |= PARAM_UINT16_1;
                         nNr1 = rPar->Get( i )->GetUShort();
                     }
-                    else if ( (nParams & PARAM_USHORT_2) == 0 )
+                    else if ( (nParams & PARAM_UINT16_2) == 0 )
                     {
-                        nParams |= PARAM_USHORT_2;
+                        nParams |= PARAM_UINT16_2;
                         nNr2 = rPar->Get( i )->GetUShort();
                     }
-                    else if ( (nParams & PARAM_USHORT_3) == 0 )
+                    else if ( (nParams & PARAM_UINT16_3) == 0 )
                     {
-                        nParams |= PARAM_USHORT_3;
+                        nParams |= PARAM_UINT16_3;
                         nNr3 = rPar->Get( i )->GetUShort();
                     }
-                    else if ( (nParams & PARAM_USHORT_4) == 0 )
+                    else if ( (nParams & PARAM_UINT16_4) == 0 )
                     {
-                        nParams |= PARAM_USHORT_4;
+                        nParams |= PARAM_UINT16_4;
                         nNr4 = rPar->Get( i )->GetUShort();
                     }
                     else
@@ -242,11 +242,11 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString )
                             }
                             else if ( pMember->GetType() == SbxULONG )
                             {
-                                if ( nParams & PARAM_ULONG_1 )
+                                if ( nParams & PARAM_UINT32_1 )
                                     SbxBase::SetError( SbxERR_WRONG_ARGS );
                                 else
                                 {
-                                    nParams |= PARAM_ULONG_1;
+                                    nParams |= PARAM_UINT32_1;
                                     nLNr1 = pMember->GetULong();
                                 }
                             }
@@ -297,11 +297,11 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString )
         }
     }
     Write (nParams);
-    if( nParams & PARAM_USHORT_1 )  Write( nNr1 );
-    if( nParams & PARAM_USHORT_2 )  Write( nNr2 );
-    if( nParams & PARAM_USHORT_3 )  Write( nNr3 );
-    if( nParams & PARAM_USHORT_4 )  Write( nNr4 );
-    if( nParams & PARAM_ULONG_1 )   Write( nLNr1 );
+    if( nParams & PARAM_UINT16_1 )  Write( nNr1 );
+    if( nParams & PARAM_UINT16_2 )  Write( nNr2 );
+    if( nParams & PARAM_UINT16_3 )  Write( nNr3 );
+    if( nParams & PARAM_UINT16_4 )  Write( nNr4 );
+    if( nParams & PARAM_UINT32_1 )  Write( nLNr1 );
     if( nParams & PARAM_STR_1 )     Write( aString1, IsKeyString );
     if( nParams & PARAM_STR_2 )     Write( aString2, IsKeyString );
     if( nParams & PARAM_BOOL_1 )    Write( bBool1 );
@@ -426,7 +426,7 @@ void CmdStream::GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 )
 {
     Write(sal_uInt16(SIFlow));
     Write(nArt);
-    Write(sal_uInt16(PARAM_USHORT_1));          // Typ der folgenden Parameter
+    Write(sal_uInt16(PARAM_UINT16_1));          // Typ der folgenden Parameter
     Write(nNr1);
 }
 
@@ -434,7 +434,7 @@ void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_UINT32 nNr1 )
 {
     Write(sal_uInt16(SIFlow));
     Write(nArt);
-    Write(sal_uInt16(PARAM_ULONG_1));           // Typ der folgenden Parameter
+    Write(sal_uInt16(PARAM_UINT32_1));          // Typ der folgenden Parameter
     Write(nNr1);
 }
 
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 4eda2f3ee04b..4de58fe1b62f 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -3183,9 +3183,9 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
             sal_Bool bBool1 = sal_False;
             SbxValueRef xValue1 = new SbxValue;
 
-            if( nParams & PARAM_USHORT_1 )
+            if( nParams & PARAM_UINT16_1 )
                 pRetStream->Read( nNr1 );
-            if( nParams & PARAM_ULONG_1 )
+            if( nParams & PARAM_UINT32_1 )
                 pRetStream->Read( nLNr1 );
             if( nParams & PARAM_STR_1 )
             {
@@ -3222,14 +3222,14 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
                     {
                         if ( aNextReturnId.equals( aUId ) )
                         {
-                            if( nParams & PARAM_ULONG_1 )   // FIXME this is to allow negative numbers, hoping that no large numbers are interpreted wrong. should have new PARAM_LONG_1 instead
+                            if( nParams & PARAM_UINT32_1 )   // FIXME this is to allow negative numbers, hoping that no large numbers are interpreted wrong. should have new PARAM_LONG_1 instead
                             {
                                 if ( nLNr1 > 0x7fffffff )
                                     pImpl->pNextReturn->PutLong( long(nLNr1 - 0xffffffff) -1 );
                                 else
                                     pImpl->pNextReturn->PutULong( nLNr1 );
                             }
-                            if( nParams & PARAM_USHORT_1 )      pImpl->pNextReturn->PutUShort( nNr1 );
+                            if( nParams & PARAM_UINT16_1 )      pImpl->pNextReturn->PutUShort( nNr1 );
                             if( nParams & PARAM_STR_1 )         pImpl->pNextReturn->PutString( aString1 );
                             if( nParams & PARAM_BOOL_1 )        pImpl->pNextReturn->PutBool( bBool1 );
                             if( nParams & PARAM_SBXVALUE_1 )    // FIXME: allow generic datatype
@@ -3368,7 +3368,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
                                 aStrm.Close();
                             }
                         }
-                        if ( nParams & PARAM_ULONG_1 )
+                        if ( nParams & PARAM_UINT32_1 )
                         {
                             switch ( nUId )
                             {
@@ -3532,7 +3532,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
                         }
 
                         aULongNames.Erase();
-                        if( (nParams & PARAM_ULONG_1) && (nNr1 & M_RET_NUM_CONTROL) )
+                        if( (nParams & PARAM_UINT32_1) && (nNr1 & M_RET_NUM_CONTROL) )
                         {
                             if ( m_pReverseControls )
                             {
@@ -3729,7 +3729,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
                             }
                             aCommand.AppendAscii( "\"" );
                         }
-                        if( nParams & PARAM_ULONG_1 )
+                        if( nParams & PARAM_UINT32_1 )
                         {
                             if ( bWasParam )
                                 aCommand.AppendAscii( ", " );