diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 15:27:47 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 15:30:56 +0200 |
commit | 591c3192275f0ac06227da09bb89179d42deddaa (patch) | |
tree | f1def7bd265fee15c298b8b573661d32b040ad08 /framework | |
parent | 232d37b25e175c7a593c4ea22b0b22fe5ffe56e8 (diff) |
More loplugin:simplifybool
Change-Id: If173ec26ed53cf99fd23f0930eaeefc595a05722
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/classes/filtercachedata.hxx | 7 | ||||
-rw-r--r-- | framework/source/dispatch/menudispatcher.cxx | 2 | ||||
-rw-r--r-- | framework/source/dispatch/popupmenudispatcher.cxx | 2 | ||||
-rw-r--r-- | framework/source/helper/oframes.cxx | 2 | ||||
-rw-r--r-- | framework/source/loadenv/loadenv.cxx | 14 |
5 files changed, 12 insertions, 15 deletions
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index d141652c45b8..60a579edb1c5 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -390,16 +390,13 @@ class PerformanceHash : public std::unordered_map< OUString ++pStepper; } - while( - ( pStepper != end() ) && - ( bFound == false ) - ) + while( pStepper != end() && !bFound ) { bFound = Wildcard::match( sSearchValue, pStepper->first ); // If element was found - break loop by setting right return value // and don't change "pStepper". He must point to found element! // Otherwise step to next one. - if( bFound == false ) + if( !bFound ) ++pStepper; } return bFound; diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 0762c747212e..58b373f6ee4c 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -163,7 +163,7 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce // Safe impossible cases SAL_WARN_IF( m_bAlreadyDisposed, "fwk", "MenuDispatcher::disposing(): Object already disposed .. don't call it again!" ); - if( m_bAlreadyDisposed == false ) + if( !m_bAlreadyDisposed ) { m_bAlreadyDisposed = true; diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index ec2724a5472d..388ff0178bbc 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -282,7 +282,7 @@ void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( Runtim // Safe impossible cases SAL_WARN_IF( m_bAlreadyDisposed, "fwk", "MenuDispatcher::disposing(): Object already disposed .. don't call it again!" ); - if( m_bAlreadyDisposed == false ) + if( !m_bAlreadyDisposed ) { m_bAlreadyDisposed = true; diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index e79593a77fe5..e39ce2a322bf 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -120,7 +120,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int if ( xOwner.is() ) { // Work only, if search was not started here ...! - if( m_bRecursiveSearchProtection == false ) + if( !m_bRecursiveSearchProtection ) { // This class is a helper for services, which must implement XFrames. // His parent and children are MY parent and children to. diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 270833b94b51..42619711ad5a 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -282,8 +282,8 @@ void LoadEnv::initializeLoading(const OUString& // UI mode const bool bUIMode = ( ( m_eFeature & E_WORK_WITH_UI ) == E_WORK_WITH_UI ) && - ( m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_HIDDEN(), false ) == false ) && - ( m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_PREVIEW(), false ) == false ); + !m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_HIDDEN(), false ) && + !m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_PREVIEW(), false ); initializeUIDefaults( m_xContext, @@ -1241,9 +1241,9 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() // or better its not allowed for some requests in general :-) if ( ( ! TargetHelper::matchSpecialTarget(m_sTarget, TargetHelper::E_DEFAULT) ) || - (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , false) == true) || + m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , false) || // (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN() , false) == sal_True) || - (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), false) == true) + m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), false) ) { return css::uno::Reference< css::frame::XFrame >(); @@ -1396,7 +1396,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() // It doesn't matter if somewhere wants to create a new view // or open a new untitled document ... // The only exception form that - hidden frames! - if (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), false) == true) + if (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), false)) return css::uno::Reference< css::frame::XFrame >(); css::uno::Reference< css::frame::XFramesSupplier > xSupplier( css::frame::Desktop::create( m_xContext ), css::uno::UNO_QUERY); @@ -1413,8 +1413,8 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() // These states indicates a wish for creation of a new view in general. if ( - (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , false) == true) || - (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), false) == true) + m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , false) || + m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), false) ) { return css::uno::Reference< css::frame::XFrame >(); |