diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-11-18 18:55:47 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-11-18 22:24:21 +0100 |
| commit | 986ac894f4288fcbde35771793f332c5981abc27 (patch) | |
| tree | 861b92291709bae1e7a3ed4cd6423f434aae9fde | |
| parent | eedfbf5b8b99049753f444ea71e0944a69dbc60c (diff) | |
SwSectionFrm: s/sal_Bool/bool/
| -rw-r--r-- | sw/source/core/inc/sectfrm.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 7966b8ef765f..bc16e528915a 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -60,7 +60,7 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm void CalcFtnAtEndFlag(); void CalcEndAtEndFlag(); const SwSectionFmt* _GetEndSectFmt() const; - sal_Bool IsEndnoteAtMyEnd() const; + bool IsEndnoteAtMyEnd() const; protected: virtual void MakeAll(); virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool bHead, sal_Bool &rReformat ); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 5091d5ffc107..6f568f4dca15 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -2369,7 +2369,7 @@ void SwSectionFrm::CalcFtnAtEndFlag() } } -sal_Bool SwSectionFrm::IsEndnoteAtMyEnd() const +bool SwSectionFrm::IsEndnoteAtMyEnd() const { return pSection->GetFmt()->GetEndAtTxtEnd( sal_False ).IsAtEnd(); } @@ -2469,13 +2469,13 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew } while ( pTmp ); aCol.Init( nCol, 0, 1000 ); } - sal_Bool bChgFtn = IsFtnAtEnd(); - sal_Bool bChgEndn = IsEndnAtEnd(); - sal_Bool bChgMyEndn = IsEndnoteAtMyEnd(); + bool bChgFtn = IsFtnAtEnd(); + bool const bChgEndn = IsEndnAtEnd(); + bool const bChgMyEndn = IsEndnoteAtMyEnd(); CalcFtnAtEndFlag(); CalcEndAtEndFlag(); - bChgFtn = ( bChgFtn != (sal_Bool) IsFtnAtEnd() ) || - ( bChgEndn != (sal_Bool) IsEndnAtEnd() ) || + bChgFtn = ( bChgFtn != IsFtnAtEnd() ) || + ( bChgEndn != IsEndnAtEnd() ) || ( bChgMyEndn != IsEndnoteAtMyEnd() ); ChgColumns( aCol, rNewCol, bChgFtn ); rInvFlags |= 0x10; @@ -2496,9 +2496,9 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew case RES_FTN_AT_TXTEND: if( !IsInFtn() ) { - sal_Bool bOld = IsFtnAtEnd(); + bool const bOld = IsFtnAtEnd(); CalcFtnAtEndFlag(); - if( bOld != (sal_Bool) IsFtnAtEnd() ) + if (bOld != IsFtnAtEnd()) { const SwFmtCol& rNewCol = GetFmt()->GetCol(); ChgColumns( rNewCol, rNewCol, sal_True ); @@ -2510,10 +2510,10 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew case RES_END_AT_TXTEND: if( !IsInFtn() ) { - sal_Bool bOld = IsEndnAtEnd(); - sal_Bool bMyOld = IsEndnoteAtMyEnd(); + bool const bOld = IsEndnAtEnd(); + bool const bMyOld = IsEndnoteAtMyEnd(); CalcEndAtEndFlag(); - if( bOld != (sal_Bool) IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd()) + if (bOld != IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd()) { const SwFmtCol& rNewCol = GetFmt()->GetCol(); ChgColumns( rNewCol, rNewCol, sal_True ); |