User: obo Date: 05/04/13 00:52:25 Modified: /dba/connectivity/source/drivers/file/ FStringFunctions.cxx
Log: INTEGRATION: CWS visibility03 (1.2.136); FILE MERGED 2005/03/04 15:10:15 mhu 1.2.136.1: #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.3 Delta lines: +11 -11 --------------------- --- FStringFunctions.cxx 4 Sep 2003 08:25:52 -0000 1.2 +++ FStringFunctions.cxx 13 Apr 2005 07:52:22 -0000 1.3 @@ -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(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
