Bugzilla – Attachment 39209 Details for
Bug 30642
[PATCH] Convert FASTBOOL to bool everywhere but binfilter
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
FSATBOOL to bool for libs-gui
libs-gui_0001-FASTBOOL-to-bool-conversion.patch (text/plain), 31.40 KB, created by
Norbert Thiebaud
on 2010-10-06 00:12:11 UTC
(
hide
)
Description:
FSATBOOL to bool for libs-gui
Filename:
MIME Type:
Creator:
Norbert Thiebaud
Created:
2010-10-06 00:12:11 UTC
Size:
31.40 KB
patch
obsolete
>From 00596773d8364608e5efb0e83c5472b765ebca8a Mon Sep 17 00:00:00 2001 >From: Norbert Thiebaud <nthiebaud@gmail.com> >Date: Tue, 5 Oct 2010 07:57:54 -0500 >Subject: [PATCH] FASTBOOL to bool conversion > >--- > svl/inc/svl/filerec.hxx | 38 ++++++++++++++++++------------------ > svl/inc/svl/itempool.hxx | 30 ++++++++++++++-------------- > svl/inc/svl/itemset.hxx | 4 +- > svl/inc/svl/metitem.hxx | 4 +- > svl/inc/svl/poolitem.hxx | 4 +- > svl/source/filerec/filerec.cxx | 24 +++++++++++----------- > svl/source/inc/poolio.hxx | 4 +- > svl/source/items/intitem.cxx | 8 +++--- > svl/source/items/itempool.cxx | 6 ++-- > svl/source/items/itemset.cxx | 4 +- > svl/source/items/poolio.cxx | 34 ++++++++++++++++---------------- > svl/source/items/poolitem.cxx | 8 +++--- > svtools/inc/svtools/parhtml.hxx | 2 +- > svtools/source/brwbox/datwin.hxx | 32 +++++++++++++++--------------- > svtools/source/svhtml/parhtml.cxx | 6 ++-- > 15 files changed, 104 insertions(+), 104 deletions(-) > >diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx >index 89b3bf0..87c436c 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 > UINT32 _nStartPos; // Start-Position des Gesamt-Records im Stream >- FASTBOOL _bHeaderOk; /* TRUE, wenn der Header schon geschrieben ist; >+ bool _bHeaderOk; /* 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(); > >- UINT32 Close( FASTBOOL bSeekToEndOfRec = TRUE ); >+ UINT32 Close( bool bSeekToEndOfRec = true ); > > private: > // not implementend, not allowed >@@ -281,7 +281,7 @@ class SVL_DLLPUBLIC SfxMiniRecordReader > protected: > SvStream* _pStream; // <SvStream>, aus dem gelesen wird > UINT32 _nEofRec; // Position direkt hinter dem Record >- FASTBOOL _bSkipped; // TRUE: der Record wurde explizit geskippt >+ bool _bSkipped; // TRUE: der Record wurde explizit geskippt > BYTE _nPreTag; // aus dem Header gelesenes Pre-Tag > > // Drei-Phasen-Ctor f"ur Subklassen >@@ -292,7 +292,7 @@ protected: > _bSkipped = FALSE; > _nPreTag = nTag; > } >- inline FASTBOOL SetHeader_Impl( UINT32 nHeader ); >+ inline bool SetHeader_Impl( UINT32 nHeader ); > > // als ung"ultig markieren und zur"uck-seeken > void SetInvalid_Impl( UINT32 nRecordStartPos ) >@@ -309,7 +309,7 @@ public: > inline ~SfxMiniRecordReader(); > > inline BYTE GetTag() const; >- inline FASTBOOL IsValid() const; >+ inline bool IsValid() const; > > inline SvStream& operator*() const; > >@@ -374,7 +374,7 @@ public: > > inline void Reset(); > >- UINT32 Close( FASTBOOL bSeekToEndOfRec = TRUE ); >+ UINT32 Close( bool bSeekToEndOfRec = true ); > }; > > //------------------------------------------------------------------------ >@@ -420,8 +420,8 @@ protected: > SfxMiniRecordReader::Construct_Impl( > pStream, SFX_REC_PRETAG_EXT ); > } >- FASTBOOL FindHeader_Impl( UINT16 nTypes, UINT16 nTag ); >- FASTBOOL ReadHeader_Impl( USHORT nTypes ); >+ bool FindHeader_Impl( UINT16 nTypes, UINT16 nTag ); >+ bool ReadHeader_Impl( USHORT nTypes ); > > public: > SfxSingleRecordReader( SvStream *pStream ); >@@ -430,7 +430,7 @@ public: > inline UINT16 GetTag() const; > > inline BYTE GetVersion() const; >- inline FASTBOOL HasVersion( USHORT nVersion ) const; >+ inline bool HasVersion( USHORT nVersion ) const; > }; > > //------------------------------------------------------------------------ >@@ -505,7 +505,7 @@ public: > > inline void Reset(); > >- UINT32 Close( FASTBOOL bSeekToEndOfRec = TRUE ); >+ UINT32 Close( bool bSeekToEndOfRec = true ); > }; > > //------------------------------------------------------------------------ >@@ -576,7 +576,7 @@ public: > > void NewContent(); > >- virtual UINT32 Close( FASTBOOL bSeekToEndOfRec = TRUE ); >+ virtual UINT32 Close( bool bSeekToEndOfRec = true ); > }; > > //------------------------------------------------------------------------ >@@ -676,17 +676,17 @@ class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader > UINT16 _nContentTag; // Art-Kennung des aktuellen Contents > BYTE _nContentVer; // Versions-Kennung des akt. Contents > >- FASTBOOL ReadHeader_Impl(); >+ bool ReadHeader_Impl(); > > public: > SfxMultiRecordReader( SvStream *pStream ); > SfxMultiRecordReader( SvStream *pStream, UINT16 nTag ); > ~SfxMultiRecordReader(); > >- FASTBOOL GetContent(); >+ bool GetContent(); > inline UINT16 GetContentTag(); > inline BYTE GetContentVersion() const; >- inline FASTBOOL HasContentVersion( USHORT nVersion ) const; >+ inline bool HasContentVersion( USHORT nVersion ) const; > > inline UINT32 ContentCount() const; > }; >@@ -835,7 +835,7 @@ inline BYTE SfxMiniRecordReader::GetTag() const > > //------------------------------------------------------------------------- > >-inline FASTBOOL SfxMiniRecordReader::IsValid() const >+inline bool SfxMiniRecordReader::IsValid() const > > /* [Beschreibung] > >@@ -865,9 +865,9 @@ inline SvStream& SfxMiniRecordReader::operator*() const > > //========================================================================= > >-inline UINT32 SfxSingleRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) >+inline UINT32 SfxSingleRecordWriter::Close( bool bSeekToEndOfRec ) > >-// siehe <SfxMiniRecordWriter::Close(FASTBOOL)> >+// siehe <SfxMiniRecordWriter::Close(bool)> > > { > UINT32 nRet = 0; >@@ -931,7 +931,7 @@ inline BYTE SfxSingleRecordReader::GetVersion() const > > //------------------------------------------------------------------------- > >-inline FASTBOOL SfxSingleRecordReader::HasVersion( USHORT nVersion ) const >+inline bool SfxSingleRecordReader::HasVersion( USHORT nVersion ) const > > /* [Beschreibung] > >@@ -1054,7 +1054,7 @@ inline BYTE SfxMultiRecordReader::GetContentVersion() const > > //------------------------------------------------------------------------- > >-inline FASTBOOL SfxMultiRecordReader::HasContentVersion( USHORT nVersion ) const >+inline bool SfxMultiRecordReader::HasContentVersion( USHORT nVersion ) const > > /* [Beschreibung] > >diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx >index 7483bf6..d140b16 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; > USHORT* _pPoolRanges; >- FASTBOOL bPersistentRefCounts; >+ bool bPersistentRefCounts; > > private: > // ObjectUser section >@@ -140,15 +140,15 @@ private: > inline USHORT GetIndex_Impl(USHORT nWhich) const; > inline USHORT GetSize_Impl() const { return nEnd - nStart + 1; } > >- SVL_DLLPRIVATE SvStream& Load1_Impl( SvStream &rStream ); >- SVL_DLLPRIVATE FASTBOOL IsItemFlag_Impl( USHORT nWhich, USHORT nFlag ) const; >+ SVL_DLLPRIVATE SvStream& Load1_Impl( SvStream &rStream ); >+ SVL_DLLPRIVATE bool IsItemFlag_Impl( USHORT nWhich, USHORT nFlag ) const; > > public: > // fuer dflt. SfxItemSet::CTOR, setze dflt. WhichRanges > void FillItemIdRanges_Impl( USHORT*& pWhichRanges ) const; > const USHORT* GetFrozenIdRanges() const > { return _pPoolRanges; } >- FASTBOOL IsVer2_Impl() const; >+ bool IsVer2_Impl() const; > > #endif > //--------------------------------------------------------------------- >@@ -170,7 +170,7 @@ public: > #ifndef TF_POOLABLE > USHORT *pSlotIds = 0, > #endif >- FASTBOOL bLoadRefCounts = TRUE ); >+ bool bLoadRefCounts = true ); > protected: > virtual ~SfxItemPool(); > public: >@@ -202,11 +202,11 @@ public: > virtual const SfxPoolItem& GetDefaultItem( USHORT nWhich ) const; > > const SfxPoolItem* LoadItem( SvStream &rStream, >- FASTBOOL bDirect = FALSE, >+ bool bDirect = false, > const SfxItemPool *pRefPool = 0 ); >- FASTBOOL StoreItem( SvStream &rStream, >+ bool StoreItem( SvStream &rStream, > const SfxPoolItem &rItem, >- FASTBOOL bDirect = FALSE ) const; >+ bool bDirect = false ) const; > > USHORT GetSurrogate(const SfxPoolItem *) const; > const SfxPoolItem * GetItem(USHORT nWhich, USHORT nSurrogate) const; >@@ -214,7 +214,7 @@ public: > const SfxPoolItem* LoadSurrogate(SvStream& rStream, > USHORT &rWhich, USHORT nSlotId, > const SfxItemPool* pRefPool = 0 ); >- FASTBOOL StoreSurrogate(SvStream& rStream, >+ bool StoreSurrogate(SvStream& rStream, > const SfxPoolItem *pItem ) const; > > virtual SvStream & Load(SvStream &); >@@ -225,11 +225,11 @@ public: > > USHORT GetFirstWhich() const { return nStart; } > USHORT GetLastWhich() const { return nEnd; } >- FASTBOOL IsInRange( USHORT nWhich ) const { >+ bool IsInRange( USHORT nWhich ) const { > return nWhich >= nStart && > nWhich <= nEnd; } >- FASTBOOL IsInVersionsRange( USHORT nWhich ) const; >- FASTBOOL IsInStoringRange( USHORT nWhich ) const; >+ bool IsInVersionsRange( USHORT nWhich ) const; >+ bool IsInStoringRange( USHORT nWhich ) const; > void SetStoringRange( USHORT nFrom, USHORT nTo ); > void SetSecondaryPool( SfxItemPool *pPool ); > SfxItemPool* GetSecondaryPool() const { >@@ -242,8 +242,8 @@ public: > void Delete(); > > #ifdef TF_POOLABLE >- FASTBOOL IsItemFlag( USHORT nWhich, USHORT nFlag ) const; >- FASTBOOL IsItemFlag( const SfxPoolItem &rItem, USHORT nFlag ) const >+ bool IsItemFlag( USHORT nWhich, USHORT nFlag ) const; >+ bool IsItemFlag( const SfxPoolItem &rItem, USHORT nFlag ) const > { return IsItemFlag( rItem.Which(), nFlag ); } > void SetItemInfos( const SfxItemInfo *pInfos ) > { pItemInfos = pInfos; } >@@ -266,7 +266,7 @@ public: > { return _nFileFormatVersion; } > void SetFileFormatVersion( USHORT nFileFormatVersion ); > USHORT GetLoadingVersion() const; >- FASTBOOL IsCurrentVersionLoading() const; >+ bool IsCurrentVersionLoading() const; > > static int IsWhich(USHORT nId) { > return nId && nId <= SFX_WHICH_MAX; } >diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx >index 2eb7519..970e149 100644 >--- a/svl/inc/svl/itemset.hxx >+++ b/svl/inc/svl/itemset.hxx >@@ -168,9 +168,9 @@ public: > void MergeRange( USHORT nFrom, USHORT nTo ); > const SfxItemSet* GetParent() const { return _pParent; } > >- virtual SvStream & Load( SvStream &, FASTBOOL bDirect = FALSE, >+ virtual SvStream & Load( SvStream &, bool bDirect = false, > const SfxItemPool *pRefPool = 0 ); >- virtual SvStream & Store( SvStream &, FASTBOOL bDirect = FALSE ) const; >+ virtual SvStream & Store( SvStream &, bool bDirect = false ) const; > > virtual int operator==(const SfxItemSet &) const; > }; >diff --git a/svl/inc/svl/metitem.hxx b/svl/inc/svl/metitem.hxx >index 3a13fe2..669004e 100644 >--- a/svl/inc/svl/metitem.hxx >+++ b/svl/inc/svl/metitem.hxx >@@ -44,8 +44,8 @@ public: > ~SfxMetricItem() { > DBG_DTOR(SfxMetricItem, 0); } > >- virtual int ScaleMetrics( long lMult, long lDiv ); >- virtual int HasMetrics() const; >+ virtual bool ScaleMetrics( long lMult, long lDiv ); >+ virtual bool HasMetrics() const; > > }; > >diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx >index 7c22509..cc26d3d 100644 >--- a/svl/inc/svl/poolitem.hxx >+++ b/svl/inc/svl/poolitem.hxx >@@ -228,8 +228,8 @@ public: > const IntlWrapper * pIntlWrapper = 0 ) const; > > virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; >- virtual int ScaleMetrics( long lMult, long lDiv ); >- virtual int HasMetrics() const; >+ virtual bool ScaleMetrics( long lMult, long lDiv ); >+ virtual bool HasMetrics() const; > > virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; > virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); >diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx >index 4315dad..7b78ad0 100644 >--- a/svl/source/filerec/filerec.cxx >+++ b/svl/source/filerec/filerec.cxx >@@ -74,7 +74,7 @@ SV_IMPL_VARARR( SfxUINT32s, UINT32 ); > > UINT32 SfxMiniRecordWriter::Close > ( >- FASTBOOL bSeekToEndOfRec /* TRUE (default) >+ bool bSeekToEndOfRec /* TRUE (default) > Der Stream wird an das Ende des Records > positioniert. > >@@ -260,7 +260,7 @@ USHORT SfxMiniRecordReader::ScanRecordType > > //------------------------------------------------------------------------- > >-FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) >+bool SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) > > /* [Beschreibung] > >@@ -272,7 +272,7 @@ FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) > */ > > { >- FASTBOOL bRet = TRUE; >+ bool bRet = true; > > // Record-Ende und Pre-Tag aus dem Header ermitteln > _nEofRec = _pStream->Tell() + SFX_REC_OFS(nHeader); >@@ -282,7 +282,7 @@ FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) > if ( _nPreTag == SFX_REC_PRETAG_EOR ) > { > _pStream->SetError( ERRCODE_IO_WRONGFORMAT ); >- bRet = FALSE; >+ bRet = true; > } > return bRet; > } >@@ -487,7 +487,7 @@ SfxSingleRecordWriter::SfxSingleRecordWriter > > //========================================================================= > >-inline FASTBOOL SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes ) >+inline bool SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes ) > > /* [Beschreibung] > >@@ -498,13 +498,13 @@ inline FASTBOOL SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes ) > */ > > { >- FASTBOOL bRet; >+ bool bRet; > > // Basisklassen-Header einlesen > UINT32 nHeader=0; > *_pStream >> nHeader; > if ( !SetHeader_Impl( nHeader ) ) >- bRet = FALSE; >+ bRet = false; > else > { > // eigenen Header einlesen >@@ -561,7 +561,7 @@ SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream, USHORT nTag ) > > //------------------------------------------------------------------------- > >-FASTBOOL SfxSingleRecordReader::FindHeader_Impl >+bool SfxSingleRecordReader::FindHeader_Impl > ( > UINT16 nTypes, // arithm. Veroderung erlaubter Record-Typen > UINT16 nTag // zu findende Record-Art-Kennung >@@ -674,7 +674,7 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter > > //------------------------------------------------------------------------ > >-UINT32 SfxMultiFixRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) >+UINT32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec ) > > // siehe <SfxMiniRecordWriter> > >@@ -799,7 +799,7 @@ void SfxMultiVarRecordWriter::NewContent() > > //------------------------------------------------------------------------- > >-UINT32 SfxMultiVarRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) >+UINT32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec ) > > // siehe <SfxMiniRecordWriter> > >@@ -872,7 +872,7 @@ void SfxMultiMixRecordWriter::NewContent > > //========================================================================= > >-FASTBOOL SfxMultiRecordReader::ReadHeader_Impl() >+bool SfxMultiRecordReader::ReadHeader_Impl() > > /* [Beschreibung] > >@@ -963,7 +963,7 @@ SfxMultiRecordReader::~SfxMultiRecordReader() > > //------------------------------------------------------------------------- > >-FASTBOOL SfxMultiRecordReader::GetContent() >+bool SfxMultiRecordReader::GetContent() > > /* [Beschreibung] > >diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx >index 41b07ac..874ae1f 100644 >--- a/svl/source/inc/poolio.hxx >+++ b/svl/source/inc/poolio.hxx >@@ -80,8 +80,8 @@ struct SfxItemPool_Impl > USHORT nStoringStart, nStoringEnd; // zu speichernder Range > BYTE nMajorVer, nMinorVer; // Pool selbst > SfxMapUnit eDefMetric; >- FASTBOOL bInSetItem; >- FASTBOOL bStreaming; // in Load() bzw. Store() >+ bool bInSetItem; >+ bool bStreaming; // in Load() bzw. Store() > > SfxItemPool_Impl( USHORT nStart, USHORT nEnd ) > : ppPoolItems (new SfxPoolItemArray_Impl*[ nEnd - nStart + 1]) >diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx >index 93d4c1a..277b0c8 100644 >--- a/svl/source/items/intitem.cxx >+++ b/svl/source/items/intitem.cxx >@@ -239,20 +239,20 @@ SfxMetricItem::SfxMetricItem(const SfxMetricItem & rItem): > > //============================================================================ > // virtual >-int SfxMetricItem::ScaleMetrics(long nMult, long nDiv) >+bool SfxMetricItem::ScaleMetrics(long nMult, long nDiv) > { > BigInt aTheValue(GetValue()); > aTheValue *= nMult; > aTheValue += nDiv / 2; > aTheValue /= nDiv; > SetValue(aTheValue); >- return 1; >+ return true; > } > > //============================================================================ > // virtual >-int SfxMetricItem::HasMetrics() const >+bool SfxMetricItem::HasMetrics() const > { >- return 1; >+ return true; > } > >diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx >index 4c9d774..0e074f6 100644 >--- a/svl/source/items/itempool.cxx >+++ b/svl/source/items/itempool.cxx >@@ -82,7 +82,7 @@ const SfxPoolItem* SfxItemPool::GetPoolDefaultItem( USHORT nWhich ) const > > // ----------------------------------------------------------------------- > >-inline FASTBOOL SfxItemPool::IsItemFlag_Impl( USHORT nPos, USHORT nFlag ) const >+inline bool SfxItemPool::IsItemFlag_Impl( USHORT nPos, USHORT nFlag ) const > { > USHORT nItemFlag = pItemInfos[nPos]._nFlags; > return nFlag == (nItemFlag & nFlag); >@@ -90,7 +90,7 @@ inline FASTBOOL SfxItemPool::IsItemFlag_Impl( USHORT nPos, USHORT nFlag ) const > > // ----------------------------------------------------------------------- > >-FASTBOOL SfxItemPool::IsItemFlag( USHORT nWhich, USHORT nFlag ) const >+bool SfxItemPool::IsItemFlag( USHORT nWhich, USHORT nFlag ) const > { > for ( const SfxItemPool *pPool = this; pPool; pPool = pPool->pSecondary ) > { >@@ -126,7 +126,7 @@ SfxItemPool::SfxItemPool > #ifndef TF_POOLABLE > USHORT* pSlotIdArray, /* Zuordnung von Slot-Ids zu Which-Ids */ > #endif >- FASTBOOL bLoadRefCounts /* Ref-Counts mitladen oder auf 1 setzen */ >+ bool bLoadRefCounts /* Ref-Counts mitladen oder auf 1 setzen */ > ) > > /* [Beschreibung] >diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx >index 2a46c24..e864ab4 100644 >--- a/svl/source/items/itemset.cxx >+++ b/svl/source/items/itemset.cxx >@@ -1501,7 +1501,7 @@ USHORT SfxItemSet::GetWhichByPos( USHORT nPos ) const > SvStream &SfxItemSet::Store > ( > SvStream& rStream, // Zielstream f"ur normale Items >- FASTBOOL bDirect // TRUE: Items direkt speicher, FALSE: Surrogate >+ bool bDirect // TRUE: Items direkt speicher, FALSE: Surrogate > ) const > > /* [Beschreibung] >@@ -1568,7 +1568,7 @@ SvStream &SfxItemSet::Load > ( > SvStream& rStream, // Stream, aus dem geladen werden soll > >- FASTBOOL bDirect, /* TRUE >+ bool bDirect, /* 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 ac437ff..bc1b99a 100644 >--- a/svl/source/items/poolio.cxx >+++ b/svl/source/items/poolio.cxx >@@ -625,7 +625,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) > } > > // Items laden >- FASTBOOL bSecondaryLoaded = FALSE; >+ bool bSecondaryLoaded = false; > long nSecondaryEnd = 0; > { > SfxMultiRecordReader aWhichIdsRec( &rStream, SFX_ITEMPOOL_REC_WHICHIDS); >@@ -664,7 +664,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) > > // Sekund"arpool einlesen > pSecondary->Load( rStream ); >- bSecondaryLoaded = TRUE; >+ bSecondaryLoaded = true; > nSecondaryEnd = rStream.Tell(); > > // zur"uck zu unseren eigenen Items >@@ -817,7 +817,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) > // Items laden > rStream.Seek( nStartPos ); > CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_ITEMS ); >- FASTBOOL bSecondaryLoaded = FALSE; >+ bool bSecondaryLoaded = false; > long nSecondaryEnd = 0; > USHORT nWhich, nSlot; > while ( rStream >> nWhich, nWhich ) >@@ -866,7 +866,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) > > // Sekund"arpool einlesen > pSecondary->Load1_Impl( rStream ); >- bSecondaryLoaded = TRUE; >+ bSecondaryLoaded = true; > nSecondaryEnd = rStream.Tell(); > > // zur"uck zu unseren eigenen Items >@@ -1090,7 +1090,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate > // auf jeden Fall aufgel"ost werden. > if ( !pRefPool ) > pRefPool = this; >- FASTBOOL bResolvable = pRefPool->GetName().Len() > 0; >+ bool 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 > //------------------------------------------------------------------------- > > >-FASTBOOL SfxItemPool::StoreSurrogate >+bool SfxItemPool::StoreSurrogate > ( > SvStream& rStream, > const SfxPoolItem* pItem >@@ -1166,7 +1166,7 @@ FASTBOOL SfxItemPool::StoreSurrogate > > [R"uckgabewert] > >- FASTBOOL TRUE >+ bool 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 @@ FASTBOOL SfxItemPool::StoreSurrogate > { > if ( pItem ) > { >- FASTBOOL bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE); >+ bool bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE); > rStream << ( bRealSurrogate > ? GetSurrogate( pItem ) > : (UINT16) SFX_ITEMS_DIRECT ); >@@ -1227,7 +1227,7 @@ USHORT SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const > > // ----------------------------------------------------------------------- > >-FASTBOOL SfxItemPool::IsInStoringRange( USHORT nWhich ) const >+bool SfxItemPool::IsInStoringRange( USHORT nWhich ) const > { > return nWhich >= pImp->nStoringStart && > nWhich <= pImp->nStoringEnd; >@@ -1444,14 +1444,14 @@ USHORT SfxItemPool::GetNewWhich > // ----------------------------------------------------------------------- > > >-FASTBOOL SfxItemPool::IsInVersionsRange( USHORT nWhich ) const >+bool SfxItemPool::IsInVersionsRange( USHORT nWhich ) const > { > return nWhich >= pImp->nVerStart && nWhich <= pImp->nVerEnd; > } > > // ----------------------------------------------------------------------- > >-FASTBOOL SfxItemPool::IsCurrentVersionLoading() const >+bool SfxItemPool::IsCurrentVersionLoading() const > > /* [Beschreibung] > >@@ -1542,7 +1542,7 @@ USHORT SfxItemPool::GetLoadingVersion() const > > //------------------------------------------------------------------------- > >-FASTBOOL SfxItemPool::IsVer2_Impl() const >+bool SfxItemPool::IsVer2_Impl() const > { > return pMaster->pImp->nMajorVer >= 2; > } >@@ -1550,8 +1550,8 @@ FASTBOOL SfxItemPool::IsVer2_Impl() const > //------------------------------------------------------------------------- > > >-FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, >- FASTBOOL bDirect ) const >+bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, >+ bool bDirect ) const > > /* [Beschreibung] > >@@ -1576,7 +1576,7 @@ FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, > > [Querverweise] > >- <SfxItemPool::LoadItem(SvStream&,FASTBOOL)const> >+ <SfxItemPool::LoadItem(SvStream&,bool)const> > */ > > { >@@ -1616,7 +1616,7 @@ FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, > //------------------------------------------------------------------------- > > >-const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, FASTBOOL bDirect, >+const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect, > const SfxItemPool *pRefPool ) > > // pRefPool==-1 => nicht putten! >@@ -1649,7 +1649,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, FASTBOOL bDirect, > } > > // wird eine andere Version geladen? >- FASTBOOL bCurVersion = pRefPool->IsCurrentVersionLoading(); >+ bool bCurVersion = pRefPool->IsCurrentVersionLoading(); > if ( !bCurVersion ) > // Which-Id auf neue Version mappen > nWhich = pRefPool->GetNewWhich( nWhich ); >diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx >index 12828ac..319cd1c 100644 >--- a/svl/source/items/poolitem.cxx >+++ b/svl/source/items/poolitem.cxx >@@ -477,15 +477,15 @@ SfxItemHandle::~SfxItemHandle() > } > > // ------------------------------------------------------------------------ >-int SfxPoolItem::ScaleMetrics( long /*lMult*/, long /*lDiv*/ ) >+bool SfxPoolItem::ScaleMetrics( long /*lMult*/, long /*lDiv*/ ) > { >- return 0; >+ return false; > } > > // ------------------------------------------------------------------------ >-int SfxPoolItem::HasMetrics() const >+bool SfxPoolItem::HasMetrics() const > { >- return 0; >+ return false; > } > > // ----------------------------------------------------------------------- >diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx >index 28e4dd9..b635390 100644 >--- a/svtools/inc/svtools/parhtml.hxx >+++ b/svtools/inc/svtools/parhtml.hxx >@@ -256,7 +256,7 @@ public: > // Mit Ausnahme des Falls, dass SwitchToUCS2==FALSE und > // SVPAR_CS_DONTKNOW uebergeben wird muss der String mit zwei(!) > // 0-Bytes an einer geraden(!) Position terminiert sein. >- static FASTBOOL IsHTMLFormat( const sal_Char* pHeader, >+ static bool IsHTMLFormat( const sal_Char* pHeader, > BOOL bSwitchToUCS2 = FALSE, > rtl_TextEncoding eEnc=RTL_TEXTENCODING_DONTKNOW ); > >diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx >index cad4115..9f5b7f6 100644 >--- a/svtools/source/brwbox/datwin.hxx >+++ b/svtools/source/brwbox/datwin.hxx >@@ -133,21 +133,21 @@ public: > String aRealRowCount; // zur Anzeige im VScrollBar > > RectangleList aInvalidRegion; // invalidated Rectangles during !UpdateMode >- FASTBOOL bInPaint; // TRUE while in Paint >- FASTBOOL bInCommand; // TRUE while in Command >- FASTBOOL bNoScrollBack; // nur vorwaerts scrollen >- FASTBOOL bNoHScroll; // kein horizontaler Scrollbar >- FASTBOOL bNoVScroll; // no vertical scrollbar >- FASTBOOL bAutoHScroll; // autohide horizontaler Scrollbar >- FASTBOOL bAutoVScroll; // autohide horizontaler Scrollbar >- FASTBOOL bUpdateMode; // nicht SV-UpdateMode wegen Invalidate() >- FASTBOOL bAutoSizeLastCol;// last column always fills up window >- FASTBOOL bResizeOnPaint; // outstanding resize-event >- FASTBOOL bUpdateOnUnlock; // Update() while locked >- FASTBOOL bInUpdateScrollbars; // Rekursionsschutz >- FASTBOOL bHadRecursion; // Rekursion war aufgetreten >- FASTBOOL bOwnDataChangedHdl; // dont change colors in DataChanged >- FASTBOOL bCallingDropCallback; // we're in a callback to AcceptDrop or ExecuteDrop curently >+ bool bInPaint; // TRUE while in Paint >+ bool bInCommand; // TRUE while in Command >+ bool bNoScrollBack; // nur vorwaerts scrollen >+ bool bNoHScroll; // kein horizontaler Scrollbar >+ bool bNoVScroll; // no vertical scrollbar >+ bool bAutoHScroll; // autohide horizontaler Scrollbar >+ bool bAutoVScroll; // autohide horizontaler Scrollbar >+ bool bUpdateMode; // nicht SV-UpdateMode wegen Invalidate() >+ bool bAutoSizeLastCol; // last column always fills up window >+ bool bResizeOnPaint; // outstanding resize-event >+ bool bUpdateOnUnlock; // Update() while locked >+ bool bInUpdateScrollbars; // Rekursionsschutz >+ bool bHadRecursion; // Rekursion war aufgetreten >+ bool bOwnDataChangedHdl; // dont change colors in DataChanged >+ bool bCallingDropCallback; // we're in a callback to AcceptDrop or ExecuteDrop curently > USHORT nUpdateLock; // lock count, dont call Control::Update()! > short nCursorHidden; // new conuter for DoHide/ShowCursor > >@@ -185,7 +185,7 @@ public: > const String& GetRealRowCount() const { return aRealRowCount; } > > void SetUpdateMode( BOOL bMode ); >- FASTBOOL GetUpdateMode() const { return bUpdateMode; } >+ bool GetUpdateMode() const { return bUpdateMode; } > void EnterUpdateLock() { ++nUpdateLock; } > void LeaveUpdateLock(); > void Update(); >diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx >index e5cb275..c9aed07 100644 >--- a/svtools/source/svhtml/parhtml.cxx >+++ b/svtools/source/svhtml/parhtml.cxx >@@ -1904,9 +1904,9 @@ int HTMLParser::FilterListing( int nToken ) > return nToken; > } > >-FASTBOOL HTMLParser::IsHTMLFormat( const sal_Char* pHeader, >- BOOL bSwitchToUCS2, >- rtl_TextEncoding eEnc ) >+bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader, >+ BOOL bSwitchToUCS2, >+ rtl_TextEncoding eEnc ) > { > // Einer der folgenden regulaeren Ausdrucke muss sich auf den String > // anwenden lassen, damit das Dok ein HTML-Dokument ist. >-- >1.7.1 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=39209">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 30642
:
39203
|
39204
|
39205
|
39206
|
39207
|
39208
| 39209 |
39210
|
39211