diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:11:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:11:45 +0000 |
| commit | 2fc0472f8dd93808c04131815bd079425a80266a (patch) | |
| tree | 235ce3f144d8909dc6f2117cbb417fa962822ccf /dbaccess/source/ui/dlg/ConnectionPage.cxx | |
| parent | 8383fddb703364f3302c4e84e5fb4377132b11d2 (diff) | |
INTEGRATION: CWS dba22 (1.5.4); FILE MERGED
2005/01/07 07:55:32 oj 1.5.4.2: RESYNC: (1.5-1.6); FILE MERGED
2005/01/06 12:42:47 oj 1.5.4.1: #i39321# extend createConnection to return a pair now
Diffstat (limited to 'dbaccess/source/ui/dlg/ConnectionPage.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/ConnectionPage.cxx | 44 |
1 files changed, 3 insertions, 41 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 7be5657723b0..bb31d28b1dcd 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2004-11-26 18:19:06 $ + * last change: $Author: kz $ $Date: 2005-01-21 17:11:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -242,7 +242,7 @@ namespace dbaui m_aUserName.SetModifyHdl(getControlModifiedLink()); m_aPasswordRequired.SetClickHdl(getControlModifiedLink()); - m_aTestConnection.SetClickHdl(LINK(this,OConnectionTabPage,OnTestConnectionClickHdl)); + m_aTestConnection.SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl)); m_aTestJavaDriver.SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl)); // extract the datasource type collection from the item set @@ -421,44 +421,6 @@ namespace dbaui return bChangedSomething; } - - // ----------------------------------------------------------------------- - IMPL_LINK(OConnectionTabPage, OnTestConnectionClickHdl, PushButton*, _pButton) - { - OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); - sal_Bool bSuccess = sal_False; - if ( m_pAdminDialog ) - { - m_pAdminDialog->saveDatasource(); - OGenericAdministrationPage::implInitControls(*m_pItemSetHelper->getOutputSet(), sal_True); - try - { - Reference< XConnection > xConnection = m_pAdminDialog->createConnection(); - bSuccess = xConnection.is(); - ::comphelper::disposeComponent(xConnection); - } - catch(Exception&) - { - } - - OSQLMessageBox::MessageType eImage = OSQLMessageBox::Info; - String aMessage,sTitle; - sTitle = String (ModuleRes(STR_CONNECTION_TEST)); - if ( bSuccess ) - { - aMessage = String(ModuleRes(STR_CONNECTION_SUCCESS)); - } - else - { - eImage = OSQLMessageBox::Error; - aMessage = String(ModuleRes(STR_CONNECTION_NO_SUCCESS)); - m_pAdminDialog->clearPassword(); - } - OSQLMessageBox aMsg(this,sTitle,aMessage); - aMsg.Execute(); - } - return 0L; - } // ----------------------------------------------------------------------- IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, _pButton) { |