From 8b75883b87c9f7989f98fb413f5e51200c52891c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 14 Nov 2011 22:07:23 +0100
Subject: Simplified some uses of css.configuration.theDefaultProvider.

* Retro-added new-style UNOIDL singleton specification for it, for easy
instantiation.
* Plus new comphelper::getComponentContext to map from XMultiServiceFactory
to XComponentContext.
---
 canvas/source/factory/cf_service.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'canvas')

diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 7b8e876e7c00..349e9bdc3301 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -154,9 +155,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
     {
         // read out configuration for preferred services:
         Reference<lang::XMultiServiceFactory> xConfigProvider(
-            m_xContext->getServiceManager()->createInstanceWithContext(
-                OUSTR("com.sun.star.configuration.ConfigurationProvider"),
-                m_xContext ), UNO_QUERY_THROW );
+            configuration::theDefaultProvider::get( m_xContext ) );
 
         Any propValue(
             makeAny( beans::PropertyValue(
-- 
cgit