User: ihi Date: 2006/08/28 08:08:34 Modified: dba/dbaccess/source/ui/misc/datasourceconnector.cxx
Log: INTEGRATION: CWS dba205a (1.9.10); FILE MERGED 2006/07/25 06:59:24 fs 1.9.10.1: #i67724# STR_WARNINGS_DURING_CONNECT: no hard-coded 'More' text, but determined at runtime File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: datasourceconnector.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/datasourceconnector.cxx?r1=1.9&r2=1.10 Delta lines: +8 -1 ------------------- --- datasourceconnector.cxx 10 Jul 2006 15:37:21 -0000 1.9 +++ datasourceconnector.cxx 28 Aug 2006 15:08:32 -0000 1.10 @@ -78,6 +78,9 @@ #ifndef _VCL_STDTEXT_HXX #include <vcl/stdtext.hxx> #endif +#ifndef _SV_BUTTON_HXX +#include <vcl/button.hxx> +#endif #ifndef SVTOOLS_FILENOTATION_HXX #include <svtools/filenotation.hxx> #endif @@ -259,8 +262,12 @@ Any aWarnings( xConnectionWarnings->getWarnings() ); if ( aWarnings.hasValue() ) { + String sMessage( ModuleRes( STR_WARNINGS_DURING_CONNECT ) ); + sMessage.SearchAndReplaceAscii( "$buttontext$", Button::GetStandardText( BUTTON_MORE ) ); + sMessage = OutputDevice::GetNonMnemonicString( sMessage ); + SQLContext aContext; - aContext.Message = String( ModuleRes( STR_WARNINGS_DURING_CONNECT ) ); + aContext.Message = sMessage; aContext.NextException = aWarnings; showError( SQLExceptionInfo( aContext ), m_pErrorMessageParent, m_xORB ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
