diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-05 07:57:51 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-07 19:06:03 -0500 |
| commit | 118323a96c21135d553bf7fc1ccc5337868e835d (patch) | |
| tree | 882c2f78093e38a50b553c195a268b1d63d3af1f /sd/inc | |
| parent | 2bbe25827196f104285db69a6fe12adb0f28c036 (diff) | |
FASTBOOL to bool conversion
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/drawdoc.hxx | 8 | ||||
| -rw-r--r-- | sd/inc/pglink.hxx | 2 | ||||
| -rw-r--r-- | sd/inc/sderror.hxx | 4 | ||||
| -rw-r--r-- | sd/inc/sdpage.hxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 6811da762934..a9ec76dd47d3 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -224,10 +224,10 @@ public: ~SdDrawDocument(); virtual SdrModel* AllocModel() const; - virtual SdrPage* AllocPage(FASTBOOL bMasterPage); + virtual SdrPage* AllocPage(bool bMasterPage); virtual const SdrModel* LoadModel(const String& rFileName); virtual void DisposeLoadedModels(); - virtual FASTBOOL IsReadOnly() const; + virtual bool IsReadOnly() const; virtual void SetChanged(sal_Bool bFlag = sal_True); virtual SvStream* GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const; @@ -449,8 +449,8 @@ public: void Merge(SdrModel& rSourceModel, USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF, USHORT nDestPos=0xFFFF, - FASTBOOL bMergeMasterPages=FALSE, FASTBOOL bAllMasterPages=FALSE, - FASTBOOL bUndo=TRUE, FASTBOOL bTreadSourceAsConst=FALSE); + bool bMergeMasterPages = false, bool bAllMasterPages = false, + bool bUndo = true, bool bTreadSourceAsConst = false); SD_DLLPUBLIC ::com::sun::star::text::WritingMode GetDefaultWritingMode() const; void SetDefaultWritingMode( ::com::sun::star::text::WritingMode eMode ); diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx index 8f8eff565d42..00c3e4e9aa08 100644 --- a/sd/inc/pglink.hxx +++ b/sd/inc/pglink.hxx @@ -47,7 +47,7 @@ public: virtual void Closed(); virtual void DataChanged( const String& , const ::com::sun::star::uno::Any & ); - FASTBOOL Connect() { return 0 != SvBaseLink::GetRealObject(); } + bool Connect() { return 0 != SvBaseLink::GetRealObject(); } }; #else diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx index 2564584cb3eb..ee2908027e51 100644 --- a/sd/inc/sderror.hxx +++ b/sd/inc/sderror.hxx @@ -49,12 +49,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/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 3999b220a1f3..bb68811687f3 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -184,7 +184,7 @@ public: virtual void SetUppBorder(INT32 nBorder); virtual void SetLwrBorder(INT32 nBorder); virtual void SetModel(SdrModel* pNewModel); - virtual FASTBOOL IsReadOnly() const; + virtual bool IsReadOnly() const; sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; } |