From 9c00e38b431b57c3760f6c0aa774424b3239eeda Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 18 Sep 2012 09:46:34 +0200
Subject: 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
---
 cui/source/options/dbregisterednamesconfig.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cui/source/options/dbregisterednamesconfig.cxx')

diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index bb935779f273..c2829b16f640 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -31,6 +31,7 @@
 #include "dbregistersettings.hxx"
 #include "svx/svxids.hrc"
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <com/sun/star/sdb/XDatabaseRegistrations.hpp>
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/extract.hxx>
@@ -61,9 +62,9 @@ namespace svx
 
         try
         {
-            ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+            Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
             Reference< XDatabaseRegistrations > xRegistrations(
-                aContext.createComponent( "com.sun.star.sdb.DatabaseContext" ), UNO_QUERY_THROW );
+                DatabaseContext::create(xContext), UNO_QUERY_THROW );
 
             Sequence< ::rtl::OUString > aRegistrationNames( xRegistrations->getRegistrationNames() );
             const ::rtl::OUString* pRegistrationName = aRegistrationNames.getConstArray();
-- 
cgit