diff options
| -rw-r--r-- | i18npool/source/localedata/filewriter.cxx | 2 | ||||
| -rw-r--r-- | include/connectivity/FValue.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/inc/frame.hxx | 16 | ||||
| -rw-r--r-- | sw/source/core/layout/findfrm.cxx | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx index 19b2558a7ec0..9c301448f9f1 100644 --- a/i18npool/source/localedata/filewriter.cxx +++ b/i18npool/source/localedata/filewriter.cxx @@ -133,7 +133,7 @@ void OFileWriter::writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 c bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const { - bool bBool = (str == "true" ? 1 : 0); + bool bBool = str == "true"; fprintf(m_f,"static const sal_Unicode default%s%d[] = {%d};\n", pAsciiStr, count, bBool); return bBool; } diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 787785d8199d..db1b28931217 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -372,10 +372,10 @@ namespace connectivity } bool isBound() const { return m_bBound; } - void setBound(bool _bBound) { m_bBound = _bBound ? 1 : 0; } + void setBound(bool _bBound) { m_bBound = _bBound; } bool isModified() const { return m_bModified; } - void setModified(bool _bMod=true) { m_bModified = _bMod ? 1 : 0; } + void setModified(bool _bMod=true) { m_bModified = _bMod; } bool isSigned() const { return m_bSigned; } void setSigned(bool _bSig=true); diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 8e6bd09bb814..0433e7e1072c 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -549,21 +549,21 @@ public: bool IsInBalancedSection() const; inline bool IsReverse() const { return mbReverse; } - inline void SetReverse( bool bNew ){ mbReverse = bNew ? 1 : 0; } + inline void SetReverse( bool bNew ){ mbReverse; } inline bool IsVertical() const; inline bool IsVertLR() const; inline bool GetVerticalFlag() const { return mbVertical; } - inline void SetVertical( bool bNew ){ mbVertical = bNew ? 1 : 0; } + inline void SetVertical( bool bNew ){ mbVertical; } - inline void SetbVertLR( bool bNew ) { mbVertLR = bNew ? 1 : 0; } - inline void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew ? 1 : 0; } - inline void SetInvalidVert( bool bNew) { mbInvalidVert = bNew ? 1 : 0; } + inline void SetbVertLR( bool bNew ) { mbVertLR = bNew; } + inline void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew; } + inline void SetInvalidVert( bool bNew) { mbInvalidVert = bNew; } inline bool IsRightToLeft() const; inline bool GetRightToLeftFlag() const { return mbRightToLeft; } - inline void SetRightToLeft( bool bNew ){ mbRightToLeft = bNew ? 1 : 0; } - inline void SetDerivedR2L( bool bNew ) { mbDerivedR2L = bNew ? 1 : 0; } - inline void SetInvalidR2L( bool bNew ) { mbInvalidR2L = bNew ? 1 : 0; } + inline void SetRightToLeft( bool bNew ){ mbRightToLeft = bNew; } + inline void SetDerivedR2L( bool bNew ) { mbDerivedR2L = bNew; } + inline void SetInvalidR2L( bool bNew ) { mbInvalidR2L = bNew; } void CheckDirChange(); // returns upper left frame position for LTR and diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index f712fd0c6c60..b6c9b0018eed 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -1310,10 +1310,10 @@ void SwFrm::SetDirFlags( bool bVert ) if( pAsk ) { - mbVertical = pAsk->IsVertical() ? 1 : 0; - mbReverse = pAsk->IsReverse() ? 1 : 0; + mbVertical = pAsk->IsVertical(); + mbReverse = pAsk->IsReverse(); - mbVertLR = pAsk->IsVertLR() ? 1 : 0; + mbVertLR = pAsk->IsVertLR(); if ( !pAsk->mbInvalidVert ) mbInvalidVert = false; @@ -1335,7 +1335,7 @@ void SwFrm::SetDirFlags( bool bVert ) OSL_ENSURE( pAsk != this, "Oops! Stack overflow is about to happen" ); if( pAsk ) - mbRightToLeft = pAsk->IsRightToLeft() ? 1 : 0; + mbRightToLeft = pAsk->IsRightToLeft(); if( !pAsk || pAsk->mbInvalidR2L ) bInv = mbInvalidR2L; } |