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

7 files changed, 205 insertions, 205 deletions

diff --git a/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx
index d079d9bfec2c..da5d5854f056 100644
--- a/sot/inc/sot/exchange.hxx
+++ b/sot/inc/sot/exchange.hxx
@@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer {
 // - SotFormatStringId -
 // ---------------------
 
-typedef sal_uIntPtr SotFormatStringId;
+typedef sal_uLong SotFormatStringId;
 
 // ----------------
 // - DataFlavorEx -
@@ -77,14 +77,14 @@ typedef ::std::list< ::com::sun::star::datatransfer::DataFlavor >   DataFlavorLi
 typedef ::std::list< DataFlavorEx >                                 DataFlavorExList;
 
 SOT_DLLPUBLIC sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector,
-                            sal_uIntPtr nId );
+                            sal_uLong nId );
 
 // -------------------------
 // - Vordefinierte Formate -
 // -------------------------
 
-// Die Reihenfolge und die Werte dürfen nicht geändert werden,
-// da die Implementation sich darauf verläßt.
+// Die Reihenfolge und die Werte d�rfen nicht ge�ndert werden,
+// da die Implementation sich darauf verl��t.
 // Standard-Formate fuer die es auch Copy/Paste-Methoden gibt
 #define FORMAT_STRING           1
 #define FORMAT_BITMAP           2
@@ -188,26 +188,26 @@ class SvGlobalName;
 class SOT_DLLPUBLIC SotExchange
 {
 public:
-    static sal_uIntPtr  RegisterFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    static sal_uIntPtr  RegisterFormatName( const String& rName );
-    static sal_uIntPtr  RegisterFormatMimeType( const String& rMimeType );
-
-    static sal_uIntPtr  GetFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    static String   GetFormatName( sal_uIntPtr nFormat );
-    static sal_Bool GetFormatDataFlavor( sal_uIntPtr nFormat, ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    static String   GetFormatMimeType( sal_uIntPtr nFormat );
+    static sal_uLong    RegisterFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    static sal_uLong    RegisterFormatName( const String& rName );
+    static sal_uLong    RegisterFormatMimeType( const String& rMimeType );
+
+    static sal_uLong    GetFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    static String   GetFormatName( sal_uLong nFormat );
+    static sal_Bool GetFormatDataFlavor( sal_uLong nFormat, ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    static String   GetFormatMimeType( sal_uLong nFormat );
     static sal_Bool     IsInternal( const SvGlobalName& );
-    static sal_uIntPtr  GetFormatIdFromMimeType( const String& rMimeType );
+    static sal_uLong    GetFormatIdFromMimeType( const String& rMimeType );
 
     // bestimme die SotFormatStringId von dem registrierten Format
     //JP 12.11.98: diese 3 Methoden sind ab sofort ueberfluessig, da
     //              die ClipboardIds statisch sind und aequivalent zur
     //              SotFormatStringId ist!
-    static SotFormatStringId GetFormatStringId( sal_uIntPtr nFormat )
+    static SotFormatStringId GetFormatStringId( sal_uLong nFormat )
         { return nFormat; }
     static SotFormatStringId GetFormatStringId( const String& rName )
         { return SotExchange::RegisterFormatMimeType( rName ); }
-    static sal_uIntPtr RegisterSotFormatName( SotFormatStringId nId )
+    static sal_uLong RegisterSotFormatName( SotFormatStringId nId )
         { return nId; }
 
     // same for XTransferable interface
@@ -221,11 +221,11 @@ public:
         // vom Anwender gewaehlte Aktion (EXCHG_IN_*, EXCHG_INOUT_*)
         sal_uInt16 nUserAction,
         // In:- Out: Zu benutzendes Format
-        sal_uIntPtr& rFormat,
+        sal_uLong& rFormat,
         // In:- Out: Default-Action (EXCHG_IN_*, EXCHG_INOUT_*)
         sal_uInt16& rDefaultAction,
         // In:- optional - check only for this specific format
-        sal_uIntPtr nOnlyTestFormat = 0,
+        sal_uLong nOnlyTestFormat = 0,
         // In:- optional - check the contents of Xtransferable
         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >* pxTransferable = NULL );
 
@@ -240,11 +240,11 @@ public:
         // vom Anwender gewaehlte Aktion (EXCHG_IN_*, EXCHG_INOUT_*)
         sal_uInt16 nUserAction,
         // In:- Out: Zu benutzendes Format
-        sal_uIntPtr& rFormat,
+        sal_uLong& rFormat,
         // In:- Out: Default-Action (EXCHG_IN_*, EXCHG_INOUT_*)
         sal_uInt16& rDefaultAction,
         // In:- optional - check only for this specific format
-        sal_uIntPtr nOnlyTestFormat = 0 );
+        sal_uLong nOnlyTestFormat = 0 );
 
     static sal_uInt16 IsChart( const SvGlobalName& rName );
     static sal_uInt16 IsMath( const SvGlobalName& rName );
diff --git a/sot/inc/sot/filelist.hxx b/sot/inc/sot/filelist.hxx
index fc04e92cb3d7..4db3e4866817 100644
--- a/sot/inc/sot/filelist.hxx
+++ b/sot/inc/sot/filelist.hxx
@@ -62,13 +62,13 @@ public:
     SOT_DLLPUBLIC friend SvStream&  operator>>( SvStream& rIStm, FileList& rFileList );
 
     // Clipboard, D&D usw.
-    static sal_uIntPtr      GetFormat();
+    static sal_uLong        GetFormat();
 
 
     // Liste fuellen/abfragen
     void AppendFile( const String& rStr );
-    String GetFile( sal_uIntPtr i ) const;
-    sal_uIntPtr Count( void ) const;
+    String GetFile( sal_uLong i ) const;
+    sal_uLong Count( void ) const;
 
 };
 
