Tag: cws_src680_visibility03 User: mhu Date: 05/03/04 07:10:18 Modified: /dba/connectivity/source/drivers/file/ FStringFunctions.cxx, fcode.cxx
Log: #i40092# Workaround ORowSetValue conversion operator ambiguity. File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FStringFunctions.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FStringFunctions.cxx?r1=1.2&r2=1.2.136.1 Delta lines: +10 -10 --------------------- --- FStringFunctions.cxx 4 Sep 2003 08:25:52 -0000 1.2 +++ FStringFunctions.cxx 4 Mar 2005 15:10:15 -0000 1.2.136.1 @@ -2,9 +2,9 @@ * * $RCSfile: FStringFunctions.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.136.1 $ * - * last change: $Author: obo $ $Date: 2003/09/04 08:25:52 $ + * last change: $Author: mhu $ $Date: 2005/03/04 15:10:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,7 +178,7 @@ if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet(lhs); + ::rtl::OUString sRet = lhs; ::rtl::OUString sNew = sRet.trim(); return sRet.copy(sRet.indexOf(sNew)); } @@ -188,7 +188,7 @@ if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet(lhs); + ::rtl::OUString sRet = lhs; ::rtl::OUString sNew = sRet.trim(); return sRet.copy(0,sRet.lastIndexOf(sNew.getStr()[sNew.getLength()-1])+1); } @@ -213,9 +213,9 @@ if ( lhs.size() != 3 ) return ORowSetValue(); - ::rtl::OUString sStr(lhs[2]); - ::rtl::OUString sFrom(lhs[1]); - ::rtl::OUString sTo(lhs[0]); + ::rtl::OUString sStr = lhs[2]; + ::rtl::OUString sFrom = lhs[1]; + ::rtl::OUString sTo = lhs[0]; sal_Int32 nIndexOf = sStr.indexOf(sFrom); while( nIndexOf != -1 ) { @@ -245,7 +245,7 @@ if ( lhs.size() != 4 ) return ORowSetValue(); - ::rtl::OUString sStr(lhs[3]); + ::rtl::OUString sStr = lhs[3]; sal_Int32 nStart = static_cast<sal_Int32>(lhs[2]); if ( nStart < 1 ) @@ -258,7 +258,7 @@ if ( lhs.isNull() || rhs.isNull() ) return lhs; - ::rtl::OUString sRet(lhs); + ::rtl::OUString sRet = lhs; sal_Int32 nCount = rhs; if ( nCount < 0 ) return ORowSetValue(); @@ -271,7 +271,7 @@ return lhs; sal_Int32 nCount = rhs; - ::rtl::OUString sRet(lhs); + ::rtl::OUString sRet = lhs; if ( nCount < 0 || nCount >= sRet.getLength() ) return ORowSetValue(); File [changed]: fcode.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/fcode.cxx?r1=1.24&r2=1.24.10.1 Delta lines: +8 -7 ------------------- --- fcode.cxx 16 Feb 2005 17:26:22 -0000 1.24 +++ fcode.cxx 4 Mar 2005 15:10:15 -0000 1.24.10.1 @@ -2,9 +2,9 @@ * * $RCSfile: fcode.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.24.10.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 17:26:22 $ + * last change: $Author: mhu $ $Date: 2005/03/04 15:10:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -371,12 +371,13 @@ 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) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
