summaryrefslogtreecommitdiff
path: root/sc/source/core/data
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@suse.com>2011-11-10 15:45:53 -0500
committerKohei Yoshida <kohei.yoshida@suse.com>2011-11-10 15:45:53 -0500
commiteaea417bfdf8d06df2b7f2e42c904c32ce77e871 (patch)
treeeeb4801aa8c1b7cb76a63aba502e7a48162d7331 /sc/source/core/data
parente67181c0f1edf99b595c4589a668150719642811 (diff)
Removing the mixed comparison flag, which is no longer needed.
This flag was introduced years ago to deal with Excel's behavior on incorrectly sorted data range. But later versions of Excel no longer follow that behavior & keeping this flag would make the evaluation code unnecessarily more complex & hard to adopt to multi-item matching.
Diffstat (limited to 'sc/source/core/data')
-rw-r--r--sc/source/core/data/dociter.cxx4
-rw-r--r--sc/source/core/data/table3.cxx17
2 files changed, 0 insertions, 21 deletions
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 5efe0163e384..689e68e2e6b4 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -865,10 +865,6 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM
}
while (false);
}
- else if (mpParam->bMixedComparison)
- {
- // Not used at the moment.
- }
if (aResults.empty())
// First query entry.
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 16c4793d546d..453905549f10 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1442,23 +1442,6 @@ bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
}
}
}
- else if (rParam.bMixedComparison)
- {
- if (rItem.meType == ScQueryEntry::ByString &&
- (rEntry.eOp == SC_LESS || rEntry.eOp == SC_LESS_EQUAL) &&
- (pCell ? pCell->HasValueData() :
- HasValueData( static_cast<SCCOL>(rEntry.nField), nRow)))
- {
- bOk = true;
- }
- else if (rItem.meType != ScQueryEntry::ByString &&
- (rEntry.eOp == SC_GREATER || rEntry.eOp == SC_GREATER_EQUAL) &&
- (pCell ? pCell->HasStringData() :
- HasStringData( static_cast<SCCOL>(rEntry.nField), nRow)))
- {
- bOk = true;
- }
- }
if (nPos == -1)
{