replace comm_ULONG with comm_UINT32

20 files changed, 149 insertions, 149 deletions

diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index a49bbb27f..87803074d 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/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 );
 
diff --git a/automation/source/inc/icommstream.hxx b/automation/source/inc/icommstream.hxx
index e3314c377..147dfe56f 100644
--- a/automation/source/inc/icommstream.hxx
+++ b/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;
 
 };
 
diff --git a/automation/source/inc/svcommstream.hxx b/automation/source/inc/svcommstream.hxx
index e92ea661c..70c4a619e 100644
--- a/automation/source/inc/svcommstream.hxx
+++ b/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: */
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index dc9d11289..b69aef204 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/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:
                             {
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 24408a250..a5f48539a 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/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;
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 9cbba78c9..a88efbebf 100644
--- a/automation/source/server/recorder.cxx
+++ b/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 )
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index 1326e59f9..8cc639a43 100644
--- a/automation/source/server/retstrm.cxx
+++ b/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);
 }
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index 537e3bd02..30e2625f5 100644
--- a/automation/source/server/retstrm.hxx
+++ b/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 );
 
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index 850265af1..fe929a594 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/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
diff --git a/automation/source/server/scmdstrm.hxx b/automation/source/server/scmdstrm.hxx
index d4585a1d2..5ef7a8c2b 100644
--- a/automation/source/server/scmdstrm.hxx
+++ b/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 );
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 99906cd0b..69a021240 100644
--- a/automation/source/server/sta_list.cxx
+++ b/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() )
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index bc24e4fe8..52684a26d 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -772,7 +772,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
         return;
 
     if ( bFirst )
-        pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), sal_True );
+        pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_UINT32)nConf | DH_MODE_DATA_VALID, UniString(), sal_True );
 
     if ( bFirst )
     {
@@ -882,7 +882,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
             }
 
             rtl::OString aId = pBase->GetUniqueOrHelpId();
-            pRet->GenReturn ( RET_WinInfo, aId, (comm_ULONG)pBase->GetType(),
+            pRet->GenReturn ( RET_WinInfo, aId, (comm_UINT32)pBase->GetType(),
                 TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), sal_False );
 
 
@@ -903,10 +903,10 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
                     if ( pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && ( !pItemWin || !pItemWin->IsVisible() ) )
                     {
                         if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                            pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)WINDOW_BUTTON,
+                            pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_UINT32)WINDOW_BUTTON,
                                 TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), sal_False );
                         if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                            pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BUTTON,
+                            pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_UINT32)WINDOW_BUTTON,
                                 TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), sal_False );
                     }
                     else
@@ -914,10 +914,10 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
                         if ( pItemWin )
                         {
                             if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                                pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)pItemWin->GetType(),
+                                pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_UINT32)pItemWin->GetType(),
                                     TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), sal_False );
                             if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                                pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)pItemWin->GetType(),
+                                pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_UINT32)pItemWin->GetType(),
                                     TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), sal_False );
                             sal_uInt16 ii;
                             for( ii = 0 ; ii < pItemWin->GetChildCount(); ii++ )
@@ -949,10 +949,10 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
                                     OSL_TRACE( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) );
                                 }
                                 if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                                    pRet->GenReturn ( RET_WinInfo, Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE,
+                                    pRet->GenReturn ( RET_WinInfo, Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_UINT32)WINDOW_BASE,
                                         aToolBoxItemType.AppendAscii(": ").Append(aName), sal_False );
                                 if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                                    pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BASE,
+                                    pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_UINT32)WINDOW_BASE,
                                         aToolBoxItemType.AppendAscii(": ").Append(aName), sal_False );
                             }
                         }
@@ -1003,7 +1003,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
                             break;
                     }
 
