diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-11 16:23:55 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-11 16:23:55 +0100 |
commit | 698c00dbdd95ebc3c6df113133076979ff2cd0a7 (patch) | |
tree | adf73cb3197fabd1120ca007ddc0b50166103745 /svl/inc | |
parent | 322a75edf8bad6616b1543a6b81972f4c3765ee2 (diff) |
removetooltypes01: #i112600# do not affect FASTBOOL in this cws
Diffstat (limited to 'svl/inc')
-rw-r--r-- | svl/inc/svl/filerec.hxx | 38 | ||||
-rw-r--r-- | svl/inc/svl/itempool.hxx | 28 | ||||
-rw-r--r-- | svl/inc/svl/itemset.hxx | 4 |
3 files changed, 35 insertions, 35 deletions
diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx index 2742d2ce537f..0a831023f3ff 100644 --- a/svl/inc/svl/filerec.hxx +++ b/svl/inc/svl/filerec.hxx @@ -223,7 +223,7 @@ class SVL_DLLPUBLIC SfxMiniRecordWriter protected: SvStream* _pStream; // <SvStream>, in dem der Record liegt sal_uInt32 _nStartPos; // Start-Position des Gesamt-Records im Stream - int _bHeaderOk; /* sal_True, wenn der Header schon geschrieben ist; + FASTBOOL _bHeaderOk; /* sal_True, wenn der Header schon geschrieben ist; bei DBG_UTIL wird SFX_BOOL_DONTCARE ver- wendet, um die Gr"o\se von Fix-Sized-Records zu pr"ufen. */ @@ -241,7 +241,7 @@ public: inline void Reset(); - sal_uInt32 Close( int bSeekToEndOfRec = sal_True ); + sal_uInt32 Close( FASTBOOL bSeekToEndOfRec = sal_True ); private: // not implementend, not allowed @@ -281,7 +281,7 @@ class SVL_DLLPUBLIC SfxMiniRecordReader protected: SvStream* _pStream; // <SvStream>, aus dem gelesen wird sal_uInt32 _nEofRec; // Position direkt hinter dem Record - int _bSkipped; // sal_True: der Record wurde explizit geskippt + FASTBOOL _bSkipped; // sal_True: der Record wurde explizit geskippt sal_uInt8 _nPreTag; // aus dem Header gelesenes Pre-Tag // Drei-Phasen-Ctor f"ur Subklassen @@ -292,7 +292,7 @@ protected: _bSkipped = sal_False; _nPreTag = nTag; } - inline int SetHeader_Impl( sal_uInt32 nHeader ); + inline FASTBOOL SetHeader_Impl( sal_uInt32 nHeader ); // als ung"ultig markieren und zur"uck-seeken void SetInvalid_Impl( sal_uInt32 nRecordStartPos ) @@ -309,7 +309,7 @@ public: inline ~SfxMiniRecordReader(); inline sal_uInt8 GetTag() const; - inline int IsValid() const; + inline FASTBOOL IsValid() const; inline SvStream& operator*() const; @@ -374,7 +374,7 @@ public: inline void Reset(); - sal_uInt32 Close( int bSeekToEndOfRec = sal_True ); + sal_uInt32 Close( FASTBOOL bSeekToEndOfRec = sal_True ); }; //------------------------------------------------------------------------ @@ -420,8 +420,8 @@ protected: SfxMiniRecordReader::Construct_Impl( pStream, SFX_REC_PRETAG_EXT ); } - int FindHeader_Impl( sal_uInt16 nTypes, sal_uInt16 nTag ); - int ReadHeader_Impl( sal_uInt16 nTypes ); + FASTBOOL FindHeader_Impl( sal_uInt16 nTypes, sal_uInt16 nTag ); + FASTBOOL ReadHeader_Impl( sal_uInt16 nTypes ); public: SfxSingleRecordReader( SvStream *pStream ); @@ -430,7 +430,7 @@ public: inline sal_uInt16 GetTag() const; inline sal_uInt8 GetVersion() const; - inline int HasVersion( sal_uInt16 nVersion ) const; + inline FASTBOOL HasVersion( sal_uInt16 nVersion ) const; }; //------------------------------------------------------------------------ @@ -505,7 +505,7 @@ public: inline void Reset(); - sal_uInt32 Close( int bSeekToEndOfRec = sal_True ); + sal_uInt32 Close( FASTBOOL bSeekToEndOfRec = sal_True ); }; //------------------------------------------------------------------------ @@ -576,7 +576,7 @@ public: void NewContent(); - virtual sal_uInt32 Close( int bSeekToEndOfRec = sal_True ); + virtual sal_uInt32 Close( FASTBOOL bSeekToEndOfRec = sal_True ); }; //------------------------------------------------------------------------ @@ -676,17 +676,17 @@ class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader sal_uInt16 _nContentTag; // Art-Kennung des aktuellen Contents sal_uInt8 _nContentVer; // Versions-Kennung des akt. Contents - int ReadHeader_Impl(); + FASTBOOL ReadHeader_Impl(); public: SfxMultiRecordReader( SvStream *pStream ); SfxMultiRecordReader( SvStream *pStream, sal_uInt16 nTag ); ~SfxMultiRecordReader(); - int GetContent(); + FASTBOOL GetContent(); inline sal_uInt16 GetContentTag(); inline sal_uInt8 GetContentVersion() const; - inline int HasContentVersion( sal_uInt16 nVersion ) const; + inline FASTBOOL HasContentVersion( sal_uInt16 nVersion ) const; inline sal_uInt32 ContentCount() const; }; @@ -835,7 +835,7 @@ inline sal_uInt8 SfxMiniRecordReader::GetTag() const //------------------------------------------------------------------------- -inline int SfxMiniRecordReader::IsValid() const +inline FASTBOOL SfxMiniRecordReader::IsValid() const /* [Beschreibung] @@ -865,9 +865,9 @@ inline SvStream& SfxMiniRecordReader::operator*() const //========================================================================= -inline sal_uInt32 SfxSingleRecordWriter::Close( int bSeekToEndOfRec ) +inline sal_uInt32 SfxSingleRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) -// siehe <SfxMiniRecordWriter::Close(int)> +// siehe <SfxMiniRecordWriter::Close(FASTBOOL)> { sal_uInt32 nRet = 0; @@ -931,7 +931,7 @@ inline sal_uInt8 SfxSingleRecordReader::GetVersion() const //------------------------------------------------------------------------- -inline int SfxSingleRecordReader::HasVersion( sal_uInt16 nVersion ) const +inline FASTBOOL SfxSingleRecordReader::HasVersion( sal_uInt16 nVersion ) const /* [Beschreibung] @@ -1054,7 +1054,7 @@ inline sal_uInt8 SfxMultiRecordReader::GetContentVersion() const //------------------------------------------------------------------------- -inline int SfxMultiRecordReader::HasContentVersion( sal_uInt16 nVersion ) const +inline FASTBOOL SfxMultiRecordReader::HasContentVersion( sal_uInt16 nVersion ) const /* [Beschreibung] diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 3ca4bf3129b7..7f00f89bc9e2 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -121,7 +121,7 @@ class SVL_DLLPUBLIC SfxItemPool SfxItemPool* pSecondary; SfxItemPool* pMaster; sal_uInt16* _pPoolRanges; - int bPersistentRefCounts; + FASTBOOL bPersistentRefCounts; private: // ObjectUser section @@ -141,14 +141,14 @@ private: inline sal_uInt16 GetSize_Impl() const { return nEnd - nStart + 1; } SVL_DLLPRIVATE SvStream& Load1_Impl( SvStream &rStream ); - SVL_DLLPRIVATE int IsItemFlag_Impl( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; + SVL_DLLPRIVATE FASTBOOL IsItemFlag_Impl( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; public: // fuer dflt. SfxItemSet::CTOR, setze dflt. WhichRanges void FillItemIdRanges_Impl( sal_uInt16*& pWhichRanges ) const; const sal_uInt16* GetFrozenIdRanges() const { return _pPoolRanges; } - int IsVer2_Impl() const; + FASTBOOL IsVer2_Impl() const; #endif //--------------------------------------------------------------------- @@ -170,7 +170,7 @@ public: #ifndef TF_POOLABLE sal_uInt16 *pSlotIds = 0, #endif - int bLoadRefCounts = sal_True ); + FASTBOOL bLoadRefCounts = sal_True ); protected: virtual ~SfxItemPool(); public: @@ -202,11 +202,11 @@ public: virtual const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; const SfxPoolItem* LoadItem( SvStream &rStream, - int bDirect = sal_False, + FASTBOOL bDirect = sal_False, const SfxItemPool *pRefPool = 0 ); - int StoreItem( SvStream &rStream, + FASTBOOL StoreItem( SvStream &rStream, const SfxPoolItem &rItem, - int bDirect = sal_False ) const; + FASTBOOL bDirect = sal_False ) const; sal_uInt32 GetSurrogate(const SfxPoolItem *) const; const SfxPoolItem * GetItem2(sal_uInt16 nWhich, sal_uInt32 nSurrogate) const; @@ -214,7 +214,7 @@ public: const SfxPoolItem* LoadSurrogate(SvStream& rStream, sal_uInt16 &rWhich, sal_uInt16 nSlotId, const SfxItemPool* pRefPool = 0 ); - int StoreSurrogate(SvStream& rStream, + FASTBOOL StoreSurrogate(SvStream& rStream, const SfxPoolItem *pItem ) const; virtual SvStream & Load(SvStream &); @@ -225,11 +225,11 @@ public: sal_uInt16 GetFirstWhich() const { return nStart; } sal_uInt16 GetLastWhich() const { return nEnd; } - int IsInRange( sal_uInt16 nWhich ) const { + FASTBOOL IsInRange( sal_uInt16 nWhich ) const { return nWhich >= nStart && nWhich <= nEnd; } - int IsInVersionsRange( sal_uInt16 nWhich ) const; - int IsInStoringRange( sal_uInt16 nWhich ) const; + FASTBOOL IsInVersionsRange( sal_uInt16 nWhich ) const; + FASTBOOL IsInStoringRange( sal_uInt16 nWhich ) const; void SetStoringRange( sal_uInt16 nFrom, sal_uInt16 nTo ); void SetSecondaryPool( SfxItemPool *pPool ); SfxItemPool* GetSecondaryPool() const { @@ -242,8 +242,8 @@ public: void Delete(); #ifdef TF_POOLABLE - int IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; - int IsItemFlag( const SfxPoolItem &rItem, sal_uInt16 nFlag ) const + FASTBOOL IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; + FASTBOOL IsItemFlag( const SfxPoolItem &rItem, sal_uInt16 nFlag ) const { return IsItemFlag( rItem.Which(), nFlag ); } void SetItemInfos( const SfxItemInfo *pInfos ) { pItemInfos = pInfos; } @@ -266,7 +266,7 @@ public: { return _nFileFormatVersion; } void SetFileFormatVersion( sal_uInt16 nFileFormatVersion ); sal_uInt16 GetLoadingVersion() const; - int IsCurrentVersionLoading() const; + FASTBOOL IsCurrentVersionLoading() const; static int IsWhich(sal_uInt16 nId) { return nId && nId <= SFX_WHICH_MAX; } diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx index 7ef299442e5b..7e6429ca37ab 100644 --- a/svl/inc/svl/itemset.hxx +++ b/svl/inc/svl/itemset.hxx @@ -168,9 +168,9 @@ public: void MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo ); const SfxItemSet* GetParent() const { return _pParent; } - virtual SvStream & Load( SvStream &, int bDirect = sal_False, + virtual SvStream & Load( SvStream &, FASTBOOL bDirect = sal_False, const SfxItemPool *pRefPool = 0 ); - virtual SvStream & Store( SvStream &, int bDirect = sal_False ) const; + virtual SvStream & Store( SvStream &, FASTBOOL bDirect = sal_False ) const; virtual int operator==(const SfxItemSet &) const; }; |