User: ihi Date: 2006/08/28 07:54:59 Modified: dba/connectivity/source/parse/sqliterator.cxx
Log: INTEGRATION: CWS dba205a (1.48.10); FILE MERGED 2006/07/26 10:25:33 fs 1.48.10.2: #i66596# getTableNode: add forgotten case table_ref := table_node 2006/07/20 11:00:18 fs 1.48.10.1: #i67383# make placeholders in the error strings unique / remove unused error strings File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqliterator.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqliterator.cxx?r1=1.50&r2=1.51 Delta lines: +6 -2 ------------------- --- sqliterator.cxx 22 Aug 2006 12:51:42 -0000 1.50 +++ sqliterator.cxx 28 Aug 2006 14:54:57 -0000 1.51 @@ -1999,9 +1999,13 @@ ::rtl::OUString sErrorMessage = m_rParser.getContext().getErrorMessage( _eError ); if ( _pReplaceToken1 ) { - sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf('#'), 1, *_pReplaceToken1 ); + bool bTwoTokens = ( _pReplaceToken2 != NULL ); + const sal_Char* pPlaceHolder1 = bTwoTokens ? "#1" : "#"; + const ::rtl::OUString sPlaceHolder1 = ::rtl::OUString::createFromAscii( pPlaceHolder1 ); + + sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( sPlaceHolder1 ), sPlaceHolder1.getLength(), *_pReplaceToken1 ); if ( _pReplaceToken2 ) - sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf('#'), 1, *_pReplaceToken2 ); + sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( ::rtl::OUString::createFromAscii( "#2" ) ), 2, *_pReplaceToken2 ); } impl_appendError( SQLException( --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
