diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 13:15:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 13:16:38 +0200 |
| commit | 03a9f139bd9ea1a4f9096fc982e6b326def58532 (patch) | |
| tree | bfb7a08bb4831a1a46b48c3bb49afa77ca436349 /unotools | |
| parent | e8a169c93d7e2443a2e56afe7e99cd0721a2c27b (diff) | |
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/moduleoptions.cxx | 3 | ||||
| -rw-r--r-- | unotools/source/i18n/localedatawrapper.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index e81f3ad7f955..1d008d74d65b 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -22,7 +22,6 @@ #include <comphelper/sequenceashashmap.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> -#include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> @@ -271,7 +270,7 @@ struct FactoryInfo { if ( !xSubstVars.is() ) { - css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::ComponentContext(xSMgr).getUNOContext() ); + css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::getComponentContext(xSMgr) ); xSubstVars = css::uno::Reference< css::util::XStringSubstitution >( css::util::PathSubstitution::create(xContext) ); diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 93eda0d0fd2c..d6dee74d9435 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/i18n/CalendarDisplayIndex.hpp> #include <com/sun/star/i18n/NumberFormatIndex.hpp> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <rtl/instance.hxx> #include <rtl/ustrbuf.hxx> #include <sal/macros.h> @@ -71,7 +71,7 @@ LocaleDataWrapper::LocaleDataWrapper( ) : xSMgr( xSF ), - xLD( LocaleData::create(comphelper::ComponentContext(xSMgr).getUNOContext()) ), + xLD( LocaleData::create(comphelper::getComponentContext(xSMgr)) ), bLocaleDataItemValid( sal_False ), bReservedWordValid( sal_False ) { |