diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-21 21:55:11 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 08:22:33 +0100 |
commit | 0e5c7d0b5bdf0f20e67b3ed65a4199107e58bffa (patch) | |
tree | a7192e24db6afb5506e2a179b368608daab255d7 /desktop | |
parent | 9e1ec4df0bb2f894333ef63f596b08e9ff79bdba (diff) |
bool improvements
Change-Id: Iddc92e42a100a0fb36c77c21d4c176dded8f3391
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 8 | ||||
-rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 2 | ||||
-rw-r--r-- | desktop/source/migration/services/jvmfwk.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index c33332ca64b2..1c9240a84423 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -277,12 +277,12 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch Reference < XDispatch > xDispatcher ; Reference < XURLTransformer > xParser ( URLTransformer::create(::comphelper::getProcessComponentContext()) ); - if( xParser.is() == sal_True ) + if( xParser.is() ) xParser->parseStrict( aURL ); xDispatcher = xDesktop->queryDispatch( aURL, OUString(), 0 ); - if( xDispatcher.is() == sal_True ) + if( xDispatcher.is() ) { { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -305,12 +305,12 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch Reference < XDispatch > xDispatcher ; Reference < XURLTransformer > xParser ( URLTransformer::create(::comphelper::getProcessComponentContext()) ); - if( xParser.is() == sal_True ) + if( xParser.is() ) xParser->parseStrict( aURL ); xDispatcher = xDesktop->queryDispatch( aURL, OUString(), 0 ); - if( xDispatcher.is() == sal_True ) + if( xDispatcher.is() ) { try { diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 8496d31e9dba..49ba7f50dfcf 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -563,7 +563,7 @@ void syncRepositories( if (restarter.is()) { OSL_TRACE( "Request restart for modified extensions manager" ); - restarter->requestRestart(xCmdEnv.is() == sal_True ? xCmdEnv->getInteractionHandler() : + restarter->requestRestart(xCmdEnv.is() ? xCmdEnv->getInteractionHandler() : Reference<task::XInteractionHandler>()); } } diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index d45012a76742..da5fff42141b 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -418,7 +418,7 @@ void SAL_CALL JavaMigration::setPropertyValue( case ENABLE_JAVA: { sal_Bool val = sal_Bool(); - if ((aValue >>= val) == sal_False) + if (!(aValue >>= val)) throw MalformedDataException( OUString("[Service implementation ") + IMPL_NAME + "] XLayerHandler::setPropertyValue received wrong type for Enable property", 0, Any()); @@ -432,7 +432,7 @@ void SAL_CALL JavaMigration::setPropertyValue( case USER_CLASS_PATH: { OUString cp; - if ((aValue >>= cp) == sal_False) + if (!(aValue >>= cp)) throw MalformedDataException( OUString("[Service implementation ") + IMPL_NAME + "] XLayerHandler::setPropertyValue received wrong type for UserClassPath property", 0, Any()); |