diff options
| author | Noel Grandin <noel@peralex.com> | 2014-05-02 15:42:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-05-05 12:47:48 +0200 |
| commit | 4f9b21248ffdf55cef9f3f9d1da76778ee000775 (patch) | |
| tree | b059d288339a68aa4c3901f1100e99b04d05a23d /desktop | |
| parent | b4107411900f5bb4c215e2d9db09fc2b2b82939b (diff) | |
simplify ternary conditions "xxx ? yyy : false"
Look for code like:
xxx ? yyy : false;
Which can be simplified to:
xxx && yyy
Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
Diffstat (limited to 'desktop')
3 files changed, 3 insertions, 4 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 73c11f34075d..11120f2778c7 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -601,7 +601,7 @@ bool ExtensionManager::doChecksForAddExtension( new NoLicenseCommandEnv(xCmdEnv->getInteractionHandler())); bCanInstall = xTmpExtension->checkPrerequisites( - xAbortChannel, _xCmdEnv, xOldExtension.is() || props.isExtensionUpdate()) == 0 ? true : false; + xAbortChannel, _xCmdEnv, xOldExtension.is() || props.isExtensionUpdate()) == 0; return bCanInstall; } diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 0b460e8d00ee..04c07b26ad5c 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -214,7 +214,7 @@ void PackageManagerImpl::initActivationLayer( } } - bool bShared = (m_context == "shared") ? true : false; + bool bShared = (m_context == "shared"); for ( ::std::size_t pos = 0; pos < tempEntries.size(); ++pos ) { OUString const & tempEntry = tempEntries[ pos ]; diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx index 072de5391ecb..565efb405137 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx @@ -111,8 +111,7 @@ ComponentBackendDb::Data ComponentBackendDb::getEntry(OUString const & url) Reference<css::xml::dom::XNode> aNode = getKeyElement(url); if (aNode.is()) { - bool bJava = (readSimpleElement("java-type-library", aNode) == - "true") ? true : false; + bool bJava = readSimpleElement("java-type-library", aNode) == "true"; retData.javaTypeLibrary = bJava; retData.implementationNames = |