-                    pRet->GenReturn ( RET_WinInfo, aID, (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(),	// So da� der Text angezeigt wird!
+                    pRet->GenReturn ( RET_WinInfo, aID, (comm_UINT32)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(),	// So da� der Text angezeigt wird!
                         TypeString(pBD->GetPushButton( pBD->GetButtonId(i) )->GetType()).AppendAscii(": ").Append(aName)
                         .AppendAscii(" ButtonId = ").AppendAscii( aID.GetBuffer() ), sal_False );
                 }
@@ -1052,10 +1052,10 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
                             OSL_TRACE( "Unknown MENUITEM %i", pMenu->GetItemType( i ) );
                         }
                         if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                            pRet->GenReturn ( RET_WinInfo, Str2Id( pMenu->GetItemCommand(nID) ), (comm_ULONG)0,
+                            pRet->GenReturn ( RET_WinInfo, Str2Id( pMenu->GetItemCommand(nID) ), (comm_UINT32)0,
                                 aMenuItemType.AppendAscii(": ").Append(aName), sal_False );
                         if ( !pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                            pRet->GenReturn ( RET_WinInfo, rtl::OString::valueOf( (sal_Int32)nID ), (comm_ULONG)0,
+                            pRet->GenReturn ( RET_WinInfo, rtl::OString::valueOf( (sal_Int32)nID ), (comm_UINT32)0,
                                 aMenuItemType.AppendAscii(": ").Append(aName), sal_False );
                     }
                 }
@@ -2606,7 +2606,7 @@ sal_Bool StatementCommand::Execute()
                 }
                 else if ( nParams & PARAM_USHORT_1 )
                 {	// Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr]
-                    comm_ULONG nAnzahl=0;
+                    comm_UINT32 nAnzahl=0;
                     if ( nParams & PARAM_USHORT_1 ) { nAnzahl++; };
                     if ( nParams & PARAM_USHORT_2 ) { nAnzahl++; };
                     if ( nParams & PARAM_USHORT_3 ) { nAnzahl++; };
@@ -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_ULONG)nNr1 ); };
-                    if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_ULONG)nNr2 ); };
-                    if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_ULONG)nNr3 ); };
-                    if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_ULONG)nNr4 ); };
+                    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 ); };
 
                     pProfiler->StartPartitioning();
                 }
@@ -2657,7 +2657,7 @@ sal_Bool StatementCommand::Execute()
 
                     if ( pProfiler->IsPartitioning() )
                     {
-                        pRet->GenReturn( RET_ProfileInfo, S_ProfileDump, (comm_ULONG)0 );
+                        pRet->GenReturn( RET_ProfileInfo, S_ProfileDump, (comm_UINT32)0 );
                         pProfiler->StopPartitioning();
                     }
 
@@ -2755,13 +2755,13 @@ sal_Bool StatementCommand::Execute()
                 {
                     case RC_MenuGetItemCount:
                         {
-                            pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)nItemCount );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)nItemCount );
                         }
                         break;
                     case RC_MenuGetItemId:
                         {
                             if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) )
-                                pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) );
+                                pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)pMenu->GetItemId(nPhysicalIndex-1) );
                         }
                         break;
                     case RC_MenuGetItemPos:
@@ -2783,7 +2783,7 @@ sal_Bool StatementCommand::Execute()
                                     }
                                 }
                             }
-                            pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)(nLogicalPos+1) );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)(nLogicalPos+1) );
                         }
                         break;
                     case RC_MenuIsSeperator:
@@ -2994,7 +2994,7 @@ sal_Bool StatementCommand::Execute()
                             if ( FSYS_ERR_OK == nErrorcode )
                             {
                                 FileStat aFS( aFile );
-                                pRet->GenReturn ( RET_Value, nMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() sal_uLong != comm_ULONG on 64bit
+                                pRet->GenReturn ( RET_Value, nMethodId, static_cast<comm_UINT32>(aFS.GetSize()) ); //GetSize() sal_uLong != comm_UINT32 on 64bit
                                 nErrorcode = aFS.GetError();
                             }
                         }
@@ -3132,7 +3132,7 @@ sal_Bool StatementCommand::Execute()
                     ReportError( GEN_RES_STR1( S_POINTER_OUTSIDE_APPWIN, RcString( nMethodId ) ) );
                     aPointer = Pointer( POINTER_NULL );
                 }
-                pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)aPointer.GetStyle() );
+                pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)aPointer.GetStyle() );
             }
             break;
         case RC_UnpackStorage:
@@ -3364,7 +3364,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, sal_uInt16 nControlIdTyp
     //HELPID BACKWARD (SIControl is no longer needed)
     if ( nControlIdType == SIControl )
     {
-        comm_ULONG nId;
+        comm_UINT32 nId;
         pCmdIn->Read( nId );
         aUId = rtl::OString( nId );
         if ( nId == 0 )
@@ -3679,10 +3679,10 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
             {
                 Point aPos = pControl->GetPosPixel();
                 aPos = pControl->GET_REAL_PARENT()->OutputToScreenPixel( aPos );
-                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)aPos.X() );
+                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)aPos.X() );
             }
             else
-                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetPosPixel().X() );
+                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetPosPixel().X() );
             break;
         case M_GetPosY:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
@@ -3698,10 +3698,10 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
             {
                 Point aPos = pControl->GetPosPixel();
                 aPos = pControl->GET_REAL_PARENT()->OutputToScreenPixel( aPos );
-                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)aPos.Y() );
+                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)aPos.Y() );
             }
             else
-                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetPosPixel().Y() );
+                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetPosPixel().Y() );
             break;
         case M_GetSizeX:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
@@ -3713,7 +3713,7 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
-            pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetSizePixel().Width() );
+            pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetSizePixel().Width() );
             break;
         case M_GetSizeY:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
@@ -3725,7 +3725,7 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
-            pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetSizePixel().Height() );
+            pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetSizePixel().Height() );
             break;
         case M_SnapShot:
             {
@@ -3823,7 +3823,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
             break;
         case M_GetRT:
             {
-                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetType() );
+                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetType() );
             }
             break;
         case M_TypeKeys:
@@ -4251,13 +4251,13 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
                         break;
                     case M_StatusGetItemCount:
                         if ( pStatus->AreItemsVisible() )
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(pStatus->GetItemCount()));
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(pStatus->GetItemCount()));
                         else
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(0));
                         break;
                     case M_StatusGetItemId:
                         if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,pStatus->GetItemCount()) )
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(pStatus->GetItemId(nNr1-1)));
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(pStatus->GetItemId(nNr1-1)));
                         break;
                 }
             }
@@ -4534,13 +4534,13 @@ sal_Bool StatementControl::Execute()
                             if ( (nParams & PARAM_USHORT_1) )
                             {
                                 if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,((TabControl*)pControl)->GetPageCount() ) )
-                                    pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)((TabControl*)pControl)->GetPageId(nNr1-1));
+                                    pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)((TabControl*)pControl)->GetPageId(nNr1-1));
                             }
                             else
-                                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)((TabControl*)pControl)->GetCurPageId());
+                                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)((TabControl*)pControl)->GetCurPageId());
                             break;
                         case M_GetPageCount:
-                            pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)((TabControl*)pControl)->GetPageCount());
+                            pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)((TabControl*)pControl)->GetPageCount());
                             break;
                         case M_SetPageId:
                             if (((TabControl*)pControl)->GetCurPageId())
@@ -4635,7 +4635,7 @@ sal_Bool StatementControl::Execute()
                             pRet->GenReturn ( RET_Value, aUId, comm_BOOL( ((TriStateBox*)pControl)->GetState() == STATE_DONTKNOW) );
                             break;
                         case M_GetState :
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((TriStateBox*)pControl)->GetState()));
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((TriStateBox*)pControl)->GetState()));
                             break;
                         case M_Check :
                             ((TriStateBox*)pControl)->SetState( STATE_CHECK );
