From cff2f333aecdb8911736d919e3c5252320100d7e Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Wed, 9 Oct 2013 10:08:06 -0400 Subject: Add isEmpty() to SharedString. This simplies a lot of its call sites. Change-Id: I0ebc43abe59ac317c053a4f606dbe376d85c03b0 --- sc/source/core/data/table3.cxx | 2 +- sc/source/core/tool/interpr1.cxx | 2 +- sc/source/core/tool/queryentry.cxx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sc/source') diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 9b63531aecdb..10c7ca767ac1 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -1487,7 +1487,7 @@ public: // Simple string matching i.e. no regexp match. if (isTextMatchOp(rEntry)) { - if (rItem.meType != ScQueryEntry::ByString && rItem.maString.getString().isEmpty()) + if (rItem.meType != ScQueryEntry::ByString && rItem.maString.isEmpty()) { // #i18374# When used from functions (match, countif, sumif, vlookup, hlookup, lookup), // the query value is assigned directly, and the string is empty. In that case, diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 9400beca2fa0..314c2caa59a8 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -976,7 +976,7 @@ double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOp if (!rItems.empty()) { const ScQueryEntry::Item& rItem = rItems[0]; - if (rItem.meType != ScQueryEntry::ByString && !rItem.maString.getString().isEmpty() && + if (rItem.meType != ScQueryEntry::ByString && !rItem.maString.isEmpty() && (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL)) { // As in ScTable::ValidQuery() match a numeric string for a diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index f93351687a98..a282f4dce500 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -107,7 +107,7 @@ bool ScQueryEntry::IsQueryByEmpty() const const Item& rItem = maQueryItems[0]; return eOp == SC_EQUAL && rItem.meType == ByEmpty && - rItem.maString.getString().isEmpty() && + rItem.maString.isEmpty() && rItem.mfVal == SC_EMPTYFIELDS; } @@ -129,7 +129,7 @@ bool ScQueryEntry::IsQueryByNonEmpty() const const Item& rItem = maQueryItems[0]; return eOp == SC_EQUAL && rItem.meType == ByEmpty && - rItem.maString.getString().isEmpty() && + rItem.maString.isEmpty() && rItem.mfVal == SC_NONEMPTYFIELDS; } -- cgit v1.2.3