CWS gnumake3: pull in cws removetooltypes01

5 files changed, 78 insertions, 78 deletions

diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index d860c8b0f572..57e65862aea2 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -237,11 +237,11 @@ static List& InitFormats_Impl()
 |*
 |*    Beschreibung      CLIP.SDW
 *************************************************************************/
-ULONG SotExchange::RegisterFormatName( const String& rName )
+sal_uLong SotExchange::RegisterFormatName( const String& rName )
 {
     const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get();
     // teste zuerst die Standard - Name
-    ULONG i, nMax = SOT_FORMAT_FILE_LIST;
+    sal_uLong i, nMax = SOT_FORMAT_FILE_LIST;
     for( i = SOT_FORMAT_STRING; i <= nMax;  ++i )
         if( COMPARE_EQUAL == rName.CompareToAscii( pFormatArray_Impl[ i ].pName ) )
             return i;
@@ -277,11 +277,11 @@ ULONG SotExchange::RegisterFormatName( const String& rName )
     return nMax + SOT_FORMATSTR_ID_USER_END + 1;
 }
 
-ULONG SotExchange::RegisterFormatMimeType( const String& rMimeType )
+sal_uLong SotExchange::RegisterFormatMimeType( const String& rMimeType )
 {
     const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get();
     // teste zuerst die Standard - Name
-    ULONG i, nMax = SOT_FORMAT_FILE_LIST;
+    sal_uLong i, nMax = SOT_FORMAT_FILE_LIST;
     for( i = SOT_FORMAT_STRING; i <= nMax;  ++i )
         if( rMimeType.EqualsAscii( pFormatArray_Impl[ i ].pMimeType ) )
             return i;
@@ -318,9 +318,9 @@ ULONG SotExchange::RegisterFormatMimeType( const String& rMimeType )
 |*
 |*    Beschreibung      CLIP.SDW
 *************************************************************************/
-ULONG SotExchange::RegisterFormat( const DataFlavor& rFlavor )
+sal_uLong SotExchange::RegisterFormat( const DataFlavor& rFlavor )
 {
-    ULONG nRet = GetFormat( rFlavor );
+    sal_uLong nRet = GetFormat( rFlavor );
 
     if( !nRet )
     {
@@ -338,7 +338,7 @@ ULONG SotExchange::RegisterFormat( const DataFlavor& rFlavor )
 |*
 *************************************************************************/
 
-sal_Bool SotExchange::GetFormatDataFlavor( ULONG nFormat, DataFlavor& rFlavor )
+sal_Bool SotExchange::GetFormatDataFlavor( sal_uLong nFormat, DataFlavor& rFlavor )
 {
     sal_Bool bRet;
 
@@ -376,11 +376,11 @@ sal_Bool SotExchange::GetFormatDataFlavor( ULONG nFormat, DataFlavor& rFlavor )
 
 /*************************************************************************
 |*
-|*    SotExchange::GetFormatMimeType( ULONG nFormat )
+|*    SotExchange::GetFormatMimeType( sal_uLong nFormat )
 |*
 *************************************************************************/
 
-String SotExchange::GetFormatMimeType( ULONG nFormat )
+String SotExchange::GetFormatMimeType( sal_uLong nFormat )
 {
     String sMimeType;
     if( SOT_FORMATSTR_ID_USER_END >= nFormat )
@@ -406,10 +406,10 @@ String SotExchange::GetFormatMimeType( ULONG nFormat )
 |*
 *************************************************************************/
 
-ULONG SotExchange::GetFormatIdFromMimeType( const String& rMimeType )
+sal_uLong SotExchange::GetFormatIdFromMimeType( const String& rMimeType )
 {
     const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get();
-    ULONG i, nMax = SOT_FORMAT_FILE_LIST;
+    sal_uLong i, nMax = SOT_FORMAT_FILE_LIST;
     for( i = SOT_FORMAT_STRING; i <= nMax;  ++i )
         if( rMimeType.EqualsAscii( pFormatArray_Impl[ i ].pMimeType ) )
             return i;
@@ -443,12 +443,12 @@ ULONG SotExchange::GetFormatIdFromMimeType( const String& rMimeType )
 |*
 |*    Beschreibung      CLIP.SDW
 *************************************************************************/
-ULONG SotExchange::GetFormat( const DataFlavor& rFlavor )
+sal_uLong SotExchange::GetFormat( const DataFlavor& rFlavor )
 {
     // teste zuerst die Standard - Name
     const ::rtl::OUString& rMimeType = rFlavor.MimeType;
     const String aMimeType( rMimeType );
-    ULONG i, nMax = SOT_FORMAT_FILE_LIST;
+    sal_uLong i, nMax = SOT_FORMAT_FILE_LIST;
     const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get();
     for( i = SOT_FORMAT_STRING; i <= nMax;  ++i )
         if( aMimeType.EqualsAscii( pFormatArray_Impl[ i ].pMimeType ) )
@@ -482,7 +482,7 @@ ULONG SotExchange::GetFormat( const DataFlavor& rFlavor )
 |*
 |*    Beschreibung      CLIP.SDW
 *************************************************************************/
-String SotExchange::GetFormatName( ULONG nFormat )
+String SotExchange::GetFormatName( sal_uLong nFormat )
 {
     DataFlavor  aFlavor;
     String      aRet;
@@ -493,7 +493,7 @@ String SotExchange::GetFormatName( ULONG nFormat )
     return aRet;
 }
 
-BOOL SotExchange::IsInternal( const SvGlobalName& rName )
+sal_Bool SotExchange::IsInternal( const SvGlobalName& rName )
 {
     if ( rName == SvGlobalName(SO3_SW_CLASSID_60) ||
          rName == SvGlobalName(SO3_SC_CLASSID_60) ||
@@ -503,6 +503,6 @@ BOOL SotExchange::IsInternal( const SvGlobalName& rName )
          rName == SvGlobalName(SO3_SM_CLASSID_60) ||
          rName == SvGlobalName(SO3_SWWEB_CLASSID_60) ||
          rName == SvGlobalName(SO3_SWGLOB_CLASSID_60) )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 3c034a980578..d04a7917b0b4 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -96,10 +96,10 @@ void SotFactory::DeInit()
                 aStr += " Count: ";
                 aStr += p->GetRefCount();
                 DBG_TRACE( "\tReferences:" );
-                p->TestObjRef( FALSE );
+                p->TestObjRef( sal_False );
 #ifdef TEST_INVARIANT
                 DBG_TRACE( "\tInvariant:" );
-                p->TestInvariant( TRUE );
+                p->TestInvariant( sal_True );
 #endif
                 p = pObjList->Next();
             }
@@ -129,7 +129,7 @@ void SotFactory::DeInit()
     if( pSotData->pDataFlavorList )
     {
 
-        for( ULONG i = 0, nMax = pSotData->pDataFlavorList->Count(); i < nMax; i++ )
+        for( sal_uLong i = 0, nMax = pSotData->pDataFlavorList->Count(); i < nMax; i++ )
             delete (::com::sun::star::datatransfer::DataFlavor*) pSotData->pDataFlavorList->GetObject( i );
         delete pSotData->pDataFlavorList;
         pSotData->pDataFlavorList = NULL;
@@ -194,7 +194,7 @@ SotFactory::~SotFactory()
 |*
 |*    Beschreibung      Zugriffsmethoden auf SotData_Impl-Daten
 *************************************************************************/
-UINT32 SotFactory::GetSvObjectCount()
+sal_uInt32 SotFactory::GetSvObjectCount()
 {
     return SOTDATA()->nSvObjCount;
 }
@@ -295,10 +295,10 @@ void SotFactory::TestInvariant()
     SotData_Impl * pSotData = SOTDATA();
     if( pSotData->pObjectList )
     {
-        ULONG nCount = pSotData->pObjectList->Count();
-        for( ULONG i = 0; i < nCount ; i++ )
+        sal_uLong nCount = pSotData->pObjectList->Count();
+        for( sal_uLong i = 0; i < nCount ; i++ )
         {
-            pSotData->pObjectList->GetObject( i )->TestInvariant( FALSE );
+            pSotData->pObjectList->GetObject( i )->TestInvariant( sal_False );
         }
     }
 #endif
@@ -349,17 +349,17 @@ void * SotFactory::CastAndAddRef
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SotFactory::Is( const SotFactory * pSuperCl ) const
+sal_Bool SotFactory::Is( const SotFactory * pSuperCl ) const
 {
     if( this == pSuperCl )
-        return TRUE;
+        return sal_True;
 
-    for( USHORT i = 0; i < nSuperCount; i++ )
+    for( sal_uInt16 i = 0; i < nSuperCount; i++ )
     {
         if( pSuperClasses[ i ]->Is( pSuperCl ) )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 048f19e65bd7..345e6ddec84b 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -61,8 +61,8 @@ FileList::~FileList()
 void FileList::ClearAll( void )
 {
     // Strings in der Liste loeschen
-    ULONG nCount = pStrList->Count();
-    for( ULONG i = 0 ; i < nCount ; i++ )
+    sal_uLong nCount = pStrList->Count();
+    for( sal_uLong i = 0 ; i < nCount ; i++ )
         delete pStrList->GetObject( i );
 
     // Liste loeschen
@@ -81,8 +81,8 @@ FileList& FileList::operator=( const FileList& rFileList )
     *pStrList = *rFileList.pStrList;
 
     // Strings in der Liste kopieren
-    ULONG nCount = pStrList->Count();
-    for( ULONG i = 0 ; i < nCount ; i++ )
+    sal_uLong nCount = pStrList->Count();
+    for( sal_uLong i = 0 ; i < nCount ; i++ )
         pStrList->Replace( new String( *rFileList.pStrList->GetObject( i ) ), i );
 
     return *this;
@@ -94,7 +94,7 @@ FileList& FileList::operator=( const FileList& rFileList )
 |*
 \*************************************************************************/
 
-ULONG FileList::GetFormat()
+sal_uLong FileList::GetFormat()
 {
     return FORMAT_FILE_LIST;
 }
@@ -184,7 +184,7 @@ void FileList::AppendFile( const String& rStr )
     pStrList->Insert( new String( rStr ) , pStrList->Count() );
 }
 
-String FileList::GetFile( ULONG i ) const
+String FileList::GetFile( sal_uLong i ) const
 {
     String aStr;
     if( i < pStrList->Count() )
@@ -192,7 +192,7 @@ String FileList::GetFile( ULONG i ) const
     return aStr;
 }
 
-ULONG FileList::Count( void ) const
+sal_uLong FileList::Count( void ) const
 {
     return pStrList->Count();
 }
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 58b08fb53f18..f04d5d439bdc 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -46,9 +46,9 @@ using namespace::com::sun::star::datatransfer;
 
 struct SotAction_Impl
 {
-    ULONG   nFormatId;          // Clipboard Id
-    USHORT  nAction;            // Action Id
-    BYTE    nContextCheckId;    // additional check of content in clipboard
+    sal_uLong   nFormatId;          // Clipboard Id
+    sal_uInt16  nAction;            // Action Id
+    sal_uInt8   nContextCheckId;    // additional check of content in clipboard
 };
 
 
@@ -68,7 +68,7 @@ struct SotAction_Impl
 
 struct SotDestinationEntry_Impl
 {
-    USHORT                  nDestination;
+    sal_uInt16                  nDestination;
     const SotAction_Impl*   aDefaultActions;
     const SotAction_Impl*   aMoveActions;
     const SotAction_Impl*   aCopyActions;
@@ -1283,7 +1283,7 @@ static SotDestinationEntry_Impl __READONLY_DATA aDestinationArray[] =     \
 // - new style GetExchange methods -
 // ---------------------------------
 
-sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, ULONG nId )
+sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, sal_uLong nId )
 {
     DataFlavorExVector::iterator    aIter( ( (DataFlavorExVector&) rDataFlavorExVector ).begin() );
     DataFlavorExVector::iterator    aEnd( ( (DataFlavorExVector&) rDataFlavorExVector ).end() );
@@ -1303,14 +1303,14 @@ sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, ULONG
 
 // -----------------------------------------------------------------------------
 
-static BOOL CheckTransferableContext_Impl( const Reference< XTransferable >* pxTransferable, const SotAction_Impl&
+static sal_Bool CheckTransferableContext_Impl( const Reference< XTransferable >* pxTransferable, const SotAction_Impl&
 #ifdef WNT
 rEntry
 #endif
 )
 {
     DataFlavor  aFlavor;
-    BOOL        bRet = TRUE;
+    sal_Bool        bRet = sal_True;
 
     try
     {
@@ -1323,7 +1323,7 @@ rEntry
             {
                 case FILEGRPDSC_ONLY_URL:
                 {
-                    bRet = FALSE;
+                    bRet = sal_False;
 
                     if( SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_FILECONTENT, aFlavor ) &&
                         (*pxTransferable)->isDataFlavorSupported( aFlavor ) &&
@@ -1367,11 +1367,11 @@ rEntry
 
 // -----------------------------------------------------------------------------
 
-static USHORT GetTransferableAction_Impl(
+static sal_uInt16 GetTransferableAction_Impl(
                             const DataFlavorExVector& rDataFlavorExVector,
                              const SotAction_Impl* pArray,
-                            ULONG& rFormat,
-                            ULONG nOnlyTestFormat,
+                            sal_uLong& rFormat,
+                            sal_uLong nOnlyTestFormat,
                             const Reference< XTransferable >* pxTransferable )
 {
     try
@@ -1380,11 +1380,11 @@ static USHORT GetTransferableAction_Impl(
         {
             DataFlavor              aFlavor;
             const SotAction_Impl*   pArrayStart = pArray;
-            ULONG                   nId = pArray->nFormatId;
+            sal_uLong                   nId = pArray->nFormatId;
 
 #if OSL_DEBUG_LEVEL > 1
 // used for testing a specific format - change in the debugger the value
-    static ULONG nChkFormat = 0;
+    static sal_uLong nChkFormat = 0;
     if( nChkFormat )
     {
         for( ; 0xffff != pArray->nFormatId &&
@@ -1454,13 +1454,13 @@ static USHORT GetTransferableAction_Impl(
 
 // -----------------------------------------------------------------------------
 
-USHORT SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavorExVector,
-                                       USHORT nDestination,
-                                       USHORT nSourceOptions,
-                                       USHORT nUserAction,
-                                       ULONG& rFormat,
-                                       USHORT& rDefaultAction,
-                                       ULONG nOnlyTestFormat,
+sal_uInt16 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavorExVector,
+                                       sal_uInt16 nDestination,
+                                       sal_uInt16 nSourceOptions,
+                                       sal_uInt16 nUserAction,
+                                       sal_uLong& rFormat,
+                                       sal_uInt16& rDefaultAction,
+                                       sal_uLong nOnlyTestFormat,
                                        const Reference< XTransferable >* pxTransferable )
 {
     // hier wird jetzt die oben definierte Tabelle "implementiert"
@@ -1568,11 +1568,11 @@ USHORT SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavorExVe
 
 // -----------------------------------------------------------------------------
 
-USHORT SotExchange::GetExchangeAction(
+sal_uInt16 SotExchange::GetExchangeAction(
                         const Reference< XTransferable >& rxTransferable,
-                        USHORT nDestination, USHORT nSourceOptions,
-                        USHORT nUserAction, ULONG& rFormat,
-                        USHORT& rDefaultAction, ULONG nOnlyTestFormat )
+                        sal_uInt16 nDestination, sal_uInt16 nSourceOptions,
+                        sal_uInt16 nUserAction, sal_uLong& rFormat,
+                        sal_uInt16& rDefaultAction, sal_uLong nOnlyTestFormat )
 {
     DataFlavorExVector aVector;
 
@@ -1625,9 +1625,9 @@ USHORT SotExchange::GetExchangeAction(
                                             nOnlyTestFormat, &rxTransferable ) );
 }
 
-USHORT SotExchange::IsChart(  const SvGlobalName& rName )
+sal_uInt16 SotExchange::IsChart(  const SvGlobalName& rName )
 {
-    USHORT nRet=0;
+    sal_uInt16 nRet=0;
 //  if ( rName == SvGlobalName( SO3_SCH_CLASSID_8 ) )
 //      nRet = SOFFICE_FILEFORMAT_8;
 //  else
@@ -1643,9 +1643,9 @@ USHORT SotExchange::IsChart(  const SvGlobalName& rName )
     return nRet;
 }
 
-USHORT SotExchange::IsMath(  const SvGlobalName& rName )
+sal_uInt16 SotExchange::IsMath(  const SvGlobalName& rName )
 {
-    USHORT nRet=0;
+    sal_uInt16 nRet=0;
 //  if ( rName == SvGlobalName( SO3_SM_CLASSID_8 ) )
 //      nRet = SOFFICE_FILEFORMAT_8;
 //  else
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 70792a325d31..8c0bb0346605 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -59,7 +59,7 @@ SO2_IMPL_INVARIANT(SotObject)
 |*
 |*  Beschreibung:
 *************************************************************************/
-void SotObject::TestMemberObjRef( BOOL /*bFree*/ )
+void SotObject::TestMemberObjRef( sal_Bool /*bFree*/ )
 {
 }
 
@@ -69,7 +69,7 @@ void SotObject::TestMemberObjRef( BOOL /*bFree*/ )
 |*  Beschreibung:
 *************************************************************************/
 #ifdef TEST_INVARIANT
-void SotObject::TestMemberInvariant( BOOL /*bPrint*/ )
+void SotObject::TestMemberInvariant( sal_Bool /*bPrint*/ )
 {
 }
 #endif
@@ -82,9 +82,9 @@ void SotObject::TestMemberInvariant( BOOL /*bPrint*/ )
 SotObject::SotObject()
     : nStrongLockCount( 0 )
     , nOwnerLockCount( 0 )
-    , bOwner      ( TRUE )
-    , bSVObject   ( FALSE )
-    , bInClose    ( FALSE )
+    , bOwner      ( sal_True )
+    , bSVObject   ( sal_False )
+    , bInClose    ( sal_False )
 {
     SotFactory::IncSvObjectCount( this );
 }
@@ -127,10 +127,10 @@ void* SotObject::CastAndAddRef( const SotFactory * pFact )
 }
 
 //=========================================================================
-USHORT SotObject::Lock( BOOL bLock )
+sal_uInt16 SotObject::Lock( sal_Bool bLock )
 {
     SotObjectRef xHoldAlive( this );
-    USHORT nRet;
+    sal_uInt16 nRet;
     if( bLock )
     {
         AddRef();
@@ -151,7 +151,7 @@ USHORT SotObject::Lock( BOOL bLock )
 //=========================================================================
 void SotObject::OwnerLock
 (
-    BOOL bLock      /* TRUE, lock. FALSE, unlock. */
+    sal_Bool bLock      /* sal_True, lock. sal_False, unlock. */
 )
 /*  [Beschreibung]
 
@@ -187,23 +187,23 @@ void SotObject::RemoveOwnerLock()
 }
 
 //=========================================================================
-BOOL SotObject::DoClose()
+sal_Bool SotObject::DoClose()
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( !bInClose )
     {
         SotObjectRef xHoldAlive( this );
-        bInClose = TRUE;
+        bInClose = sal_True;
         bRet = Close();
-        bInClose = FALSE;
+        bInClose = sal_False;
     }
     return bRet;
 }
 
 //=========================================================================
-BOOL SotObject::Close()
+sal_Bool SotObject::Close()
 {
-    return TRUE;
+    return sal_True;
 }