summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2011-01-12 16:31:19 +0100
committerCarsten Driesner <cd@openoffice.org>2011-01-12 16:31:19 +0100
commitcaa3d247d2ff8d34881e5fdb2edd4d153c2725c0 (patch)
tree5f7a338347960600b4aa9fb5bc30c8dfd0454f2c /sot
parent15e0ed81e377962c1f054d581e26d8038e50c73c (diff)
removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in sot
Diffstat (limited to 'sot')
-rw-r--r--sot/inc/sot/exchange.hxx38
-rw-r--r--sot/inc/sot/filelist.hxx6
-rw-r--r--sot/inc/sot/formats.hxx276
-rw-r--r--sot/inc/sot/object.hxx2
-rw-r--r--sot/inc/sot/stg.hxx56
-rw-r--r--sot/inc/sot/storage.hxx22
-rw-r--r--sot/inc/sot/storinfo.hxx10
-rw-r--r--sot/source/base/exchange.cxx28
-rw-r--r--sot/source/base/factory.cxx6
-rw-r--r--sot/source/base/filelist.cxx14
-rw-r--r--sot/source/base/formats.cxx20
-rw-r--r--sot/source/base/object.cxx8
-rw-r--r--sot/source/sdstor/stg.cxx34
-rw-r--r--sot/source/sdstor/stgcache.cxx20
-rw-r--r--sot/source/sdstor/stgcache.hxx6
-rw-r--r--sot/source/sdstor/stgdir.cxx16
-rw-r--r--sot/source/sdstor/stgio.cxx36
-rw-r--r--sot/source/sdstor/stgio.hxx4
-rw-r--r--sot/source/sdstor/stgole.cxx10
-rw-r--r--sot/source/sdstor/stgole.hxx10
-rw-r--r--sot/source/sdstor/stgstrms.cxx30
-rw-r--r--sot/source/sdstor/stgstrms.hxx12
-rw-r--r--sot/source/sdstor/storage.cxx36
-rw-r--r--sot/source/sdstor/storinfo.cxx8
-rw-r--r--sot/source/sdstor/ucbstorage.cxx104
25 files changed, 406 insertions, 406 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 drfen nicht gendert werden,
-// da die Implementation sich darauf verlt.
+// 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
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 )
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index f1f51f20343b..bf1490447b08 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -79,14 +79,14 @@ StorageBase::~StorageBase()
// The following three methods are declared as const, since they
// may be called from within a const method.
-sal_uIntPtr StorageBase::GetError() const
+sal_uLong StorageBase::GetError() const
{
- sal_uIntPtr n = m_nError;
+ sal_uLong n = m_nError;
((StorageBase*) this)->m_nError = SVSTREAM_OK;
return n;
}
-void StorageBase::SetError( sal_uIntPtr n ) const
+void StorageBase::SetError( sal_uLong n ) const
{
if( !m_nError )
((StorageBase*) this)->m_nError = n;
@@ -205,7 +205,7 @@ sal_Bool StorageStream::Equals( const BaseStorageStream& rStream ) const
return pOther && ( pOther->pEntry == pEntry );
}
-sal_uIntPtr StorageStream::Read( void* pData, sal_uIntPtr nSize )
+sal_uLong StorageStream::Read( void* pData, sal_uLong nSize )
{
if( Validate() )
{
@@ -219,7 +219,7 @@ sal_uIntPtr StorageStream::Read( void* pData, sal_uIntPtr nSize )
return nSize;
}
-sal_uIntPtr StorageStream::Write( const void* pData, sal_uIntPtr nSize )
+sal_uLong StorageStream::Write( const void* pData, sal_uLong nSize )
{
if( Validate( sal_True ) )
{
@@ -233,7 +233,7 @@ sal_uIntPtr StorageStream::Write( const void* pData, sal_uIntPtr nSize )
return nSize;
}
-sal_uIntPtr StorageStream::Seek( sal_uIntPtr n )
+sal_uLong StorageStream::Seek( sal_uLong n )
{
if( Validate() )
return nPos = pEntry->Seek( n );
@@ -247,7 +247,7 @@ void StorageStream::Flush()
Commit();
}
-sal_Bool StorageStream::SetSize( sal_uIntPtr nNewSize )
+sal_Bool StorageStream::SetSize( sal_uLong nNewSize )
{
if( Validate( sal_True ) )
{
@@ -346,7 +346,7 @@ sal_Bool Storage::IsStorageFile( const String & rFileName )
sal_Bool Storage::IsStorageFile( SvStream* pStream )
{
StgHeader aHdr;
- sal_uIntPtr nPos = pStream->Tell();
+ sal_uLong nPos = pStream->Tell();
sal_Bool bRet = ( aHdr.Load( *pStream ) && aHdr.Check() );
// It's not a stream error if it is too small for a OLE storage header
@@ -401,7 +401,7 @@ Storage::Storage( SvStream& r, sal_Bool bDirect )
if( r.GetError() == SVSTREAM_OK )
{
pIo->SetStrm( &r, sal_False );
- sal_uIntPtr nSize = r.Seek( STREAM_SEEK_TO_END );
+ sal_uLong nSize = r.Seek( STREAM_SEEK_TO_END );
r.Seek( 0L );
// Initializing is OK if the stream is empty
Init( sal_Bool( nSize == 0 ) );
@@ -446,7 +446,7 @@ Storage::Storage( UCBStorageStream& rStrm, sal_Bool bDirect )
pIo->SetStrm( &rStrm );
- sal_uIntPtr nSize = pStream->Seek( STREAM_SEEK_TO_END );
+ sal_uLong nSize = pStream->Seek( STREAM_SEEK_TO_END );
pStream->Seek( 0L );
// Initializing is OK if the stream is empty
Init( sal_Bool( nSize == 0 ) );
@@ -469,7 +469,7 @@ void Storage::Init( sal_Bool bCreate )
bIsRoot = sal_True;
if( pIo->Good() )
{
- sal_uIntPtr nSize = pIo->GetStrm()->Seek( STREAM_SEEK_TO_END );
+ sal_uLong nSize = pIo->GetStrm()->Seek( STREAM_SEEK_TO_END );
pIo->GetStrm()->Seek( 0L );
if( nSize )
{
@@ -743,7 +743,7 @@ sal_Bool Storage::CopyTo( const String& rElem, BaseStorage* pDest, const String&
BaseStorage* p1 = OpenStorage( rElem, INTERNAL_MODE );
BaseStorage* p2 = pDest->OpenOLEStorage( rNew, STREAM_WRITE | STREAM_SHARE_DENYALL, pEntry->bDirect );
- sal_uIntPtr nTmpErr = p2->GetError();
+ sal_uLong nTmpErr = p2->GetError();
if( !nTmpErr )
{
p2->SetClassId( p1->GetClassId() );
@@ -769,7 +769,7 @@ sal_Bool Storage::CopyTo( const String& rElem, BaseStorage* pDest, const String&
BaseStorageStream* p1 = OpenStream( rElem, INTERNAL_MODE );
BaseStorageStream* p2 = pDest->OpenStream( rNew, STREAM_WRITE | STREAM_SHARE_DENYALL, pEntry->bDirect );
- sal_uIntPtr nTmpErr = p2->GetError();
+ sal_uLong nTmpErr = p2->GetError();
if( !nTmpErr )
{
p1->CopyTo( p2 );
@@ -855,7 +855,7 @@ sal_Bool Storage::MoveTo( const String& rElem, BaseStorage* pODest, const String
{
pIo->MoveError( *this );
pDest->pIo->MoveError( *pDest );
- sal_uIntPtr nErr = GetError();
+ sal_uLong nErr = GetError();
if( !nErr )
nErr = pDest->GetError();
SetError( nErr );
@@ -946,7 +946,7 @@ sal_Bool Storage::Revert()
// Set the storage type
void Storage::SetClass( const SvGlobalName & rClass,
- sal_uIntPtr nOriginalClipFormat,
+ sal_uLong nOriginalClipFormat,
const String & rUserTypeName )
{
if( Validate( sal_True ) )
@@ -973,7 +973,7 @@ void Storage::SetClass( const SvGlobalName & rClass,
}
void Storage::SetConvertClass( const SvGlobalName & rConvertClass,
- sal_uIntPtr nOriginalClipFormat,
+ sal_uLong nOriginalClipFormat,
const String & rUserTypeName )
{
if( Validate( sal_True ) )
@@ -1000,7 +1000,7 @@ SvGlobalName Storage::GetClassName()
return SvGlobalName();
}
-sal_uIntPtr Storage::GetFormat()
+sal_uLong Storage::GetFormat()
{
StgCompObjStream aCompObj( *this, sal_False );
if( aCompObj.Load() )
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index d0f0b0332482..5a0fde8b9cf1 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -105,7 +105,7 @@ void StgPage::SetPage( short nOff, sal_Int32 nVal )
// The disk cache holds the cached sectors. The sector type differ according
// to their purpose.
-sal_Int32 lcl_GetPageCount( sal_uIntPtr nFileSize, short nPageSize )
+sal_Int32 lcl_GetPageCount( sal_uLong nFileSize, short nPageSize )
{
// return (nFileSize >= 512) ? (nFileSize - 512) / nPageSize : 0;
// #i61980# reallife: last page may be incomplete, return number of *started* pages
@@ -135,8 +135,8 @@ StgCache::~StgCache()
void StgCache::SetPhysPageSize( short n )
{
nPageSize = n;
- sal_uIntPtr nPos = pStrm->Tell();
- sal_uIntPtr nFileSize = pStrm->Seek( STREAM_SEEK_TO_END );
+ sal_uLong nPos = pStrm->Tell();
+ sal_uLong nFileSize = pStrm->Seek( STREAM_SEEK_TO_END );
nPages = lcl_GetPageCount( nFileSize, nPageSize );
pStrm->Seek( nPos );
}
@@ -397,7 +397,7 @@ sal_Bool StgCache::Open( const String& rName, StreamMode nMode )
SetStrm( pFileStrm, sal_True );
if( pFileStrm->IsOpen() )
{
- sal_uIntPtr nFileSize = pStrm->Seek( STREAM_SEEK_TO_END );
+ sal_uLong nFileSize = pStrm->Seek( STREAM_SEEK_TO_END );
nPages = lcl_GetPageCount( nFileSize, nPageSize );
pStrm->Seek( 0L );
}
@@ -431,9 +431,9 @@ sal_Bool StgCache::Read( sal_Int32 nPage, void* pBuf, sal_Int32 nPg )
SetError( SVSTREAM_READ_ERROR );
else if ( nPage < nPages )
{
- sal_uIntPtr nPos = Page2Pos( nPage );
+ sal_uLong nPos = Page2Pos( nPage );
sal_Int32 nPg2 = ( ( nPage + nPg ) > nPages ) ? nPages - nPage : nPg;
- sal_uIntPtr nBytes = nPg2 * nPageSize;
+ sal_uLong nBytes = nPg2 * nPageSize;
// fixed address and size for the header
if( nPage == -1 )
{
@@ -462,8 +462,8 @@ sal_Bool StgCache::Write( sal_Int32 nPage, void* pBuf, sal_Int32 nPg )
{
if( Good() )
{
- sal_uIntPtr nPos = Page2Pos( nPage );
- sal_uIntPtr nBytes = nPg * nPageSize;
+ sal_uLong nPos = Page2Pos( nPage );
+ sal_uLong nBytes = nPg * nPageSize;
// fixed address and size for the header
if( nPage == -1 )
nPos = 0L, nBytes = 512;
@@ -475,7 +475,7 @@ sal_Bool StgCache::Write( sal_Int32 nPage, void* pBuf, sal_Int32 nPg )
#endif
}
}
- sal_uIntPtr nRes = pStrm->Write( pBuf, nBytes );
+ sal_uLong nRes = pStrm->Write( pBuf, nBytes );
if( nRes != nBytes )
SetError( SVSTREAM_WRITE_ERROR );
else
@@ -510,7 +510,7 @@ sal_Bool StgCache::SetSize( sal_Int32 n )
return Good();
}
-void StgCache::SetError( sal_uIntPtr n )
+void StgCache::SetError( sal_uLong n )
{
if( n && !nError )
nError = n;
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 0c1fc3eab1ff..d6849bdd4b3d 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -47,7 +47,7 @@ class StorageBase;
class StgCache {
StgPage* pCur; // top of LRU list
StgPage* pElem1; // top of ordered list
- sal_uIntPtr nError; // error code
+ sal_uLong nError; // error code
sal_Int32 nPages; // size of data area in pages
sal_uInt16 nRef; // reference count
void * pLRUCache; // hash table of cached objects
@@ -78,9 +78,9 @@ public:
sal_Bool IsWritable() { return pStrm->IsWritable(); }
sal_Bool Good() { return sal_Bool( nError == SVSTREAM_OK ); }
sal_Bool Bad() { return sal_Bool( nError != SVSTREAM_OK ); }
- sal_uIntPtr GetError() { return nError; }
+ sal_uLong GetError() { return nError; }
void MoveError( StorageBase& );
- void SetError( sal_uIntPtr );
+ void SetError( sal_uLong );
void ResetError();
sal_Bool Open( const String& rName, StreamMode );
void Close();
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 080a4aba5268..42676a9dd222 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -504,7 +504,7 @@ void StgDirEntry::Copy( BaseStorageStream& rDest )
sal_Int32 n = GetSize();
if( rDest.SetSize( n ) && n )
{
- sal_uIntPtr Pos = rDest.Tell();
+ sal_uLong Pos = rDest.Tell();
sal_uInt8 aTempBytes[ 4096 ];
void* p = static_cast<void*>( aTempBytes );
Seek( 0L );
@@ -618,7 +618,7 @@ sal_Bool StgDirEntry::Strm2Tmp()
{
if( !pTmpStrm )
{
- sal_uIntPtr n = 0;
+ sal_uLong n = 0;
if( pCurStrm )
{
// It was already commited once
@@ -640,10 +640,10 @@ sal_Bool StgDirEntry::Strm2Tmp()
pStgStrm->Pos2Page( 0L );
while( n )
{
- sal_uIntPtr nn = n;
+ sal_uLong nn = n;
if( nn > 4096 )
nn = 4096;
- if( (sal_uIntPtr) pStgStrm->Read( p, nn ) != nn )
+ if( (sal_uLong) pStgStrm->Read( p, nn ) != nn )
break;
if( pTmpStrm->Write( p, nn ) != nn )
break;
@@ -676,10 +676,10 @@ sal_Bool StgDirEntry::Tmp2Strm()
pTmpStrm = pCurStrm, pCurStrm = NULL;
if( pTmpStrm )
{
- sal_uIntPtr n = pTmpStrm->GetSize();
+ sal_uLong n = pTmpStrm->GetSize();
StgStrm* pNewStrm;
StgIo& rIo = pStgStrm->GetIo();
- sal_uIntPtr nThreshold = (sal_uIntPtr) rIo.aHdr.GetThreshold();
+ sal_uLong nThreshold = (sal_uLong) rIo.aHdr.GetThreshold();
if( n < nThreshold )
pNewStrm = new StgSmallStrm( rIo, STG_EOF, 0 );
else
@@ -690,12 +690,12 @@ sal_Bool StgDirEntry::Tmp2Strm()
pTmpStrm->Seek( 0L );
while( n )
{
- sal_uIntPtr nn = n;
+ sal_uLong nn = n;
if( nn > 4096 )
nn = 4096;
if( pTmpStrm->Read( p, nn ) != nn )
break;
- if( (sal_uIntPtr) pNewStrm->Write( p, nn ) != nn )
+ if( (sal_uLong) pNewStrm->Write( p, nn ) != nn )
break;
n -= nn;
}
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 54dbe1d43366..0a10192528c1 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -135,7 +135,7 @@ sal_Bool StgIo::CommitAll()
if( aHdr.Store( *this ) )
{
pStrm->Flush();
- sal_uIntPtr n = pStrm->GetError();
+ sal_uLong n = pStrm->GetError();
SetError( n );
#ifdef DBG_UTIL
if( n==0 ) ValidateFATs();
@@ -163,7 +163,7 @@ public:
sal_Int32 Count() { return nPages; }
sal_Int32 operator[]( sal_Int32 nOffset ) { return pFat[ nOffset ]; }
- sal_uIntPtr Mark( sal_Int32 nPage, sal_Int32 nCount, sal_Int32 nExpect );
+ sal_uLong Mark( sal_Int32 nPage, sal_Int32 nCount, sal_Int32 nExpect );
sal_Bool HasUnrefChains();
};
@@ -201,7 +201,7 @@ sal_Bool EasyFat::HasUnrefChains()
return sal_False;
}
-sal_uIntPtr EasyFat::Mark( sal_Int32 nPage, sal_Int32 nCount, sal_Int32 nExpect )
+sal_uLong EasyFat::Mark( sal_Int32 nPage, sal_Int32 nCount, sal_Int32 nExpect )
{
if( nCount > 0 )
--nCount /= GetPageSize(), nCount++;
@@ -231,17 +231,17 @@ sal_uIntPtr EasyFat::Mark( sal_Int32 nPage, sal_Int32 nCount, sal_Int32 nExpect
class Validator
{
- sal_uIntPtr nError;
+ sal_uLong nError;
EasyFat aSmallFat;
EasyFat aFat;
StgIo &rIo;
- sal_uIntPtr ValidateMasterFATs();
- sal_uIntPtr ValidateDirectoryEntries();
- sal_uIntPtr FindUnrefedChains();
- sal_uIntPtr MarkAll( StgDirEntry *pEntry );
+ sal_uLong ValidateMasterFATs();
+ sal_uLong ValidateDirectoryEntries();
+ sal_uLong FindUnrefedChains();
+ sal_uLong MarkAll( StgDirEntry *pEntry );
public:
@@ -254,7 +254,7 @@ Validator::Validator( StgIo &rIoP )
aFat( rIoP, rIoP.pFAT, 1 << rIoP.aHdr.GetPageSize() ),
rIo( rIoP )
{
- sal_uIntPtr nErr = nError = FAT_OK;
+ sal_uLong nErr = nError = FAT_OK;
if( ( nErr = ValidateMasterFATs() ) != FAT_OK )
nError = nErr;
@@ -264,10 +264,10 @@ Validator::Validator( StgIo &rIoP )
nError = nErr;
}
-sal_uIntPtr Validator::ValidateMasterFATs()
+sal_uLong Validator::ValidateMasterFATs()
{
sal_Int32 nCount = rIo.aHdr.GetFATSize();
- sal_uIntPtr nErr;
+ sal_uLong nErr;
for( sal_Int32 i = 0; i < nCount; i++ )
{
if( ( nErr = aFat.Mark(rIo.pFAT->GetPage( short(i), sal_False ), aFat.GetPageSize(), -3 )) != FAT_OK )
@@ -279,10 +279,10 @@ sal_uIntPtr Validator::ValidateMasterFATs()
return FAT_OK;
}
-sal_uIntPtr Validator::MarkAll( StgDirEntry *pEntry )
+sal_uLong Validator::MarkAll( StgDirEntry *pEntry )
{
StgIterator aIter( *pEntry );
- sal_uIntPtr nErr = FAT_OK;
+ sal_uLong nErr = FAT_OK;
for( StgDirEntry* p = aIter.First(); p ; p = aIter.Next() )
{
if( p->aEntry.GetType() == STG_STORAGE )
@@ -305,10 +305,10 @@ sal_uIntPtr Validator::MarkAll( StgDirEntry *pEntry )
return FAT_OK;
}
-sal_uIntPtr Validator::ValidateDirectoryEntries()
+sal_uLong Validator::ValidateDirectoryEntries()
{
// Normale DirEntries
- sal_uIntPtr nErr = MarkAll( rIo.pTOC->GetRoot() );
+ sal_uLong nErr = MarkAll( rIo.pTOC->GetRoot() );
if( nErr != FAT_OK )
return nErr;
// Small Data
@@ -328,7 +328,7 @@ sal_uIntPtr Validator::ValidateDirectoryEntries()
return nErr;
}
-sal_uIntPtr Validator::FindUnrefedChains()
+sal_uLong Validator::FindUnrefedChains()
{
if( aSmallFat.HasUnrefChains() ||
aFat.HasUnrefChains() )
@@ -349,7 +349,7 @@ const Link& StgIo::GetErrorLink()
return ErrorLink::get();
}
-sal_uIntPtr StgIo::ValidateFATs()
+sal_uLong StgIo::ValidateFATs()
{
if( bFile )
{
@@ -367,7 +367,7 @@ sal_uIntPtr StgIo::ValidateFATs()
delete pV;
}
- sal_uIntPtr nErr;
+ sal_uLong nErr;
if( bRet1 != bRet2 )
nErr = bRet1 ? FAT_ONFILEERROR : FAT_INMEMORYERROR;
else nErr = bRet1 ? FAT_OK : FAT_BOTHERROR;
diff --git a/sot/source/sdstor/stgio.hxx b/sot/source/sdstor/stgio.hxx
index 43f72ebefd59..45b1985618f1 100644
--- a/sot/source/sdstor/stgio.hxx
+++ b/sot/source/sdstor/stgio.hxx
@@ -53,7 +53,7 @@ enum FAT_ERROR
struct StgLinkArg
{
String aFile;
- sal_uIntPtr nErr;
+ sal_uLong nErr;
};
class StgIo : public StgCache {
@@ -74,7 +74,7 @@ public:
static void SetErrorLink( const Link& );
static const Link& GetErrorLink();
- sal_uIntPtr ValidateFATs( );
+ sal_uLong ValidateFATs( );
};
#endif
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 250e0bc4d12b..80481957b3d0 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -58,7 +58,7 @@ StgInternalStream::~StgInternalStream()
delete pStrm;
}
-sal_uIntPtr StgInternalStream::GetData( void* pData, sal_uIntPtr nSize )
+sal_uLong StgInternalStream::GetData( void* pData, sal_uLong nSize )
{
if( pStrm )
{
@@ -70,7 +70,7 @@ sal_uIntPtr StgInternalStream::GetData( void* pData, sal_uIntPtr nSize )
return 0;
}
-sal_uIntPtr StgInternalStream::PutData( const void* pData, sal_uIntPtr nSize )
+sal_uLong StgInternalStream::PutData( const void* pData, sal_uLong nSize )
{
if( pStrm )
{
@@ -82,7 +82,7 @@ sal_uIntPtr StgInternalStream::PutData( const void* pData, sal_uIntPtr nSize )
return 0;
}
-sal_uIntPtr StgInternalStream::SeekPos( sal_uIntPtr nPos )
+sal_uLong StgInternalStream::SeekPos( sal_uLong nPos )
{
return pStrm ? pStrm->Seek( nPos ) : 0;
}
@@ -129,7 +129,7 @@ sal_Bool StgCompObjStream::Load()
// higher bits are ignored
nLen1 &= 0xFFFF;
sal_Char* p = new sal_Char[ (sal_uInt16) nLen1 ];
- if( Read( p, nLen1 ) == (sal_uIntPtr) nLen1 )
+ if( Read( p, nLen1 ) == (sal_uLong) nLen1 )
{
aUserName = nLen1 ? String( p, gsl_getSystemTextEncoding() ) : String();
/* // Now we can read the CB format
@@ -140,7 +140,7 @@ sal_Bool StgCompObjStream::Load()
// get a string name
if( nLen2 > nLen1 )
delete p, p = new char[ nLen2 ];
- if( Read( p, nLen2 ) == (sal_uIntPtr) nLen2 && nLen2 )
+ if( Read( p, nLen2 ) == (sal_uLong) nLen2 && nLen2 )
nCbFormat = Exchange::RegisterFormatName( String( p ) );
else
SetError( SVSTREAM_GENERALERROR );
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index 5448bd3b6f9c..4f3901f5212b 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -36,9 +36,9 @@
class StgInternalStream : public SvStream
{
BaseStorageStream* pStrm;
- 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();
public:
StgInternalStream( BaseStorage&, const String&, sal_Bool );
@@ -52,12 +52,12 @@ class StgCompObjStream : public StgInternalStream
{
ClsId aClsId;
String aUserName;
- sal_uIntPtr nCbFormat;
+ sal_uLong nCbFormat;
public:
StgCompObjStream( BaseStorage&, sal_Bool );
ClsId& GetClsId() { return aClsId; }
String& GetUserName() { return aUserName; }
- sal_uIntPtr& GetCbFormat() { return nCbFormat; }
+ sal_uLong& GetCbFormat() { return nCbFormat; }
sal_Bool Load();
sal_Bool Store();
};
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index a47695fc14d7..b3a775417817 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1043,7 +1043,7 @@ sal_Int32 StgSmallStrm::Write( const void* pBuf, sal_Int32 n )
#define THRESHOLD 32768L
-StgTmpStrm::StgTmpStrm( sal_uIntPtr nInitSize )
+StgTmpStrm::StgTmpStrm( sal_uLong nInitSize )
: SvMemoryStream( nInitSize > THRESHOLD
? 16
: ( nInitSize ? nInitSize : 16 ), 4096 )
@@ -1057,8 +1057,8 @@ StgTmpStrm::StgTmpStrm( sal_uIntPtr nInitSize )
sal_Bool StgTmpStrm::Copy( StgTmpStrm& rSrc )
{
- sal_uIntPtr n = rSrc.GetSize();
- sal_uIntPtr nCur = rSrc.Tell();
+ sal_uLong n = rSrc.GetSize();
+ sal_uLong nCur = rSrc.Tell();
SetSize( n );
if( GetError() == SVSTREAM_OK )
{
@@ -1067,7 +1067,7 @@ sal_Bool StgTmpStrm::Copy( StgTmpStrm& rSrc )
Seek( 0L );
while( n )
{
- sal_uIntPtr nn = n;
+ sal_uLong nn = n;
if( nn > 4096 )
nn = 4096;
if( rSrc.Read( p, nn ) != nn )
@@ -1095,12 +1095,12 @@ StgTmpStrm::~StgTmpStrm()
}
}
-sal_uIntPtr StgTmpStrm::GetSize() const
+sal_uLong StgTmpStrm::GetSize() const
{
- sal_uIntPtr n;
+ sal_uLong n;
if( pStrm )
{
- sal_uIntPtr old = pStrm->Tell();
+ sal_uLong old = pStrm->Tell();
n = pStrm->Seek( STREAM_SEEK_TO_END );
pStrm->Seek( old );
}
@@ -1109,7 +1109,7 @@ sal_uIntPtr StgTmpStrm::GetSize() const
return n;
}
-void StgTmpStrm::SetSize( sal_uIntPtr n )
+void StgTmpStrm::SetSize( sal_uLong n )
{
if( pStrm )
pStrm->SetStreamSize( n );
@@ -1119,15 +1119,15 @@ void StgTmpStrm::SetSize( sal_uIntPtr n )
{
aName = TempFile::CreateTempName();
SvFileStream* s = new SvFileStream( aName, STREAM_READWRITE );
- sal_uIntPtr nCur = Tell();
- sal_uIntPtr i = nEndOfData;
+ sal_uLong nCur = Tell();
+ sal_uLong i = nEndOfData;
if( i )
{
sal_uInt8* p = new sal_uInt8[ 4096 ];
Seek( 0L );
while( i )
{
- sal_uIntPtr nb = ( i > 4096 ) ? 4096 : i;
+ sal_uLong nb = ( i > 4096 ) ? 4096 : i;
if( Read( p, nb ) == nb
&& s->Write( p, nb ) == nb )
i -= nb;
@@ -1163,7 +1163,7 @@ void StgTmpStrm::SetSize( sal_uIntPtr n )
{
if( n > nEndOfData )
{
- sal_uIntPtr nCur = Tell();
+ sal_uLong nCur = Tell();
Seek( nEndOfData - 1 );
*this << (sal_uInt8) 0;
Seek( nCur );
@@ -1174,7 +1174,7 @@ void StgTmpStrm::SetSize( sal_uIntPtr n )
}
}
-sal_uIntPtr StgTmpStrm::GetData( void* pData, sal_uIntPtr n )
+sal_uLong StgTmpStrm::GetData( void* pData, sal_uLong n )
{
if( pStrm )
{
@@ -1186,7 +1186,7 @@ sal_uIntPtr StgTmpStrm::GetData( void* pData, sal_uIntPtr n )
return SvMemoryStream::GetData( (sal_Char *)pData, n );
}
-sal_uIntPtr StgTmpStrm::PutData( const void* pData, sal_uIntPtr n )
+sal_uLong StgTmpStrm::PutData( const void* pData, sal_uLong n )
{
sal_uInt32 nCur = Tell();
sal_uInt32 nNew = nCur + n;
@@ -1206,7 +1206,7 @@ sal_uIntPtr StgTmpStrm::PutData( const void* pData, sal_uIntPtr n )
return nNew;
}
-sal_uIntPtr StgTmpStrm::SeekPos( sal_uIntPtr n )
+sal_uLong StgTmpStrm::SeekPos( sal_uLong n )
{
if( n == STREAM_SEEK_TO_END )
n = GetSize();
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx
index 1ececadae35e..a1bb0707cdd7 100644
--- a/sot/source/sdstor/stgstrms.hxx
+++ b/sot/source/sdstor/stgstrms.hxx
@@ -154,17 +154,17 @@ class StgTmpStrm : public SvMemoryStream
String aName;
SvFileStream* pStrm;
using SvMemoryStream::GetData;
- 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();
public:
- StgTmpStrm( sal_uIntPtr=16 );
+ StgTmpStrm( sal_uLong=16 );
~StgTmpStrm();
sal_Bool Copy( StgTmpStrm& );
- void SetSize( sal_uIntPtr );
- sal_uIntPtr GetSize() const;
+ void SetSize( sal_uLong );
+ sal_uLong GetSize() const;
};
#endif
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index f912d76cdaf6..13c254e0cb4d 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -170,7 +170,7 @@ SotStorageStream::~SotStorageStream()
*************************************************************************/
void SotStorageStream::SyncSvStream()
{
- sal_uIntPtr nPos = 0;
+ sal_uLong nPos = 0;
if( pOwnStm )
{
pOwnStm->Flush();
@@ -197,9 +197,9 @@ void SotStorageStream::ResetError()
|*
|* Beschreibung
*************************************************************************/
-sal_uIntPtr SotStorageStream::GetData( void* pData, sal_uIntPtr nSize )
+sal_uLong SotStorageStream::GetData( void* pData, sal_uLong nSize )
{
- sal_uIntPtr nRet = 0;
+ sal_uLong nRet = 0;
if( pOwnStm )
{
@@ -216,9 +216,9 @@ sal_uIntPtr SotStorageStream::GetData( void* pData, sal_uIntPtr nSize )
|*
|* Beschreibung
*************************************************************************/
-sal_uIntPtr SotStorageStream::PutData( const void* pData, sal_uIntPtr nSize )
+sal_uLong SotStorageStream::PutData( const void* pData, sal_uLong nSize )
{
- sal_uIntPtr nRet = 0;
+ sal_uLong nRet = 0;
if( pOwnStm )
{
@@ -235,9 +235,9 @@ sal_uIntPtr SotStorageStream::PutData( const void* pData, sal_uIntPtr nSize )
|*
|* Beschreibung
*************************************************************************/
-sal_uIntPtr SotStorageStream::SeekPos( sal_uIntPtr nPos )
+sal_uLong SotStorageStream::SeekPos( sal_uLong nPos )
{
- sal_uIntPtr nRet = 0;
+ sal_uLong nRet = 0;
if( pOwnStm )
{
@@ -270,9 +270,9 @@ void SotStorageStream::FlushData()
|*
|* Beschreibung
*************************************************************************/
-void SotStorageStream::SetSize( sal_uIntPtr nNewSize )
+void SotStorageStream::SetSize( sal_uLong nNewSize )
{
- sal_uIntPtr nPos = Tell();
+ sal_uLong nPos = Tell();
if( pOwnStm )
{
pOwnStm->SetSize( nNewSize );
@@ -297,9 +297,9 @@ void SotStorageStream::SetSize( sal_uIntPtr nNewSize )
*************************************************************************/
sal_uInt32 SotStorageStream::GetSize() const
{
- sal_uIntPtr nPos = Tell();
+ sal_uLong nPos = Tell();
((SotStorageStream *)this)->Seek( STREAM_SEEK_TO_END );
- sal_uIntPtr nSize = Tell();
+ sal_uLong nSize = Tell();
((SotStorageStream *)this)->Seek( nPos );
return nSize;
}
@@ -316,12 +316,12 @@ sal_Bool SotStorageStream::CopyTo( SotStorageStream * pDestStm )
if( !pOwnStm || !pDestStm->pOwnStm )
{ // Wenn Ole2 oder nicht nur eigene StorageStreams
- sal_uIntPtr nPos = Tell(); // Position merken
+ sal_uLong nPos = Tell(); // Position merken
Seek( 0L );
pDestStm->SetSize( 0 ); // Ziel-Stream leeren
void * pMem = new sal_uInt8[ 8192 ];
- sal_uIntPtr nRead;
+ sal_uLong nRead;
while( 0 != (nRead = Read( pMem, 8192 )) )
{
if( nRead != pDestStm->Write( pMem, nRead ) )
@@ -651,7 +651,7 @@ SotStorage::SotStorage( BaseStorage * pStor )
}
m_pOwnStg = pStor;
- sal_uIntPtr nErr = m_pOwnStg ? m_pOwnStg->GetError() : SVSTREAM_CANNOT_MAKE;
+ sal_uLong nErr = m_pOwnStg ? m_pOwnStg->GetError() : SVSTREAM_CANNOT_MAKE;
SetError( nErr );
if ( IsOLEStorage() )
m_nVersion = SOFFICE_FILEFORMAT_50;
@@ -973,7 +973,7 @@ void SotStorage::ResetError()
|* Beschreibung
*************************************************************************/
void SotStorage::SetClass( const SvGlobalName & rName,
- sal_uIntPtr nOriginalClipFormat,
+ sal_uLong nOriginalClipFormat,
const String & rUserTypeName )
{
DBG_ASSERT( Owner(), "must be owner" );
@@ -984,7 +984,7 @@ void SotStorage::SetClass( const SvGlobalName & rName,
}
void SotStorage::SetConvertClass( const SvGlobalName & rName,
- sal_uIntPtr nOriginalClipFormat,
+ sal_uLong nOriginalClipFormat,
const String & rUserTypeName )
{
DBG_ASSERT( Owner(), "must be owner" );
@@ -1013,9 +1013,9 @@ SvGlobalName SotStorage::GetClassName()
return aGN;
}
-sal_uIntPtr SotStorage::GetFormat()
+sal_uLong SotStorage::GetFormat()
{
- sal_uIntPtr nFormat = 0;
+ sal_uLong nFormat = 0;
DBG_ASSERT( Owner(), "must be owner" );
if( m_pOwnStg )
nFormat = m_pOwnStg->GetFormat();
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index 0958362f64a9..383d2f20d1c5 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -39,7 +39,7 @@ PRV_SV_IMPL_OWNER_LIST(SvStorageInfoList,SvStorageInfo)
const SvStorageInfo * SvStorageInfoList::Get( const String & rEleName )
{
- for( sal_uIntPtr i = 0; i < Count(); i++ )
+ for( sal_uLong i = 0; i < Count(); i++ )
{
const SvStorageInfo & rType = GetObject( i );
if( rType.GetName() == rEleName )
@@ -50,7 +50,7 @@ const SvStorageInfo * SvStorageInfoList::Get( const String & rEleName )
/************** class SvStorageInfo **************************************
*************************************************************************/
-sal_uIntPtr ReadClipboardFormat( SvStream & rStm )
+sal_uLong ReadClipboardFormat( SvStream & rStm )
{
sal_uInt32 nFormat = 0;
sal_Int32 nLen = 0;
@@ -61,7 +61,7 @@ sal_uIntPtr ReadClipboardFormat( SvStream & rStm )
{
// get a string name
sal_Char * p = new sal_Char[ nLen ];
- if( rStm.Read( p, nLen ) == (sal_uIntPtr) nLen )
+ if( rStm.Read( p, nLen ) == (sal_uLong) nLen )
{
nFormat = SotExchange::RegisterFormatName( String::CreateFromAscii( p, short(nLen-1) ) );
}
@@ -88,7 +88,7 @@ sal_uIntPtr ReadClipboardFormat( SvStream & rStm )
return nFormat;
}
-void WriteClipboardFormat( SvStream & rStm, sal_uIntPtr nFormat )
+void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat )
{
// determine the clipboard format string
String aCbFmt;
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index ccdd42bb04bd..532877117329 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -443,10 +443,10 @@ class UCBStorageStream_Impl : public SvRefBase, public SvStream
~UCBStorageStream_Impl();
public:
- 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 void SetSize( sal_uIntPtr nSize );
+ 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 SetSize( sal_uLong nSize );
virtual void FlushData();
virtual void ResetError();
@@ -482,19 +482,19 @@ public:
sal_Int16 Commit(); // if modified and commited: transfer an XInputStream to the content
sal_Bool Revert(); // discard all changes
BaseStorage* CreateStorage();// create an OLE Storage on the UCBStorageStream
- sal_uIntPtr GetSize();
+ sal_uLong GetSize();
- sal_uIntPtr ReadSourceWriteTemporary( sal_uIntPtr aLength ); // read aLength from source and copy to temporary,
+ sal_uLong ReadSourceWriteTemporary( sal_uLong aLength ); // read aLength from source and copy to temporary,
// no seeking is produced
- sal_uIntPtr ReadSourceWriteTemporary(); // read source till the end and copy to temporary,
+ sal_uLong ReadSourceWriteTemporary(); // read source till the end and copy to temporary,
// no seeking is produced
#if 0
- sal_uIntPtr CopySourceToTemporary( sal_uIntPtr aLength ); // same as ReadSourceWriteToTemporary( aLength )
+ sal_uLong CopySourceToTemporary( sal_uLong aLength ); // same as ReadSourceWriteToTemporary( aLength )
// but the writing is done at the end of temporary
// pointer position is not changed
#endif
- sal_uIntPtr CopySourceToTemporary(); // same as ReadSourceWriteToTemporary()
+ sal_uLong CopySourceToTemporary(); // same as ReadSourceWriteToTemporary()
// but the writing is done at the end of temporary
// pointer position is not changed
Reference<XInputStream> GetXInputStream(); // return XInputStream, after that
@@ -536,7 +536,7 @@ public:
sal_Bool m_bDirty; // ???
sal_Bool m_bIsLinked;
sal_Bool m_bListCreated;
- sal_uIntPtr m_nFormat;
+ sal_uLong m_nFormat;
String m_aUserTypeName;
SvGlobalName m_aClassId;
@@ -589,7 +589,7 @@ struct UCBStorageElement_Impl
{
String m_aName; // the actual URL relative to the root "folder"
String m_aOriginalName;// the original name in the content
- sal_uIntPtr m_nSize;
+ sal_uLong m_nSize;
sal_Bool m_bIsFolder; // Only sal_True when it is a UCBStorage !
sal_Bool m_bIsStorage; // Also sal_True when it is an OLEStorage !
sal_Bool m_bIsRemoved; // element will be removed on commit
@@ -598,7 +598,7 @@ struct UCBStorageElement_Impl
UCBStorageStream_ImplRef m_xStream; // reference to the "real" stream
UCBStorageElement_Impl( const ::rtl::OUString& rName,
- sal_Bool bIsFolder = sal_False, sal_uIntPtr nSize = 0 )
+ sal_Bool bIsFolder = sal_False, sal_uLong nSize = 0 )
: m_aName( rName )
, m_aOriginalName( rName )
, m_nSize( nSize )
@@ -896,12 +896,12 @@ sal_Bool UCBStorageStream_Impl::Init()
return sal_True;
}
-sal_uIntPtr UCBStorageStream_Impl::ReadSourceWriteTemporary()
+sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary()
{
// read source stream till the end and copy all the data to
// the current position of the temporary stream
- sal_uIntPtr aResult = 0;
+ sal_uLong aResult = 0;
if( m_bSourceRead )
{
@@ -909,7 +909,7 @@ sal_uIntPtr UCBStorageStream_Impl::ReadSourceWriteTemporary()
try
{
- sal_uIntPtr aReaded;
+ sal_uLong aReaded;
do
{
aReaded = m_rSource->readBytes( aData, 32000 );
@@ -933,12 +933,12 @@ sal_uIntPtr UCBStorageStream_Impl::ReadSourceWriteTemporary()
}
-sal_uIntPtr UCBStorageStream_Impl::ReadSourceWriteTemporary( sal_uIntPtr aLength )
+sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary( sal_uLong aLength )
{
// read aLength bite from the source stream and copy them to the current
// position of the temporary stream
- sal_uIntPtr aResult = 0;
+ sal_uLong aResult = 0;
if( m_bSourceRead )
{
@@ -947,11 +947,11 @@ sal_uIntPtr UCBStorageStream_Impl::ReadSourceWriteTemporary( sal_uIntPtr aLength
try
{
- sal_uIntPtr aReaded = 32000;
+ sal_uLong aReaded = 32000;
- for( sal_uIntPtr pInd = 0; pInd < aLength && aReaded == 32000 ; pInd += 32000 )
+ for( sal_uLong pInd = 0; pInd < aLength && aReaded == 32000 ; pInd += 32000 )
{
- sal_uIntPtr aToCopy = min( aLength - pInd, 32000 );
+ sal_uLong aToCopy = min( aLength - pInd, 32000 );
aReaded = m_rSource->readBytes( aData, aToCopy );
aResult += m_pStream->Write( aData.getArray(), aReaded );
}
@@ -973,14 +973,14 @@ sal_uIntPtr UCBStorageStream_Impl::ReadSourceWriteTemporary( sal_uIntPtr aLength
return aResult;
}
-sal_uIntPtr UCBStorageStream_Impl::CopySourceToTemporary()
+sal_uLong UCBStorageStream_Impl::CopySourceToTemporary()
{
// current position of the temporary stream is not changed
- sal_uIntPtr aResult = 0;
+ sal_uLong aResult = 0;
if( m_bSourceRead )
{
- sal_uIntPtr aPos = m_pStream->Tell();
+ sal_uLong aPos = m_pStream->Tell();
m_pStream->Seek( STREAM_SEEK_TO_END );
aResult = ReadSourceWriteTemporary();
m_pStream->Seek( aPos );
@@ -991,14 +991,14 @@ sal_uIntPtr UCBStorageStream_Impl::CopySourceToTemporary()
}
#if 0
-sal_uIntPtr UCBStorageStream_Impl::CopySourceToTemporary( sal_uIntPtr aLength )
+sal_uLong UCBStorageStream_Impl::CopySourceToTemporary( sal_uLong aLength )
{
// current position of the temporary stream is not changed
- sal_uIntPtr aResult = 0;
+ sal_uLong aResult = 0;
if( m_bSourceRead )
{
- sal_uIntPtr aPos = m_pStream->Tell();
+ sal_uLong aPos = m_pStream->Tell();
m_pStream->Seek( STREAM_SEEK_TO_END );
aResult = ReadSourceWriteTemporary( aLength );
m_pStream->Seek( aPos );
@@ -1011,9 +1011,9 @@ sal_uIntPtr UCBStorageStream_Impl::CopySourceToTemporary( sal_uIntPtr aLength )
// UCBStorageStream_Impl must have a SvStream interface, because it then can be used as underlying stream
// of an OLEStorage; so every write access caused by storage operations marks the UCBStorageStream as modified
-sal_uIntPtr UCBStorageStream_Impl::GetData( void* pData, sal_uIntPtr nSize )
+sal_uLong UCBStorageStream_Impl::GetData( void* pData, sal_uLong nSize )
{
- sal_uIntPtr aResult = 0;
+ sal_uLong aResult = 0;
if( !Init() )
return 0;
@@ -1026,13 +1026,13 @@ sal_uIntPtr UCBStorageStream_Impl::GetData( void* pData, sal_uIntPtr nSize )
// read the tail of the data from original stream
// copy this tail to the temporary stream
- sal_uIntPtr aToRead = nSize - aResult;
+ sal_uLong aToRead = nSize - aResult;
pData = (void*)( (char*)pData + aResult );
try
{
Sequence<sal_Int8> aData( aToRead );
- sal_uIntPtr aReaded = m_rSource->readBytes( aData, aToRead );
+ sal_uLong aReaded = m_rSource->readBytes( aData, aToRead );
aResult += m_pStream->Write( (void*)aData.getArray(), aReaded );
memcpy( pData, aData.getArray(), aReaded );
}
@@ -1053,7 +1053,7 @@ sal_uIntPtr UCBStorageStream_Impl::GetData( void* pData, sal_uIntPtr nSize )
return aResult;
}
-sal_uIntPtr UCBStorageStream_Impl::PutData( const void* pData, sal_uIntPtr nSize )
+sal_uLong UCBStorageStream_Impl::PutData( const void* pData, sal_uLong nSize )
{
if ( !(m_nMode & STREAM_WRITE) )
{
@@ -1064,7 +1064,7 @@ sal_uIntPtr UCBStorageStream_Impl::PutData( const void* pData, sal_uIntPtr nSize
if( !nSize || !Init() )
return 0;
- sal_uIntPtr aResult = m_pStream->Write( pData, nSize );
+ sal_uLong aResult = m_pStream->Write( pData, nSize );
m_bModified = aResult > 0;
@@ -1072,12 +1072,12 @@ sal_uIntPtr UCBStorageStream_Impl::PutData( const void* pData, sal_uIntPtr nSize
}
-sal_uIntPtr UCBStorageStream_Impl::SeekPos( sal_uIntPtr nPos )
+sal_uLong UCBStorageStream_Impl::SeekPos( sal_uLong nPos )
{
if( !Init() )
return 0;
- sal_uIntPtr aResult;
+ sal_uLong aResult;
if( nPos == STREAM_SEEK_TO_END )
{
@@ -1129,7 +1129,7 @@ sal_uIntPtr UCBStorageStream_Impl::SeekPos( sal_uIntPtr nPos )
return aResult;
}
-void UCBStorageStream_Impl::SetSize( sal_uIntPtr nSize )
+void UCBStorageStream_Impl::SetSize( sal_uLong nSize )
{
if ( !(m_nMode & STREAM_WRITE) )
{
@@ -1144,7 +1144,7 @@ void UCBStorageStream_Impl::SetSize( sal_uIntPtr nSize )
if( m_bSourceRead )
{
- sal_uIntPtr aPos = m_pStream->Tell();
+ sal_uLong aPos = m_pStream->Tell();
m_pStream->Seek( STREAM_SEEK_TO_END );
if( m_pStream->Tell() < nSize )
ReadSourceWriteTemporary( nSize - m_pStream->Tell() );
@@ -1184,15 +1184,15 @@ void UCBStorageStream_Impl::ResetError()
m_pAntiImpl->ResetError();
}
-sal_uIntPtr UCBStorageStream_Impl::GetSize()
+sal_uLong UCBStorageStream_Impl::GetSize()
{
if( !Init() )
return 0;
- sal_uIntPtr nPos = m_pStream->Tell();
+ sal_uLong nPos = m_pStream->Tell();
m_pStream->Seek( STREAM_SEEK_TO_END );
ReadSourceWriteTemporary();
- sal_uIntPtr nRet = m_pStream->Tell();
+ sal_uLong nRet = m_pStream->Tell();
m_pStream->Seek( nPos );
return nRet;
@@ -1423,13 +1423,13 @@ UCBStorageStream::~UCBStorageStream()
pImp->ReleaseRef();
}
-sal_uIntPtr UCBStorageStream::Read( void * pData, sal_uIntPtr nSize )
+sal_uLong UCBStorageStream::Read( void * pData, sal_uLong nSize )
{
//return pImp->m_pStream->Read( pData, nSize );
return pImp->GetData( pData, nSize );
}
-sal_uIntPtr UCBStorageStream::Write( const void* pData, sal_uIntPtr nSize )
+sal_uLong UCBStorageStream::Write( const void* pData, sal_uLong nSize )
{
/*
// mba: does occur in writer !
@@ -1444,13 +1444,13 @@ sal_uIntPtr UCBStorageStream::Write( const void* pData, sal_uIntPtr nSize )
return pImp->PutData( pData, nSize );
}
-sal_uIntPtr UCBStorageStream::Seek( sal_uIntPtr nPos )
+sal_uLong UCBStorageStream::Seek( sal_uLong nPos )
{
//return pImp->m_pStream->Seek( nPos );
return pImp->Seek( nPos );
}
-sal_uIntPtr UCBStorageStream::Tell()
+sal_uLong UCBStorageStream::Tell()
{
if( !pImp->Init() )
return 0;
@@ -1463,7 +1463,7 @@ void UCBStorageStream::Flush()
Commit();
}
-sal_Bool UCBStorageStream::SetSize( sal_uIntPtr nNewSize )
+sal_Bool UCBStorageStream::SetSize( sal_uLong nNewSize )
{
/*
if ( pImp->m_bCommited )
@@ -2013,7 +2013,7 @@ void UCBStorage_Impl::ReadContent()
sal_Bool bIsFolder( xRow->getBoolean(2) );
sal_Int64 nSize = xRow->getLong(4);
- UCBStorageElement_Impl* pElement = new UCBStorageElement_Impl( aTitle, bIsFolder, (sal_uIntPtr) nSize );
+ UCBStorageElement_Impl* pElement = new UCBStorageElement_Impl( aTitle, bIsFolder, (sal_uLong) nSize );
m_aChildrenList.Insert( pElement, LIST_APPEND );
sal_Bool bIsOfficeDocument = m_bIsLinked || ( m_aClassId != SvGlobalName() );
@@ -2658,7 +2658,7 @@ void UCBStorage::SetDirty()
pImp->m_bDirty = sal_True;
}
-void UCBStorage::SetClass( const SvGlobalName & rClass, sal_uIntPtr nOriginalClipFormat, const String & rUserTypeName )
+void UCBStorage::SetClass( const SvGlobalName & rClass, sal_uLong nOriginalClipFormat, const String & rUserTypeName )
{
pImp->m_aClassId = rClass;
pImp->m_nFormat = nOriginalClipFormat;
@@ -2697,7 +2697,7 @@ const ClsId& UCBStorage::GetClassId() const
return ( const ClsId& ) pImp->m_aClassId.GetCLSID();
}
-void UCBStorage::SetConvertClass( const SvGlobalName & /*rConvertClass*/, sal_uIntPtr /*nOriginalClipFormat*/, const String & /*rUserTypeName*/ )
+void UCBStorage::SetConvertClass( const SvGlobalName & /*rConvertClass*/, sal_uLong /*nOriginalClipFormat*/, const String & /*rUserTypeName*/ )
{
// ???
}
@@ -2713,7 +2713,7 @@ SvGlobalName UCBStorage::GetClassName()
return pImp->m_aClassId;
}
-sal_uIntPtr UCBStorage::GetFormat()
+sal_uLong UCBStorage::GetFormat()
{
return pImp->m_nFormat;
}
@@ -2733,7 +2733,7 @@ void UCBStorage::FillInfoList( SvStorageInfoList* pList ) const
if ( !pElement->m_bIsRemoved )
{
// problem: what about the size of a substorage ?!
- sal_uIntPtr nSize = pElement->m_nSize;
+ sal_uLong nSize = pElement->m_nSize;
if ( pElement->m_xStream.Is() )
nSize = pElement->m_xStream->GetSize();
SvStorageInfo aInfo( pElement->m_aName, nSize, pElement->m_bIsStorage );
@@ -3339,7 +3339,7 @@ sal_Bool UCBStorage::IsStorageFile( SvStream* pFile )
if ( !pFile )
return sal_False;
- sal_uIntPtr nPos = pFile->Tell();
+ sal_uLong nPos = pFile->Tell();
pFile->Seek( STREAM_SEEK_TO_END );
if ( pFile->Tell() < 4 )
return sal_False;
@@ -3370,7 +3370,7 @@ sal_Bool UCBStorage::IsDiskSpannedFile( SvStream* pFile )
if ( !pFile )
return sal_False;
- sal_uIntPtr nPos = pFile->Tell();
+ sal_uLong nPos = pFile->Tell();
pFile->Seek( STREAM_SEEK_TO_END );
if ( !pFile->Tell() )
return sal_False;
@@ -3394,7 +3394,7 @@ sal_Bool UCBStorage::IsDiskSpannedFile( SvStream* pFile )
String UCBStorage::GetLinkedFile( SvStream &rStream )
{
String aString;
- sal_uIntPtr nPos = rStream.Tell();
+ sal_uLong nPos = rStream.Tell();
rStream.Seek( STREAM_SEEK_TO_END );
if ( !rStream.Tell() )
return aString;
generated by cgit (git 2.34.1) at 2025-02-11 16:01:48 +0000