Tag: cws_src680_hsqlcsv User: fs Date: 2006/10/11 01:57:17 Modified: dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: RESYNC: (1.176-1.180); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.176.20.1&r2=1.176.20.2 Delta lines: +20 -9 -------------------- --- unodatbr.cxx 18 Sep 2006 20:19:58 -0000 1.176.20.1 +++ unodatbr.cxx 11 Oct 2006 08:57:14 -0000 1.176.20.2 @@ -33,9 +33,15 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbaccess.hxx" + #ifndef _SVX_GRIDCTRL_HXX #include <svx/gridctrl.hxx> #endif +#ifndef SVX_DATABASE_REGISTRATION_UI_HXX +#include <svx/databaseregistrationui.hxx> +#endif #ifndef _SBA_UNODATBR_HXX_ #include "unodatbr.hxx" #endif @@ -318,6 +324,8 @@ #include <svtools/moduleoptions.hxx> #endif +#include <memory> + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; @@ -2892,11 +2900,10 @@ DBTreeListModel::DBTreeListUserData* pTreeListData = static_cast< DBTreeListModel::DBTreeListUserData* >( _pDSEntry->GetUserData() ); if ( pTreeListData ) { - impl_releaseConnection( pTreeListData->xConnection ); + DBG_ASSERT( !pTreeListData->xConnection.is() == !!pTreeListData->aController.empty(), + "SbaTableQueryBrowser::disposeConnection: inconsistency: there should either be a connection and a controller, or none of both!" ); - // release the model-controller-connection - DBG_ASSERT( !pTreeListData->aController.empty(), - "SbaTableQueryBrowser::disposeConnection: there's a connection, but we didn't register ourself as controller at the model?!" ); + impl_releaseConnection( pTreeListData->xConnection ); pTreeListData->aController.clear(); } } @@ -3552,7 +3559,7 @@ if (!m_xMultiServiceFacatory.is()) // no ORB -> no administration dialog - aContextMenu.EnableItem(ID_TREE_ADMINISTRATE, sal_False); + aContextMenu.EnableItem(ID_TREE_EDIT_DATABASE, sal_False); // no disabled entries aContextMenu.RemoveDisabledEntries(); @@ -3574,7 +3581,7 @@ switch (nPos) { - case ID_TREE_ADMINISTRATE: + case ID_TREE_EDIT_DATABASE: implAdministrate(pEntry); break; @@ -3599,6 +3606,10 @@ pTransfer->CopyToClipboard(getView()); } break; + + case ID_TREE_ADMINISTRATE: + ::svx::administrateDatabaseRegistration( getView() ); + break; } return sal_True; // handled --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
