User: kz      
Date: 05/01/21 09:13:39

Modified:
 /dba/dbaccess/source/ui/dlg/
  UserAdminDlg.cxx

Log:
 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

File Changes:

Directory: /dba/dbaccess/source/ui/dlg/
=======================================

File [changed]: UserAdminDlg.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/UserAdminDlg.cxx?r1=1.2&r2=1.3
Delta lines:  +7 -7
-------------------
--- UserAdminDlg.cxx    2 Aug 2004 15:42:22 -0000       1.2
+++ UserAdminDlg.cxx    21 Jan 2005 17:13:36 -0000      1.3
@@ -173,7 +173,7 @@
                        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 @@
                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()




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to