1 files changed, 11 insertions, 11 deletions

diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index cc7433f20caf..341aee188fd0 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -56,7 +56,7 @@ SV_IMPL_PTRARR_SORT( ScAddInDocs, ScAddInDocPtr );
 extern "C" {
 void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData )
 {
-    ScAddInAsync::CallBack( ULONG( nHandle ), pData );
+    ScAddInAsync::CallBack( sal_uLong( nHandle ), pData );
 }
 }
 
@@ -70,11 +70,11 @@ ScAddInAsync::ScAddInAsync() :
 
 
 
-ScAddInAsync::ScAddInAsync( ULONG nHandleP, USHORT nIndex, ScDocument* pDoc ) :
+ScAddInAsync::ScAddInAsync( sal_uLong nHandleP, sal_uInt16 nIndex, ScDocument* pDoc ) :
     SvtBroadcaster(),
     pStr( NULL ),
     nHandle( nHandleP ),
-    bValid( FALSE )
+    bValid( false )
 {
     pDocs = new ScAddInDocs( 1, 1 );
     pDocs->Insert( pDoc );
@@ -100,9 +100,9 @@ ScAddInAsync::~ScAddInAsync()
 
 
 
-ScAddInAsync* ScAddInAsync::Get( ULONG nHandleP )
+ScAddInAsync* ScAddInAsync::Get( sal_uLong nHandleP )
 {
-    USHORT nPos;
+    sal_uInt16 nPos;
     ScAddInAsync* pRet = 0;
     aSeekObj.nHandle = nHandleP;
     if ( theAddInAsyncTbl.Seek_Entry( &aSeekObj, &nPos ) )
@@ -113,7 +113,7 @@ ScAddInAsync* ScAddInAsync::Get( ULONG nHandleP )
 
 
 
-void ScAddInAsync::CallBack( ULONG nHandleP, void* pData )
+void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData )
 {
     ScAddInAsync* p;
     if ( (p = Get( nHandleP )) == NULL )
@@ -141,12 +141,12 @@ void ScAddInAsync::CallBack( ULONG nHandleP, void* pData )
             OSL_FAIL( "unbekannter AsyncType" );
             return;
     }
-    p->bValid = TRUE;
+    p->bValid = sal_True;
     p->Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) );
 
     const ScDocument** ppDoc = (const ScDocument**) p->pDocs->GetData();
-    USHORT nCount = p->pDocs->Count();
-    for ( USHORT j=0; j<nCount; j++, ppDoc++ )
+    sal_uInt16 nCount = p->pDocs->Count();
+    for ( sal_uInt16 j=0; j<nCount; j++, ppDoc++ )
     {
         ScDocument* pDoc = (ScDocument*)*ppDoc;
         pDoc->TrackFormulas();
@@ -159,7 +159,7 @@ void ScAddInAsync::CallBack( ULONG nHandleP, void* pData )
 
 void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP )
 {
-    USHORT nPos = theAddInAsyncTbl.Count();
+    sal_uInt16 nPos = theAddInAsyncTbl.Count();
     if ( nPos )
     {
         const ScAddInAsync** ppAsync =
@@ -167,7 +167,7 @@ void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP )
         for ( ; nPos-- >0; ppAsync-- )
         {   // rueckwaerts wg. Pointer-Aufrueckerei im Array
             ScAddInDocs* p = ((ScAddInAsync*)*ppAsync)->pDocs;
-            USHORT nFoundPos;
+            sal_uInt16 nFoundPos;
             if ( p->Seek_Entry( pDocumentP, &nFoundPos ) )
             {
                 p->Remove( nFoundPos );