BinUSHORT->BinUINT16 && BinULONG->BinUINT32

automation/source/inc/rcontrol.hxx

@@ -54,8 +54,8 @@
 #define SIReturnError       13
 
 // Typisierung im Stream
-#define BinUSHORT           11
-#define BinULONG            14
+#define BinUINT16           11
+#define BinUINT32           14
 #define BinString           12
 #define BinBool             13
 #define BinSbxValue         15

automation/source/server/cmdbasestream.cxx

@@ -212,7 +212,7 @@ void CmdBaseStream::Read (comm_UINT16 &nNr)
     *pCommStream >> nId;
     if (pCommStream->IsEof()) return;
 #if OSL_DEBUG_LEVEL > 1
-    if (nId != BinUSHORT) OSL_TRACE( "Falscher Typ im Stream: Erwartet USHORT, gefunden :%hu", nId );
+    if (nId != BinUINT16) OSL_TRACE( "Falscher Typ im Stream: Erwartet USHORT, gefunden :%hu", nId );
 #endif
     *pCommStream >> nNr;
 }
@@ -223,7 +223,7 @@ void CmdBaseStream::Read (comm_UINT32 &nNr)
     *pCommStream >> nId;
     if (pCommStream->IsEof()) return;
 #if OSL_DEBUG_LEVEL > 1
-    if (nId != BinULONG) OSL_TRACE( "Falscher Typ im Stream: Erwartet ULONG, gefunden :%hu", nId );
+    if (nId != BinUINT32) OSL_TRACE( "Falscher Typ im Stream: Erwartet ULONG, gefunden :%hu", nId );
 #endif
     *pCommStream >> nNr;
 }
@@ -269,13 +269,13 @@ comm_UINT16 CmdBaseStream::GetNextType()
 
 void CmdBaseStream::Write( comm_UINT16 nNr )
 {
-    *pCommStream << comm_UINT16( BinUSHORT );
+    *pCommStream << comm_UINT16( BinUINT16 );
     *pCommStream << nNr;
 }
 
 void CmdBaseStream::Write( comm_UINT32 nNr )
 {
-    *pCommStream << comm_UINT16( BinULONG );
+    *pCommStream << comm_UINT16( BinUINT32 );
     *pCommStream << nNr;
 }
 

automation/source/server/scmdstrm.cxx

@@ -86,24 +86,24 @@ void SCmdStream::Read ( SfxPoolItem *&pItem )
     Read( nType );
     switch (nType)
     {
-        case BinUSHORT:
+        case BinUINT16:
             {
                 comm_UINT16 nNr;
                 Read (nNr );
                 pItem = new SfxUInt16Item(nId,nNr);
 #if OSL_DEBUG_LEVEL > 1
-                StatementList::m_pDbgWin->AddText( "USHORT:" );
+                StatementList::m_pDbgWin->AddText( "UINT16" );
                 StatementList::m_pDbgWin->AddText( String::CreateFromInt32( nNr ) );
 #endif
             }
             break;
-        case BinULONG:
+        case BinUINT32:
             {
                 comm_UINT32 nNr;
                 Read (nNr );
                 pItem = new SfxUInt32Item(nId,nNr);
 #if OSL_DEBUG_LEVEL > 1
-                StatementList::m_pDbgWin->AddText( "ULONG:" );
+                StatementList::m_pDbgWin->AddText( "UINT32" );
                 StatementList::m_pDbgWin->AddText( String::CreateFromInt64( nNr ) );
 #endif
             }
@@ -157,24 +157,24 @@ void SCmdStream::Read ( ::com::sun::star::beans::PropertyValue &rItem )
     nType = GetNextType();
     switch (nType)
     {
-        case BinUSHORT:
+        case BinUINT16:
             {
                 comm_UINT16 nNr;
                 Read (nNr );
                 rItem.Value <<= nNr;
 #if OSL_DEBUG_LEVEL > 1
-                StatementList::m_pDbgWin->AddText( "USHORT:" );
+                StatementList::m_pDbgWin->AddText( "UINT16" );
                 StatementList::m_pDbgWin->AddText( String::CreateFromInt32( nNr ) );
 #endif
             }
             break;
-        case BinULONG:
+        case BinUINT32:
             {
                 comm_UINT32 nNr;
                 Read (nNr );
                 rItem.Value <<= nNr;
 #if OSL_DEBUG_LEVEL > 1
-                StatementList::m_pDbgWin->AddText( "ULONG:" );
+                StatementList::m_pDbgWin->AddText( "UINT32" );
                 StatementList::m_pDbgWin->AddText( String::CreateFromInt64( nNr ) );
 #endif
             }

automation/source/server/statemnt.cxx

@@ -349,7 +349,7 @@ StatementSlot::StatementSlot( SCmdStream *pCmdIn )
     {
         switch ( pCmdIn->GetNextType() )
         {
-            case BinUSHORT: // use old calling method
+            case BinUINT16: // use old calling method
                 {
                     nAnzahl++;
                     pItemArr = new SfxPoolItem*[nAnzahl];

automation/source/testtool/cmdstrm.cxx

@@ -344,7 +344,7 @@ void CmdStream::GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar )
                 case SbxUINT:
                 case SbxSINGLE:
                     if ( !bWriteUnoSlot )
-                        Write( (sal_uInt16)BinUSHORT );
+                        Write( (sal_uInt16)BinUINT16 );
                     Write(rPar->Get( 2*n )->GetUShort());
                     break;
                 case SbxLONG:
@@ -353,7 +353,7 @@ void CmdStream::GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar )
                 case SbxSALUINT64:
                 case SbxDOUBLE:
                     if ( !bWriteUnoSlot )
-                        Write( (sal_uInt16)BinULONG );
+                        Write( (sal_uInt16)BinUINT32 );
                     Write(rPar->Get( 2*n )->GetULong());
                     break;
                 case SbxSTRING: