Tag: cws_src680_dba205b User: oj Date: 2006/09/04 05:05:08 Modified: dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: RESYNC: (1.176-1.178); 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.18.2&r2=1.176.18.3 Delta lines: +17 -9 -------------------- --- unodatbr.cxx 6 Aug 2006 20:16:00 -0000 1.176.18.2 +++ unodatbr.cxx 4 Sep 2006 12:05:06 -0000 1.176.18.3 @@ -36,6 +36,9 @@ #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 @@ -321,6 +324,8 @@ #include <svtools/moduleoptions.hxx> #endif +#include <memory> + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::sdb; @@ -2928,11 +2933,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(); } } @@ -3573,7 +3577,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(); @@ -3595,7 +3599,7 @@ switch (nPos) { - case ID_TREE_ADMINISTRATE: + case ID_TREE_EDIT_DATABASE: implAdministrate(pEntry); break; @@ -3620,6 +3624,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]
