replace comm_ULONG with comm_UINT32

automation/inc/automation/commtypes.hxx

@@ -39,7 +39,6 @@
 /** defines:
     comm_BYTE
     comm_BOOL
-    comm_ULONG
     comm_UINT16
     comm_UINT32
     comm_UniChar
@@ -57,7 +56,6 @@ typedef sal_Unicode comm_UniChar;
 #include <tools/solar.h>
 typedef sal_uInt8 comm_BYTE;
 typedef sal_Bool comm_BOOL;
-typedef sal_uInt32 comm_ULONG;
 typedef sal_uInt16 comm_UINT16;
 typedef sal_uInt32 comm_UINT32;
 

automation/source/inc/cmdbasestream.hxx

@@ -51,13 +51,13 @@ public:
 
     void GenError( rtl::OString *pUId, comm_String *pString );
 
-    void GenReturn( comm_UINT16 nRet, comm_ULONG nNr );
-    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG nNr );
+    void GenReturn( comm_UINT16 nRet, comm_UINT32 nNr );
+    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr );
     void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_String *pString );
     void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_BOOL bBool );
-    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
+    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr, comm_String *pString, comm_BOOL bBool );
 
-    void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_ULONG nNr );
+    void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT32 nNr );
     void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_String *pString );
     void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_BOOL bBool );
     void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT16 nNr );
@@ -67,16 +67,16 @@ public:
     void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString );
     void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString, comm_BOOL bBool );
     void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_BOOL bBool );
-    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_ULONG nNr );
+    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr );
 
     void Read ( comm_UINT16 &nNr );
-    void Read ( comm_ULONG &nNr );
+    void Read ( comm_UINT32 &nNr );
     void Read (comm_UniChar* &aString, comm_UINT16 &nLenInChars );
     void Read ( comm_BOOL &bBool );
     comm_UINT16 GetNextType();
 
     void Write( comm_UINT16 nNr );
-    void Write( comm_ULONG nNr );
+    void Write( comm_UINT32 nNr );
     void Write( const comm_UniChar* aString, comm_UINT16 nLenInChars );
     void Write( comm_BOOL bBool );
 

automation/source/inc/icommstream.hxx

@@ -47,18 +47,18 @@ public:
     virtual ~ICommStream(){}
 
     virtual ICommStream&    operator>>( comm_UINT16& rUShort )=0;
-    virtual ICommStream&    operator>>( comm_ULONG& rULong )=0;
+    virtual ICommStream&    operator>>( comm_UINT32& rULong )=0;
     virtual ICommStream&    operator>>( comm_BOOL& rChar )=0;
 
     virtual ICommStream&    operator<<( comm_UINT16 nUShort )=0;
-    virtual ICommStream&    operator<<( comm_ULONG nULong )=0;
+    virtual ICommStream&    operator<<( comm_UINT32 nULong )=0;
     virtual ICommStream&    operator<<( comm_BOOL nChar )=0;
 
-    virtual comm_ULONG          Read( void* pData, comm_ULONG nSize )=0;
-    virtual comm_ULONG          Write( const void* pData, comm_ULONG nSize )=0;
+    virtual comm_UINT32         Read( void* pData, comm_UINT32 nSize )=0;
+    virtual comm_UINT32         Write( const void* pData, comm_UINT32 nSize )=0;
 
     virtual comm_BOOL       IsEof() const=0;
-    virtual comm_ULONG      SeekRel( long nPos )=0;
+    virtual comm_UINT32     SeekRel( long nPos )=0;
 
 };
 

automation/source/inc/svcommstream.hxx

@@ -42,18 +42,18 @@ public:
     ~SvCommStream();
 
     ICommStream&        operator>>( comm_UINT16& rUShort );
-    ICommStream&        operator>>( comm_ULONG& rULong );
+    ICommStream&        operator>>( comm_UINT32& rULong );
     ICommStream&        operator>>( comm_BOOL& rChar );
 
     ICommStream&        operator<<( comm_UINT16 nUShort );
-    ICommStream&        operator<<( comm_ULONG nULong );
+    ICommStream&        operator<<( comm_UINT32 nULong );
     ICommStream&        operator<<( comm_BOOL nChar );
 
-    comm_ULONG      Read( void* pData, comm_ULONG nSize );
-    comm_ULONG      Write( const void* pData, comm_ULONG nSize );
+    comm_UINT32     Read( void* pData, comm_UINT32 nSize );
+    comm_UINT32     Write( const void* pData, comm_UINT32 nSize );
 
     comm_BOOL       IsEof() const;
-    comm_ULONG      SeekRel( long nPos );
+    comm_UINT32     SeekRel( long nPos );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

automation/source/server/XMLParser.cxx

@@ -496,7 +496,7 @@ void StatementCommand::HandleSAXParser()
             break;
         case RC_SAXGetNodeType:
             {
-                   pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() );
+                   pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)pSAXParser->GetCurrentNode()->GetNodeType() );
             }
             break;
         case RC_SAXGetAttributeCount:
@@ -514,13 +514,13 @@ void StatementCommand::HandleSAXParser()
                             pRet->GenReturn ( RET_Value, nMethodId, pElementNode->GetNodeName() );
                             break;
                         case RC_SAXGetChildCount:
-                            pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pElementNode->GetChildCount() );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)pElementNode->GetChildCount() );
                             break;
                         case RC_SAXGetAttributeCount:
                             if ( xAttributeList.is() )
-                                pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)xAttributeList->getLength() );
+                                pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)xAttributeList->getLength() );
                             else
-                                pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)0 );
+                                pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)0 );
                             break;
                         case RC_SAXGetAttributeName:
                             {

automation/source/server/cmdbasestream.cxx

@@ -58,7 +58,7 @@ void CmdBaseStream::GenError (rtl::OString *pUId, comm_String *pString )
     Write(pString);
 }
 
-void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_ULONG nUId )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT32 nUId )
 {
     Write(comm_UINT16(SIReturn));
     Write(nRet);
@@ -66,12 +66,12 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_ULONG nUId )
     Write(comm_UINT16(PARAM_NONE));             // Typ der folgenden Parameter
 }
 
-void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG nNr )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr )
 {
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
-        Write(comm_ULONG(0));
+        Write(comm_UINT32(0));
     else
         Write(pUId);
     Write(comm_UINT16(PARAM_ULONG_1));          // Typ der folgenden Parameter
@@ -83,7 +83,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_String
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
-        Write(comm_ULONG(0));
+        Write(comm_UINT32(0));
     else
         Write(pUId);
     Write(comm_UINT16(PARAM_STR_1));                // Typ der folgenden Parameter
@@ -95,19 +95,19 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_BOOL b
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
-        Write(comm_ULONG(0));
+        Write(comm_UINT32(0));
     else
         Write(pUId);
     Write(comm_UINT16(PARAM_BOOL_1));           // Typ der folgenden Parameter
     Write(bBool);
 }
 
-void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr, comm_String *pString, comm_BOOL bBool )
 {
     Write(comm_UINT16(SIReturn));
     Write(nRet);
     if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
-        Write(comm_ULONG(0));
+        Write(comm_UINT32(0));
     else
         Write(pUId);
     Write(comm_UINT16(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1));     // Typ der folgenden Parameter
@@ -116,11 +116,11 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG
     Write(bBool);
 }
 
-void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_ULONG nNr )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT32 nNr )
 {
     Write(comm_UINT16(SIReturn));
     Write(nRet);
-    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
     Write(comm_UINT16(PARAM_ULONG_1));          // Typ der folgenden Parameter
     Write(nNr);
 }
@@ -129,7 +129,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_Strin
 {
     Write(comm_UINT16(SIReturn));
     Write(nRet);
-    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
     Write(comm_UINT16(PARAM_STR_1));                // Typ der folgenden Parameter
     Write(pString);
 }
@@ -138,7 +138,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_BOOL
 {
     Write(comm_UINT16(SIReturn));
     Write(nRet);
-    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
     Write(comm_UINT16(PARAM_BOOL_1));           // Typ der folgenden Parameter
     Write(bBool);
 }
@@ -147,7 +147,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT1
 {
     Write(comm_UINT16(SIReturn));
     Write(nRet);
-    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
     Write(comm_UINT16(PARAM_USHORT_1));         // Typ der folgenden Parameter
     Write(nNr);
 }
@@ -194,7 +194,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
     Write(bBool);
 }
 
-void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_ULONG nNr )
+void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr )
 {
     Write(comm_UINT16(SIReturn));
     Write(nRet);
@@ -217,7 +217,7 @@ void CmdBaseStream::Read (comm_UINT16 &nNr)
     *pCommStream >> nNr;
 }
 
-void CmdBaseStream::Read (comm_ULONG &nNr)
+void CmdBaseStream::Read (comm_UINT32 &nNr)
 {
     comm_UINT16 nId;
     *pCommStream >> nId;
@@ -239,7 +239,7 @@ void CmdBaseStream::Read (comm_UniChar* &aString, comm_UINT16 &nLenInChars )
     *pCommStream >> nLenInChars;
 
     aString = new comm_UniChar [nLenInChars];
-    pCommStream->Read( aString, ((comm_ULONG)nLenInChars) * sizeof( comm_UniChar ) );
+    pCommStream->Read( aString, ((comm_UINT32)nLenInChars) * sizeof( comm_UniChar ) );
 #ifdef OSL_BIGENDIAN
     // we have to change the byteorder
     comm_UINT16 n;
@@ -273,7 +273,7 @@ void CmdBaseStream::Write( comm_UINT16 nNr )
     *pCommStream << nNr;
 }
 
-void CmdBaseStream::Write( comm_ULONG nNr )
+void CmdBaseStream::Write( comm_UINT32 nNr )
 {
     *pCommStream << comm_UINT16( BinULONG );
     *pCommStream << nNr;
@@ -313,10 +313,10 @@ void CmdBaseStream::Write( const comm_UniChar* aString, comm_UINT16 nLenInChars
     aNewString = new comm_UniChar [nNewLenInChars];
     for ( n = 0 ; n < nNewLenInChars ; n++ )
         aNewString[ n ] = aNoBiDiString[ n ] >> 8 | aNoBiDiString[ n ] << 8;
-    pCommStream->Write( aNewString, ((comm_ULONG)nNewLenInChars) * sizeof( comm_UniChar ) );
+    pCommStream->Write( aNewString, ((comm_UINT32)nNewLenInChars) * sizeof( comm_UniChar ) );
     delete [] aNewString;
 #else
-    pCommStream->Write( aNoBiDiString, ((comm_ULONG)nNewLenInChars) * sizeof( comm_UniChar ) );
+    pCommStream->Write( aNoBiDiString, ((comm_UINT32)nNewLenInChars) * sizeof( comm_UniChar ) );
 #endif
 
     delete [] aNoBiDiString;

automation/source/server/recorder.cxx

@@ -273,7 +273,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                     case VCLEVENT_LISTBOX_SELECT:
                         if ( m_bRecord )
                         {
-                            StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
+                            StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, comm_UINT32( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
                             bSendData = sal_True;
                         }
                         if ( m_bLog )
@@ -308,7 +308,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                     Sound::Beep();
                                 else
                                 {
-                                    StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, (comm_ULONG) nPos+1 );
+                                    StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, (comm_UINT32) nPos+1 );
                                     bSendData = sal_True;
                                 }
                             }
@@ -372,7 +372,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                             if ( nMethod != M_Click )
                                                 StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod );
                                             else
-                                                StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_ULONG)nCurrentButtonId );
+                                                StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_UINT32)nCurrentButtonId );
                                             bSendData = sal_True;
                                         }
                                         if ( m_bLog )

automation/source/server/retstrm.cxx

@@ -58,7 +58,7 @@ void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, String aString )
     CmdBaseStream::GenReturn ( nRet, &aUId, &aString );
 }
 
-void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool )
+void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, comm_UINT32 nNr, String aString, sal_Bool bBool )
 {
     CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool );
 }
@@ -79,7 +79,7 @@ void RetStream::GenReturn ( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValu
 {
     Write(sal_uInt16(SIReturn));
     Write(nRet);
-    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
     Write(sal_uInt16(PARAM_SBXVALUE_1));        // Typ der folgenden Parameter
     Write(aValue);
 }

automation/source/server/retstrm.hxx

@@ -44,17 +44,17 @@ public:
     void GenError( rtl::OString aUId, String aString );
 
     using CmdBaseStream::GenReturn;
-    void GenReturn( comm_UINT16 nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
-    void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
+    void GenReturn( comm_UINT16 nRet, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
+    void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
     void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
 
 // MacroRecorder
     void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
     void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
-    void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+    void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
 
     void GenReturn( sal_uInt16 nRet, rtl::OString aUId, String aString );
-    void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool );
+    void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_UINT32 nNr, String aString, sal_Bool bBool );
 
 // needed for RemoteCommand and Profiling
     void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue );
@@ -71,7 +71,7 @@ public:
 
     using CmdBaseStream::Write;
     void Write( comm_UINT16 nNr ){CmdBaseStream::Write( nNr );}
-    void Write( comm_ULONG nNr ){CmdBaseStream::Write( nNr );}
+    void Write( comm_UINT32 nNr ){CmdBaseStream::Write( nNr );}
     void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );}
     void Write( SbxValue &aValue );
 

automation/source/server/scmdstrm.cxx

@@ -99,7 +99,7 @@ void SCmdStream::Read ( SfxPoolItem *&pItem )
             break;
         case BinULONG:
             {
-                comm_ULONG nNr;
+                comm_UINT32 nNr;
                 Read (nNr );
                 pItem = new SfxUInt32Item(nId,nNr);
 #if OSL_DEBUG_LEVEL > 1
@@ -170,7 +170,7 @@ void SCmdStream::Read ( ::com::sun::star::beans::PropertyValue &rItem )
             break;
         case BinULONG:
             {
-                comm_ULONG nNr;
+                comm_UINT32 nNr;
                 Read (nNr );
                 rItem.Value <<= nNr;
 #if OSL_DEBUG_LEVEL > 1

automation/source/server/scmdstrm.hxx

@@ -48,7 +48,7 @@ public:
 
     using CmdBaseStream::Read;
     void Read ( comm_UINT16 &nNr ){CmdBaseStream::Read ( nNr );}
-    void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
+    void Read ( comm_UINT32 &nNr ){CmdBaseStream::Read ( nNr );}
     void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
     void Read ( String &aString );
     void Read ( SfxPoolItem *&pItem );

automation/source/server/sta_list.cxx

@@ -167,7 +167,7 @@ void StatementList::SendProfile( String aText )
 
             if ( pProfiler->IsPartitioning() )
                                 // FIXME: HELPID
-                pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() sal_uLong != comm_ULONG on 64bit
+                pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_UINT32>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() sal_uLong != comm_UINT32 on 64bit
         }
 
         if ( pProfiler->IsAutoProfiling() )

automation/source/server/statemnt.hxx

@@ -337,7 +337,7 @@ protected:
     sal_uInt16 nMethodId;
     sal_uInt16 nParams;
     comm_UINT16 nNr1,nNr2,nNr3,nNr4;
-    comm_ULONG nLNr1;
+    comm_UINT32 nLNr1;
     String aString1,aString2;
     sal_Bool bBool1,bBool2;
 
@@ -373,7 +373,7 @@ protected:
     sal_uInt16 nMethodId;
     sal_uInt16 nParams;
     comm_UINT16 nNr1,nNr2,nNr3,nNr4;
-    comm_ULONG nLNr1;
+    comm_UINT32 nLNr1;
     String aString1,aString2;
     sal_Bool bBool1,bBool2;
     sal_Bool ControlOK( Window *pControl, const sal_Char* aBezeichnung );
@@ -397,7 +397,7 @@ class StatementFlow : public StatementList      // Kommunikation mit Sequence
 
     sal_uInt16 nParams;
     comm_UINT16 nSNr1;
-    comm_ULONG nLNr1;
+    comm_UINT32 nLNr1;
     String aString1;
     sal_Bool bBool1;
 

automation/source/server/svcommstream.cxx

@@ -35,17 +35,17 @@ SvCommStream::SvCommStream( SvStream* pIO ) { pStream = pIO; }
 SvCommStream::~SvCommStream() {}
 
 ICommStream& SvCommStream::operator>>( comm_UINT16& rUShort ) { *pStream >> rUShort; return *this; }
-ICommStream& SvCommStream::operator>>( comm_ULONG& rULong ) { *pStream >> rULong; return *this; }
+ICommStream& SvCommStream::operator>>( comm_UINT32& rULong ) { *pStream >> rULong; return *this; }
 ICommStream& SvCommStream::operator>>( comm_BOOL& rChar ) { *pStream >> rChar; return *this; }
 
 ICommStream& SvCommStream::operator<<( comm_UINT16 nUShort ) { *pStream << nUShort; return *this; }
-ICommStream& SvCommStream::operator<<( comm_ULONG nULong ) { *pStream << nULong; return *this; }
+ICommStream& SvCommStream::operator<<( comm_UINT32 nULong ) { *pStream << nULong; return *this; }
 ICommStream& SvCommStream::operator<<( comm_BOOL nChar ) { *pStream << nChar; return *this; }
 
-comm_ULONG SvCommStream::Read( void* pData, comm_ULONG nSize ) { return pStream->Read( pData, nSize ); }
-comm_ULONG SvCommStream::Write( const void* pData, comm_ULONG nSize ) { return pStream->Write( pData, nSize ); }
+comm_UINT32 SvCommStream::Read( void* pData, comm_UINT32 nSize ) { return pStream->Read( pData, nSize ); }
+comm_UINT32 SvCommStream::Write( const void* pData, comm_UINT32 nSize ) { return pStream->Write( pData, nSize ); }
 
 comm_BOOL SvCommStream::IsEof() const { return pStream->IsEof(); }
-comm_ULONG SvCommStream::SeekRel( long nPos ) { return pStream->SeekRel( nPos ); }
+comm_UINT32 SvCommStream::SeekRel( long nPos ) { return pStream->SeekRel( nPos ); }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

automation/source/simplecm/communiio.hxx

@@ -44,25 +44,25 @@
 class ITransmiter
 {
 protected:
-    comm_ULONG nLastSent;
+    comm_UINT32 nLastSent;
 public:
     ITransmiter() :nLastSent( 0 ){}
     virtual ~ITransmiter() {}
     virtual comm_UINT16 TransferBytes( const void* pBuffer, comm_UINT32 nLen ) = 0;
 
-    comm_ULONG GetLastSent() const { return nLastSent; }
+    comm_UINT32 GetLastSent() const { return nLastSent; }
 };
 
 class IReceiver
 {
 protected:
-    comm_ULONG nLastReceived;
+    comm_UINT32 nLastReceived;
 public:
     IReceiver() :nLastReceived( 0 ){}
     virtual ~IReceiver() {;}
     virtual comm_UINT16 ReceiveBytes( void* pBuffer, comm_UINT32 nLen ) = 0;
 
-    comm_ULONG GetLastReceived() const { return nLastReceived; }
+    comm_UINT32 GetLastReceived() const { return nLastReceived; }
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

automation/source/simplecm/packethandler.cxx

@@ -111,8 +111,8 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen )
 
         if ( bMultiChannel || bForceMultiChannelThisPacket )
         {
-            comm_ULONG nReadSoFar = 0;
-            comm_ULONG nHeaderReadSoFar = 0;
+            comm_UINT32 nReadSoFar = 0;
+            comm_UINT32 nHeaderReadSoFar = 0;
 
             // Pr�fbyte f�r L�ngenangabe
             unsigned char nLenCheck = 0;

automation/source/testtool/cmdstrm.cxx

@@ -172,7 +172,7 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString )
 {
     sal_uInt16 nParams = PARAM_NONE;
     sal_uInt16 nNr1=0,nNr2=0,nNr3=0,nNr4=0;
-    comm_ULONG nLNr1=0;
+    comm_UINT32 nLNr1=0;
     String aString1,aString2;
     sal_Bool bBool1=sal_False,bBool2=sal_False;
 
@@ -399,7 +399,7 @@ void CmdStream::GenCmdUNOSlot( const String &aURL )
     Write( aURL );          // Die UNO URL eben
 }
 
-void CmdStream::GenCmdControl( comm_ULONG nUId, sal_uInt16 nMethodId, SbxArray* rPar )
+void CmdStream::GenCmdControl( comm_UINT32 nUId, sal_uInt16 nMethodId, SbxArray* rPar )
 {
     Write(sal_uInt16(SIControl));
     Write(nUId);
@@ -430,7 +430,7 @@ void CmdStream::GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 )
     Write(nNr1);
 }
 
-void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_ULONG nNr1 )
+void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_UINT32 nNr1 )
 {
     Write(sal_uInt16(SIFlow));
     Write(nArt);
@@ -459,7 +459,7 @@ SvMemoryStream* CmdStream::GetStream()
     return pSammel;
 }
 
-void CmdStream::Reset( comm_ULONG nSequence )
+void CmdStream::Reset( comm_UINT32 nSequence )
 {
     delete pCommStream;
     delete pSammel;

automation/source/testtool/cmdstrm.hxx

@@ -46,16 +46,16 @@ public:
 
     void GenCmdUNOSlot( const String &aURL );
 
-    void GenCmdControl( comm_ULONG nUId, sal_uInt16 nMethodId, SbxArray* rPar );
+    void GenCmdControl( comm_UINT32 nUId, sal_uInt16 nMethodId, SbxArray* rPar );
     void GenCmdControl( String aUId, sal_uInt16 nMethodId, SbxArray* rPar );
 
 
     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, comm_UINT32 nNr1 );
     void GenCmdFlow( sal_uInt16 nArt, String aString1 );
 
-    void Reset(comm_ULONG nSequence);
+    void Reset(comm_UINT32 nSequence);
 
     SvMemoryStream* GetStream();
 
@@ -67,7 +67,7 @@ private:
 
     using CmdBaseStream::Write;
     void Write( comm_UINT16 nNr ){CmdBaseStream::Write( nNr );}
-    void Write( comm_ULONG nNr ){CmdBaseStream::Write( nNr );}
+    void Write( comm_UINT32 nNr ){CmdBaseStream::Write( nNr );}
     void Write( const comm_UniChar* aString, comm_UINT16 nLenInChars ){CmdBaseStream::Write( aString, nLenInChars );}
     void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );}
 //  new

automation/source/testtool/cretstrm.hxx

@@ -44,7 +44,7 @@ public:
 
     using CmdBaseStream::Read;
     void Read ( comm_UINT16 &nNr ){CmdBaseStream::Read ( nNr );}
-    void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
+    void Read ( comm_UINT32 &nNr ){CmdBaseStream::Read ( nNr );}
     virtual void Read ( rtl::OString* &pId ){CmdBaseStream::Read ( pId );}
     void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
     void Read( String &aString );

automation/source/testtool/objtest.cxx

@@ -169,7 +169,7 @@ void ControlDef::Write( SvStream &aStream )
     if ( pData->aUId.HasString() )
         aStream.WriteByteString( pData->aUId.GetStr(), RTL_TEXTENCODING_UTF8 );
     else
-        aStream << static_cast<comm_ULONG>(pData->aUId.GetNum()); //GetNum() sal_uLong != comm_ULONG on 64bit
+        aStream << static_cast<comm_UINT32>(pData->aUId.GetNum()); //GetNum() sal_uLong != comm_UINT32 on 64bit
     if ( pSons )
         for ( sal_uInt16 i = 0 ; pSons->Count() > i ; i++ )
             ((ControlDef*)(*pSons)[i])->Write(aStream);
@@ -1401,7 +1401,7 @@ sal_Bool TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pC
         }
         else
         {
-            comm_ULONG nUId;
+            comm_UINT32 nUId;
             aStream >> nUId;
             aUId = rtl::OString();// nUId;
         }
@@ -3168,7 +3168,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
             }
             else
             {
-                comm_ULONG nUId;
+                comm_UINT32 nUId;
                 pRetStream->Read( nUId );         // bei Sequence einfach die Sequence
                 // FIXME: HELPID
                 #if 0
@@ -3178,7 +3178,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
             pRetStream->Read(nParams);
 
             sal_uInt16 nNr1 = 0;
-            comm_ULONG nLNr1 = 0;
+            comm_UINT32 nLNr1 = 0;
             String aString1;
             sal_Bool bBool1 = sal_False;
             SbxValueRef xValue1 = new SbxValue;
@@ -3785,7 +3785,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
             }
             else
             {
-                comm_ULONG nUId;
+                comm_UINT32 nUId;
                 pRetStream->Read( nUId );         // bei Sequence einfach die Sequence
                 // FIXME: HELPID
                 #if 0