From cc9b349213382b2d93369c079b2c604ac64b0613 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Tue, 5 Oct 2010 07:57:55 -0500 Subject: [PATCH] FASTBOOL to bool conversion --- sw/inc/crsrsh.hxx | 2 +- sw/inc/dcontact.hxx | 6 +++--- sw/inc/drawdoc.hxx | 2 +- sw/inc/swerror.h | 4 ++-- sw/source/core/draw/dcontact.cxx | 6 +++--- sw/source/core/draw/dflyobj.cxx | 2 +- sw/source/core/draw/drawdoc.cxx | 2 +- sw/source/core/inc/dflyobj.hxx | 2 +- sw/source/core/table/swtable.cxx | 4 ++-- sw/source/ui/inc/view.hxx | 2 +- sw/source/ui/uiview/view.cxx | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 951f673..ea07070 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -667,7 +667,7 @@ public: const SwShellCrsr* getShellCrsr( bool bBlock ) const { return (const_cast(this))->getShellCrsr( bBlock ); } - FASTBOOL IsBlockMode() const { return 0 != pBlockCrsr; } + bool IsBlockMode() const { return 0 != pBlockCrsr; } const IBlockCursor* GetBlockCrsr() const { return pBlockCrsr; } IBlockCursor* GetBlockCrsr() { return pBlockCrsr; } diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 9415f14..d6bc6e9 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -351,12 +351,12 @@ class SwDrawVirtObj : public SdrVirtObj virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void RecalcSnapRect(); virtual const Rectangle& GetSnapRect() const; virtual void SetSnapRect(const Rectangle& rRect); @@ -369,7 +369,7 @@ class SwDrawVirtObj : public SdrVirtObj virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); // #108784# - virtual FASTBOOL HasTextEdit() const; + virtual bool HasTextEdit() const; // OD 17.06.2003 #108784# - overload 'layer' methods virtual SdrLayerID GetLayer() const; diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index cf2336e..f868e58 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -46,7 +46,7 @@ public: const SwDoc& GetDoc() const { return *pDoc; } SwDoc& GetDoc() { return *pDoc; } - virtual SdrPage* AllocPage(FASTBOOL bMasterPage); + virtual SdrPage* AllocPage(bool bMasterPage); // fuers "load on demand" von Grafiken im DrawingLayer virtual SvStream* GetDocumentStream( SdrDocumentStreamInfo& rInfo ) const; diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h index 78184a3..6be90ef 100644 --- a/sw/inc/swerror.h +++ b/sw/inc/swerror.h @@ -95,12 +95,12 @@ #ifndef __RSC -inline FASTBOOL IsWarning( ULONG nErr ) +inline bool IsWarning( ULONG nErr ) { return 0 != ( nErr & ERRCODE_WARNING_MASK & nErr ); } -inline FASTBOOL IsError( ULONG nErr ) +inline bool IsError( ULONG nErr ) { return nErr && 0 == ( ERRCODE_WARNING_MASK & nErr ); } diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 6079825..6c3a0a7 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2638,7 +2638,7 @@ void SwDrawVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2) SetRectsDirty(); } -void SwDrawVirtObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SwDrawVirtObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { rRefObj.NbcShear(rRef - GetOffset(), nWink, tn, bVShear); SetRectsDirty(); @@ -2683,7 +2683,7 @@ void SwDrawVirtObj::Mirror(const Point& rRef1, const Point& rRef2) SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0); } -void SwDrawVirtObj::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SwDrawVirtObj::Shear(const Point& rRef, long nWink, double tn, bool bVShear) { if(nWink) { @@ -2774,7 +2774,7 @@ void SwDrawVirtObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i) } // #108784# -FASTBOOL SwDrawVirtObj::HasTextEdit() const +bool SwDrawVirtObj::HasTextEdit() const { return rRefObj.HasTextEdit(); } diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index b5a446c..8e30ff6 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -904,7 +904,7 @@ Pointer __EXPORT SwVirtFlyDrawObj::GetMacroPointer( } -FASTBOOL __EXPORT SwVirtFlyDrawObj::HasMacro() const +bool __EXPORT SwVirtFlyDrawObj::HasMacro() const { const SwFmtURL &rURL = pFlyFrm->GetFmt()->GetURL(); return rURL.GetMap() || rURL.GetURL().Len(); diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index af81b9d..1278074 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -160,7 +160,7 @@ SwDrawDocument::~SwDrawDocument() \************************************************************************/ -SdrPage* SwDrawDocument::AllocPage(FASTBOOL bMasterPage) +SdrPage* SwDrawDocument::AllocPage(bool bMasterPage) { SwDPage* pPage = new SwDPage(*this, 0 != bMasterPage); pPage->SetName( String::CreateFromAscii( diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 6cd65bf..f8b759d 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -127,7 +127,7 @@ public: void SetRect() const; // ist eine URL an einer Grafik gesetzt, dann ist das ein Makro-Object - virtual FASTBOOL HasMacro() const; + virtual bool HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 2ede651..81b7566 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -475,7 +475,7 @@ void lcl_RefreshHidden( SwTabCols &rToFill, USHORT nPos ) void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox, const SwFrmFmt *pTabFmt, const BOOL bHidden, - const FASTBOOL bRefreshHidden ) + const bool bRefreshHidden ) { const long nWish = pTabFmt->GetFrmSize().GetWidth(); const long nAct = rToFill.GetRight() - rToFill.GetLeft(); // +1 why? @@ -578,7 +578,7 @@ void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox, } void lcl_ProcessBoxGet( const SwTableBox *pBox, SwTabCols &rToFill, - const SwFrmFmt *pTabFmt, FASTBOOL bRefreshHidden ) + const SwFrmFmt *pTabFmt, bool bRefreshHidden ) { if ( pBox->GetTabLines().Count() ) { diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 08e27ac..21b52c8 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -422,7 +422,7 @@ public: void GotFocus() const; virtual SdrView* GetDrawView() const; virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); - virtual void ShowCursor( FASTBOOL bOn = TRUE ); + virtual void ShowCursor( bool bOn = TRUE ); virtual ErrCode DoVerb( long nVerb ); virtual USHORT SetPrinter( SfxPrinter* pNew, diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 0e3d55e..59ecf1d 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -1629,7 +1629,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe -void SwView::ShowCursor( FASTBOOL bOn ) +void SwView::ShowCursor( bool bOn ) { //JP 10.10.2001: Bug 90461 - don't scroll the cursor into the visible area BOOL bUnlockView = !pWrtShell->IsViewLocked(); -- 1.7.1