diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-25 15:48:51 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-25 17:21:38 +0300 |
| commit | 6047d5952dc119cd2de3f9b2d6c556e8bfd8fcac (patch) | |
| tree | e5e027d52e8487abdb59dc99d6311ca73b9805ef | |
| parent | ec1531b327122093c6032063c5cc789d4df4d06f (diff) | |
WaE: unsafe mix of type 'bool' and type 'sal_Bool' in operation
| -rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 6879add25435..5091d5ffc107 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -2474,8 +2474,8 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew sal_Bool bChgMyEndn = IsEndnoteAtMyEnd(); CalcFtnAtEndFlag(); CalcEndAtEndFlag(); - bChgFtn = ( bChgFtn != IsFtnAtEnd() ) || - ( bChgEndn != IsEndnAtEnd() ) || + bChgFtn = ( bChgFtn != (sal_Bool) IsFtnAtEnd() ) || + ( bChgEndn != (sal_Bool) IsEndnAtEnd() ) || ( bChgMyEndn != IsEndnoteAtMyEnd() ); ChgColumns( aCol, rNewCol, bChgFtn ); rInvFlags |= 0x10; @@ -2498,7 +2498,7 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew { sal_Bool bOld = IsFtnAtEnd(); CalcFtnAtEndFlag(); - if( bOld != IsFtnAtEnd() ) + if( bOld != (sal_Bool) IsFtnAtEnd() ) { const SwFmtCol& rNewCol = GetFmt()->GetCol(); ChgColumns( rNewCol, rNewCol, sal_True ); @@ -2513,7 +2513,7 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew sal_Bool bOld = IsEndnAtEnd(); sal_Bool bMyOld = IsEndnoteAtMyEnd(); CalcEndAtEndFlag(); - if( bOld != IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd()) + if( bOld != (sal_Bool) IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd()) { const SwFmtCol& rNewCol = GetFmt()->GetCol(); ChgColumns( rNewCol, rNewCol, sal_True ); |