diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2007-07-24 11:10:26 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2007-07-24 11:10:26 +0000 |
commit | c1bd83edeebd4649581098a622fe5e8f4f2093eb (patch) | |
tree | a569d8a08e2eb6b08d6956da1571ecba4e4bd8aa /dbaccess/source/ui/misc/datasourceconnector.cxx | |
parent | INTEGRATION: CWS dba23b (1.31.88); FILE MERGED (diff) | |
download | core-c1bd83edeebd4649581098a622fe5e8f4f2093eb.tar.gz core-c1bd83edeebd4649581098a622fe5e8f4f2093eb.zip |
INTEGRATION: CWS dba23b (1.11.100); FILE MERGED
2007/07/11 11:54:08 fs 1.11.100.2: RESYNC: (1.11-1.12); FILE MERGED
2007/07/08 20:35:13 fs 1.11.100.1: during #i65812#: context details not used
Diffstat (limited to 'dbaccess/source/ui/misc/datasourceconnector.cxx')
-rw-r--r-- | dbaccess/source/ui/misc/datasourceconnector.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 111a96004b8f..8891178a5d54 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -4,9 +4,9 @@ * * $RCSfile: datasourceconnector.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: rt $ $Date: 2007-07-06 08:36:26 $ + * last change: $Author: rt $ $Date: 2007-07-24 12:10:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -123,11 +123,10 @@ namespace dbaui //--------------------------------------------------------------------- ODatasourceConnector::ODatasourceConnector( const Reference< XMultiServiceFactory >& _rxORB, Window* _pMessageParent, - const ::rtl::OUString& _rContextInformation, const ::rtl::OUString& _rContextDetails ) + const ::rtl::OUString& _rContextInformation ) :m_pErrorMessageParent(_pMessageParent) ,m_xORB(_rxORB) ,m_sContextInformation( _rContextInformation ) - ,m_sContextDetails( _rContextDetails ) { implConstruct(); } @@ -241,13 +240,11 @@ namespace dbaui { if ( m_sContextInformation.getLength() ) { - SQLContext aContext; + SQLException aError; + aError.Message = m_sContextInformation; + aError.NextException = aInfo.get(); - aContext.Message = m_sContextInformation; - aContext.Details = m_sContextDetails; - aContext.NextException = aInfo.get(); - - aInfo = aContext; + aInfo = aError; } showError(aInfo, m_pErrorMessageParent, m_xORB); |