@@ -4723,20 +4723,20 @@ sal_Bool StatementControl::Execute()
                             AnimateMouse( pControl, MitteOben);
                             break;
                         case M_GetSelCount :
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((ListBox*)pControl)->GetSelectEntryCount()));
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetSelectEntryCount()));
                             break;
                         case M_GetSelIndex :
                             if ( ! (nParams & PARAM_USHORT_1) )
                             {
                                 if ( ((ListBox*)pControl)->GetSelectEntryCount() == 0 )
                                 {
-                                    pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
+                                    pRet->GenReturn ( RET_Value, aUId, comm_UINT32(0));
                                     break;
                                 }
                                 nNr1 = 1;
                             }
                             ValueOK(aUId, MethodString( nMethodId ),nNr1,((ListBox*)pControl)->GetSelectEntryCount());
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((ListBox*)pControl)->GetSelectEntryPos(nNr1-1)) +1);
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetSelectEntryPos(nNr1-1)) +1);
                             break;
                         case M_GetSelText :
                             if ( ! (nParams & PARAM_USHORT_1) )
@@ -4744,7 +4744,7 @@ sal_Bool StatementControl::Execute()
                             pRet->GenReturn ( RET_Value, aUId, ((ListBox*)pControl)->GetSelectEntry(nNr1-1));
                             break;
                         case M_GetItemCount :
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((ListBox*)pControl)->GetEntryCount()));
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetEntryCount()));
                             break;
                         case M_GetItemText :
                             pRet->GenReturn ( RET_Value, aUId, ((ListBox*)pControl)->GetEntry(nNr1-1));
@@ -4834,11 +4834,11 @@ sal_Bool StatementControl::Execute()
                                     nPos = 0;
                                 else
                                     nPos++;
-                                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG) nPos);
+                                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32) nPos);
                             }
                             break;
                         case M_GetItemCount :
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((ComboBox*)pControl)->GetEntryCount()));
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ComboBox*)pControl)->GetEntryCount()));
                             break;
                         case M_GetItemText :
                             pRet->GenReturn ( RET_Value, aUId, ((ComboBox*)pControl)->GetEntry(nNr1-1));
@@ -5210,17 +5210,17 @@ sal_Bool StatementControl::Execute()
                                                 pRet->GenReturn ( RET_Value, aUId, Id2Str( pTB->GetHelpId(pTB->GetItemId(nItemPos)) ) );
                                                 break;
                                             case 1:
-                                                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos));
+                                                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTB->GetItemType(nItemPos));
                                                 break;
                                             case 2:
-                                                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos)));
+                                                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTB->GetItemState(pTB->GetItemId(nItemPos)));
                                                 break;
                                             case 3:
-                                                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos));
+                                                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTB->GetItemId(nItemPos));
                                                 break;
                                             default:
                                                 ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
-                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
+                                                pRet->GenReturn ( RET_Value, aUId, comm_UINT32(0));
                                                 break;
                                             }
                                     }
@@ -5233,7 +5233,7 @@ sal_Bool StatementControl::Execute()
                                 pRet->GenReturn ( RET_Value, aUId, (String)pTB->GetText());
                                 break;
                             case M_GetItemCount :
-                                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemCount());
+                                pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTB->GetItemCount());
                                 break;
                             case M_SetNextToolBox :
                                 if ( (nParams & PARAM_STR_1) )
@@ -5311,10 +5311,10 @@ sal_Bool StatementControl::Execute()
                             }
                             break;
                         case M_GetSelCount :
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((SvLBox*)pControl)->GetSelectionCount()));
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((SvLBox*)pControl)->GetSelectionCount()));
                             break;
                         case M_GetItemCount :
-                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((SvLBox*)pControl)->GetVisibleCount()) );
+                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((SvLBox*)pControl)->GetVisibleCount()) );
                             break;
                         case M_GetSelIndex :
                             if ( ! (nParams & PARAM_USHORT_1) )