diff --git a/sot/inc/sot/formats.hxx b/sot/inc/sot/formats.hxx
index 8a61884c88e7..303afecb5a17 100644
--- a/sot/inc/sot/formats.hxx
+++ b/sot/inc/sot/formats.hxx
@@ -46,145 +46,145 @@
 #endif
 #include <sot/exchange.hxx>
 
-#define SOT_FORMAT_SYSTEM_START                 ((sal_uIntPtr)0)
-#define SOT_FORMAT_STRING                       ((sal_uIntPtr)FORMAT_STRING)
-#define SOT_FORMAT_BITMAP                       ((sal_uIntPtr)FORMAT_BITMAP)
-#define SOT_FORMAT_GDIMETAFILE                  ((sal_uIntPtr)FORMAT_GDIMETAFILE)
-#define SOT_FORMAT_PRIVATE                      ((sal_uIntPtr)FORMAT_PRIVATE)
-#define SOT_FORMAT_FILE                         ((sal_uIntPtr)FORMAT_FILE)
-#define SOT_FORMAT_FILE_LIST                    ((sal_uIntPtr)FORMAT_FILE_LIST)
-#define SOT_FORMAT_RTF                          ((sal_uIntPtr)FORMAT_RTF)
+#define SOT_FORMAT_SYSTEM_START                 ((sal_uLong)0)
+#define SOT_FORMAT_STRING                       ((sal_uLong)FORMAT_STRING)
+#define SOT_FORMAT_BITMAP                       ((sal_uLong)FORMAT_BITMAP)
+#define SOT_FORMAT_GDIMETAFILE                  ((sal_uLong)FORMAT_GDIMETAFILE)
+#define SOT_FORMAT_PRIVATE                      ((sal_uLong)FORMAT_PRIVATE)
+#define SOT_FORMAT_FILE                         ((sal_uLong)FORMAT_FILE)
+#define SOT_FORMAT_FILE_LIST                    ((sal_uLong)FORMAT_FILE_LIST)
+#define SOT_FORMAT_RTF                          ((sal_uLong)FORMAT_RTF)
 
