cppcheck: fix some redundantCondition warnings
Change-Id: If53d33fb4d9ca9dc1babb9043bd07c5d29fe74c2 Reviewed-on: https://gerrit.libreoffice.org/18353 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
parent
d417059dae
commit
f0208db49d
@ -956,7 +956,7 @@ bool SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
|
||||
{
|
||||
if( rOp.GetType() == SbxEMPTY )
|
||||
{
|
||||
if ( !bVBAInterop || ( bVBAInterop && ( eOp != SbxNOT ) ) )
|
||||
if ( !bVBAInterop || ( eOp != SbxNOT ) )
|
||||
goto Lbl_OpIsEmpty;
|
||||
}
|
||||
if( Get( aL ) ) switch( eOp )
|
||||
@ -1185,7 +1185,7 @@ Lbl_OpIsDouble:
|
||||
{
|
||||
if( rOp.GetType() == SbxEMPTY )
|
||||
{
|
||||
if ( !bVBAInterop || ( bVBAInterop && ( eOp != SbxNEG ) ) )
|
||||
if ( !bVBAInterop || ( eOp != SbxNEG ) )
|
||||
goto Lbl_OpIsEmpty;
|
||||
}
|
||||
if( Get( aL ) )
|
||||
|
@ -105,7 +105,7 @@ namespace {
|
||||
int nGuidLen = GetStringFromClassID( *guidList[nInd], &pSubKey[23], 38 );
|
||||
|
||||
BOOL bLocalSuccess = FALSE;
|
||||
if ( nGuidLen && nGuidLen == 38 )
|
||||
if ( nGuidLen == 38 )
|
||||
{
|
||||
if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE, pSubKey, &hKey ) )
|
||||
{
|
||||
|
@ -557,8 +557,7 @@ void sharp()
|
||||
if (infile->fp != NULL)
|
||||
{
|
||||
name = (infile->progname != NULL) ? infile->progname : infile->filename;
|
||||
if (sharpfilename == NULL ||
|
||||
(sharpfilename != NULL && !streq(name, sharpfilename)))
|
||||
if (sharpfilename == NULL || (!streq(name, sharpfilename)))
|
||||
{
|
||||
if (sharpfilename != NULL)
|
||||
free(sharpfilename);
|
||||
|
@ -3684,7 +3684,7 @@ bool ScXMLExport::IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2)
|
||||
aCell1.aAreaLink.Compare( aCell2.aAreaLink ) ) ||
|
||||
!aCell1.bHasAreaLink )
|
||||
{
|
||||
if (!aCell1.bHasAnnotation || (aCell1.bHasAnnotation && false/*IsAnnotationEqual(aCell1.xCell, aCell2.xCell)*/)) // no longer compareable
|
||||
if (!aCell1.bHasAnnotation)
|
||||
{
|
||||
if ((((aCell1.nStyleIndex == aCell2.nStyleIndex) && (aCell1.bIsAutoStyle == aCell2.bIsAutoStyle)) ||
|
||||
((aCell1.nStyleIndex == aCell2.nStyleIndex) && (aCell1.nStyleIndex == -1))) &&
|
||||
|
@ -7270,11 +7270,11 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
|
||||
else
|
||||
{
|
||||
FastAttributeList *pLRSpaceAttrList = FastSerializerHelper::createAttrList();
|
||||
if((0 != rLRSpace.GetTextLeft()) || ((0 == rLRSpace.GetTextLeft()) && rLRSpace.IsExplicitZeroMarginValLeft()))
|
||||
if((0 != rLRSpace.GetTextLeft()) || (rLRSpace.IsExplicitZeroMarginValLeft()))
|
||||
{
|
||||
pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_left : XML_start ) ), OString::number( rLRSpace.GetTextLeft() ) );
|
||||
}
|
||||
if((0 != rLRSpace.GetRight()) || ((0 == rLRSpace.GetRight()) && rLRSpace.IsExplicitZeroMarginValRight()))
|
||||
if((0 != rLRSpace.GetRight()) || (rLRSpace.IsExplicitZeroMarginValRight()))
|
||||
{
|
||||
pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_right : XML_end ) ), OString::number( rLRSpace.GetRight() ) );
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user