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

15 files changed, 90 insertions, 90 deletions

diff --git a/unotools/inc/unotools/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx
index 8737c9763289..37bbdf3018e3 100644
--- a/unotools/inc/unotools/fontcfg.hxx
+++ b/unotools/inc/unotools/fontcfg.hxx
@@ -118,38 +118,38 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration
 // IMPL_FONT_ATTR_COMIC         - Like Comic Sans MS
 // IMPL_FONT_ATTR_BRUSHSCRIPT   - More Script
 // IMPL_FONT_ATTR_OTHERSTYLE    - OldStyle, ... so negativ points
-#define IMPL_FONT_ATTR_DEFAULT       ((sal_uIntPtr)0x00000001)
-#define IMPL_FONT_ATTR_STANDARD      ((sal_uIntPtr)0x00000002)
-#define IMPL_FONT_ATTR_NORMAL        ((sal_uIntPtr)0x00000004)
-#define IMPL_FONT_ATTR_SYMBOL        ((sal_uIntPtr)0x00000008)
-#define IMPL_FONT_ATTR_FIXED         ((sal_uIntPtr)0x00000010)
-#define IMPL_FONT_ATTR_SANSSERIF     ((sal_uIntPtr)0x00000020)
-#define IMPL_FONT_ATTR_SERIF         ((sal_uIntPtr)0x00000040)
-#define IMPL_FONT_ATTR_DECORATIVE    ((sal_uIntPtr)0x00000080)
-#define IMPL_FONT_ATTR_SPECIAL       ((sal_uIntPtr)0x00000100)
-#define IMPL_FONT_ATTR_ITALIC        ((sal_uIntPtr)0x00000200)
-#define IMPL_FONT_ATTR_TITLING       ((sal_uIntPtr)0x00000400)
-#define IMPL_FONT_ATTR_CAPITALS      ((sal_uIntPtr)0x00000800)
-#define IMPL_FONT_ATTR_CJK           ((sal_uIntPtr)0x00001000)
-#define IMPL_FONT_ATTR_CJK_JP        ((sal_uIntPtr)0x00002000)
-#define IMPL_FONT_ATTR_CJK_SC        ((sal_uIntPtr)0x00004000)
-#define IMPL_FONT_ATTR_CJK_TC        ((sal_uIntPtr)0x00008000)
-#define IMPL_FONT_ATTR_CJK_KR        ((sal_uIntPtr)0x00010000)
-#define IMPL_FONT_ATTR_CTL           ((sal_uIntPtr)0x00020000)
-#define IMPL_FONT_ATTR_NONELATIN     ((sal_uIntPtr)0x00040000)
-#define IMPL_FONT_ATTR_FULL          ((sal_uIntPtr)0x00080000)
-#define IMPL_FONT_ATTR_OUTLINE       ((sal_uIntPtr)0x00100000)
-#define IMPL_FONT_ATTR_SHADOW        ((sal_uIntPtr)0x00200000)
-#define IMPL_FONT_ATTR_ROUNDED       ((sal_uIntPtr)0x00400000)
-#define IMPL_FONT_ATTR_TYPEWRITER    ((sal_uIntPtr)0x00800000)
-#define IMPL_FONT_ATTR_SCRIPT        ((sal_uIntPtr)0x01000000)
-#define IMPL_FONT_ATTR_HANDWRITING   ((sal_uIntPtr)0x02000000)
-#define IMPL_FONT_ATTR_CHANCERY      ((sal_uIntPtr)0x04000000)
-#define IMPL_FONT_ATTR_COMIC         ((sal_uIntPtr)0x08000000)
-#define IMPL_FONT_ATTR_BRUSHSCRIPT   ((sal_uIntPtr)0x10000000)
-#define IMPL_FONT_ATTR_GOTHIC        ((sal_uIntPtr)0x20000000)
-#define IMPL_FONT_ATTR_SCHOOLBOOK    ((sal_uIntPtr)0x40000000)
-#define IMPL_FONT_ATTR_OTHERSTYLE    ((sal_uIntPtr)0x80000000)
+#define IMPL_FONT_ATTR_DEFAULT       ((sal_uLong)0x00000001)
+#define IMPL_FONT_ATTR_STANDARD      ((sal_uLong)0x00000002)
+#define IMPL_FONT_ATTR_NORMAL        ((sal_uLong)0x00000004)
+#define IMPL_FONT_ATTR_SYMBOL        ((sal_uLong)0x00000008)
+#define IMPL_FONT_ATTR_FIXED         ((sal_uLong)0x00000010)
+#define IMPL_FONT_ATTR_SANSSERIF     ((sal_uLong)0x00000020)
+#define IMPL_FONT_ATTR_SERIF         ((sal_uLong)0x00000040)
+#define IMPL_FONT_ATTR_DECORATIVE    ((sal_uLong)0x00000080)
+#define IMPL_FONT_ATTR_SPECIAL       ((sal_uLong)0x00000100)
+#define IMPL_FONT_ATTR_ITALIC        ((sal_uLong)0x00000200)
+#define IMPL_FONT_ATTR_TITLING       ((sal_uLong)0x00000400)
+#define IMPL_FONT_ATTR_CAPITALS      ((sal_uLong)0x00000800)
+#define IMPL_FONT_ATTR_CJK           ((sal_uLong)0x00001000)
+#define IMPL_FONT_ATTR_CJK_JP        ((sal_uLong)0x00002000)
+#define IMPL_FONT_ATTR_CJK_SC        ((sal_uLong)0x00004000)
+#define IMPL_FONT_ATTR_CJK_TC        ((sal_uLong)0x00008000)
+#define IMPL_FONT_ATTR_CJK_KR        ((sal_uLong)0x00010000)
+#define IMPL_FONT_ATTR_CTL           ((sal_uLong)0x00020000)
+#define IMPL_FONT_ATTR_NONELATIN     ((sal_uLong)0x00040000)
+#define IMPL_FONT_ATTR_FULL          ((sal_uLong)0x00080000)
+#define IMPL_FONT_ATTR_OUTLINE       ((sal_uLong)0x00100000)
+#define IMPL_FONT_ATTR_SHADOW        ((sal_uLong)0x00200000)
+#define IMPL_FONT_ATTR_ROUNDED       ((sal_uLong)0x00400000)
+#define IMPL_FONT_ATTR_TYPEWRITER    ((sal_uLong)0x00800000)
+#define IMPL_FONT_ATTR_SCRIPT        ((sal_uLong)0x01000000)
+#define IMPL_FONT_ATTR_HANDWRITING   ((sal_uLong)0x02000000)
+#define IMPL_FONT_ATTR_CHANCERY      ((sal_uLong)0x04000000)
+#define IMPL_FONT_ATTR_COMIC         ((sal_uLong)0x08000000)
+#define IMPL_FONT_ATTR_BRUSHSCRIPT   ((sal_uLong)0x10000000)
+#define IMPL_FONT_ATTR_GOTHIC        ((sal_uLong)0x20000000)
+#define IMPL_FONT_ATTR_SCHOOLBOOK    ((sal_uLong)0x40000000)
+#define IMPL_FONT_ATTR_OTHERSTYLE    ((sal_uLong)0x80000000)
 
 #define IMPL_FONT_ATTR_CJK_ALLLANG   (IMPL_FONT_ATTR_CJK_JP | IMPL_FONT_ATTR_CJK_SC | IMPL_FONT_ATTR_CJK_TC | IMPL_FONT_ATTR_CJK_KR)
 #define IMPL_FONT_ATTR_ALLSCRIPT     (IMPL_FONT_ATTR_SCRIPT | IMPL_FONT_ATTR_HANDWRITING | IMPL_FONT_ATTR_CHANCERY | IMPL_FONT_ATTR_COMIC | IMPL_FONT_ATTR_BRUSHSCRIPT)
