diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/property.hxx | 2 | ||||
| -rw-r--r-- | include/comphelper/stl_types.hxx | 4 | ||||
| -rw-r--r-- | include/svl/urlfilter.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/bmpacc.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/image.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/keycod.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/textdata.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/timer.hxx | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx index 5dc53bc33ac0..fd7ed830b8d3 100644 --- a/include/comphelper/property.hxx +++ b/include/comphelper/property.hxx @@ -48,7 +48,7 @@ namespace comphelper { bool operator() (const ::com::sun::star::beans::Property& x, const ::com::sun::star::beans::Property& y) const { - return x.Name.compareTo(y.Name) < 0;// ? true : false; + return x.Name.compareTo(y.Name) < 0; } }; diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index 28f3a14ad6a6..b9bfbe3778b7 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -49,9 +49,9 @@ public: bool operator() (const OUString& x, const OUString& y) const { if (m_bCaseSensitive) - return rtl_ustr_compare(x.getStr(), y.getStr()) < 0 ? true : false; + return rtl_ustr_compare(x.getStr(), y.getStr()) < 0; else - return rtl_ustr_compareIgnoreAsciiCase(x.getStr(), y.getStr()) < 0 ? true : false; + return rtl_ustr_compareIgnoreAsciiCase(x.getStr(), y.getStr()) < 0; } bool isCaseSensitive() const {return m_bCaseSensitive;} diff --git a/include/svl/urlfilter.hxx b/include/svl/urlfilter.hxx index e8065fa8fae1..c607dd32c711 100644 --- a/include/svl/urlfilter.hxx +++ b/include/svl/urlfilter.hxx @@ -33,7 +33,7 @@ public: bool operator()( const WildCard& _rMatcher ) { - return _rMatcher.Matches( m_rCompareString ) ? true : false; + return _rMatcher.Matches( m_rCompareString ); } static void createWildCardFilterList(const OUString& _rFilterList,::std::vector< WildCard >& _rFilters); diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx index e96f49c02d5f..153464faabd9 100644 --- a/include/vcl/bmpacc.hxx +++ b/include/vcl/bmpacc.hxx @@ -254,7 +254,7 @@ inline Point BitmapReadAccess::BottomRight() const inline bool BitmapReadAccess::IsTopDown() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); - return( mpBuffer ? sal::static_int_cast<bool>( BMP_SCANLINE_ADJUSTMENT( mpBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) : false ); + return mpBuffer && ( BMP_SCANLINE_ADJUSTMENT( mpBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ); } diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index fb618d1a21d7..82f53a2d94c9 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -68,7 +68,7 @@ public: Image GetColorTransformedImage( ImageColorTransform eColorTransform ) const; - bool operator!() const { return( !mpImplData ? true : false ); } + bool operator!() const { return !mpImplData; } Image& operator=( const Image& rImage ); bool operator==( const Image& rImage ) const; bool operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); } diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 4029c30bc618..20e80cf02eae 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -67,7 +67,7 @@ public: OUString GetName( Window* pWindow = NULL ) const; bool IsFunction() const - { return ((eFunc != KEYFUNC_DONTKNOW) ? true : false); } + { return (eFunc != KEYFUNC_DONTKNOW); } KeyFuncType GetFunction() const; diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx index 1f475878a01e..8fbc62fd8146 100644 --- a/include/vcl/textdata.hxx +++ b/include/vcl/textdata.hxx @@ -52,7 +52,7 @@ public: inline bool TextPaM::operator == ( const TextPaM& rPaM ) const { - return ( ( mnPara == rPaM.mnPara ) && ( mnIndex == rPaM.mnIndex ) ) ? true : false; + return ( mnPara == rPaM.mnPara ) && ( mnIndex == rPaM.mnIndex ); } inline bool TextPaM::operator != ( const TextPaM& rPaM ) const @@ -62,14 +62,14 @@ inline bool TextPaM::operator != ( const TextPaM& rPaM ) const inline bool TextPaM::operator < ( const TextPaM& rPaM ) const { - return ( ( mnPara < rPaM.mnPara ) || - ( ( mnPara == rPaM.mnPara ) && mnIndex < rPaM.mnIndex ) ) ? true : false; + return ( mnPara < rPaM.mnPara ) || + ( ( mnPara == rPaM.mnPara ) && mnIndex < rPaM.mnIndex ); } inline bool TextPaM::operator > ( const TextPaM& rPaM ) const { - return ( ( mnPara > rPaM.mnPara ) || - ( ( mnPara == rPaM.mnPara ) && mnIndex > rPaM.mnIndex ) ) ? true : false; + return ( mnPara > rPaM.mnPara ) || + ( ( mnPara == rPaM.mnPara ) && mnIndex > rPaM.mnIndex ); } class VCL_DLLPUBLIC TextSelection diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 91db8cb0a3b5..665978076727 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -49,7 +49,7 @@ public: /// set the timeout in milliseconds void SetTimeout( sal_uLong nTimeoutMs ); sal_uLong GetTimeout() const { return mnTimeout; } - bool IsActive() const { return mbActive ? true : false; } + bool IsActive() const { return mbActive; } void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; } const Link& GetTimeoutHdl() const { return maTimeoutHdl; } |