fdo#46808, Adapt sdb::DatabaseContext UNO service to new style

Create a merged XDatabaseContext interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.

Quite a few IDL files had to be marked as published for this to work.

Change-Id: Ie9a0da88d8c33cc83fc9d2334ff83ab2744c222f

1 files changed, 3 insertions, 53 deletions

diff --git a/offapi/com/sun/star/sdb/DatabaseContext.idl b/offapi/com/sun/star/sdb/DatabaseContext.idl
index 52ddc1c0a924..fee353634067 100644
--- a/offapi/com/sun/star/sdb/DatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseContext.idl
@@ -19,19 +19,9 @@
 #ifndef __com_sun_star_sdb_DatabaseContext_idl__
 #define __com_sun_star_sdb_DatabaseContext_idl__
 
-#include <com/sun/star/container/XEnumerationAccess.idl>
+#include <com/sun/star/sdb/XDatabaseContext.idl>
 
-#include <com/sun/star/container/XContainer.idl>
-
-#include <com/sun/star/lang/XSingleServiceFactory.idl>
-
-#include <com/sun/star/container/XNameAccess.idl>
-
-#include <com/sun/star/uno/XNamingService.idl>
-
- module com {  module sun {  module star {  module sdb {
-
-published interface XDatabaseRegistrations;
+module com {  module sun {  module star {  module sdb {
 
 /** is the context for accessing datasource.
 
@@ -44,50 +34,10 @@ published interface XDatabaseRegistrations;
     </p>
     @see com::sun::star::sdb::DataSource
  */
-published service DatabaseContext
-{
-    /** Enumeration on all registered data sources.
-     */
-    interface com::sun::star::container::XEnumerationAccess;
-
-    /** NameAccess on all registered data sources.
-        <p>One exception is the <method "com.sun.star.container.XNameAccess">getByName</method>, this method also allows to ask
-        for a <member "DataAccessDescriptor">DatabaseLocation</member>.
-        </p>
-     */
-    interface com::sun::star::container::XNameAccess;
-
-    /** Interface for registering new datasources.
-     */
-    interface com::sun::star::uno::XNamingService;
-
-    /** Interface for registering listener to get notified when new datasources are created or removed.
-    */
-    interface com::sun::star::container::XContainer;
-
-    /** Interface for creation of new datasources.
-    */
-    interface com::sun::star::lang::XSingleServiceFactory;
-
-    /** allows to access and modify the configuration data for registered data source.
-
-        <p>The main purpose of this interface is to allow you to register data sources which you know
-        by URL only, and have not yet loaded.</p>
-
-        <p>Also, it hides the details of the configuration data where the data source registrations
-        are maintained, so if possible at all, you should use this interface, instead of modifying or
-        querying the configuration data directly.</p>
-
-        @since OOo 3.3
-    */
-    [optional] interface XDatabaseRegistrations;
-};
-
+published service DatabaseContext : XDatabaseContext;
 
 }; }; }; };
 
-/*===========================================================================
-===========================================================================*/
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */