removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in sot

5 files changed, 38 insertions, 38 deletions

diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index ec45c757c369..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
 *************************************************************************/
-sal_uIntPtr SotExchange::RegisterFormatName( const String& rName )
+sal_uLong SotExchange::RegisterFormatName( const String& rName )
 {
     const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get();
     // teste zuerst die Standard - Name
-    sal_uIntPtr 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 @@ sal_uIntPtr SotExchange::RegisterFormatName( const String& rName )
     return nMax + SOT_FORMATSTR_ID_USER_END + 1;
 }
 
-sal_uIntPtr SotExchange::RegisterFormatMimeType( const String& rMimeType )
+sal_uLong SotExchange::RegisterFormatMimeType( const String& rMimeType )
 {
     const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get();
     // teste zuerst die Standard - Name
-    sal_uIntPtr 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 @@ sal_uIntPtr SotExchange::RegisterFormatMimeType( const String& rMimeType )
 |*
 |*    Beschreibung      CLIP.SDW
 *************************************************************************/
-sal_uIntPtr SotExchange::RegisterFormat( const DataFlavor& rFlavor )
+sal_uLong SotExchange::RegisterFormat( const DataFlavor& rFlavor )
 {
-    sal_uIntPtr nRet = GetFormat( rFlavor );
+    sal_uLong nRet = GetFormat( rFlavor );
 
     if( !nRet )
     {
@@ -338,7 +338,7 @@ sal_uIntPtr SotExchange::RegisterFormat( const DataFlavor& rFlavor )
 |*
 *************************************************************************/
 
-sal_Bool SotExchange::GetFormatDataFlavor( sal_uIntPtr nFormat, DataFlavor& rFlavor )
+sal_Bool SotExchange::GetFormatDataFlavor( sal_uLong nFormat, DataFlavor& rFlavor )
 {
     sal_Bool bRet;
 
@@ -376,11 +376,11 @@ sal_Bool SotExchange::GetFormatDataFlavor( sal_uIntPtr nFormat, DataFlavor& rFla
 
 /*************************************************************************
 |*
-|*    SotExchange::GetFormatMimeType( sal_uIntPtr nFormat )
+|*    SotExchange::GetFormatMimeType( sal_uLong nFormat )
 |*
 *************************************************************************/
 
-String SotExchange::GetFormatMimeType( sal_uIntPtr nFormat )
+String SotExchange::GetFormatMimeType( sal_uLong nFormat )
 {
     String sMimeType;
     if( SOT_FORMATSTR_ID_USER_END >= nFormat )
@@ -406,10 +406,10 @@ String SotExchange::GetFormatMimeType( sal_uIntPtr nFormat )
 |*
 *************************************************************************/
 
-sal_uIntPtr SotExchange::GetFormatIdFromMimeType( const String& rMimeType )
+sal_uLong SotExchange::GetFormatIdFromMimeType( const String& rMimeType )
 {
     const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get();
-    sal_uIntPtr 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 @@ sal_uIntPtr SotExchange::GetFormatIdFromMimeType( const String& rMimeType )
 |*
 |*    Beschreibung      CLIP.SDW
 *************************************************************************/
-sal_uIntPtr 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 );
-    sal_uIntPtr 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 @@ sal_uIntPtr SotExchange::GetFormat( const DataFlavor& rFlavor )
 |*
 |*    Beschreibung      CLIP.SDW
 *************************************************************************/
-String SotExchange::GetFormatName( sal_uIntPtr nFormat )
+String SotExchange::GetFormatName( sal_uLong nFormat )
 {
     DataFlavor  aFlavor;
     String      aRet;
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 3b71382906ca..44e138f7aa1f 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -129,7 +129,7 @@ void SotFactory::DeInit()
     if( pSotData->pDataFlavorList )
     {
 
-        for( sal_uIntPtr 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;
@@ -295,8 +295,8 @@ void SotFactory::TestInvariant()
     SotData_Impl * pSotData = SOTDATA();
     if( pSotData->pObjectList )
     {
-        sal_uIntPtr nCount = pSotData->pObjectList->Count();
-        for( sal_uIntPtr i = 0; i < nCount ; i++ )
+        sal_uLong nCount = pSotData->pObjectList->Count();
+        for( sal_uLong i = 0; i < nCount ; i++ )
         {
             pSotData->pObjectList->GetObject( i )->TestInvariant( sal_False );
         }
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 5be0b01e8de6..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
-    sal_uIntPtr nCount = pStrList->Count();
-    for( sal_uIntPtr 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
-    sal_uIntPtr nCount = pStrList->Count();
-    for( sal_uIntPtr 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 )
 |*
 \*************************************************************************/
 
-sal_uIntPtr 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( sal_uIntPtr i ) const
+String FileList::GetFile( sal_uLong i ) const
 {
     String aStr;
     if( i < pStrList->Count() )
@@ -192,7 +192,7 @@ String FileList::GetFile( sal_uIntPtr i ) const
     return aStr;
 }
 
-sal_uIntPtr 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 81deb8e90112..f04d5d439bdc 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -46,7 +46,7 @@ using namespace::com::sun::star::datatransfer;
 
 struct SotAction_Impl
 {
-    sal_uIntPtr     nFormatId;          // Clipboard Id
+    sal_uLong   nFormatId;          // Clipboard Id
     sal_uInt16  nAction;            // Action Id
     sal_uInt8   nContextCheckId;    // additional check of content in clipboard
 };
@@ -1283,7 +1283,7 @@ static SotDestinationEntry_Impl __READONLY_DATA aDestinationArray[] =     \
 // - new style GetExchange methods -
 // ---------------------------------
 
-sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, sal_uIntPtr nId )
+sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, sal_uLong nId )
 {
     DataFlavorExVector::iterator    aIter( ( (DataFlavorExVector&) rDataFlavorExVector ).begin() );
     DataFlavorExVector::iterator    aEnd( ( (DataFlavorExVector&) rDataFlavorExVector ).end() );
@@ -1370,8 +1370,8 @@ rEntry
 static sal_uInt16 GetTransferableAction_Impl(
                             const DataFlavorExVector& rDataFlavorExVector,
                              const SotAction_Impl* pArray,
-                            sal_uIntPtr& rFormat,
-                            sal_uIntPtr nOnlyTestFormat,
+                            sal_uLong& rFormat,
+                            sal_uLong nOnlyTestFormat,
                             const Reference< XTransferable >* pxTransferable )
 {
     try
@@ -1380,11 +1380,11 @@ static sal_uInt16 GetTransferableAction_Impl(
         {
             DataFlavor              aFlavor;
             const SotAction_Impl*   pArrayStart = pArray;
-            sal_uIntPtr                 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 sal_uIntPtr nChkFormat = 0;
+    static sal_uLong nChkFormat = 0;
     if( nChkFormat )
     {
         for( ; 0xffff != pArray->nFormatId &&
@@ -1458,9 +1458,9 @@ sal_uInt16 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavor
                                        sal_uInt16 nDestination,
                                        sal_uInt16 nSourceOptions,
                                        sal_uInt16 nUserAction,
-                                       sal_uIntPtr& rFormat,
+                                       sal_uLong& rFormat,
                                        sal_uInt16& rDefaultAction,
-                                       sal_uIntPtr nOnlyTestFormat,
+                                       sal_uLong nOnlyTestFormat,
                                        const Reference< XTransferable >* pxTransferable )
 {
     // hier wird jetzt die oben definierte Tabelle "implementiert"
@@ -1571,8 +1571,8 @@ sal_uInt16 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavor
 sal_uInt16 SotExchange::GetExchangeAction(
                         const Reference< XTransferable >& rxTransferable,
                         sal_uInt16 nDestination, sal_uInt16 nSourceOptions,
-                        sal_uInt16 nUserAction, sal_uIntPtr& rFormat,
-                        sal_uInt16& rDefaultAction, sal_uIntPtr nOnlyTestFormat )
+                        sal_uInt16 nUserAction, sal_uLong& rFormat,
+                        sal_uInt16& rDefaultAction, sal_uLong nOnlyTestFormat )
 {
     DataFlavorExVector aVector;
 
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 5ac3f7f45d87..d7530163d0b5 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -151,7 +151,7 @@ sal_Bool SotObject::ShouldDelete()
         return sal_False;
     }
 
-   sal_uIntPtr i;
+   sal_uLong i;
     for( i = 1; i < pAggList->Count(); i++ )
     {
         SvAggregate & rAgg = pAggList->GetObject( i );
@@ -212,7 +212,7 @@ SvAggregateMemberList & SotObject::GetAggList()
 |*
 |*    Beschreibung
 *************************************************************************/
-void SotObject::RemoveInterface( sal_uIntPtr nPos )
+void SotObject::RemoveInterface( sal_uLong nPos )
 {
     SvAggregate & rAgg = pAggList->GetObject( nPos );
     if( !rAgg.bFactory )
@@ -238,7 +238,7 @@ void SotObject::RemoveInterface( SotObject * pObjP )
 {
     DBG_ASSERT( pObjP, "null pointer" );
     DBG_ASSERT( pAggList, "no aggregation list" );
-    sal_uIntPtr i;
+    sal_uLong i;
     for( i = 0; i < pAggList->Count(); i++ )
     {
         SvAggregate & rAgg = pAggList->GetObject( i );
@@ -298,7 +298,7 @@ void * SotObject::DownAggCast( const SotFactory * pFact )
     // geht den Pfad nur Richtung aggregierte Objekte
     if( pAggList )
     {
-        for( sal_uIntPtr i = 1; !pCast || i < pAggList->Count(); i++ )
+        for( sal_uLong i = 1; !pCast || i < pAggList->Count(); i++ )
         {
             SvAggregate & rAgg = pAggList->GetObject( i );
             if( rAgg.bFactory )