Tag: cws_src680_dba205a User: fs Date: 2006/07/20 04:00:21 Modified: dba/connectivity/source/parse/sqliterator.cxx
Log: #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.48&r2=1.48.10.1 Delta lines: +9 -5 ------------------- --- sqliterator.cxx 10 Jul 2006 14:38:34 -0000 1.48 +++ sqliterator.cxx 20 Jul 2006 11:00:18 -0000 1.48.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: sqliterator.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.48.10.1 $ * - * last change: $Author: obo $ $Date: 2006/07/10 14:38:34 $ + * last change: $Author: fs $ $Date: 2006/07/20 11:00:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1975,9 +1975,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]