@@ -219,7 +219,7 @@ public:
                                                                    rtl::OUString(),
                                                                    rtl::OUString() )
                                      ) const;
-    static void getMapName( const String& rOrgName, String& rShortName, String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, sal_uIntPtr& rType );
+    static void getMapName( const String& rOrgName, String& rShortName, String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, sal_uLong& rType );
 };
 
 } // namespace utl
diff --git a/unotools/inc/unotools/fontcvt.hxx b/unotools/inc/unotools/fontcvt.hxx
index caf7df5c2e77..715ffeb56623 100644
--- a/unotools/inc/unotools/fontcvt.hxx
+++ b/unotools/inc/unotools/fontcvt.hxx
@@ -35,12 +35,12 @@
 // - FontToSubsFont -
 // ------------------
 
-#define FONTTOSUBSFONT_IMPORT                   ((sal_uIntPtr)0x00000001)
-#define FONTTOSUBSFONT_EXPORT                   ((sal_uIntPtr)0x00000002)
-#define FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS     ((sal_uIntPtr)0x00000004)
+#define FONTTOSUBSFONT_IMPORT                   ((sal_uLong)0x00000001)
+#define FONTTOSUBSFONT_EXPORT                   ((sal_uLong)0x00000002)
+#define FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS     ((sal_uLong)0x00000004)
 
 typedef void* FontToSubsFontConverter;
