User: hr Date: 2006/08/15 03:49:55 Modified: dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: INTEGRATION: CWS dba30 (1.173.12); FILE MERGED 2006/07/19 12:41:54 fs 1.173.12.3: RESYNC: (1.174-1.176); FILE MERGED 2006/05/08 11:21:12 fs 1.173.12.2: RESYNC: (1.173-1.174); FILE MERGED 2006/03/31 13:30:24 fs 1.173.12.1: #i54504# 'Database Registrations...' entry in the data source browser's context menu 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&r2=1.177 Delta lines: +11 -2 -------------------- --- unodatbr.cxx 10 Jul 2006 15:24:46 -0000 1.176 +++ unodatbr.cxx 15 Aug 2006 10:49:53 -0000 1.177 @@ -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 @@ -315,6 +318,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; @@ -3557,7 +3562,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(); @@ -3579,7 +3584,7 @@ switch (nPos) { - case ID_TREE_ADMINISTRATE: + case ID_TREE_EDIT_DATABASE: implAdministrate(pEntry); break; @@ -3604,6 +3609,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]
