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

6 files changed, 50 insertions, 50 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 )