-UNOTOOLS_DLLPUBLIC FontToSubsFontConverter     CreateFontToSubsFontConverter( const String& rFontName, sal_uIntPtr nFlags );
+UNOTOOLS_DLLPUBLIC FontToSubsFontConverter     CreateFontToSubsFontConverter( const String& rFontName, sal_uLong nFlags );
 UNOTOOLS_DLLPUBLIC void                        DestroyFontToSubsFontConverter( FontToSubsFontConverter hConverter );
 UNOTOOLS_DLLPUBLIC sal_Unicode                 ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c );
 UNOTOOLS_DLLPUBLIC String                      GetFontToSubsFontName( FontToSubsFontConverter hConverter );
diff --git a/unotools/inc/unotools/fontdefs.hxx b/unotools/inc/unotools/fontdefs.hxx
index 3fe59e895f25..3ba232b6eba4 100644
--- a/unotools/inc/unotools/fontdefs.hxx
+++ b/unotools/inc/unotools/fontdefs.hxx
@@ -40,12 +40,12 @@ namespace utl {
 // - SubsFontName -
 // ----------------
 
-#define SUBSFONT_ONLYONE    ((sal_uIntPtr)0x00000001)
-#define SUBSFONT_MS         ((sal_uIntPtr)0x00000002)
-#define SUBSFONT_PS         ((sal_uIntPtr)0x00000004)
-#define SUBSFONT_HTML       ((sal_uIntPtr)0x00000008)
+#define SUBSFONT_ONLYONE    ((sal_uLong)0x00000001)
+#define SUBSFONT_MS         ((sal_uLong)0x00000002)
+#define SUBSFONT_PS         ((sal_uLong)0x00000004)
+#define SUBSFONT_HTML       ((sal_uLong)0x00000008)
 
-UNOTOOLS_DLLPUBLIC String GetSubsFontName( const String& rName, sal_uIntPtr nFlags );
+UNOTOOLS_DLLPUBLIC String GetSubsFontName( const String& rName, sal_uLong nFlags );
 
 // -----------------
 // - FontTokenName -
diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx
index 2fec6ca05f2f..f94443787ca2 100755
--- a/unotools/inc/unotools/syslocaleoptions.hxx
+++ b/unotools/inc/unotools/syslocaleoptions.hxx
@@ -38,10 +38,10 @@
 #include <unotools/options.hxx>
 
 // bits for broadcasting hints of changes in a SfxSimpleHint, may be combined
-const sal_uIntPtr SYSLOCALEOPTIONS_HINT_LOCALE    = 0x00000001;
-const sal_uIntPtr SYSLOCALEOPTIONS_HINT_CURRENCY  = 0x00000002;
-const sal_uIntPtr SYSLOCALEOPTIONS_HINT_UILOCALE  = 0x00000004;
-const sal_uIntPtr SYSLOCALEOPTIONS_HINT_DECSEP    = 0x00000008;
+const sal_uLong SYSLOCALEOPTIONS_HINT_LOCALE    = 0x00000001;
+const sal_uLong SYSLOCALEOPTIONS_HINT_CURRENCY  = 0x00000002;
+const sal_uLong SYSLOCALEOPTIONS_HINT_UILOCALE  = 0x00000004;
+const sal_uLong SYSLOCALEOPTIONS_HINT_DECSEP    = 0x00000008;
 
 class SvtSysLocaleOptions_Impl;
 class SvtListener;
diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx
index 4e38b465b1a8..a24d132ae793 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -73,7 +73,7 @@ namespace utl
                                                 sal_Bool bNewOnly = sal_False );
         static sal_Bool             HasParentFolder( const String& rFolder );
 
