diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-13 06:52:42 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-13 06:52:42 +0000 |
| commit | b31f4a8ba4885efdbbc6326a40bca38be408ad51 (patch) | |
| tree | 8408e7f4c39c9e867d67f0a6c1424274efd3243e /connectivity/source/drivers/file/fcode.cxx | |
| parent | INTEGRATION: CWS visibility03 (1.2.136); FILE MERGED (diff) | |
| download | core-b31f4a8ba4885efdbbc6326a40bca38be408ad51.tar.gz core-b31f4a8ba4885efdbbc6326a40bca38be408ad51.zip | |
INTEGRATION: CWS visibility03 (1.24.10); FILE MERGED
2005/03/04 15:10:15 mhu 1.24.10.1: #i40092# Workaround ORowSetValue conversion operator ambiguity.
Diffstat (limited to 'connectivity/source/drivers/file/fcode.cxx')
| -rw-r--r-- | connectivity/source/drivers/file/fcode.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index f5439cb6e401..b76fc3d77bb5 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fcode.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: vg $ $Date: 2005-02-16 17:26:22 $ + * last change: $Author: obo $ $Date: 2005-04-13 07:52:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -371,12 +371,13 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con static rtl::OLocale aLocale = rtl::OLocale::registerLocale(sLanguage, sCountry); INT32 nRes = compareIgnoreCase(aLH, aRH, aLocale); #else + rtl::OUString sLH = aLH, sRH = aRH; INT32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength ( - static_cast<rtl::OUString>(aLH).pData->buffer, - static_cast<rtl::OUString>(aLH).pData->length, - static_cast<rtl::OUString>(aRH).pData->buffer, - static_cast<rtl::OUString>(aRH).pData->length ); + sLH.pData->buffer, + sLH.pData->length, + sRH.pData->buffer, + sRH.pData->length ); #endif switch(aPredicateType) { |