diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-14 22:07:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-14 22:07:23 +0100 |
| commit | 8b75883b87c9f7989f98fb413f5e51200c52891c (patch) | |
| tree | 5eaf6d052d25c61654b4e06ffb67784eab9d263b /canvas | |
| parent | f72516ed25d25963f497396985d56344eb3ff465 (diff) | |
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.
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
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( |