From c763ceb4a6104ac4af504681babc069aa6ae5bd3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 20 Apr 2016 17:19:52 +0200 Subject: loplugin:salbool: Automatic rewrite of sal_False/True Change-Id: I3a3295b538e79186914390b6da73cc8bc25419a5 --- stoc/source/corereflection/crbase.cxx | 4 ++-- stoc/source/corereflection/crcomp.cxx | 4 ++-- stoc/source/corereflection/crefl.cxx | 2 +- stoc/source/corereflection/criface.cxx | 4 ++-- stoc/source/defaultregistry/defaultregistry.cxx | 6 +++--- stoc/source/implementationregistration/implreg.cxx | 4 ++-- stoc/source/invocation/invocation.cxx | 6 +++--- stoc/source/javavm/javavm.cxx | 10 +++++----- stoc/source/loader/dllcomponentloader.cxx | 2 +- stoc/source/servicemanager/servicemanager.cxx | 6 +++--- stoc/source/typeconv/convert.cxx | 4 ++-- 11 files changed, 26 insertions(+), 26 deletions(-) (limited to 'stoc') diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx index d3dcacf366bd..0f1fcca70821 100644 --- a/stoc/source/corereflection/crbase.cxx +++ b/stoc/source/corereflection/crbase.cxx @@ -130,7 +130,7 @@ sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType ) TypeClass eAssign = getTypeClass(); if (equals( xType ) || eAssign == TypeClass_ANY) // default shot { - return sal_True; + return true; } else { @@ -141,7 +141,7 @@ sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType ) return s_aAssignableFromTab[eAssign-1][eFrom-1]; } } - return sal_False; + return false; } void IdlClassImpl::createObject( Any & rObj ) diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx index 7e1eeab99607..6e76911b2fff 100644 --- a/stoc/source/corereflection/crcomp.cxx +++ b/stoc/source/corereflection/crcomp.cxx @@ -290,7 +290,7 @@ sal_Bool CompoundIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & if (eTC == TypeClass_STRUCT || eTC == TypeClass_EXCEPTION) { if (equals( xType )) - return sal_True; + return true; else { const Sequence< Reference< XIdlClass > > & rSeq = xType->getSuperclasses(); @@ -302,7 +302,7 @@ sal_Bool CompoundIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & } } } - return sal_False; + return false; } Sequence< Reference< XIdlClass > > CompoundIdlClassImpl::getSuperclasses() diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index adad971a2d23..d9e9007e2dc4 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -308,7 +308,7 @@ sal_Bool IdlReflectionServiceImpl::hasByHierarchicalName( const OUString & rName catch (container::NoSuchElementException &) { } - return sal_False; + return false; } diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 16fa4060ef8b..22b12db3abae 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -821,7 +821,7 @@ sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & if (xType.is() && xType->getTypeClass() == TypeClass_INTERFACE) { if (equals( xType )) - return sal_True; + return true; else { const Sequence< Reference< XIdlClass > > & rSeq = xType->getSuperclasses(); @@ -832,7 +832,7 @@ sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & } } } - return sal_False; + return false; } Uik InterfaceIdlClassImpl::getUik() diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index d4077d9c1c08..5637d55f439f 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -1244,13 +1244,13 @@ sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException, std::e { if ( (m_localReg.is() && m_localReg->isValid()) || (m_defaultReg.is() && m_defaultReg->isValid()) ) - return sal_True; + return true; } catch(InvalidRegistryException& ) { } - return sal_False; + return false; } @@ -1321,7 +1321,7 @@ sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) { } - return sal_False; + return false; } diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index a5c663d2ff93..b5b21cbfc8bf 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1610,7 +1610,7 @@ Sequence< OUString > ImplementationRegistration::getImplementations( { try { - xReg->open(OUString() /* in mem */, sal_False, sal_True); + xReg->open(OUString() /* in mem */, false, true); Reference < XRegistryKey > xImpl; { // only necessary for deleting the temporary variable of rootkey @@ -1723,7 +1723,7 @@ void ImplementationRegistration::doRegister( { try { - xReg->open(OUString() /* in mem */, sal_False, sal_True); + xReg->open(OUString() /* in mem */, false, true); { // only necessary for deleting the temporary variable of rootkey xSourceKey = xReg->getRootKey()->createKey( spool().slash_IMPLEMENTATIONS ); diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 370478f2a470..0d405d53ba45 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -490,7 +490,7 @@ sal_Bool Invocation_Impl::hasMethod( const OUString& Name ) return _xDirect->hasMethod( Name ); if( _xIntrospectionAccess.is() ) return _xIntrospectionAccess->hasMethod( Name, MethodConcept::ALL ^ MethodConcept::DANGEROUS ); - return sal_False; + return false; } @@ -502,11 +502,11 @@ sal_Bool Invocation_Impl::hasProperty( const OUString& Name ) // PropertySet if( _xIntrospectionAccess.is() && _xIntrospectionAccess->hasProperty( Name, PropertyConcept::ALL ^ PropertyConcept::DANGEROUS ) ) - return sal_True; + return true; // NameAccess if( _xNameAccess.is() ) return _xNameAccess->hasByName( Name ); - return sal_False; + return false; } diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 683e6ef9b00f..1fb04ea16a89 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -276,7 +276,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, css::uno::Reference xConfRegistry_simple(xConfRegistry, css::uno::UNO_QUERY); if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException("javavm.cxx: couldn't get ConfigurationRegistry", nullptr); - xConfRegistry_simple->open("org.openoffice.Inet", sal_True, sal_False); + xConfRegistry_simple->open("org.openoffice.Inet", true, false); css::uno::Reference xRegistryRootKey = xConfRegistry_simple->getRootKey(); // if ooInetProxyType is not 0 then read the settings @@ -370,7 +370,7 @@ void getDefaultLocaleFromConfig( throw css::uno::RuntimeException( OUString("javavm.cxx: couldn't get ConfigurationRegistry"), nullptr); - xConfRegistry_simple->open("org.openoffice.Setup", sal_True, sal_False); + xConfRegistry_simple->open("org.openoffice.Setup", true, false); css::uno::Reference xRegistryRootKey = xConfRegistry_simple->getRootKey(); // read locale @@ -426,7 +426,7 @@ void getJavaPropsFromSafetySettings( xConfRegistry_simple->open( "org.openoffice.Office.Java", - sal_True, sal_False); + true, false); css::uno::Reference xRegistryRootKey = xConfRegistry_simple->getRootKey(); @@ -791,7 +791,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) jfw::JavaInfoGuard pJavaInfo; if (JFW_E_NONE == jfw_getSelectedJRE(&pJavaInfo.info)) { - sal_Bool bExist = sal_False; + sal_Bool bExist = false; if (JFW_E_NONE == jfw_existJRE(pJavaInfo.info, &bExist)) { if (!bExist @@ -916,7 +916,7 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMEnabled() // initVMConfiguration(&aJvm, m_xContext->getServiceManager(), m_xContext); // return aJvm.isEnabled(); //ToDo - sal_Bool bEnabled = sal_False; + sal_Bool bEnabled = false; if (jfw_getEnabled( & bEnabled) != JFW_E_NONE) throw css::uno::RuntimeException(); return bEnabled; diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index ecbe66ba7430..01cf1d700a7f 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -157,7 +157,7 @@ sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo( #else writeSharedLibComponentInfo( cppu::bootstrap_expandUri(rLibName), OUString(), m_xSMgr, xKey ); - return sal_True; + return true; #endif } diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 2e9c42e25215..19de2de8017c 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -234,9 +234,9 @@ sal_Bool PropertySetInfo_Impl::hasPropertyByName( OUString const & name ) for ( sal_Int32 nPos = m_properties.getLength(); nPos--; ) { if (p[ nPos ].Name.equals( name )) - return sal_True; + return true; } - return sal_False; + return false; } @@ -1119,7 +1119,7 @@ sal_Bool OServiceManager::has( const Any & Element ) return m_ImplementationNameMap.find( implName ) != m_ImplementationNameMap.end(); } - return sal_False; + return false; } // XSet diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index b0bfb0c4fc6a..b7ec72cba391 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -740,12 +740,12 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina const OUString & aStr = *static_cast(rVal.getValue()); if ( aStr == "0" || aStr.equalsIgnoreAsciiCase( "false" )) { - sal_Bool bFalse = sal_False; + sal_Bool bFalse = false; aRet.setValue( &bFalse, cppu::UnoType::get() ); } else if ( aStr == "1" || aStr.equalsIgnoreAsciiCase( "true" )) { - sal_Bool bTrue = sal_True; + sal_Bool bTrue = true; aRet.setValue( &bTrue, cppu::UnoType::get() ); } else -- cgit