From 2e284203da7f9882842111265f5f68ea0a145065 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 13 Sep 2012 11:01:15 +0200
Subject: fdo#46808, Adapt ucb::UniversalContentBroker UNO service to new style

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

Change-Id: Id264387bf8af8bf211050e15b8801a1fde368167
---
 basic/source/runtime/iosys.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'basic')

diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 893ba364d75b..4ac4fa400c15 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <com/sun/star/ucb/UniversalContentBroker.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
 #include <com/sun/star/ucb/XContentProviderManager.hpp>
@@ -276,18 +277,17 @@ bool hasUno( void )
     if( bNeedInit )
     {
         bNeedInit = false;
-        Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
-        if( !xSMgr.is() )
+        Reference< XComponentContext > xContext = getProcessComponentContext();
+        if( !xContext.is() )
         {
             // No service manager at all
             bRetVal = false;
         }
         else
         {
-            Reference< XContentProviderManager > xManager( xSMgr->createInstance(
-                                                               ::rtl::OUString( "com.sun.star.ucb.UniversalContentBroker" ) ), UNO_QUERY );
+            Reference< XUniversalContentBroker > xManager = UniversalContentBroker::createDefault(xContext);
 
-            if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString("file:///" ) ).is() ) )
+            if ( !( xManager->queryContentProvider( ::rtl::OUString("file:///" ) ).is() ) )
             {
                 // No UCB
                 bRetVal = false;
-- 
cgit