diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-19 11:25:32 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-19 12:53:34 +0200 |
commit | 2e51afc77c0800dda6c09bb645d8962ae125b2ba (patch) | |
tree | 087dc79cce1eaeedb9556be0953bdda2e8954560 /basic/source/classes | |
parent | 575b457d728531a1cfff95d2eea1887e09d79009 (diff) |
loplugin:comparisonwithconstant in basic
Change-Id: Ie34a17d2fb465ffbe675ba4e99917d23959f1fb5
Reviewed-on: https://gerrit.libreoffice.org/37809
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic/source/classes')
-rw-r--r-- | basic/source/classes/eventatt.cxx | 6 | ||||
-rw-r--r-- | basic/source/classes/sb.cxx | 4 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 4 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index eea4b67060eb..4e65c7a289fb 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -279,7 +279,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any } // Default: Be tolerant and search everywhere - if( (!pMethVar || nullptr == dynamic_cast<const SbMethod*>( pMethVar)) && maBasicRef.is() ) + if( (!pMethVar || dynamic_cast<const SbMethod*>( pMethVar) == nullptr) && maBasicRef.is() ) { pMethVar = maBasicRef->FindQualified( aMacro, SbxClassType::DontCare ); } @@ -328,7 +328,7 @@ css::uno::Reference< css::container::XNameContainer > implFindDialogLibForDialog css::uno::Reference< css::container::XNameContainer > aRetDlgLib; SbxVariable* pDlgLibContVar = pBasic->Find("DialogLibraries", SbxClassType::Object); - if( pDlgLibContVar && nullptr != dynamic_cast<const SbUnoObject*>( pDlgLibContVar) ) + if( pDlgLibContVar && dynamic_cast<const SbUnoObject*>( pDlgLibContVar) != nullptr ) { SbUnoObject* pDlgLibContUnoObj = static_cast<SbUnoObject*>(static_cast<SbxBase*>(pDlgLibContVar)); Any aDlgLibContAny = pDlgLibContUnoObj->getUnoAny(); @@ -427,7 +427,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) // Get dialog SbxBaseRef pObj = rPar.Get( 1 )->GetObject(); - if( !(pObj.is() && nullptr != dynamic_cast<const SbUnoObject*>( pObj.get() )) ) + if( !(pObj.is() && dynamic_cast<const SbUnoObject*>( pObj.get() ) != nullptr) ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); return; diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index c3e0a63c2668..913d94967aad 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1256,7 +1256,7 @@ void StarBASIC::DeInitAllModules() // Deinit own modules for (const auto& pModule: pModules) { - if( pModule->pImage && !pModule->isProxyModule() && nullptr == dynamic_cast<SbObjModule*>( pModule.get()) ) + if( pModule->pImage && !pModule->isProxyModule() && dynamic_cast<SbObjModule*>( pModule.get()) == nullptr ) { pModule->pImage->bInit = false; } @@ -1853,7 +1853,7 @@ bool StarBASIC::LoadData( SvStream& r, sal_uInt16 nVer ) { return false; } - else if( nullptr != dynamic_cast<const SbJScriptModule*>( pMod) ) + else if( dynamic_cast<const SbJScriptModule*>( pMod) != nullptr ) { // assign Ref, so that pMod will be deleted SbModuleRef xRef = pMod; diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 43573250de0c..c35f96425659 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -995,7 +995,7 @@ Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType if( pClassModule->createCOMWrapperForIface( aRetAny, pClassModuleObj ) ) return aRetAny; } - if( nullptr == dynamic_cast<const SbUnoObject*>( xObj.get() ) ) + if( dynamic_cast<const SbUnoObject*>( xObj.get() ) == nullptr ) { // Create NativeObjectWrapper to identify object in case of callbacks SbxObject* pObj = dynamic_cast<SbxObject*>( pVar->GetObject() ); @@ -4246,7 +4246,7 @@ ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObject , m_xScopeObj( xScopeObj ) , m_aListeners( m_aMutex ) { - m_bProxyIsClassModuleObject = xScopeObj.is() && nullptr != dynamic_cast<const SbClassModuleObject*>( xScopeObj.get() ); + m_bProxyIsClassModuleObject = xScopeObj.is() && dynamic_cast<const SbClassModuleObject*>( xScopeObj.get() ) != nullptr; } Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 9f74c7415172..f5b63ce1a669 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1321,7 +1321,7 @@ void SbModule::ClearPrivateVars() void SbModule::implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic ) { - if( pVar->SbxValue::GetType() != SbxOBJECT || nullptr != dynamic_cast<const SbProcedureProperty*>( pVar) ) + if( pVar->SbxValue::GetType() != SbxOBJECT || dynamic_cast<const SbProcedureProperty*>( pVar) != nullptr ) return; SbxObject* pObj = dynamic_cast<SbxObject*>( pVar->GetObject() ); @@ -1380,7 +1380,7 @@ void StarBASIC::ClearAllModuleVars() for (const auto& rModule: pModules) { // Initialise only, if the startcode was already executed - if( rModule->pImage && rModule->pImage->bInit && !rModule->isProxyModule() && nullptr == dynamic_cast<const SbObjModule*>( rModule.get()) ) + if( rModule->pImage && rModule->pImage->bInit && !rModule->isProxyModule() && dynamic_cast<const SbObjModule*>( rModule.get()) == nullptr ) rModule->ClearPrivateVars(); } |