@@ -5323,7 +5323,7 @@ sal_Bool StatementControl::Execute()
                             {
                                 nNr1--;
                                 GET_NTH_ENTRY_LBOX( FirstSelected, NextSelected, nNr1);
-                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG( ((SvTreeListBox*)pControl)->GetVisiblePos( pThisEntry )) +1 );
+                                pRet->GenReturn ( RET_Value, aUId, comm_UINT32( ((SvTreeListBox*)pControl)->GetVisiblePos( pThisEntry )) +1 );
                             }
                             break;
                         case M_Select :
@@ -5447,7 +5447,7 @@ sal_Bool StatementControl::Execute()
                                                     pRet->GenReturn ( RET_Value, aUId, comm_BOOL( pItem->IsStateTristate() ) );
                                                     break;
                                                 case M_GetState :
-                                                    pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pItem->GetButtonFlags() & ~SV_STATE_MASK ));
+                                                    pRet->GenReturn ( RET_Value, aUId, comm_UINT32( pItem->GetButtonFlags() & ~SV_STATE_MASK ));
                                                     break;
                                                 case M_Check :
                                                     if ( !pItem->IsStateChecked() )
@@ -5578,7 +5578,7 @@ sal_Bool StatementControl::Execute()
                                                 break;
                                             case M_GetRowCount :
                                                 {
-                                                    pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pEBBox->GetRowCount() );
+                                                    pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pEBBox->GetRowCount() );
                                                 }
                                                 break;
                                             case M_IsEditing :
@@ -5618,7 +5618,7 @@ sal_Bool StatementControl::Execute()
                                         switch ( nMethodId )
                                         {
                                         case M_GetItemCount:
-                                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pVS->GetItemCount()));
+                                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32( pVS->GetItemCount()));
                                             break;
                                         case M_GetItemText:
                                             if ( ValueOK( aUId, MethodString( nMethodId ), nNr1, pVS->GetItemCount() ))
@@ -5630,9 +5630,9 @@ sal_Bool StatementControl::Execute()
                                             break;
                                         case M_GetSelIndex :
                                             if ( pVS->IsNoSelection() )
-                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
+                                                pRet->GenReturn ( RET_Value, aUId, comm_UINT32(0));
                                             else
-                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pVS->GetItemPos( pVS->GetSelectItemId() ) +1));
+                                                pRet->GenReturn ( RET_Value, aUId, comm_UINT32( pVS->GetItemPos( pVS->GetSelectItemId() ) +1));
                                             break;
                                         case M_GetSelText :
                                             if ( pVS->IsNoSelection() )
@@ -5655,7 +5655,7 @@ sal_Bool StatementControl::Execute()
                                         switch ( nMethodId )
                                         {
                                         case M_GetItemCount:
-                                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pRM->GetItemCount()));
+                                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32( pRM->GetItemCount()));
                                             break;
                                         case M_GetItemText:
                                             if ( ValueOK( aUId, MethodString( nMethodId ), nNr1, pRM->GetItemCount() ))
@@ -5671,7 +5671,7 @@ sal_Bool StatementControl::Execute()
                                             }
                                             break;
                                         case M_GetSelIndex :
-                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pRM->GetItemIndex( pRM->GetCurrentRoadmapItemID() ) +1));
+                                                pRet->GenReturn ( RET_Value, aUId, comm_UINT32( pRM->GetItemIndex( pRM->GetCurrentRoadmapItemID() ) +1));
                                             break;
                                         case M_GetSelText :
                                                 pRet->GenReturn ( RET_Value, aUId, pRM->GetRoadmapItemLabel( pRM->GetCurrentRoadmapItemID() ) );
@@ -5692,7 +5692,7 @@ sal_Bool StatementControl::Execute()
                                         switch ( nMethodId )
                                         {
                                         case M_GetItemCount:
-                                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pELB->getItemCount()));
+                                            pRet->GenReturn ( RET_Value, aUId, comm_UINT32( pELB->getItemCount()));
                                             break;
                                         case M_GetItemText:
                                             if ( ValueOK( aUId, MethodString( nMethodId ), nNr1, pELB->getItemCount() ))
