diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 12:34:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 12:36:29 +0200 |
| commit | e710c1dbfb87a54d666752db1106b76e9e05ba43 (patch) | |
| tree | 26d4a229f6dff683bb7e72afc8cdbc8d6f4d7c76 /toolkit/source/helper | |
| parent | 746a717ed4648cd6c0d0d810a90a6539373b130c (diff) | |
loplugin:simplifybool
Change-Id: Ib238714477fdeadad07c470e1d9ed64b2b18f25d
Diffstat (limited to 'toolkit/source/helper')
| -rw-r--r-- | toolkit/source/helper/property.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/helper/unopropertyarrayhelper.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/helper/unowrapper.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index e1144e463b4f..b71916d20b71 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -385,7 +385,7 @@ bool DoesDependOnOthers( sal_uInt16 nPropertyId ) { const ImplPropertyInfo* pImplPropertyInfo = ImplGetImplPropertyInfo( nPropertyId ); DBG_ASSERT( pImplPropertyInfo, "Invalid PropertyId!" ); - return pImplPropertyInfo ? pImplPropertyInfo->bDependsOnOthers : false; + return pImplPropertyInfo && pImplPropertyInfo->bDependsOnOthers; } bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index d8658952590a..c1c3c6a2c162 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -46,7 +46,7 @@ bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) nPropId = BASEPROPERTY_FONTDESCRIPTOR; - return maIDs.find( nPropId ) != maIDs.end() ? true : false; + return maIDs.find( nPropId ) != maIDs.end(); } // ::cppu::IPropertyArrayHelper diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 5cdcbfe0e120..3681847a26f9 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -212,7 +212,7 @@ static bool lcl_ImplIsParent( vcl::Window* pParentWindow, vcl::Window* pPossible while ( pWindow && ( pWindow != pParentWindow ) ) pWindow = pWindow->GetParent(); - return pWindow ? true : false; + return pWindow != nullptr; } void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) |