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/source | |
parent | 322a75edf8bad6616b1543a6b81972f4c3765ee2 (diff) |
removetooltypes01: #i112600# do not affect FASTBOOL in this cws
Diffstat (limited to 'svl/source')
-rw-r--r-- | svl/source/filerec/filerec.cxx | 20 | ||||
-rw-r--r-- | svl/source/inc/poolio.hxx | 4 | ||||
-rw-r--r-- | svl/source/items/itempool.cxx | 6 | ||||
-rw-r--r-- | svl/source/items/itemset.cxx | 4 | ||||
-rw-r--r-- | svl/source/items/poolio.cxx | 30 |
5 files changed, 32 insertions, 32 deletions
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index 3170db4e4f2a..9e5a8b2027f9 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -74,7 +74,7 @@ SV_IMPL_VARARR( SfxUINT32s, sal_uInt32 ); sal_uInt32 SfxMiniRecordWriter::Close ( - int bSeekToEndOfRec /* sal_True (default) + FASTBOOL bSeekToEndOfRec /* sal_True (default) Der Stream wird an das Ende des Records positioniert. @@ -260,7 +260,7 @@ sal_uInt16 SfxMiniRecordReader::ScanRecordType //------------------------------------------------------------------------- -int SfxMiniRecordReader::SetHeader_Impl( sal_uInt32 nHeader ) +FASTBOOL SfxMiniRecordReader::SetHeader_Impl( sal_uInt32 nHeader ) /* [Beschreibung] @@ -272,7 +272,7 @@ int SfxMiniRecordReader::SetHeader_Impl( sal_uInt32 nHeader ) */ { - int bRet = sal_True; + FASTBOOL bRet = sal_True; // Record-Ende und Pre-Tag aus dem Header ermitteln _nEofRec = _pStream->Tell() + SFX_REC_OFS(nHeader); @@ -487,7 +487,7 @@ SfxSingleRecordWriter::SfxSingleRecordWriter //========================================================================= -inline int SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes ) +inline FASTBOOL SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes ) /* [Beschreibung] @@ -498,7 +498,7 @@ inline int SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes ) */ { - int bRet; + FASTBOOL bRet; // Basisklassen-Header einlesen sal_uInt32 nHeader=0; @@ -561,7 +561,7 @@ SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream, sal_uInt16 nTag //------------------------------------------------------------------------- -int SfxSingleRecordReader::FindHeader_Impl +FASTBOOL SfxSingleRecordReader::FindHeader_Impl ( sal_uInt16 nTypes, // arithm. Veroderung erlaubter Record-Typen sal_uInt16 nTag // zu findende Record-Art-Kennung @@ -674,7 +674,7 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter //------------------------------------------------------------------------ -sal_uInt32 SfxMultiFixRecordWriter::Close( int bSeekToEndOfRec ) +sal_uInt32 SfxMultiFixRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) // siehe <SfxMiniRecordWriter> @@ -799,7 +799,7 @@ void SfxMultiVarRecordWriter::NewContent() //------------------------------------------------------------------------- -sal_uInt32 SfxMultiVarRecordWriter::Close( int bSeekToEndOfRec ) +sal_uInt32 SfxMultiVarRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) // siehe <SfxMiniRecordWriter> @@ -872,7 +872,7 @@ void SfxMultiMixRecordWriter::NewContent //========================================================================= -int SfxMultiRecordReader::ReadHeader_Impl() +FASTBOOL SfxMultiRecordReader::ReadHeader_Impl() /* [Beschreibung] @@ -963,7 +963,7 @@ SfxMultiRecordReader::~SfxMultiRecordReader() //------------------------------------------------------------------------- -int SfxMultiRecordReader::GetContent() +FASTBOOL SfxMultiRecordReader::GetContent() /* [Beschreibung] diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index a0c977237d8b..013b6c760096 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -82,8 +82,8 @@ struct SfxItemPool_Impl sal_uInt16 nStoringStart, nStoringEnd; // zu speichernder Range sal_uInt8 nMajorVer, nMinorVer; // Pool selbst SfxMapUnit eDefMetric; - int bInSetItem; - int bStreaming; // in Load() bzw. Store() + FASTBOOL bInSetItem; + FASTBOOL bStreaming; // in Load() bzw. Store() SfxItemPool_Impl( sal_uInt16 nStart, sal_uInt16 nEnd ) : ppPoolItems (new SfxPoolItemArray_Impl*[ nEnd - nStart + 1]) diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index a3ae4c0a7c7e..c5c0aa68addf 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -74,7 +74,7 @@ const SfxPoolItem* SfxItemPool::GetPoolDefaultItem( sal_uInt16 nWhich ) const // ----------------------------------------------------------------------- -inline int SfxItemPool::IsItemFlag_Impl( sal_uInt16 nPos, sal_uInt16 nFlag ) const +inline FASTBOOL SfxItemPool::IsItemFlag_Impl( sal_uInt16 nPos, sal_uInt16 nFlag ) const { sal_uInt16 nItemFlag = pItemInfos[nPos]._nFlags; return nFlag == (nItemFlag & nFlag); @@ -82,7 +82,7 @@ inline int SfxItemPool::IsItemFlag_Impl( sal_uInt16 nPos, sal_uInt16 nFlag ) con // ----------------------------------------------------------------------- -int SfxItemPool::IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const +FASTBOOL SfxItemPool::IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const { for ( const SfxItemPool *pPool = this; pPool; pPool = pPool->pSecondary ) { @@ -118,7 +118,7 @@ SfxItemPool::SfxItemPool #ifndef TF_POOLABLE sal_uInt16* pSlotIdArray, /* Zuordnung von Slot-Ids zu Which-Ids */ #endif - int bLoadRefCounts /* Ref-Counts mitladen oder auf 1 setzen */ + FASTBOOL bLoadRefCounts /* Ref-Counts mitladen oder auf 1 setzen */ ) /* [Beschreibung] diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 69efd2e7aa2c..1c7b6a17231b 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1498,7 +1498,7 @@ sal_uInt16 SfxItemSet::GetWhichByPos( sal_uInt16 nPos ) const SvStream &SfxItemSet::Store ( SvStream& rStream, // Zielstream f"ur normale Items - int bDirect // sal_True: Items direkt speicher, sal_False: Surrogate + FASTBOOL bDirect // sal_True: Items direkt speicher, sal_False: Surrogate ) const /* [Beschreibung] @@ -1565,7 +1565,7 @@ SvStream &SfxItemSet::Load ( SvStream& rStream, // Stream, aus dem geladen werden soll - int bDirect, /* sal_True + FASTBOOL bDirect, /* sal_True Items werden direkt aus dem Stream gelesen, nicht "uber Surrogate diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index d384cdedf89f..62cb544fa04d 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -625,7 +625,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) } // Items laden - int bSecondaryLoaded = sal_False; + FASTBOOL bSecondaryLoaded = sal_False; long nSecondaryEnd = 0; { SfxMultiRecordReader aWhichIdsRec( &rStream, SFX_ITEMPOOL_REC_WHICHIDS); @@ -818,7 +818,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) // Items laden rStream.Seek( nStartPos ); CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_ITEMS ); - int bSecondaryLoaded = sal_False; + FASTBOOL bSecondaryLoaded = sal_False; long nSecondaryEnd = 0; sal_uInt16 nWhich, nSlot; while ( rStream >> nWhich, nWhich ) @@ -1090,7 +1090,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate // auf jeden Fall aufgel"ost werden. if ( !pRefPool ) pRefPool = this; - int bResolvable = pRefPool->GetName().Len() > 0; + FASTBOOL bResolvable = pRefPool->GetName().Len() > 0; if ( !bResolvable ) { // Bei einem anders aufgebauten Pool im Stream, mu\s die SlotId @@ -1153,7 +1153,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate //------------------------------------------------------------------------- -int SfxItemPool::StoreSurrogate +FASTBOOL SfxItemPool::StoreSurrogate ( SvStream& rStream, const SfxPoolItem* pItem @@ -1166,7 +1166,7 @@ int SfxItemPool::StoreSurrogate [R"uckgabewert] - int sal_True + FASTBOOL sal_True es wurde ein echtes Surrogat gespeichert, auch SFX_ITEMS_NULL bei 'pItem==0', SFX_ITEMS_STATICDEFAULT und SFX_ITEMS_POOLDEFAULT @@ -1181,7 +1181,7 @@ int SfxItemPool::StoreSurrogate { if ( pItem ) { - int bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE); + FASTBOOL bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE); rStream << ( bRealSurrogate ? GetSurrogate( pItem ) : SFX_ITEMS_DIRECT ); @@ -1227,7 +1227,7 @@ sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const // ----------------------------------------------------------------------- -int SfxItemPool::IsInStoringRange( sal_uInt16 nWhich ) const +FASTBOOL SfxItemPool::IsInStoringRange( sal_uInt16 nWhich ) const { return nWhich >= pImp->nStoringStart && nWhich <= pImp->nStoringEnd; @@ -1444,14 +1444,14 @@ sal_uInt16 SfxItemPool::GetNewWhich // ----------------------------------------------------------------------- -int SfxItemPool::IsInVersionsRange( sal_uInt16 nWhich ) const +FASTBOOL SfxItemPool::IsInVersionsRange( sal_uInt16 nWhich ) const { return nWhich >= pImp->nVerStart && nWhich <= pImp->nVerEnd; } // ----------------------------------------------------------------------- -int SfxItemPool::IsCurrentVersionLoading() const +FASTBOOL SfxItemPool::IsCurrentVersionLoading() const /* [Beschreibung] @@ -1542,7 +1542,7 @@ sal_uInt16 SfxItemPool::GetLoadingVersion() const //------------------------------------------------------------------------- -int SfxItemPool::IsVer2_Impl() const +FASTBOOL SfxItemPool::IsVer2_Impl() const { return pMaster->pImp->nMajorVer >= 2; } @@ -1550,8 +1550,8 @@ int SfxItemPool::IsVer2_Impl() const //------------------------------------------------------------------------- -int SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, - int bDirect ) const +FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, + FASTBOOL bDirect ) const /* [Beschreibung] @@ -1576,7 +1576,7 @@ int SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, [Querverweise] - <SfxItemPool::LoadItem(SvStream&,int)const> + <SfxItemPool::LoadItem(SvStream&,FASTBOOL)const> */ { @@ -1616,7 +1616,7 @@ int SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, //------------------------------------------------------------------------- -const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, int bDirect, +const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, FASTBOOL bDirect, const SfxItemPool *pRefPool ) // pRefPool==-1 => nicht putten! @@ -1650,7 +1650,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, int bDirect, } // wird eine andere Version geladen? - int bCurVersion = pRefPool->IsCurrentVersionLoading(); + FASTBOOL bCurVersion = pRefPool->IsCurrentVersionLoading(); if ( !bCurVersion ) // Which-Id auf neue Version mappen nWhich = pRefPool->GetNewWhich( nWhich ); |