diff options
-rw-r--r-- | framework/source/helper/ocomponentenumeration.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 260c96330bb6..dce0ead90d00 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -79,7 +79,7 @@ Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementExcepti SolarMutexGuard g; // If we have no elements or end of enumeration is arrived ... - if ( hasMoreElements() == sal_False ) + if ( !hasMoreElements() ) { // .. throw an exception! throw NoSuchElementException(); diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index a3f7bd700584..92c4ff3d562e 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -733,10 +733,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra // If last active frame was active ... // but new one is not it ... // ... set it as active one. - if ( - ( eActiveState == E_ACTIVE ) && - ( xFrame->isActive() == sal_False ) - ) + if ( eActiveState == E_ACTIVE && !xFrame->isActive() ) { xFrame->activate(); } |