diff options
-rw-r--r-- | sw/inc/crsrsh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/dcontact.hxx | 6 | ||||
-rw-r--r-- | sw/inc/drawdoc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swerror.h | 4 | ||||
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/draw/drawdoc.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/dflyobj.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/table/swtable.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/view.hxx | 2 | ||||
-rw-r--r-- | 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 22cb3613502e..02bc0fcacd27 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<SwCrsrShell*>(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 5406fb042e95..70b38b23e3d4 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 19d6bd4a679a..4b07327a2556 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -44,7 +44,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 fa7e03f3a381..af457a2de9b0 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 766c3ca86377..a35e7470b521 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2667,7 +2667,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(); @@ -2712,7 +2712,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) { @@ -2803,7 +2803,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 75111933e0ec..b518c31ed8fd 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 dc5073a2676f..5f42126a157a 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -156,7 +156,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 47e8fb700809..090af9b1ab0c 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 48b3b5f335fb..30d0bceb8e53 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 17069743c583..a6202387d319 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 04a4a469ba03..3c774d615a89 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -1628,7 +1628,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(); |