mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cppcheck: redundantCondition [part1]

Browse Source 
Change-Id: I21c5340e7b5ec09248b08aa76f43acf883c56cd8
This commit is contained in:
Julien Nabet
2015-06-14 12:17:55 +02:00
parent 01a189abcd
commit b226928c6d
19 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
basic/source/runtime/runtime.cxx
View File

@@ -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 )