-        static sal_uIntPtr                GetSize( const String& rContent );
+        static sal_uLong                GetSize( const String& rContent );
         static sal_Bool             IsYounger( const String& rIsYoung, const String& rIsOlder );
 
         static sal_Bool             Exists( const String& rContent );
diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx
index 54185da6b70d..bb77b2d67cc2 100644
--- a/unotools/inc/unotools/ucblockbytes.hxx
+++ b/unotools/inc/unotools/ucblockbytes.hxx
@@ -152,10 +152,10 @@ public:
 
     // SvLockBytes
     virtual void            SetSynchronMode (sal_Bool bSynchron);
-    virtual ErrCode         ReadAt ( sal_uIntPtr nPos, void *pBuffer, sal_uIntPtr nCount, sal_uIntPtr *pRead) const;
-    virtual ErrCode         WriteAt ( sal_uIntPtr, const void*, sal_uIntPtr, sal_uIntPtr *pWritten);
+    virtual ErrCode         ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const;
+    virtual ErrCode         WriteAt ( sal_uLong, const void*, sal_uLong, sal_uLong *pWritten);
     virtual ErrCode         Flush (void) const;
-    virtual ErrCode         SetSize (sal_uIntPtr);
+    virtual ErrCode         SetSize (sal_uLong);
     virtual ErrCode         Stat ( SvLockBytesStat *pStat, SvLockBytesStatFlag) const;
 
     void                    SetError( ErrCode nError )
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 513de501109c..f16f6ed9cfca 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -200,7 +200,7 @@ void SvtCalcFilterOptions_Impl::Load()
  ---------------------------------------------------------------------------*/
 struct SvtFilterOptions_Impl
 {
-    sal_uIntPtr nFlags;
+    sal_uLong nFlags;
     SvtAppFilterOptions_Impl aWriterCfg;
     SvtCalcFilterOptions_Impl aCalcCfg;
     SvtAppFilterOptions_Impl aImpressCfg;
@@ -228,8 +228,8 @@ struct SvtFilterOptions_Impl
         Load();
     }
 