-#define SOT_FORMATSTR_ID_DRAWING                ((sal_uIntPtr)11)
-#define SOT_FORMATSTR_ID_SVXB                   ((sal_uIntPtr)12)
-#define SOT_FORMATSTR_ID_SVIM                   ((sal_uIntPtr)13)
-#define SOT_FORMATSTR_ID_XFA                    ((sal_uIntPtr)14)
-#define SOT_FORMATSTR_ID_EDITENGINE             ((sal_uIntPtr)15)
-#define SOT_FORMATSTR_ID_INTERNALLINK_STATE     ((sal_uIntPtr)16)
-#define SOT_FORMATSTR_ID_SOLK                   ((sal_uIntPtr)17)
-#define SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK      ((sal_uIntPtr)18)
-#define SOT_FORMATSTR_ID_TREELISTBOX            ((sal_uIntPtr)19)
-#define SOT_FORMATSTR_ID_NATIVE                 ((sal_uIntPtr)20)
-#define SOT_FORMATSTR_ID_OWNERLINK              ((sal_uIntPtr)21)
-#define SOT_FORMATSTR_ID_STARSERVER             ((sal_uIntPtr)22)
-#define SOT_FORMATSTR_ID_STAROBJECT             ((sal_uIntPtr)23)
-#define SOT_FORMATSTR_ID_APPLETOBJECT           ((sal_uIntPtr)24)
-#define SOT_FORMATSTR_ID_PLUGIN_OBJECT          ((sal_uIntPtr)25)
-#define SOT_FORMATSTR_ID_STARWRITER_30          ((sal_uIntPtr)26)
-#define SOT_FORMATSTR_ID_STARWRITER_40          ((sal_uIntPtr)27)
-#define SOT_FORMATSTR_ID_STARWRITER_50          ((sal_uIntPtr)28)
-#define SOT_FORMATSTR_ID_STARWRITERWEB_40       ((sal_uIntPtr)29)
-#define SOT_FORMATSTR_ID_STARWRITERWEB_50       ((sal_uIntPtr)30)
-#define SOT_FORMATSTR_ID_STARWRITERGLOB_40      ((sal_uIntPtr)31)
-#define SOT_FORMATSTR_ID_STARWRITERGLOB_50      ((sal_uIntPtr)32)
-#define SOT_FORMATSTR_ID_STARDRAW               ((sal_uIntPtr)33)
-#define SOT_FORMATSTR_ID_STARDRAW_40            ((sal_uIntPtr)34)
-#define SOT_FORMATSTR_ID_STARIMPRESS_50         ((sal_uIntPtr)35)
-#define SOT_FORMATSTR_ID_STARDRAW_50            ((sal_uIntPtr)36)
-#define SOT_FORMATSTR_ID_STARCALC               ((sal_uIntPtr)37)
-#define SOT_FORMATSTR_ID_STARCALC_40            ((sal_uIntPtr)38)
-#define SOT_FORMATSTR_ID_STARCALC_50            ((sal_uIntPtr)39)
-#define SOT_FORMATSTR_ID_STARCHART              ((sal_uIntPtr)40)
-#define SOT_FORMATSTR_ID_STARCHART_40           ((sal_uIntPtr)41)
-#define SOT_FORMATSTR_ID_STARCHART_50           ((sal_uIntPtr)42)
-#define SOT_FORMATSTR_ID_STARIMAGE              ((sal_uIntPtr)43)
-#define SOT_FORMATSTR_ID_STARIMAGE_40           ((sal_uIntPtr)44)
-#define SOT_FORMATSTR_ID_STARIMAGE_50           ((sal_uIntPtr)45)
-#define SOT_FORMATSTR_ID_STARMATH               ((sal_uIntPtr)46)
-#define SOT_FORMATSTR_ID_STARMATH_40            ((sal_uIntPtr)47)
-#define SOT_FORMATSTR_ID_STARMATH_50            ((sal_uIntPtr)48)
-#define SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC    ((sal_uIntPtr)49)
-#define SOT_FORMATSTR_ID_FILLED_AREA            ((sal_uIntPtr)50)
-#define SOT_FORMATSTR_ID_HTML                   ((sal_uIntPtr)51)
-#define SOT_FORMATSTR_ID_HTML_SIMPLE            ((sal_uIntPtr)52)
-#define SOT_FORMATSTR_ID_CHAOS                  ((sal_uIntPtr)53)
-#define SOT_FORMATSTR_ID_CNT_MSGATTACHFILE      ((sal_uIntPtr)54)
-#define SOT_FORMATSTR_ID_BIFF_5                 ((sal_uIntPtr)55)
-#define SOT_FORMATSTR_ID_BIFF__5                ((sal_uIntPtr)56)
-#define SOT_FORMATSTR_ID_SYLK                   ((sal_uIntPtr)57)
-#define SOT_FORMATSTR_ID_SYLK_BIGCAPS           ((sal_uIntPtr)58)
-#define SOT_FORMATSTR_ID_LINK                   ((sal_uIntPtr)59)
-#define SOT_FORMATSTR_ID_DIF                    ((sal_uIntPtr)60)
-#define SOT_FORMATSTR_ID_STARDRAW_TABBAR        ((sal_uIntPtr)61)
-#define SOT_FORMATSTR_ID_SONLK                  ((sal_uIntPtr)62)
-#define SOT_FORMATSTR_ID_MSWORD_DOC             ((sal_uIntPtr)63)
-#define SOT_FORMATSTR_ID_STAR_FRAMESET_DOC      ((sal_uIntPtr)64)
-#define SOT_FORMATSTR_ID_OFFICE_DOC             ((sal_uIntPtr)65)
-#define SOT_FORMATSTR_ID_NOTES_DOCINFO          ((sal_uIntPtr)66)
-#define SOT_FORMATSTR_ID_NOTES_HNOTE            ((sal_uIntPtr)67)
-#define SOT_FORMATSTR_ID_NOTES_NATIVE           ((sal_uIntPtr)68)
-#define SOT_FORMATSTR_ID_SFX_DOC                ((sal_uIntPtr)69)
-#define SOT_FORMATSTR_ID_EVDF                   ((sal_uIntPtr)70)
-#define SOT_FORMATSTR_ID_ESDF                   ((sal_uIntPtr)71)
-#define SOT_FORMATSTR_ID_IDF                    ((sal_uIntPtr)72)
-#define SOT_FORMATSTR_ID_EFTP                   ((sal_uIntPtr)73)
-#define SOT_FORMATSTR_ID_EFD                    ((sal_uIntPtr)74)
-#define SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH      ((sal_uIntPtr)75)
-#define SOT_FORMATSTR_ID_EXTENDED_TABBAR        ((sal_uIntPtr)76)
-#define SOT_FORMATSTR_ID_SBA_DATAEXCHANGE       ((sal_uIntPtr)77)
-#define SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE  ((sal_uIntPtr)78)
-#define SOT_FORMATSTR_ID_SBA_PRIVATE_URL        ((sal_uIntPtr)79)
-#define SOT_FORMATSTR_ID_SBA_TABED              ((sal_uIntPtr)80)
-#define SOT_FORMATSTR_ID_SBA_TABID              ((sal_uIntPtr)81)
-#define SOT_FORMATSTR_ID_SBA_JOIN               ((sal_uIntPtr)82)
-#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR       ((sal_uIntPtr)83)
-#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR      ((sal_uIntPtr)84)
-#define SOT_FORMATSTR_ID_EMBED_SOURCE           ((sal_uIntPtr)85)
-#define SOT_FORMATSTR_ID_LINK_SOURCE            ((sal_uIntPtr)86)
-#define SOT_FORMATSTR_ID_EMBEDDED_OBJ           ((sal_uIntPtr)87)
-#define SOT_FORMATSTR_ID_FILECONTENT            ((sal_uIntPtr)88)
-#define SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR      ((sal_uIntPtr)89)
-#define SOT_FORMATSTR_ID_FILENAME               ((sal_uIntPtr)90)
-#define SOT_FORMATSTR_ID_SD_OLE                 ((sal_uIntPtr)91)
-#define SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE       ((sal_uIntPtr)92)
-#define SOT_FORMATSTR_ID_EMBED_SOURCE_OLE       ((sal_uIntPtr)93)
-#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE   ((sal_uIntPtr)94)
-#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE  ((sal_uIntPtr)95)
-#define SOT_FORMATSTR_ID_LINK_SOURCE_OLE        ((sal_uIntPtr)96)
-#define SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE   ((sal_uIntPtr)97)
-#define SOT_FORMATSTR_ID_OUTPLACE_OBJ           ((sal_uIntPtr)98)
-#define SOT_FORMATSTR_ID_CNT_OWN_CLIP           ((sal_uIntPtr)99)
-#define SOT_FORMATSTR_ID_INET_IMAGE             ((sal_uIntPtr)100)
-#define SOT_FORMATSTR_ID_NETSCAPE_IMAGE         ((sal_uIntPtr)101)
-#define SOT_FORMATSTR_ID_SBA_FORMEXCHANGE       ((sal_uIntPtr)102)
-#define SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE     ((sal_uIntPtr)103)
-#define SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ((sal_uIntPtr)104)
-#define SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50   ((sal_uIntPtr)105)
-#define SOT_FORMATSTR_ID_GRAPHOBJ               ((sal_uIntPtr)106)
-#define SOT_FORMATSTR_ID_STARWRITER_60          ((sal_uIntPtr)107)
-#define SOT_FORMATSTR_ID_STARWRITERWEB_60       ((sal_uIntPtr)108)
-#define SOT_FORMATSTR_ID_STARWRITERGLOB_60      ((sal_uIntPtr)109)
-#define SOT_FORMATSTR_ID_STARDRAW_60            ((sal_uIntPtr)110)
-#define SOT_FORMATSTR_ID_STARIMPRESS_60         ((sal_uIntPtr)111)
-#define SOT_FORMATSTR_ID_STARCALC_60            ((sal_uIntPtr)112)
-#define SOT_FORMATSTR_ID_STARCHART_60           ((sal_uIntPtr)113)
-#define SOT_FORMATSTR_ID_STARMATH_60            ((sal_uIntPtr)114)
-#define SOT_FORMATSTR_ID_WMF                    ((sal_uIntPtr)115)
-#define SOT_FORMATSTR_ID_DBACCESS_QUERY         ((sal_uIntPtr)116)
-#define SOT_FORMATSTR_ID_DBACCESS_TABLE         ((sal_uIntPtr)117)
-#define SOT_FORMATSTR_ID_DBACCESS_COMMAND       ((sal_uIntPtr)118)
-#define SOT_FORMATSTR_ID_DIALOG_60              ((sal_uIntPtr)119)
-#define SOT_FORMATSTR_ID_EMF                    ((sal_uIntPtr)120)
-#define SOT_FORMATSTR_ID_BIFF_8                 ((sal_uIntPtr)121)
-#define SOT_FORMATSTR_ID_BMP                    ((sal_uIntPtr)122)
-#define SOT_FORMATSTR_ID_HTML_NO_COMMENT        ((sal_uIntPtr)123)
-#define SOT_FORMATSTR_ID_STARWRITER_8           ((sal_uIntPtr)124)
-#define SOT_FORMATSTR_ID_STARWRITERWEB_8        ((sal_uIntPtr)125)
-#define SOT_FORMATSTR_ID_STARWRITERGLOB_8       ((sal_uIntPtr)126)
-#define SOT_FORMATSTR_ID_STARDRAW_8             ((sal_uIntPtr)127)
-#define SOT_FORMATSTR_ID_STARIMPRESS_8          ((sal_uIntPtr)128)
-#define SOT_FORMATSTR_ID_STARCALC_8             ((sal_uIntPtr)129)
-#define SOT_FORMATSTR_ID_STARCHART_8            ((sal_uIntPtr)130)
-#define SOT_FORMATSTR_ID_STARMATH_8             ((sal_uIntPtr)131)
-#define SOT_FORMATSTR_ID_XFORMS                 ((sal_uIntPtr)132)
-#define SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE  ((sal_uIntPtr)133)
-#define SOT_FORMATSTR_ID_STARDRAW_8_TEMPLATE    ((sal_uIntPtr)134)
-#define SOT_FORMATSTR_ID_STARIMPRESS_8_TEMPLATE ((sal_uIntPtr)135)
-#define SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE    ((sal_uIntPtr)136)
-#define SOT_FORMATSTR_ID_STARCHART_8_TEMPLATE   ((sal_uIntPtr)137)
-#define SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE    ((sal_uIntPtr)138)
-#define SOT_FORMATSTR_ID_STARBASE_8             ((sal_uIntPtr)139)
-#define SOT_FORMATSTR_ID_HC_GDIMETAFILE         ((sal_uIntPtr)140)
+#define SOT_FORMATSTR_ID_DRAWING                ((sal_uLong)11)
+#define SOT_FORMATSTR_ID_SVXB                   ((sal_uLong)12)
+#define SOT_FORMATSTR_ID_SVIM                   ((sal_uLong)13)
+#define SOT_FORMATSTR_ID_XFA                    ((sal_uLong)14)
+#define SOT_FORMATSTR_ID_EDITENGINE             ((sal_uLong)15)
+#define SOT_FORMATSTR_ID_INTERNALLINK_STATE     ((sal_uLong)16)
+#define SOT_FORMATSTR_ID_SOLK                   ((sal_uLong)17)
+#define SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK      ((sal_uLong)18)
+#define SOT_FORMATSTR_ID_TREELISTBOX            ((sal_uLong)19)
+#define SOT_FORMATSTR_ID_NATIVE                 ((sal_uLong)20)
+#define SOT_FORMATSTR_ID_OWNERLINK              ((sal_uLong)21)
+#define SOT_FORMATSTR_ID_STARSERVER             ((sal_uLong)22)
+#define SOT_FORMATSTR_ID_STAROBJECT             ((sal_uLong)23)
+#define SOT_FORMATSTR_ID_APPLETOBJECT           ((sal_uLong)24)
+#define SOT_FORMATSTR_ID_PLUGIN_OBJECT          ((sal_uLong)25)
+#define SOT_FORMATSTR_ID_STARWRITER_30          ((sal_uLong)26)
+#define SOT_FORMATSTR_ID_STARWRITER_40          ((sal_uLong)27)
+#define SOT_FORMATSTR_ID_STARWRITER_50          ((sal_uLong)28)
+#define SOT_FORMATSTR_ID_STARWRITERWEB_40       ((sal_uLong)29)
+#define SOT_FORMATSTR_ID_STARWRITERWEB_50       ((sal_uLong)30)
+#define SOT_FORMATSTR_ID_STARWRITERGLOB_40      ((sal_uLong)31)
+#define SOT_FORMATSTR_ID_STARWRITERGLOB_50      ((sal_uLong)32)
+#define SOT_FORMATSTR_ID_STARDRAW               ((sal_uLong)33)
+#define SOT_FORMATSTR_ID_STARDRAW_40            ((sal_uLong)34)
+#define SOT_FORMATSTR_ID_STARIMPRESS_50         ((sal_uLong)35)
+#define SOT_FORMATSTR_ID_STARDRAW_50            ((sal_uLong)36)
+#define SOT_FORMATSTR_ID_STARCALC               ((sal_uLong)37)
+#define SOT_FORMATSTR_ID_STARCALC_40            ((sal_uLong)38)
+#define SOT_FORMATSTR_ID_STARCALC_50            ((sal_uLong)39)
+#define SOT_FORMATSTR_ID_STARCHART              ((sal_uLong)40)
+#define SOT_FORMATSTR_ID_STARCHART_40           ((sal_uLong)41)
+#define SOT_FORMATSTR_ID_STARCHART_50           ((sal_uLong)42)
+#define SOT_FORMATSTR_ID_STARIMAGE              ((sal_uLong)43)
+#define SOT_FORMATSTR_ID_STARIMAGE_40           ((sal_uLong)44)
+#define SOT_FORMATSTR_ID_STARIMAGE_50           ((sal_uLong)45)
+#define SOT_FORMATSTR_ID_STARMATH               ((sal_uLong)46)
+#define SOT_FORMATSTR_ID_STARMATH_40            ((sal_uLong)47)
+#define SOT_FORMATSTR_ID_STARMATH_50            ((sal_uLong)48)
+#define SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC    ((sal_uLong)49)
+#define SOT_FORMATSTR_ID_FILLED_AREA            ((sal_uLong)50)
+#define SOT_FORMATSTR_ID_HTML                   ((sal_uLong)51)
+#define SOT_FORMATSTR_ID_HTML_SIMPLE            ((sal_uLong)52)
+#define SOT_FORMATSTR_ID_CHAOS                  ((sal_uLong)53)
+#define SOT_FORMATSTR_ID_CNT_MSGATTACHFILE      ((sal_uLong)54)
+#define SOT_FORMATSTR_ID_BIFF_5                 ((sal_uLong)55)
+#define SOT_FORMATSTR_ID_BIFF__5                ((sal_uLong)56)
+#define SOT_FORMATSTR_ID_SYLK                   ((sal_uLong)57)
+#define SOT_FORMATSTR_ID_SYLK_BIGCAPS           ((sal_uLong)58)
+#define SOT_FORMATSTR_ID_LINK                   ((sal_uLong)59)
+#define SOT_FORMATSTR_ID_DIF                    ((sal_uLong)60)
+#define SOT_FORMATSTR_ID_STARDRAW_TABBAR        ((sal_uLong)61)
+#define SOT_FORMATSTR_ID_SONLK                  ((sal_uLong)62)
+#define SOT_FORMATSTR_ID_MSWORD_DOC             ((sal_uLong)63)
+#define SOT_FORMATSTR_ID_STAR_FRAMESET_DOC      ((sal_uLong)64)
+#define SOT_FORMATSTR_ID_OFFICE_DOC             ((sal_uLong)65)
+#define SOT_FORMATSTR_ID_NOTES_DOCINFO          ((sal_uLong)66)
+#define SOT_FORMATSTR_ID_NOTES_HNOTE            ((sal_uLong)67)
+#define SOT_FORMATSTR_ID_NOTES_NATIVE           ((sal_uLong)68)
+#define SOT_FORMATSTR_ID_SFX_DOC                ((sal_uLong)69)
+#define SOT_FORMATSTR_ID_EVDF                   ((sal_uLong)70)
+#define SOT_FORMATSTR_ID_ESDF                   ((sal_uLong)71)
+#define SOT_FORMATSTR_ID_IDF                    ((sal_uLong)72)
+#define SOT_FORMATSTR_ID_EFTP                   ((sal_uLong)73)
+#define SOT_FORMATSTR_ID_EFD                    ((sal_uLong)74)
+#define SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH      ((sal_uLong)75)
+#define SOT_FORMATSTR_ID_EXTENDED_TABBAR        ((sal_uLong)76)
+#define SOT_FORMATSTR_ID_SBA_DATAEXCHANGE       ((sal_uLong)77)
+#define SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE  ((sal_uLong)78)
+#define SOT_FORMATSTR_ID_SBA_PRIVATE_URL        ((sal_uLong)79)
+#define SOT_FORMATSTR_ID_SBA_TABED              ((sal_uLong)80)
+#define SOT_FORMATSTR_ID_SBA_TABID              ((sal_uLong)81)
+#define SOT_FORMATSTR_ID_SBA_JOIN               ((sal_uLong)82)
+#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR       ((sal_uLong)83)
+#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR      ((sal_uLong)84)
+#define SOT_FORMATSTR_ID_EMBED_SOURCE           ((sal_uLong)85)
+#define SOT_FORMATSTR_ID_LINK_SOURCE            ((sal_uLong)86)
+#define SOT_FORMATSTR_ID_EMBEDDED_OBJ           ((sal_uLong)87)
+#define SOT_FORMATSTR_ID_FILECONTENT            ((sal_uLong)88)
+#define SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR      ((sal_uLong)89)
+#define SOT_FORMATSTR_ID_FILENAME               ((sal_uLong)90)
+#define SOT_FORMATSTR_ID_SD_OLE                 ((sal_uLong)91)
+#define SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE       ((sal_uLong)92)
+#define SOT_FORMATSTR_ID_EMBED_SOURCE_OLE       ((sal_uLong)93)
+#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE   ((sal_uLong)94)
+#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE  ((sal_uLong)95)
+#define SOT_FORMATSTR_ID_LINK_SOURCE_OLE        ((sal_uLong)96)
+#define SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE   ((sal_uLong)97)
+#define SOT_FORMATSTR_ID_OUTPLACE_OBJ           ((sal_uLong)98)
+#define SOT_FORMATSTR_ID_CNT_OWN_CLIP           ((sal_uLong)99)
+#define SOT_FORMATSTR_ID_INET_IMAGE             ((sal_uLong)100)
+#define SOT_FORMATSTR_ID_NETSCAPE_IMAGE         ((sal_uLong)101)
+#define SOT_FORMATSTR_ID_SBA_FORMEXCHANGE       ((sal_uLong)102)
+#define SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE     ((sal_uLong)103)
+#define SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ((sal_uLong)104)
+#define SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50   ((sal_uLong)105)
+#define SOT_FORMATSTR_ID_GRAPHOBJ               ((sal_uLong)106)
+#define SOT_FORMATSTR_ID_STARWRITER_60          ((sal_uLong)107)
+#define SOT_FORMATSTR_ID_STARWRITERWEB_60       ((sal_uLong)108)
+#define SOT_FORMATSTR_ID_STARWRITERGLOB_60      ((sal_uLong)109)
+#define SOT_FORMATSTR_ID_STARDRAW_60            ((sal_uLong)110)
+#define SOT_FORMATSTR_ID_STARIMPRESS_60         ((sal_uLong)111)
+#define SOT_FORMATSTR_ID_STARCALC_60            ((sal_uLong)112)
+#define SOT_FORMATSTR_ID_STARCHART_60           ((sal_uLong)113)
+#define SOT_FORMATSTR_ID_STARMATH_60            ((sal_uLong)114)
+#define SOT_FORMATSTR_ID_WMF                    ((sal_uLong)115)
+#define SOT_FORMATSTR_ID_DBACCESS_QUERY         ((sal_uLong)116)
+#define SOT_FORMATSTR_ID_DBACCESS_TABLE         ((sal_uLong)117)
+#define SOT_FORMATSTR_ID_DBACCESS_COMMAND       ((sal_uLong)118)
+#define SOT_FORMATSTR_ID_DIALOG_60              ((sal_uLong)119)
+#define SOT_FORMATSTR_ID_EMF                    ((sal_uLong)120)
+#define SOT_FORMATSTR_ID_BIFF_8                 ((sal_uLong)121)
+#define SOT_FORMATSTR_ID_BMP                    ((sal_uLong)122)
+#define SOT_FORMATSTR_ID_HTML_NO_COMMENT        ((sal_uLong)123)
+#define SOT_FORMATSTR_ID_STARWRITER_8           ((sal_uLong)124)
+#define SOT_FORMATSTR_ID_STARWRITERWEB_8        ((sal_uLong)125)
+#define SOT_FORMATSTR_ID_STARWRITERGLOB_8       ((sal_uLong)126)
+#define SOT_FORMATSTR_ID_STARDRAW_8             ((sal_uLong)127)
+#define SOT_FORMATSTR_ID_STARIMPRESS_8          ((sal_uLong)128)
+#define SOT_FORMATSTR_ID_STARCALC_8             ((sal_uLong)129)
+#define SOT_FORMATSTR_ID_STARCHART_8            ((sal_uLong)130)
+#define SOT_FORMATSTR_ID_STARMATH_8             ((sal_uLong)131)
+#define SOT_FORMATSTR_ID_XFORMS                 ((sal_uLong)132)
+#define SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE  ((sal_uLong)133)
+#define SOT_FORMATSTR_ID_STARDRAW_8_TEMPLATE    ((sal_uLong)134)
+#define SOT_FORMATSTR_ID_STARIMPRESS_8_TEMPLATE ((sal_uLong)135)
+#define SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE    ((sal_uLong)136)
+#define SOT_FORMATSTR_ID_STARCHART_8_TEMPLATE   ((sal_uLong)137)
+#define SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE    ((sal_uLong)138)
+#define SOT_FORMATSTR_ID_STARBASE_8             ((sal_uLong)139)
+#define SOT_FORMATSTR_ID_HC_GDIMETAFILE         ((sal_uLong)140)
 #define SOT_FORMATSTR_ID_USER_END               SOT_FORMATSTR_ID_HC_GDIMETAFILE
 
 #endif // _SOT_FORMATS_HXX
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index 5b6cedfbf410..163f6932d66d 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -395,7 +395,7 @@ friend class SvObject;
                 bInClose:1;         // sal_True, im DoClose
 
     void *      DownAggCast( const SotFactory * pFact );
