User: kz Date: 05/01/21 09:13:54 Modified: /dba/dbaccess/source/ui/dlg/ adminpages.cxx
Log: INTEGRATION: CWS dba22 (1.36.22); FILE MERGED 2005/01/06 12:42:50 oj 1.36.22.1: #i39321# extend createConnection to return a pair now File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: adminpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adminpages.cxx?r1=1.36&r2=1.37 Delta lines: +21 -17 --------------------- --- adminpages.cxx 27 Oct 2004 13:00:55 -0000 1.36 +++ adminpages.cxx 21 Jan 2005 17:13:51 -0000 1.37 @@ -342,16 +342,19 @@ { m_pAdminDialog->saveDatasource(); OGenericAdministrationPage::implInitControls(*m_pItemSetHelper->getOutputSet(), sal_True); + sal_Bool bShowMessage = sal_True; try { - Reference< XConnection > xConnection = m_pAdminDialog->createConnection(); - bSuccess = xConnection.is(); - ::comphelper::disposeComponent(xConnection); + ::std::pair< Reference<XConnection>,sal_Bool> xConnection = m_pAdminDialog->createConnection(); + bShowMessage = xConnection.second; + bSuccess = xConnection.first.is(); + ::comphelper::disposeComponent(xConnection.first); } catch(Exception&) { } - + if ( bShowMessage ) + { OSQLMessageBox::MessageType eImage = OSQLMessageBox::Info; String aMessage,sTitle; sTitle = String (ModuleRes(STR_CONNECTION_TEST)); @@ -367,6 +370,7 @@ } OSQLMessageBox aMsg(this,sTitle,aMessage); aMsg.Execute(); + } } return 0L; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
