diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-06 13:32:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-14 18:03:06 +0200 |
| commit | e67657d5211f6e95ddf8bd621108608573b00d5d (patch) | |
| tree | 66724101dbd95721714bd40fcb4861663432774c /basic | |
| parent | 186def8f48e273c3a3b4d23b3ab2efd0d8664731 (diff) | |
loplugin:simplifybool more
look for expressions like
!(a && !b)
which can be expanded out
Change-Id: I72515a9638762b050f9a258c08da39ebfa2ef8e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100579
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 4 | ||||
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 2 | ||||
| -rw-r--r-- | basic/source/sbx/sbxvar.cxx | 2 | ||||
| -rw-r--r-- | basic/source/uno/namecont.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index b735933ea9b9..c7b62b70278c 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1388,7 +1388,7 @@ void SbModule::GlobalRunInit( bool bBasicStart ) { // If no Basic-Start, only initialise, if the module is not initialised if( !bBasicStart ) - if( !(pImage && !pImage->bInit) ) + if( !pImage || pImage->bInit ) return; // Initialise GlobalInitErr-Flag for Compiler-Error @@ -2081,7 +2081,7 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller ) // #100883 Own Broadcast for SbMethod void SbMethod::Broadcast( SfxHintId nHintId ) { - if( !(mpBroadcaster && !IsSet( SbxFlagBits::NoBroadcast )) ) + if( !mpBroadcaster || IsSet( SbxFlagBits::NoBroadcast ) ) return; // Because the method could be called from outside, test here once again diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 62a54b87b576..f55d5ad86bd8 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -911,7 +911,7 @@ void SbiRuntime::Error( ErrCode n, bool bVBATranslationAlreadyDone ) return; nError = n; - if( !(isVBAEnabled() && !bVBATranslationAlreadyDone) ) + if( !isVBAEnabled() || bVBATranslationAlreadyDone ) return; OUString aMsg = pInst->GetErrorMsg(); diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 571c3cf1a69b..5134ff751aaa 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -146,7 +146,7 @@ SbxArray* SbxVariable::GetParameters() const void SbxVariable::Broadcast( SfxHintId nHintId ) { - if( !(mpBroadcaster && !IsSet( SbxFlagBits::NoBroadcast )) ) + if( !mpBroadcaster || IsSet( SbxFlagBits::NoBroadcast ) ) return; // Because the method could be called from outside, check the diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 0904dcb766c2..58401206fc4d 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -2299,7 +2299,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) bool bLoaded = pImplLib->mbLoaded; pImplLib->mbLoaded = true; - if( !(!bLoaded && xNameAccess->hasElements()) ) + if( bLoaded || !xNameAccess->hasElements() ) return; if( pImplLib->mbPasswordProtected ) |