summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
Diffstat (limited to 'basic')
-rw-r--r--basic/source/classes/sbxmod.cxx4
-rw-r--r--basic/source/runtime/runtime.cxx2
-rw-r--r--basic/source/sbx/sbxvar.cxx2
-rw-r--r--basic/source/uno/namecont.cxx2
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 )