-    void SetFlag( sal_uIntPtr nFlag, sal_Bool bSet );
-    sal_Bool IsFlag( sal_uIntPtr nFlag ) const;
+    void SetFlag( sal_uLong nFlag, sal_Bool bSet );
+    sal_Bool IsFlag( sal_uLong nFlag ) const;
     void Load()
     {
         aWriterCfg.Load();
@@ -240,7 +240,7 @@ struct SvtFilterOptions_Impl
 /* -----------------------------22.01.01 10:34--------------------------------
 
  ---------------------------------------------------------------------------*/
-void SvtFilterOptions_Impl::SetFlag( sal_uIntPtr nFlag, sal_Bool bSet )
+void SvtFilterOptions_Impl::SetFlag( sal_uLong nFlag, sal_Bool bSet )
 {
     switch(nFlag)
     {
@@ -261,7 +261,7 @@ void SvtFilterOptions_Impl::SetFlag( sal_uIntPtr nFlag, sal_Bool bSet )
 /* -----------------------------22.01.01 10:35--------------------------------
 
  ---------------------------------------------------------------------------*/
-sal_Bool SvtFilterOptions_Impl::IsFlag( sal_uIntPtr nFlag ) const
+sal_Bool SvtFilterOptions_Impl::IsFlag( sal_uLong nFlag ) const
 {
     sal_Bool bRet;
     switch(nFlag)
@@ -326,9 +326,9 @@ const Sequence<OUString>& SvtFilterOptions::GetPropertyNames()
     return aNames;
 }
 //-----------------------------------------------------------------------
-static sal_uIntPtr lcl_GetFlag(sal_Int32 nProp)
+static sal_uLong lcl_GetFlag(sal_Int32 nProp)
 {
-    sal_uIntPtr nFlag = 0;
+    sal_uLong nFlag = 0;
     switch(nProp)
     {
         case  0: nFlag = FILTERCFG_MATH_LOAD; break;
@@ -367,7 +367,7 @@ void SvtFilterOptions::Commit()
     const Type& rType = ::getBooleanCppuType();
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
-        sal_uIntPtr nFlag = lcl_GetFlag(nProp);
+        sal_uLong nFlag = lcl_GetFlag(nProp);
         sal_Bool bVal = pImp->IsFlag( nFlag);
         pValues[nProp].setValue(&bVal, rType);
 
@@ -391,7 +391,7 @@ void SvtFilterOptions::Load()
             if(pValues[nProp].hasValue())
             {
                 sal_Bool bVal = *(sal_Bool*)pValues[nProp].getValue();
-                sal_uIntPtr nFlag = lcl_GetFlag(nProp);
+                sal_uLong nFlag = lcl_GetFlag(nProp);
                 pImp->SetFlag( nFlag, bVal);
             }
         }
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index c9ef88c50a8f..b7fd73898c71 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -612,7 +612,7 @@ static ImplFontAttrWidthSearchData const aImplWidthAttrSearchList[] =
 struct ImplFontAttrTypeSearchData
 {
     const char*             mpStr;
-    sal_uIntPtr                   mnType;
+    sal_uLong                   mnType;
 };
 
 static ImplFontAttrTypeSearchData const aImplTypeAttrSearchList[] =
@@ -792,7 +792,7 @@ static sal_Bool ImplFindAndErase( String& rName, const char* pStr )
 // =======================================================================
 
 void FontSubstConfiguration::getMapName( const String& rOrgName, String& rShortName,
-    String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, sal_uIntPtr& rType )
+    String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, sal_uLong& rType )
 {
     rShortName = rOrgName;
 
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 491c17679839..64ea0816d210 100755
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -88,7 +88,7 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem
         OUString                m_aLocaleString;    // en-US or de-DE or empty for SYSTEM
         OUString                m_aUILocaleString;    // en-US or de-DE or empty for SYSTEM
         OUString                m_aCurrencyString;  // USD-en-US or EUR-de-DE
-        sal_uIntPtr                   m_nBlockedHint;     // pending hints
+        sal_uLong                   m_nBlockedHint;     // pending hints
         sal_Bool                m_bDecimalSeparator; //use decimal separator same as locale
 
         sal_Bool                m_bROLocale;
@@ -386,7 +386,7 @@ void SvtSysLocaleOptions_Impl::SetLocaleString( const OUString& rStr )
         MakeRealLocale();
         MsLangId::setConfiguredSystemLanguage( m_eRealLanguage );
         SetModified();
-        sal_uIntPtr nHint = SYSLOCALEOPTIONS_HINT_LOCALE;
+        sal_uLong nHint = SYSLOCALEOPTIONS_HINT_LOCALE;
         if ( !m_aCurrencyString.getLength() )
             nHint |= SYSLOCALEOPTIONS_HINT_CURRENCY;
         NotifyListeners( nHint );
@@ -430,7 +430,7 @@ void SvtSysLocaleOptions_Impl::SetDecimalSeparatorAsLocale( sal_Bool bSet)
 
 void SvtSysLocaleOptions_Impl::Notify( const Sequence< rtl::OUString >& seqPropertyNames )
 {
-    sal_uIntPtr nHint = 0;
+    sal_uLong nHint = 0;
     Sequence< Any > seqValues = GetProperties( seqPropertyNames );
     Sequence< sal_Bool > seqROStates = GetReadOnlyStates( seqPropertyNames );
     sal_Int32 nCount = seqPropertyNames.getLength();
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index fb0472fc2f03..1ae7d1c7e0f0 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1417,7 +1417,7 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf,
 
     // convert number
     pNumBuf = ImplAddUNum( aNumBuf, (sal_uInt64)nNumber );
-    nNumLen = (sal_uInt16)(sal_uIntPtr)(pNumBuf-aNumBuf);
+    nNumLen = (sal_uInt16)(sal_uLong)(pNumBuf-aNumBuf);
     pNumBuf = aNumBuf;
 
     if ( nNumLen <= nDecimals )
@@ -1551,7 +1551,7 @@ String LocaleDataWrapper::getDate( const Date& rDate ) const
             pBuf = ImplAdd2UNum( pBuf, nDay, sal_True /* IsDateDayLeadingZero() */ );
     }
 
-    return String( aBuf, (xub_StrLen)(sal_uIntPtr)(pBuf-aBuf) );
+    return String( aBuf, (xub_StrLen)(sal_uLong)(pBuf-aBuf) );
 }
 
 
@@ -1589,7 +1589,7 @@ String LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool b1
         }
     }
 
-    String aStr( aBuf, (xub_StrLen)(sal_uIntPtr)(pBuf-aBuf) );
+    String aStr( aBuf, (xub_StrLen)(sal_uLong)(pBuf-aBuf) );
 
     if ( bHour12 )
     {
@@ -1626,7 +1626,7 @@ String LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal,
     // day of month
     nVal = rCal.getValue( CalendarFieldIndex::DAY_OF_MONTH );
     pBuf = ImplAdd2UNum( aBuf, nVal, bDayOfMonthWithLeadingZero );
-    String aDay( aBuf, (xub_StrLen)(sal_uIntPtr)(pBuf-aBuf) );
+    String aDay( aBuf, (xub_StrLen)(sal_uLong)(pBuf-aBuf) );
     // month of year
     nVal = rCal.getValue( CalendarFieldIndex::MONTH );
     String aMonth( rCal.getDisplayName( CalendarDisplayIndex::MONTH, nVal, nDisplayMonth ) );
@@ -1636,7 +1636,7 @@ String LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal,
         pBuf = ImplAddUNum( aBuf, nVal % 100, 2 );
     else
         pBuf = ImplAddUNum( aBuf, nVal );
-    String aYear( aBuf, (xub_StrLen)(sal_uIntPtr)(pBuf-aBuf) );
+    String aYear( aBuf, (xub_StrLen)(sal_uLong)(pBuf-aBuf) );
     // concatenate
     switch ( getLongDateFormat() )
     {
@@ -1692,7 +1692,7 @@ String LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, sal_Boo
         }
     }
 
-    return String( aBuf, (xub_StrLen)(sal_uIntPtr)(pBuf-aBuf) );
+    return String( aBuf, (xub_StrLen)(sal_uLong)(pBuf-aBuf) );
 }
 
 
