diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 15:34:35 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 15:34:35 +0000 |
| commit | 77b60f1563a82963de12629b954038fad246ea9a (patch) | |
| tree | 05afb509f060d19a725cba01d4de5f597e4e20f5 /sc/source/core | |
| parent | aa33164819cfebbe6de2ed7f37878cebaf3d7b74 (diff) | |
INTEGRATION: CWS calc25 (1.17.74); FILE MERGED
2004/11/01 17:09:39 er 1.17.74.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/global2.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index c055b3db3f97..cc77c2db2e1a 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: global2.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2004-09-08 13:44:17 $ + * last change: $Author: obo $ $Date: 2004-11-15 16:34:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -321,8 +321,8 @@ ScQueryParam::ScQueryParam( const ScQueryParam& r ) : nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab), nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow), bHasHeader(r.bHasHeader),bInplace(r.bInplace),bCaseSens(r.bCaseSens), - bRegExp(r.bRegExp),bDuplicate(r.bDuplicate),bByRow(r.bByRow), - bDestPers(r.bDestPers) + bRegExp(r.bRegExp), bMixedComparison(r.bMixedComparison), + bDuplicate(r.bDuplicate), bByRow(r.bByRow), bDestPers(r.bDestPers) { nEntryCount = 0; @@ -346,8 +346,8 @@ void ScQueryParam::Clear() nRow1=nRow2=nDestRow = 0; nDestTab = 0; nTab = SCTAB_MAX; - bHasHeader=bCaseSens=bRegExp = FALSE; - bInplace=bByRow=bDuplicate=bDestPers = TRUE; + bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE; + bInplace = bByRow = bDuplicate = bDestPers = TRUE; Resize( MAXQUERY ); for (USHORT i=0; i<MAXQUERY; i++) @@ -370,6 +370,7 @@ ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r ) bInplace = r.bInplace; bCaseSens = r.bCaseSens; bRegExp = r.bRegExp; + bMixedComparison = r.bMixedComparison; bDuplicate = r.bDuplicate; bByRow = r.bByRow; bDestPers = r.bDestPers; @@ -405,6 +406,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const && (bInplace == rOther.bInplace) && (bCaseSens == rOther.bCaseSens) && (bRegExp == rOther.bRegExp) + && (bMixedComparison == rOther.bMixedComparison) && (bDuplicate == rOther.bDuplicate) && (bDestPers == rOther.bDestPers) && (nDestTab == rOther.nDestTab) |