Tag: cws_src680_dba30 User: fs Date: 06/03/31 05:30:27 Modified: /dba/dbaccess/inc/ dbaccess_helpid.hrc /dba/dbaccess/source/ui/browser/ sbabrw.src, unodatbr.cxx /dba/dbaccess/source/ui/inc/ browserids.hxx /dba/dbaccess/util/ hidother.src
Log: #i54504# 'Database Registrations...' entry in the data source browser's context menu File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: dbaccess_helpid.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/dbaccess_helpid.hrc?r1=1.65&r2=1.65.14.1 Delta lines: +30 -28 --------------------- --- dbaccess_helpid.hrc 8 Sep 2005 09:47:50 -0000 1.65 +++ dbaccess_helpid.hrc 31 Mar 2006 13:30:23 -0000 1.65.14.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbaccess_helpid.hrc,v $ * - * $Revision: 1.65 $ + * $Revision: 1.65.14.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 09:47:50 $ + * last change: $Author: fs $ $Date: 2006/03/31 13:30:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -95,7 +95,7 @@ #define HID_BROWSER_COLUMNWIDTH (HID_DBACCESS_START + 62) #define HID_BROWSER_TABLEFORMAT (HID_DBACCESS_START + 63) #define HID_BROWSER_ROWHEIGHT (HID_DBACCESS_START + 64) -#define HID_BROWSER_DSADMINISTRATE (HID_DBACCESS_START + 65) +#define HID_BROWSER_EDIT_DATABASE (HID_DBACCESS_START + 65) #define HID_BROWSER_CLOSECONN (HID_DBACCESS_START + 66) #define HID_BROWSER_REFRESHCONN (HID_DBACCESS_START + 67) @@ -354,6 +354,8 @@ #define HID_DSADMIN_SCHEMA (HID_DBACCESS_START + 293) #define HID_DSADMIN_IGNOREINDEXAPPENDIX (HID_DBACCESS_START + 294) #define HID_DSADMIN_DOSLINEENDS (HID_DBACCESS_START + 295) + +#define HID_BROWSER_ADMINISTRATE (HID_DBACCESS_START + 296) #define HID_PAGE_DBWIZARD_GENERALPAGE (HID_DBACCESS_START + 300) #define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE (HID_DBACCESS_START + 301) Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: sbabrw.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/sbabrw.src?r1=1.101&r2=1.101.16.1 Delta lines: +17 -7 -------------------- --- sbabrw.src 23 Sep 2005 14:09:45 -0000 1.101 +++ sbabrw.src 31 Mar 2006 13:30:24 -0000 1.101.16.1 @@ -4,9 +4,9 @@ * * $RCSfile: sbabrw.src,v $ * - * $Revision: 1.101 $ + * $Revision: 1.101.16.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 14:09:45 $ + * last change: $Author: fs $ $Date: 2006/03/31 13:30:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -132,12 +132,18 @@ Text [ en-US ] = "Tables"; }; -#define MID_ADMINISTRATE \ - Identifier = ID_TREE_ADMINISTRATE ; \ - HelpId = HID_BROWSER_DSADMINISTRATE ; \ +#define MID_EDIT_DATABASE \ + Identifier = ID_TREE_EDIT_DATABASE ; \ + HelpId = HID_BROWSER_EDIT_DATABASE; \ Text [ de ] = "~Datenbankdatei bearbeiten ..." ; \ Text [ en-US ] = "Edit ~Database File..." ;\ +#define MID_ADMINISTRATE \ + Identifier = ID_TREE_ADMINISTRATE ; \ + HelpId = HID_BROWSER_ADMINISTRATE; \ + Text [ de ] = "Datenbank-Registrierungen ..." ; \ + Text [ en-US ] = "Database Registrations ..." ;\ + #define MID_CLOSECONN \ Identifier = ID_TREE_CLOSE_CONN ; \ HelpId = HID_BROWSER_CLOSECONN ; \ @@ -153,7 +159,7 @@ #define MITEMS_DEFAULT \ MenuItem \ { \ - MID_ADMINISTRATE \ + MID_EDIT_DATABASE \ }; \ MenuItem \ { \ @@ -170,6 +176,10 @@ MenuItem \ { \ Separator = TRUE; \ + }; \ + MenuItem \ + { \ + MID_ADMINISTRATE \ }; Menu MENU_BROWSER_DEFAULTCONTEXT File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.173&r2=1.173.12.1 Delta lines: +14 -5 -------------------- --- unodatbr.cxx 24 Oct 2005 08:31:15 -0000 1.173 +++ unodatbr.cxx 31 Mar 2006 13:30:24 -0000 1.173.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.173 $ + * $Revision: 1.173.12.1 $ * - * last change: $Author: rt $ $Date: 2005/10/24 08:31:15 $ + * last change: $Author: fs $ $Date: 2006/03/31 13:30:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ -309,6 +312,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; @@ -3632,7 +3637,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(); @@ -3654,7 +3659,7 @@ switch (nPos) { - case ID_TREE_ADMINISTRATE: + case ID_TREE_EDIT_DATABASE: implAdministrate(pEntry); break; @@ -3679,6 +3684,10 @@ pTransfer->CopyToClipboard(getView()); } break; + + case ID_TREE_ADMINISTRATE: + ::svx::administrateDatabaseRegistration( getView() ); + break; } return sal_True; // handled Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: browserids.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/browserids.hxx?r1=1.36&r2=1.36.14.1 Delta lines: +5 -4 ------------------- --- browserids.hxx 8 Sep 2005 15:44:07 -0000 1.36 +++ browserids.hxx 31 Mar 2006 13:30:24 -0000 1.36.14.1 @@ -4,9 +4,9 @@ * * $RCSfile: browserids.hxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.36.14.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:44:07 $ + * last change: $Author: fs $ $Date: 2006/03/31 13:30:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,9 +80,10 @@ // The following ids are local to special components (e.g. menus), so they don't need to be unique // overall. Please have this in mind when changing anything -#define ID_TREE_ADMINISTRATE 1 +#define ID_TREE_EDIT_DATABASE 1 #define ID_TREE_CLOSE_CONN 2 #define ID_TREE_REBUILD_CONN 3 +#define ID_TREE_ADMINISTRATE 4 // free // free // free Directory: /dba/dbaccess/util/ ============================== File [changed]: hidother.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/util/hidother.src?r1=1.60&r2=1.60.14.1 Delta lines: +4 -4 ------------------- --- hidother.src 8 Sep 2005 16:53:44 -0000 1.60 +++ hidother.src 31 Mar 2006 13:30:25 -0000 1.60.14.1 @@ -4,9 +4,9 @@ * * $RCSfile: hidother.src,v $ * - * $Revision: 1.60 $ + * $Revision: 1.60.14.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 16:53:44 $ + * last change: $Author: fs $ $Date: 2006/03/31 13:30:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,7 +89,7 @@ hidspecial HID_BROWSER_COLUMNWIDTH { HelpId = HID_BROWSER_COLUMNWIDTH; }; hidspecial HID_BROWSER_TABLEFORMAT { HelpId = HID_BROWSER_TABLEFORMAT; }; hidspecial HID_BROWSER_ROWHEIGHT { HelpId = HID_BROWSER_ROWHEIGHT; }; -hidspecial HID_BROWSER_DSADMINISTRATE { HelpId = HID_BROWSER_DSADMINISTRATE; }; +hidspecial HID_BROWSER_EDIT_DATABASE { HelpId = HID_BROWSER_EDIT_DATABASE; }; hidspecial HID_BROWSER_CLOSECONN { HelpId = HID_BROWSER_CLOSECONN; }; hidspecial HID_BROWSER_REFRESHCONN { HelpId = HID_BROWSER_REFRESHCONN; }; hidspecial HID_DSADMIN_SPECIAL_MESSAGE { HelpId = HID_DSADMIN_SPECIAL_MESSAGE; }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
