diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-11-14 10:37:47 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-11-14 10:37:47 -0500 |
| commit | ebdd9c300718bce454ef56a31d5d8fb699fc1822 (patch) | |
| tree | bcafb712a437482e70321b9f64c2a68825407286 /sc/source/core/data | |
| parent | f8beaced3d4dbf541fafb94b84ed35b498d4365e (diff) | |
Revert "Revert "Removing the mixed comparison flag, which is no longer needed.""
This reverts commit 7d7036c235a92268f23cc04eab8abcb08cddeb3f.
Diffstat (limited to 'sc/source/core/data')
| -rw-r--r-- | sc/source/core/data/dociter.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/table3.cxx | 17 |
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) { |