@@ -1722,7 +1722,7 @@ String LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals,
 
     sal_Unicode* pBuf = ImplAddFormatNum( pBuffer, nNumber, nDecimals,
         bUseThousandSep, bTrailingZeros );
-    String aStr( pBuffer, (xub_StrLen)(sal_uIntPtr)(pBuf-pBuffer) );
+    String aStr( pBuffer, (xub_StrLen)(sal_uLong)(pBuf-pBuffer) );
 
     if ( pBuffer != aBuf )
         delete [] pBuffer;
@@ -1760,7 +1760,7 @@ String LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals,
     // convert number
     sal_Unicode* pEndNumBuf = ImplAddFormatNum( pNumBuffer, nNumber, nDecimals,
         bUseThousandSep, sal_True );
-    xub_StrLen nNumLen = (xub_StrLen)(sal_uIntPtr)(pEndNumBuf-pNumBuffer);
+    xub_StrLen nNumLen = (xub_StrLen)(sal_uLong)(pEndNumBuf-pNumBuffer);
 
     // replace zeros with zero character
     if ( (cZeroChar != '0') && nDecimals /* && IsNumTrailingZeros() */ )
@@ -1921,7 +1921,7 @@ String LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals,
         }
     }
 
-    String aNumber( pBuffer, (xub_StrLen)(sal_uIntPtr)(pBuf-pBuffer) );
+    String aNumber( pBuffer, (xub_StrLen)(sal_uLong)(pBuf-pBuffer) );
 
     if ( pBuffer != aBuf )
         delete [] pBuffer;
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 65401ffe4af8..5f5011d9d863 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1376,7 +1376,7 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const
 // from an traditional symbol font (i.e. U+F020..U+F0FF)
 void ConvertChar::RecodeString( String& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const
 {
-    sal_uIntPtr nLastIndex = (sal_uIntPtr)nIndex + nLen;
+    sal_uLong nLastIndex = (sal_uLong)nIndex + nLen;
     if( nLastIndex > rStr.Len() )
         nLastIndex = rStr.Len();
 
@@ -1460,7 +1460,7 @@ const ConvertChar* ConvertChar::GetRecodeData( const String& rOrgFontName, const
 //=======================================================================
 
 FontToSubsFontConverter CreateFontToSubsFontConverter(
-    const String& rOrgName, sal_uIntPtr nFlags )
+    const String& rOrgName, sal_uLong nFlags )
 {
     const ConvertChar* pCvt = NULL;
 
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index a929fa176e42..c93175ed1c73 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -519,7 +519,7 @@ void AddTokenFontName( String& rName, const String& rNewToken )
 
 // =======================================================================
 
-String GetSubsFontName( const String& rName, sal_uIntPtr nFlags )
+String GetSubsFontName( const String& rName, sal_uLong nFlags )
 {
     String aName;
 
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index a45d152b44f6..be855cd960af 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -223,7 +223,7 @@ DECLARE_LIST( StringList_Impl, ::rtl::OUString* )
 
     if ( pFiles )
     {
-        sal_uIntPtr nCount = pFiles->Count();
+        sal_uLong nCount = pFiles->Count();
         Sequence < ::rtl::OUString > aRet( nCount );
         ::rtl::OUString* pRet = aRet.getArray();
         for ( sal_uInt16 i = 0; i < nCount; ++i )
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index e4c555626816..f363e8d1153d 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -366,10 +366,10 @@ Sequence < OUString > UCBContentHelper::GetFolderContents( const String& rFolder
 
     if ( pFiles )
     {
-        sal_uIntPtr nCount = pFiles->Count();
+        sal_uLong nCount = pFiles->Count();
         Sequence < OUString > aRet( nCount );
         OUString* pRet = aRet.getArray();
-        for ( sal_uIntPtr i = 0; i < nCount; ++i )
+        for ( sal_uLong i = 0; i < nCount; ++i )
         {
             OUString* pFile = pFiles->GetObject(i);
             pRet[i] = *( pFile );
@@ -447,10 +447,10 @@ Sequence < OUString > UCBContentHelper::GetResultSet( const String& rURL )
 
     if ( pList )
     {
-        sal_uIntPtr nCount = pList->Count();
+        sal_uLong nCount = pList->Count();
         Sequence < OUString > aRet( nCount );
         OUString* pRet = aRet.getArray();
-        for ( sal_uIntPtr i = 0; i < nCount; ++i )
+        for ( sal_uLong i = 0; i < nCount; ++i )
         {
             OUString* pEntry = pList->GetObject(i);
             pRet[i] = *( pEntry );
@@ -626,9 +626,9 @@ sal_Bool UCBContentHelper::HasParentFolder( const String& rFolder )
 
 // -----------------------------------------------------------------------
 
-sal_uIntPtr UCBContentHelper::GetSize( const String& rContent )
+sal_uLong UCBContentHelper::GetSize( const String& rContent )
 {
-    sal_uIntPtr nSize = 0;
+    sal_uLong nSize = 0;
     sal_Int64 nTemp = 0;
     INetURLObject aObj( rContent );
     DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 51b6bb0b1a61..74e1872fb528 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1429,7 +1429,7 @@ void UcbLockBytes::SetSynchronMode (sal_Bool bSynchron)
 }
 
 //----------------------------------------------------------------------------
-ErrCode UcbLockBytes::ReadAt ( sal_uIntPtr nPos, void *pBuffer, sal_uIntPtr nCount, sal_uIntPtr *pRead) const
+ErrCode UcbLockBytes::ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const
 {
     if ( IsSynchronMode() )
     {
@@ -1488,13 +1488,13 @@ ErrCode UcbLockBytes::ReadAt ( sal_uIntPtr nPos, void *pBuffer, sal_uIntPtr nCou
 
     rtl_copyMemory (pBuffer, aData.getConstArray(), nSize);
     if (pRead)
-        *pRead = sal_uIntPtr(nSize);
+        *pRead = sal_uLong(nSize);
 
     return ERRCODE_NONE;
 }
 
 //----------------------------------------------------------------------------
-ErrCode UcbLockBytes::WriteAt ( sal_uIntPtr nPos, const void *pBuffer, sal_uIntPtr nCount, sal_uIntPtr *pWritten)
+ErrCode UcbLockBytes::WriteAt ( sal_uLong nPos, const void *pBuffer, sal_uLong nCount, sal_uLong *pWritten)
 {
     if ( pWritten )
         *pWritten = 0;
@@ -1543,11 +1543,11 @@ ErrCode UcbLockBytes::Flush() const
 }
 
 //----------------------------------------------------------------------------
-ErrCode UcbLockBytes::SetSize (sal_uIntPtr nNewSize)
+ErrCode UcbLockBytes::SetSize (sal_uLong nNewSize)
 {
     SvLockBytesStat aStat;
     Stat( &aStat, (SvLockBytesStatFlag) 0 );
-    sal_uIntPtr nSize = aStat.nSize;
+    sal_uLong nSize = aStat.nSize;
 
     if ( nSize > nNewSize )
     {
@@ -1564,7 +1564,7 @@ ErrCode UcbLockBytes::SetSize (sal_uIntPtr nNewSize)
 
     if ( nSize < nNewSize )
     {
-        sal_uIntPtr nDiff = nNewSize-nSize, nCount=0;
+        sal_uLong nDiff = nNewSize-nSize, nCount=0;
         sal_uInt8* pBuffer = new sal_uInt8[ nDiff ];
         memset(pBuffer, 0, nDiff); // initialize for enhanced security
         WriteAt( nSize, pBuffer, nDiff, &nCount );
@@ -1603,7 +1603,7 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const
 
     try
     {
-        pStat->nSize = sal_uIntPtr(xSeekable->getLength());
+        pStat->nSize = sal_uLong(xSeekable->getLength());
     }
     catch (IOException)
     {