diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 15:34:51 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 15:34:51 +0000 |
| commit | e75a071fcbfdbf64548b326906c9132e6e48a289 (patch) | |
| tree | aaaedb94dddf1e90c3d8dfc6c52503cc892551e4 /sc/source/core | |
| parent | 77b60f1563a82963de12629b954038fad246ea9a (diff) | |
INTEGRATION: CWS calc25 (1.19.2); FILE MERGED
2004/11/01 17:09:39 er 1.19.2.1: #i36381# numbers are treated as being less than strings only for the [HV]?LOOKUP and MATCH functions
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/data/table3.cxx | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index db0e28aed51c..c8bc5f5025fe 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: table3.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2004-10-22 07:58:04 $ + * last change: $Author: obo $ $Date: 2004-11-15 16:34:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1128,19 +1128,22 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, } } } - else if (rEntry.bQueryByString && - (rEntry.eOp == SC_LESS || rEntry.eOp == SC_LESS_EQUAL) && - (pCell ? pCell->HasValueData() : - HasValueData( static_cast<SCCOL>(rEntry.nField), nRow))) + else if (rParam.bMixedComparison) { - bOk = TRUE; - } - else if (!rEntry.bQueryByString && - (rEntry.eOp == SC_GREATER || rEntry.eOp == SC_GREATER_EQUAL) && - (pCell ? pCell->HasStringData() : - HasStringData( static_cast<SCCOL>(rEntry.nField), nRow))) - { - bOk = TRUE; + if (rEntry.bQueryByString && + (rEntry.eOp == SC_LESS || rEntry.eOp == SC_LESS_EQUAL) && + (pCell ? pCell->HasValueData() : + HasValueData( static_cast<SCCOL>(rEntry.nField), nRow))) + { + bOk = TRUE; + } + else if (!rEntry.bQueryByString && + (rEntry.eOp == SC_GREATER || rEntry.eOp == SC_GREATER_EQUAL) && + (pCell ? pCell->HasStringData() : + HasStringData( static_cast<SCCOL>(rEntry.nField), nRow))) + { + bOk = TRUE; + } } if (nPos == -1) |