summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2021-10-20 17:00:54 +0200
committerEike Rathke <erack@redhat.com>2021-10-20 19:51:59 +0200
commit84304ee068b36c4f545e9e7e761ecde646b02db1 (patch)
treef6f2c22e7b58e8d09e40411de0dc0736fa32d159 /sc
parent45f53338461ba61c53c51a04f99fa281bf5150ae (diff)
ScRefCellValue::hasEmptyValue() already includes isEmpty()
... so explicitly checking for isEmpty() in an extra condition is superfluous. Change-Id: Id84099a273b80834f0cb080e86991bd67f39babe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123903 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/interpr8.cxx30
1 files changed, 12 insertions, 18 deletions
diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index fd0762eabc62..a24b2b949a50 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -1407,16 +1407,13 @@ void ScInterpreter::ScConcat_MS()
if ( nGlobalError != FormulaError::NONE )
break;
ScRefCellValue aCell( mrDoc, aAdr );
- if ( !aCell.isEmpty() )
+ if (!aCell.hasEmptyValue())
{
- if ( !aCell.hasEmptyValue() )
- {
- svl::SharedString aSS;
- GetCellString( aSS, aCell);
- const OUString& rStr = aSS.getString();
- if (CheckStringResultLen( aResBuf, rStr))
- aResBuf.append( rStr);
- }
+ svl::SharedString aSS;
+ GetCellString( aSS, aCell);
+ const OUString& rStr = aSS.getString();
+ if (CheckStringResultLen( aResBuf, rStr))
+ aResBuf.append( rStr);
}
}
break;
@@ -1450,16 +1447,13 @@ void ScInterpreter::ScConcat_MS()
aAdr.SetRow( nRow );
aAdr.SetCol( nCol );
ScRefCellValue aCell( mrDoc, aAdr );
- if ( !aCell.isEmpty() )
+ if (!aCell.hasEmptyValue() )
{
- if ( !aCell.hasEmptyValue() )
- {
- svl::SharedString aSS;
- GetCellString( aSS, aCell);
- const OUString& rStr = aSS.getString();
- if (CheckStringResultLen( aResBuf, rStr))
- aResBuf.append( rStr);
- }
+ svl::SharedString aSS;
+ GetCellString( aSS, aCell);
+ const OUString& rStr = aSS.getString();
+ if (CheckStringResultLen( aResBuf, rStr))
+ aResBuf.append( rStr);
}
}
}