diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-01-13 10:26:18 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-01-13 10:26:18 +0100 |
commit | 6e6de6ff1ed83b1a0d3a09ce4a91f72f15403886 (patch) | |
tree | 488f77e158e641b890570509692f9996d1dbea2f /svl/inc/svl | |
parent | caa3d247d2ff8d34881e5fdb2edd4d153c2725c0 (diff) |
removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in svl
Diffstat (limited to 'svl/inc/svl')
-rw-r--r-- | svl/inc/svl/cntnrsrt.hxx | 24 | ||||
-rw-r--r-- | svl/inc/svl/filerec.hxx | 2 | ||||
-rw-r--r-- | svl/inc/svl/instrm.hxx | 14 | ||||
-rw-r--r-- | svl/inc/svl/itempool.hxx | 12 | ||||
-rw-r--r-- | svl/inc/svl/nranges.hxx | 2 | ||||
-rw-r--r-- | svl/inc/svl/outstrm.hxx | 8 | ||||
-rw-r--r-- | svl/inc/svl/poolitem.hxx | 16 | ||||
-rw-r--r-- | svl/inc/svl/rngitem.hxx | 2 | ||||
-rw-r--r-- | svl/inc/svl/smplhint.hxx | 6 | ||||
-rw-r--r-- | svl/inc/svl/strmadpt.hxx | 16 | ||||
-rw-r--r-- | svl/inc/svl/style.hxx | 6 | ||||
-rw-r--r-- | svl/inc/svl/svdde.hxx | 30 | ||||
-rw-r--r-- | svl/inc/svl/svstdarr.hxx | 4 | ||||
-rw-r--r-- | svl/inc/svl/zformat.hxx | 4 |
14 files changed, 73 insertions, 73 deletions
diff --git a/svl/inc/svl/cntnrsrt.hxx b/svl/inc/svl/cntnrsrt.hxx index f7c114274981..7c0dc6863371 100644 --- a/svl/inc/svl/cntnrsrt.hxx +++ b/svl/inc/svl/cntnrsrt.hxx @@ -68,12 +68,12 @@ public: \ \ sal_Bool Insert( Type* pObj ); \ \ - Type *Remove( sal_uIntPtr nPos ) \ + Type *Remove( sal_uLong nPos ) \ { return (Type *)Container::Remove( nPos ); } \ \ Type *Remove( Type* pObj ); \ \ - void DeleteAndDestroy( sal_uIntPtr nPos ) \ + void DeleteAndDestroy( sal_uLong nPos ) \ { \ Type *pObj = Remove( nPos ); \ if( pObj ) \ @@ -83,15 +83,15 @@ public: \ void DeleteAndDestroy() \ { while( Count() ) DeleteAndDestroy( 0 ); } \ \ - Type* GetObject( sal_uIntPtr nPos ) const \ + Type* GetObject( sal_uLong nPos ) const \ { return (Type *)Container::GetObject( nPos ); } \ \ - Type* operator[]( sal_uIntPtr nPos ) const \ + Type* operator[]( sal_uLong nPos ) const \ { return GetObject(nPos); } \ \ - sal_Bool Seek_Entry( const Type *pObj, sal_uIntPtr* pPos ) const; \ + sal_Bool Seek_Entry( const Type *pObj, sal_uLong* pPos ) const; \ \ - sal_uIntPtr GetPos( const Type* pObj ) const; \ + sal_uLong GetPos( const Type* pObj ) const; \ #define DECLARE_CONTAINER_SORT( ClassName, Type ) \ @@ -113,7 +113,7 @@ class ClassName : private Container \ #define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) \ sal_Bool ClassName::Insert( Type *pObj ) \ { \ - sal_uIntPtr nPos; \ + sal_uLong nPos; \ sal_Bool bExist = Seek_Entry( pObj, &nPos ); \ if( !bExist ) \ Container::Insert( pObj, nPos ); \ @@ -122,25 +122,25 @@ sal_Bool ClassName::Insert( Type *pObj ) \ Type *ClassName::Remove( Type* pObj ) \ { \ - sal_uIntPtr nPos; \ + sal_uLong nPos; \ if( Seek_Entry( pObj, &nPos ) ) \ return Remove( nPos ); \ else \ return 0; \ } \ \ -sal_uIntPtr ClassName::GetPos( const Type* pObj ) const \ +sal_uLong ClassName::GetPos( const Type* pObj ) const \ { \ - sal_uIntPtr nPos; \ + sal_uLong nPos; \ if( Seek_Entry( pObj, &nPos ) ) \ return nPos; \ else \ return CONTAINER_ENTRY_NOTFOUND; \ } \ \ -sal_Bool ClassName::Seek_Entry( const Type* pObj, sal_uIntPtr* pPos ) const \ +sal_Bool ClassName::Seek_Entry( const Type* pObj, sal_uLong* pPos ) const \ { \ - register sal_uIntPtr nO = Count(), \ + register sal_uLong nO = Count(), \ nM, \ nU = 0; \ if( nO > 0 ) \ diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx index 0a831023f3ff..eef347ab772b 100644 --- a/svl/inc/svl/filerec.hxx +++ b/svl/inc/svl/filerec.hxx @@ -973,7 +973,7 @@ inline void SfxMultiFixRecordWriter::NewContent() { #ifdef DBG_UTIL - sal_uIntPtr nOldStartPos; + sal_uLong nOldStartPos; // Startposition des aktuellen Contents merken - Achtung Subklassen! nOldStartPos = _nContentStartPos; #endif diff --git a/svl/inc/svl/instrm.hxx b/svl/inc/svl/instrm.hxx index f27375baff25..124c80a21630 100644 --- a/svl/inc/svl/instrm.hxx +++ b/svl/inc/svl/instrm.hxx @@ -47,19 +47,19 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream com::sun::star::uno::Reference< com::sun::star::io::XSeekable > m_xSeekable; SvDataPipe_Impl * m_pPipe; - sal_uIntPtr m_nSeekedFrom; + sal_uLong m_nSeekedFrom; SVL_DLLPRIVATE bool open(); - SVL_DLLPRIVATE virtual sal_uIntPtr GetData(void * pData, sal_uIntPtr nSize); + SVL_DLLPRIVATE virtual sal_uLong GetData(void * pData, sal_uLong nSize); - SVL_DLLPRIVATE virtual sal_uIntPtr PutData(void const *, sal_uIntPtr); + SVL_DLLPRIVATE virtual sal_uLong PutData(void const *, sal_uLong); - SVL_DLLPRIVATE virtual sal_uIntPtr SeekPos(sal_uIntPtr nPos); + SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong nPos); SVL_DLLPRIVATE virtual void FlushData(); - SVL_DLLPRIVATE virtual void SetSize(sal_uIntPtr); + SVL_DLLPRIVATE virtual void SetSize(sal_uLong); public: SvInputStream( @@ -71,9 +71,9 @@ public: virtual sal_uInt16 IsA() const; - virtual void AddMark(sal_uIntPtr nPos); + virtual void AddMark(sal_uLong nPos); - virtual void RemoveMark(sal_uIntPtr nPos); + virtual void RemoveMark(sal_uLong nPos); }; #endif // SVTOOLS_INSTRM_HXX diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 7f00f89bc9e2..735f9b1162aa 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -154,9 +154,9 @@ public: //--------------------------------------------------------------------- protected: - static inline void SetRefCount( SfxPoolItem& rItem, sal_uIntPtr n ); - static inline sal_uIntPtr AddRef( const SfxPoolItem& rItem, sal_uIntPtr n = 1 ); - static inline sal_uIntPtr ReleaseRef( const SfxPoolItem& rItem, sal_uIntPtr n = 1); + static inline void SetRefCount( SfxPoolItem& rItem, sal_uLong n ); + static inline sal_uLong AddRef( const SfxPoolItem& rItem, sal_uLong n = 1 ); + static inline sal_uLong ReleaseRef( const SfxPoolItem& rItem, sal_uLong n = 1); public: SfxItemPool( const SfxItemPool &rPool, @@ -283,19 +283,19 @@ private: // --------------- Inline Implementierungen ------------------------------ // nur der Pool darf den Referenz-Zaehler manipulieren !!! -inline void SfxItemPool::SetRefCount( SfxPoolItem& rItem, sal_uIntPtr n ) +inline void SfxItemPool::SetRefCount( SfxPoolItem& rItem, sal_uLong n ) { rItem.SetRefCount(n); } // nur der Pool darf den Referenz-Zaehler manipulieren !!! -inline sal_uIntPtr SfxItemPool::AddRef( const SfxPoolItem& rItem, sal_uIntPtr n ) +inline sal_uLong SfxItemPool::AddRef( const SfxPoolItem& rItem, sal_uLong n ) { return rItem.AddRef(n); } // nur der Pool darf den Referenz-Zaehler manipulieren !!! -inline sal_uIntPtr SfxItemPool::ReleaseRef( const SfxPoolItem& rItem, sal_uIntPtr n ) +inline sal_uLong SfxItemPool::ReleaseRef( const SfxPoolItem& rItem, sal_uLong n ) { return rItem.ReleaseRef(n); } diff --git a/svl/inc/svl/nranges.hxx b/svl/inc/svl/nranges.hxx index 9571fc79cb47..c7ba2029f5a6 100644 --- a/svl/inc/svl/nranges.hxx +++ b/svl/inc/svl/nranges.hxx @@ -40,7 +40,7 @@ #include <svl/nranges.hxx> #undef NUMTYPE -#define NUMTYPE sal_uIntPtr +#define NUMTYPE sal_uLong #define SfxNumRanges SfxULongRanges #include <svl/nranges.hxx> diff --git a/svl/inc/svl/outstrm.hxx b/svl/inc/svl/outstrm.hxx index 8846bd84e5df..b48cea2e04da 100644 --- a/svl/inc/svl/outstrm.hxx +++ b/svl/inc/svl/outstrm.hxx @@ -42,15 +42,15 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > m_xStream; - SVL_DLLPRIVATE virtual sal_uIntPtr GetData(void *, sal_uIntPtr); + SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong); - SVL_DLLPRIVATE virtual sal_uIntPtr PutData(void const * pData, sal_uIntPtr nSize); + SVL_DLLPRIVATE virtual sal_uLong PutData(void const * pData, sal_uLong nSize); - SVL_DLLPRIVATE virtual sal_uIntPtr SeekPos(sal_uIntPtr); + SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong); SVL_DLLPRIVATE virtual void FlushData(); - SVL_DLLPRIVATE virtual void SetSize(sal_uIntPtr); + SVL_DLLPRIVATE virtual void SetSize(sal_uLong); public: SvOutputStream(com::sun::star::uno::Reference< diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index 0a8b63e1b155..48e5a80166b7 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -183,17 +183,17 @@ friend class SfxItemPoolCache; friend class SfxItemSet; friend class SfxVoidItem; - sal_uIntPtr nRefCount; // Referenzzaehler + sal_uLong nRefCount; // Referenzzaehler sal_uInt16 nWhich; sal_uInt16 nKind; private: - inline void SetRefCount( sal_uIntPtr n ); + inline void SetRefCount( sal_uLong n ); inline void SetKind( sal_uInt16 n ); public: - inline sal_uIntPtr AddRef( sal_uIntPtr n = 1 ) const; + inline sal_uLong AddRef( sal_uLong n = 1 ) const; private: - inline sal_uIntPtr ReleaseRef( sal_uIntPtr n = 1 ) const; + inline sal_uLong ReleaseRef( sal_uLong n = 1 ) const; SVL_DLLPRIVATE long Delete_Impl(void*); #if 0 @@ -239,7 +239,7 @@ public: virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const = 0; - sal_uIntPtr GetRefCount() const { return nRefCount; } + sal_uLong GetRefCount() const { return nRefCount; } inline sal_uInt16 GetKind() const { return nKind; } /** Read in a Unicode string from a streamed byte string representation. @@ -295,7 +295,7 @@ private: // ----------------------------------------------------------------------- -inline void SfxPoolItem::SetRefCount( sal_uIntPtr n ) +inline void SfxPoolItem::SetRefCount( sal_uLong n ) { DBG_CHKTHIS( SfxPoolItem, 0 ); nRefCount = n; @@ -309,7 +309,7 @@ inline void SfxPoolItem::SetKind( sal_uInt16 n ) nKind = n; } -inline sal_uIntPtr SfxPoolItem::AddRef( sal_uIntPtr n ) const +inline sal_uLong SfxPoolItem::AddRef( sal_uLong n ) const { DBG_CHKTHIS( SfxPoolItem, 0 ); DBG_ASSERT( nRefCount <= SFX_ITEMS_MAXREF, "AddRef mit nicht-Pool-Item" ); @@ -317,7 +317,7 @@ inline sal_uIntPtr SfxPoolItem::AddRef( sal_uIntPtr n ) const return ( ((SfxPoolItem *)this)->nRefCount += n ); } -inline sal_uIntPtr SfxPoolItem::ReleaseRef( sal_uIntPtr n ) const +inline sal_uLong SfxPoolItem::ReleaseRef( sal_uLong n ) const { DBG_CHKTHIS( SfxPoolItem, 0 ); DBG_ASSERT( nRefCount <= SFX_ITEMS_MAXREF, "AddRef mit nicht-Pool-Item" ); diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx index 914fb5f4cd9a..320c358f5520 100644 --- a/svl/inc/svl/rngitem.hxx +++ b/svl/inc/svl/rngitem.hxx @@ -38,7 +38,7 @@ #undef SfxXRangesItem #ifndef _SFXITEMS_HXX -#define NUMTYPE sal_uIntPtr +#define NUMTYPE sal_uLong #define SfxXRangeItem SfxULongRangeItem #define SfxXRangesItem SfxULongRangesItem #include <svl/rngitem.hxx> diff --git a/svl/inc/svl/smplhint.hxx b/svl/inc/svl/smplhint.hxx index 42e5aa4f69a4..9e3e867b1703 100644 --- a/svl/inc/svl/smplhint.hxx +++ b/svl/inc/svl/smplhint.hxx @@ -68,11 +68,11 @@ class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint { private: - sal_uIntPtr nId; + sal_uLong nId; public: TYPEINFO(); - SfxSimpleHint( sal_uIntPtr nId ); - sal_uIntPtr GetId() const { return nId; } + SfxSimpleHint( sal_uLong nId ); + sal_uLong GetId() const { return nId; } }; //-------------------------------------------------------------------- diff --git a/svl/inc/svl/strmadpt.hxx b/svl/inc/svl/strmadpt.hxx index 0d2779504daf..936e33071706 100644 --- a/svl/inc/svl/strmadpt.hxx +++ b/svl/inc/svl/strmadpt.hxx @@ -51,23 +51,23 @@ public: rTheOutputStream): m_xOutputStream(rTheOutputStream), m_nPosition(0) {} - virtual ErrCode ReadAt(sal_uIntPtr, void *, sal_uIntPtr, sal_uIntPtr *) const; + virtual ErrCode ReadAt(sal_uLong, void *, sal_uLong, sal_uLong *) const; - virtual ErrCode WriteAt(sal_uIntPtr nPos, const void * pBuffer, sal_uIntPtr nCount, - sal_uIntPtr * pWritten); + virtual ErrCode WriteAt(sal_uLong nPos, const void * pBuffer, sal_uLong nCount, + sal_uLong * pWritten); virtual ErrCode Flush() const; - virtual ErrCode SetSize(sal_uIntPtr); + virtual ErrCode SetSize(sal_uLong); virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const; - virtual ErrCode FillAppend(const void * pBuffer, sal_uIntPtr nCount, - sal_uIntPtr * pWritten); + virtual ErrCode FillAppend(const void * pBuffer, sal_uLong nCount, + sal_uLong * pWritten); - virtual sal_uIntPtr Tell() const; + virtual sal_uLong Tell() const; - virtual sal_uIntPtr Seek(sal_uIntPtr); + virtual sal_uLong Seek(sal_uLong); virtual void Terminate(); }; diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 667fe7137994..5ae5cb8e673b 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -102,7 +102,7 @@ protected: SfxItemSet* pSet; // ItemSet sal_uInt16 nMask; // Flags - sal_uIntPtr nHelpId; // Hilfe-ID + sal_uLong nHelpId; // Hilfe-ID sal_Bool bMySet; // sal_True: Set loeschen im dtor @@ -149,8 +149,8 @@ public: sal_Bool IsUserDefined() const { return sal_Bool( ( nMask & SFXSTYLEBIT_USERDEF) != 0 ); } - virtual sal_uIntPtr GetHelpId( String& rFile ); - virtual void SetHelpId( const String& r, sal_uIntPtr nId ); + virtual sal_uLong GetHelpId( String& rFile ); + virtual void SetHelpId( const String& r, sal_uLong nId ); virtual SfxItemSet& GetItemSet(); virtual sal_uInt16 GetVersion() const; diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx index 229ecbec8361..35448521c459 100644 --- a/svl/inc/svl/svdde.hxx +++ b/svl/inc/svl/svdde.hxx @@ -92,11 +92,11 @@ class SVL_DLLPUBLIC DdeData //#if 0 // _SOLAR__PRIVATE SVL_DLLPRIVATE void Lock(); //#endif - void SetFormat( sal_uIntPtr nFmt ); + void SetFormat( sal_uLong nFmt ); public: DdeData(); - DdeData( const void*, long, sal_uIntPtr = FORMAT_STRING ); + DdeData( const void*, long, sal_uLong = FORMAT_STRING ); DdeData( const String& ); DdeData( const DdeData& ); ~DdeData(); @@ -104,12 +104,12 @@ public: operator const void*() const; operator long() const; - sal_uIntPtr GetFormat() const; + sal_uLong GetFormat() const; DdeData& operator = ( const DdeData& ); - static sal_uIntPtr GetExternalFormat( sal_uIntPtr nFmt ); - static sal_uIntPtr GetInternalFormat( sal_uIntPtr nFmt ); + static sal_uLong GetExternalFormat( sal_uLong nFmt ); + static sal_uLong GetInternalFormat( sal_uLong nFmt ); }; // ------------------ // - DdeServiceList - @@ -184,8 +184,8 @@ public: void SetDoneHdl( const Link& rLink ) { aDone = rLink; } const Link& GetDoneHdl() const { return aDone; } - void SetFormat( sal_uIntPtr nFmt ) { aDdeData.SetFormat( nFmt ); } - sal_uIntPtr GetFormat() const { return aDdeData.GetFormat(); } + void SetFormat( sal_uLong nFmt ) { aDdeData.SetFormat( nFmt ); } + sal_uLong GetFormat() const { return aDdeData.GetFormat(); } long GetError(); @@ -253,7 +253,7 @@ class SVL_DLLPUBLIC DdePoke : public DdeTransaction { public: DdePoke( DdeConnection&, const String&, const char*, long, - sal_uIntPtr = FORMAT_STRING, long = 0 ); + sal_uLong = FORMAT_STRING, long = 0 ); DdePoke( DdeConnection&, const String&, const DdeData&, long = 0 ); DdePoke( DdeConnection&, const String&, const String&, long = 0 ); }; @@ -312,8 +312,8 @@ class SVL_DLLPUBLIC DdeItem DdeTopic* pMyTopic; DdeItemImp* pImpData; - void IncMonitor( sal_uIntPtr ); - void DecMonitor( sal_uIntPtr ); + void IncMonitor( sal_uLong ); + void DecMonitor( sal_uLong ); protected: sal_uInt8 nType; @@ -340,7 +340,7 @@ public: DdeGetPutItem( const String& rStr ); DdeGetPutItem( const DdeItem& rItem ); - virtual DdeData* Get( sal_uIntPtr ); + virtual DdeData* Get( sal_uLong ); virtual sal_Bool Put( const DdeData* ); virtual void AdviseLoop( sal_Bool ); // AdviseLoop starten/stoppen }; @@ -356,7 +356,7 @@ class SVL_DLLPUBLIC DdeTopic public: virtual void Connect( long ); virtual void Disconnect( long ); - virtual DdeData* Get( sal_uIntPtr ); + virtual DdeData* Get( sal_uLong ); virtual sal_Bool Put( const DdeData* ); virtual sal_Bool Execute( const String* ); // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden @@ -460,9 +460,9 @@ public: void AddTopic( const DdeTopic& ); void RemoveTopic( const DdeTopic& ); - void AddFormat( sal_uIntPtr ); - void RemoveFormat( sal_uIntPtr ); - sal_Bool HasFormat( sal_uIntPtr ); + void AddFormat( sal_uLong ); + void RemoveFormat( sal_uLong ); + sal_Bool HasFormat( sal_uLong ); private: // DdeService( const DdeService& ); diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx index e3377b732ad8..88f318c2d5d3 100644 --- a/svl/inc/svl/svstdarr.hxx +++ b/svl/inc/svl/svstdarr.hxx @@ -50,14 +50,14 @@ typedef std::deque< sal_uInt8 > SvBytes; //#ifdef _SVSTDARR_ULONGS #ifndef _SVSTDARR_ULONGS_DECL -SV_DECL_VARARR_VISIBILITY( SvULongs, sal_uIntPtr, 1, 1, SVL_DLLPUBLIC ) +SV_DECL_VARARR_VISIBILITY( SvULongs, sal_uLong, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_ULONGS_DECL #endif //#endif //#ifdef _SVSTDARR_ULONGSSORT #ifndef _SVSTDARR_ULONGSSORT_DECL -SV_DECL_VARARR_SORT_VISIBILITY( SvULongsSort, sal_uIntPtr, 1, 1, SVL_DLLPUBLIC ) +SV_DECL_VARARR_SORT_VISIBILITY( SvULongsSort, sal_uLong, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_ULONGSSORT_DECL #endif //#endif diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index 6afaa6105d01..64a336aabc30 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -504,8 +504,8 @@ private: double& fLimit, SvNumberformatLimitOps eOp); - SVL_DLLPRIVATE sal_uIntPtr ImpGGT(sal_uIntPtr x, sal_uIntPtr y); - SVL_DLLPRIVATE sal_uIntPtr ImpGGTRound(sal_uIntPtr x, sal_uIntPtr y); + SVL_DLLPRIVATE sal_uLong ImpGGT(sal_uLong x, sal_uLong y); + SVL_DLLPRIVATE sal_uLong ImpGGTRound(sal_uLong x, sal_uLong y); // Helper function for number strings // append string symbols, insert leading 0 or ' ', or ... |