User: obo Date: 05/03/18 02:09:43 Modified: /dba/dbaccess/source/ui/dlg/ UserAdmin.cxx
Log: INTEGRATION: CWS dba25 (1.13.38); FILE MERGED 2005/03/04 07:19:44 oj 1.13.38.1: #i43912# use set connection as activeconnection File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: UserAdmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/UserAdmin.cxx?r1=1.13&r2=1.14 Delta lines: +13 -20 --------------------- --- UserAdmin.cxx 21 Jan 2005 17:13:22 -0000 1.13 +++ UserAdmin.cxx 18 Mar 2005 10:09:40 -0000 1.14 @@ -384,13 +384,6 @@ return m_LB_USER.GetSelectEntry(); } // ----------------------------------------------------------------------------- -int OUserAdmin::DeactivatePage(SfxItemSet* _pSet) -{ - int nResult = OGenericAdministrationPage::DeactivatePage(_pSet); - ::comphelper::disposeComponent(m_xConnection); - return nResult; -} -// ----------------------------------------------------------------------------- void OUserAdmin::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { } @@ -406,22 +399,22 @@ { if ( !m_xConnection.is() && m_pAdminDialog ) { + m_xConnection = m_pAdminDialog->createConnection().first; + Reference< XTablesSupplier > xTablesSup(m_xConnection,UNO_QUERY); + Reference<XUsersSupplier> xUsersSup(xTablesSup,UNO_QUERY); + if ( !xUsersSup.is() ) + { Reference< XDataDefinitionSupplier > xDriver(m_pAdminDialog->getDriver(),UNO_QUERY); if ( xDriver.is() ) { - m_xConnection = m_pAdminDialog->createConnection().first; - if ( m_xConnection.is() ) - { - // now set the tables supplier at the table control - Reference< XTablesSupplier > xTablesSup = xDriver->getDataDefinitionByConnection(m_xConnection); - - Reference<XUsersSupplier> xUsersSup(xTablesSup,UNO_QUERY); + xUsersSup.set(xDriver->getDataDefinitionByConnection(m_xConnection),UNO_QUERY); + xTablesSup.set(xUsersSup,UNO_QUERY); + } + } if ( xUsersSup.is() ) { m_TableCtrl.setTablesSupplier(xTablesSup); m_xUsers = xUsersSup->getUsers(); - } - } } } FillUserNames(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
