diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-06-14 12:17:55 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2015-06-14 12:17:55 +0200 |
| commit | b226928c6d5d094359b970b64a063b243d4fc84c (patch) | |
| tree | 3ec0329c0f69fc4e9b57210135d51c2006853388 /basic | |
| parent | 01a189abcd9a4ca472a74b3b2c000c9338fc2c91 (diff) | |
cppcheck: redundantCondition [part1]
Change-Id: I21c5340e7b5ec09248b08aa76f43acf883c56cd8
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 8b92c8e5cf26..53a10788f67b 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1628,7 +1628,7 @@ inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef& refVal, SbxVariableRe SbxDataType eVarType = refVar->GetType(); SbxDataType eValType = refVal->GetType(); - if ( !( !bVBA|| ( bVBA && refVar->GetType() != SbxEMPTY ) ) || !refVar->CanWrite() ) + if ( !( !bVBA || refVar->GetType() != SbxEMPTY ) || !refVar->CanWrite() ) return false; if ( eValType != SbxOBJECT ) @@ -1825,7 +1825,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b // Getting in here causes problems with objects with default properties // if they are SbxEMPTY I guess - if ( !bHandleDefaultProp || ( bHandleDefaultProp && eValType == SbxOBJECT ) ) + if ( !bHandleDefaultProp || eValType == SbxOBJECT ) { // activate GetOject for collections on refVal SbxBase* pObjVarObj = refVal->GetObject(); @@ -3842,7 +3842,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem ) } } // consider index-access for UnoObjects - else if( pElem->GetType() == SbxOBJECT && !pElem->ISA(SbxMethod) && ( !bVBAEnabled || ( bVBAEnabled && !pElem->ISA(SbxProperty) ) ) ) + else if( pElem->GetType() == SbxOBJECT && !pElem->ISA(SbxMethod) && ( !bVBAEnabled || !pElem->ISA(SbxProperty) ) ) { pPar = pElem->GetParameters(); if ( pPar ) |