-    void        RemoveInterface( sal_uIntPtr );
+    void        RemoveInterface( sal_uLong );
     void        RemoveInterface( SotObject * );
 #if defined (GCC) && (defined (C281) || defined (C290) || defined (C291))
 public:
diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx
index b4f13b8d2660..630c7d6a4a0f 100644
--- a/sot/inc/sot/stg.hxx
+++ b/sot/inc/sot/stg.hxx
@@ -73,7 +73,7 @@ struct ClsId
 class SOT_DLLPUBLIC StorageBase : public SvRefBase
 {
 protected:
-    sal_uIntPtr           m_nError;                   // error code
+    sal_uLong           m_nError;                   // error code
     StreamMode      m_nMode;                    // open mode
     sal_Bool            m_bAutoCommit;
                     StorageBase();
@@ -84,8 +84,8 @@ public:
     virtual sal_Bool    Validate( sal_Bool=sal_False ) const = 0;
     virtual sal_Bool    ValidateMode( StreamMode ) const = 0;
     void            ResetError() const;
-    void            SetError( sal_uIntPtr ) const;
-    sal_uIntPtr           GetError() const;
+    void            SetError( sal_uLong ) const;
+    sal_uLong           GetError() const;
     sal_Bool            Good() const          { return sal_Bool( m_nError == SVSTREAM_OK ); }
     StreamMode      GetMode() const  { return m_nMode;  }
     void            SetAutoCommit( sal_Bool bSet )
@@ -96,12 +96,12 @@ class BaseStorageStream : public StorageBase
 {
 public:
                     TYPEINFO();
-    virtual sal_uIntPtr   Read( void * pData, sal_uIntPtr nSize ) = 0;
-    virtual sal_uIntPtr   Write( const void* pData, sal_uIntPtr nSize ) = 0;
-    virtual sal_uIntPtr   Seek( sal_uIntPtr nPos ) = 0;
-    virtual sal_uIntPtr   Tell() = 0;
+    virtual sal_uLong   Read( void * pData, sal_uLong nSize ) = 0;
+    virtual sal_uLong   Write( const void* pData, sal_uLong nSize ) = 0;
+    virtual sal_uLong   Seek( sal_uLong nPos ) = 0;
+    virtual sal_uLong   Tell() = 0;
     virtual void    Flush() = 0;
-    virtual sal_Bool    SetSize( sal_uIntPtr nNewSize ) = 0;
+    virtual sal_Bool    SetSize( sal_uLong nNewSize ) = 0;
     virtual sal_Bool    CopyTo( BaseStorageStream * pDestStm ) = 0;
     virtual sal_Bool    Commit() = 0;
     virtual sal_Bool    Revert() = 0;
@@ -119,13 +119,13 @@ public:
     virtual const ClsId&        GetClassId() const = 0;
     virtual void                SetDirty() = 0;
     virtual void                SetClass( const SvGlobalName & rClass,
-                                    sal_uIntPtr nOriginalClipFormat,
+                                    sal_uLong nOriginalClipFormat,
                                     const String & rUserTypeName ) = 0;
     virtual void                SetConvertClass( const SvGlobalName & rConvertClass,
-                                           sal_uIntPtr nOriginalClipFormat,
+                                           sal_uLong nOriginalClipFormat,
                                            const String & rUserTypeName ) = 0;
     virtual SvGlobalName        GetClassName() = 0;
-    virtual sal_uIntPtr               GetFormat() = 0;
+    virtual sal_uLong               GetFormat() = 0;
     virtual String              GetUserName() = 0;
     virtual sal_Bool                ShouldConvert() = 0;
     virtual void                FillInfoList( SvStorageInfoList* ) const = 0;
@@ -172,18 +172,18 @@ public:
 class StorageStream : public BaseStorageStream, public OLEStorageBase
 {
 //friend class Storage;
-    sal_uIntPtr           nPos;                             // current position
+    sal_uLong           nPos;                             // current position
 protected:
                     ~StorageStream();
 public:
                     TYPEINFO();
                     StorageStream( StgIo*, StgDirEntry*, StreamMode );
-    virtual sal_uIntPtr   Read( void * pData, sal_uIntPtr nSize );
-    virtual sal_uIntPtr   Write( const void* pData, sal_uIntPtr nSize );
-    virtual sal_uIntPtr   Seek( sal_uIntPtr nPos );
-    virtual sal_uIntPtr   Tell() { return nPos; }
+    virtual sal_uLong   Read( void * pData, sal_uLong nSize );
+    virtual sal_uLong   Write( const void* pData, sal_uLong nSize );
+    virtual sal_uLong   Seek( sal_uLong nPos );
+    virtual sal_uLong   Tell() { return nPos; }
     virtual void    Flush();
-    virtual sal_Bool    SetSize( sal_uIntPtr nNewSize );
+    virtual sal_Bool    SetSize( sal_uLong nNewSize );
     virtual sal_Bool    CopyTo( BaseStorageStream * pDestStm );
     virtual sal_Bool    Commit();
     virtual sal_Bool    Revert();
@@ -219,13 +219,13 @@ public:
     virtual const ClsId&        GetClassId() const;
     virtual void                SetDirty();
     virtual void                SetClass( const SvGlobalName & rClass,
-                                    sal_uIntPtr nOriginalClipFormat,
+                                    sal_uLong nOriginalClipFormat,
                                     const String & rUserTypeName );
     virtual void                SetConvertClass( const SvGlobalName & rConvertClass,
-                                           sal_uIntPtr nOriginalClipFormat,
+                                           sal_uLong nOriginalClipFormat,
                                            const String & rUserTypeName );
     virtual SvGlobalName        GetClassName();
-    virtual sal_uIntPtr               GetFormat();
+    virtual sal_uLong               GetFormat();
     virtual String              GetUserName();
     virtual sal_Bool                ShouldConvert();
     virtual void                FillInfoList( SvStorageInfoList* ) const;
@@ -274,12 +274,12 @@ public:
                                 UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const ByteString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress );
                                 UCBStorageStream( UCBStorageStream_Impl* );
 
-    virtual sal_uIntPtr               Read( void * pData, sal_uIntPtr nSize );
-    virtual sal_uIntPtr               Write( const void* pData, sal_uIntPtr nSize );
-    virtual sal_uIntPtr               Seek( sal_uIntPtr nPos );
-    virtual sal_uIntPtr               Tell();
+    virtual sal_uLong               Read( void * pData, sal_uLong nSize );
+    virtual sal_uLong               Write( const void* pData, sal_uLong nSize );
+    virtual sal_uLong               Seek( sal_uLong nPos );
+    virtual sal_uLong               Tell();
     virtual void                Flush();
-    virtual sal_Bool                SetSize( sal_uIntPtr nNewSize );
+    virtual sal_Bool                SetSize( sal_uLong nNewSize );
     virtual sal_Bool                CopyTo( BaseStorageStream * pDestStm );
     virtual sal_Bool                Commit();
     virtual sal_Bool                Revert();
@@ -339,13 +339,13 @@ public:
     virtual const ClsId&        GetClassId() const;
     virtual void                SetDirty();
     virtual void                SetClass( const SvGlobalName & rClass,
-                                    sal_uIntPtr nOriginalClipFormat,
+                                    sal_uLong nOriginalClipFormat,
                                     const String & rUserTypeName );
     virtual void                SetConvertClass( const SvGlobalName & rConvertClass,
-                                           sal_uIntPtr nOriginalClipFormat,
+                                           sal_uLong nOriginalClipFormat,
                                            const String & rUserTypeName );
     virtual SvGlobalName        GetClassName();
-    virtual sal_uIntPtr               GetFormat();
+    virtual sal_uLong               GetFormat();
     virtual String              GetUserName();
     virtual sal_Bool                ShouldConvert();
     virtual void                FillInfoList( SvStorageInfoList* ) const;
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index ccfeae4d9193..3c253fd80d1e 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -71,9 +71,9 @@ friend class SotStorage;
 friend class ImpStream;
     BaseStorageStream * pOwnStm;// Zeiger auf den eigenen Stream
 protected:
-    virtual sal_uIntPtr       GetData( void* pData, sal_uIntPtr nSize );
-    virtual sal_uIntPtr       PutData( const void* pData, sal_uIntPtr nSize );
-    virtual sal_uIntPtr       SeekPos( sal_uIntPtr nPos );
+    virtual sal_uLong       GetData( void* pData, sal_uLong nSize );
+    virtual sal_uLong       PutData( const void* pData, sal_uLong nSize );
+    virtual sal_uLong       SeekPos( sal_uLong nPos );
     virtual void        FlushData();
                         ~SotStorageStream();
 public:
@@ -91,7 +91,7 @@ public:
 
     virtual void        ResetError();
 
-    virtual void        SetSize( sal_uIntPtr nNewSize );
+    virtual void        SetSize( sal_uLong nNewSize );
     sal_uInt32              GetSize() const;
     sal_Bool                CopyTo( SotStorageStream * pDestStm );
     virtual sal_Bool        Commit();
@@ -125,7 +125,7 @@ friend class ::binfilter::SvStorage;
     BaseStorage *   m_pTmpStg;   // Temp-Storage fuer Transacted, nur auf diesem schreiben!        ??? Useless ???
     BaseStorage *   m_pOwnStg;   // Zielstorage
     SvStream *  m_pStorStm;  // nur fuer SDSTORAGES
-    sal_uIntPtr       m_nError;
+    sal_uLong       m_nError;
     String      m_aName;      // Name des Storage
     sal_Bool        m_bIsRoot:1,  // z.B.: File-Storage
                 m_bDelStm:1;
@@ -175,9 +175,9 @@ public:
                             return m_nVersion;
                         }
 
-    sal_uIntPtr               GetErrorCode() const { return m_nError; }
-    sal_uIntPtr               GetError() const { return ERRCODE_TOERROR(m_nError); }
-    void                SetError( sal_uIntPtr nErrorCode )
+    sal_uLong               GetErrorCode() const { return m_nError; }
+    sal_uLong               GetError() const { return ERRCODE_TOERROR(m_nError); }
+    void                SetError( sal_uLong nErrorCode )
                         {
                             if( m_nError == SVSTREAM_OK )
                                 m_nError = nErrorCode;
@@ -190,13 +190,13 @@ public:
 
                         // eigener Datenbereich
     virtual void        SetClass( const SvGlobalName & rClass,
-                                  sal_uIntPtr bOriginalClipFormat,
+                                  sal_uLong bOriginalClipFormat,
                                   const String & rUserTypeName );
     virtual void        SetConvertClass( const SvGlobalName & rConvertClass,
-                                         sal_uIntPtr bOriginalClipFormat,
+                                         sal_uLong bOriginalClipFormat,
                                          const String & rUserTypeName );
     virtual SvGlobalName GetClassName();// Typ der Daten im Storage
-    virtual sal_uIntPtr       GetFormat();
+    virtual sal_uLong       GetFormat();
     virtual String      GetUserName();
     virtual sal_Bool        ShouldConvert();
     void                SetName( const String& rName );
diff --git a/sot/inc/sot/storinfo.hxx b/sot/inc/sot/storinfo.hxx
index 5f225c26d0de..02db24529129 100644
--- a/sot/inc/sot/storinfo.hxx
+++ b/sot/inc/sot/storinfo.hxx
@@ -39,14 +39,14 @@ class SvStorageInfo
 friend class SvStorage;
     String          aName;
     SvGlobalName    aClassName;
-    sal_uIntPtr           nSize;
+    sal_uLong           nSize;
     sal_Bool            bStream:1,
                     bStorage:1;
 
                             SvStorageInfo(){}; // Fuer SvStorage
 public:
                             SvStorageInfo( const StgDirEntry& );
-                            SvStorageInfo( const String& rName, sal_uIntPtr nSz, sal_Bool bIsStorage )
+                            SvStorageInfo( const String& rName, sal_uLong nSz, sal_Bool bIsStorage )
                                 : aName( rName )
                                 , nSize( nSz )
                                 , bStream( !bIsStorage )
@@ -57,7 +57,7 @@ public:
     const String &          GetName() const { return aName; }
     sal_Bool                    IsStream() const { return bStream; }
     sal_Bool                    IsStorage() const { return bStorage; }
-    sal_uIntPtr                   GetSize() const { return nSize;      }
+    sal_uLong                   GetSize() const { return nSize;      }
 };
 
 class SOT_DLLPUBLIC SvStorageInfoList
@@ -66,7 +66,7 @@ class SOT_DLLPUBLIC SvStorageInfoList
     const SvStorageInfo * Get( const String & rName );
 };
 
-SOT_DLLPUBLIC sal_uIntPtr ReadClipboardFormat( SvStream & rStm );
-SOT_DLLPUBLIC void WriteClipboardFormat( SvStream & rStm, sal_uIntPtr nFormat );
+SOT_DLLPUBLIC sal_uLong ReadClipboardFormat( SvStream & rStm );
+SOT_DLLPUBLIC void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat );
 
 #endif // _STORINFO_HXX