diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:13:36 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:13:36 +0000 |
| commit | 62902dce077d858db537de30aaeccaf134227846 (patch) | |
| tree | a4e8329ea840916ce9326c97f735e88ad260094c /dbaccess/source/ui/dlg/UserAdminDlg.cxx | |
| parent | 879291cb76ca09e715e710555737a519580fedb8 (diff) | |
INTEGRATION: CWS dba22 (1.2.62); FILE MERGED
2005/01/06 12:42:50 oj 1.2.62.1: #i39321# extend createConnection to return a pair now
Diffstat (limited to 'dbaccess/source/ui/dlg/UserAdminDlg.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/UserAdminDlg.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 61d94c40a093..9277ddd5b504 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: UserAdminDlg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-08-02 15:42:22 $ + * last change: $Author: kz $ $Date: 2005-01-21 17:13:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -173,7 +173,7 @@ namespace dbaui sal_Bool bError = !xDriver.is(); if ( !bError ) { - m_xConnection = createConnection(); + m_xConnection = createConnection().first; if ( m_xConnection.is() ) { // now set the tables supplier at the table control @@ -224,11 +224,11 @@ namespace dbaui return m_pItemSet; } // ----------------------------------------------------------------------------- - Reference< XConnection > OUserAdminDlg::createConnection() + ::std::pair< Reference<XConnection>,sal_Bool> OUserAdminDlg::createConnection() { if ( !m_xConnection.is() ) - m_xConnection = m_pImpl->createConnection(); - return m_xConnection; + m_xConnection = m_pImpl->createConnection().first; + return ::std::pair< Reference<XConnection>,sal_Bool> (m_xConnection,sal_False); } // ----------------------------------------------------------------------------- Reference< XMultiServiceFactory > OUserAdminDlg::getORB() |