@@ -5742,15 +5742,15 @@ sal_Bool StatementControl::Execute()
                                             break;
                                         case M_GetSelCount :
                                             if ( pELB->getSelIndex() == EXTENSION_LISTBOX_ENTRY_NOTFOUND )
-                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG( 0 ));
+                                                pRet->GenReturn ( RET_Value, aUId, comm_UINT32( 0 ));
                                             else
-                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG( 1 ));
+                                                pRet->GenReturn ( RET_Value, aUId, comm_UINT32( 1 ));
                                             break;
                                         case M_GetSelIndex :
                                             if ( pELB->getSelIndex() == EXTENSION_LISTBOX_ENTRY_NOTFOUND )
-                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG( 0 ));
+                                                pRet->GenReturn ( RET_Value, aUId, comm_UINT32( 0 ));
                                             else
-                                                   pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pELB->getSelIndex() +1));
+                                                   pRet->GenReturn ( RET_Value, aUId, comm_UINT32( pELB->getSelIndex() +1));
                                             break;
                                         default:
                                             ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "RoadMap" ) );
@@ -5812,7 +5812,7 @@ sal_Bool StatementControl::Execute()
                                                             case TypeClass_UNSIGNED_LONG:
                                                             case TypeClass_UNSIGNED_HYPER:
                                                                 {
-                                                                    comm_ULONG val = 0;
+                                                                    comm_UINT32 val = 0;
                                                                     aCell >>= val;
                                                                     pRet->GenReturn ( RET_Value, aUId, val );
                                                                 }
@@ -5833,12 +5833,12 @@ sal_Bool StatementControl::Execute()
                                                 break;
                                             case M_GetColumnCount :
                                                 {
-                                                    pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTC->GetColumnCount() );
+                                                    pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTC->GetColumnCount() );
                                                 }
                                                 break;
                                             case M_GetRowCount :
                                                 {
-                                                    pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTC->GetRowCount() );
+                                                    pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTC->GetRowCount() );
                                                 }
                                                 break;
                                             case M_Select :
@@ -6284,11 +6284,11 @@ sal_Bool StatementControl::Execute()
                                     ReportError( aUId, GEN_RES_STR1( S_BUTTONID_REQUIRED, MethodString( nMethodId ) ) );
                                 break;
                             case M_GetButtonCount :
-                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG(pBD->GetButtonCount()));
+                                pRet->GenReturn ( RET_Value, aUId, comm_UINT32(pBD->GetButtonCount()));
                                 break;
                             case M_GetButtonId :
                                 if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,pBD->GetButtonCount()) )
-                                    pRet->GenReturn ( RET_Value, aUId, comm_ULONG(pBD->GetButtonId(nNr1-1)));
+                                    pRet->GenReturn ( RET_Value, aUId, comm_UINT32(pBD->GetButtonId(nNr1-1)));
                                 break;
                             default:
                                 ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "MessageBox" ) );
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index 6c95ed582..9fcdd2a41 100644
--- a/automation/source/server/statemnt.hxx
+++ b/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;
 
diff --git a/automation/source/server/svcommstream.cxx b/automation/source/server/svcommstream.cxx
index 71945f723..730cfabc6 100644
--- a/automation/source/server/svcommstream.cxx
+++ b/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: */
diff --git a/automation/source/simplecm/communiio.hxx b/automation/source/simplecm/communiio.hxx
index 013629ee8..c6a342d39 100644
--- a/automation/source/simplecm/communiio.hxx
+++ b/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: */
diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx
index aea8a1a94..70feb9c04 100644
--- a/automation/source/simplecm/packethandler.cxx
+++ b/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;
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index efb8c3e1c..3bff14b32 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/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;
diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx
index a6ceed1f3..9f104e2b4 100644
--- a/automation/source/testtool/cmdstrm.hxx
+++ b/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
diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx
index 6bb8bec59..f33dc65a8 100644
--- a/automation/source/testtool/cretstrm.hxx
+++ b/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 );
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 5f7d3de9d..eaffdaebe 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/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