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 /i18npool | |
| parent | e8a169c93d7e2443a2e56afe7e99cd0721a2c27b (diff) | |
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'i18npool')
4 files changed, 8 insertions, 8 deletions
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx index f538933c6207..24ec060fc613 100644 --- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx +++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/i18n/UnicodeType.hpp> #include <com/sun/star/i18n/LocaleData.hpp> #include <com/sun/star/i18n/NativeNumberMode.hpp> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <string.h> // memcpy() @@ -401,7 +401,7 @@ sal_Bool cclass_Unicode::setupInternational( const Locale& rLocale ) } if ( !mxLocaleData.is() ) { - mxLocaleData.set( LocaleData::create(comphelper::ComponentContext(xMSF).getUNOContext()) ); + mxLocaleData.set( LocaleData::create(comphelper::getComponentContext(xMSF)) ); } return bChanged; } diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index 12a3cc62cbaa..d2a85d2c72a3 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/i18n/CollatorOptions.hpp> #include <com/sun/star/i18n/LocaleData.hpp> #include <rtl/ustrbuf.hxx> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> using namespace com::sun::star; using namespace com::sun::star::lang; @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace i18n { CollatorImpl::CollatorImpl( const Reference < XMultiServiceFactory >& rxMSF ) : xMSF(rxMSF) { - mxLocaleData.set(LocaleData::create(comphelper::ComponentContext(xMSF).getUNOContext())); + mxLocaleData.set(LocaleData::create(comphelper::getComponentContext(xMSF))); cachedItem = NULL; } diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index dc2e6089d77f..4cb947c20a53 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -25,7 +25,7 @@ #include <nativenumbersupplier.hxx> #include <stdio.h> #include <string.h> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> // Cyrillic upper case #define C_CYR_A "\xD0\x90" @@ -272,7 +272,7 @@ DefaultNumberingProvider::~DefaultNumberingProvider() void DefaultNumberingProvider::impl_loadTranslit() { if ( !translit ) - translit = new TransliterationImpl(comphelper::ComponentContext(xSMgr).getUNOContext()); + translit = new TransliterationImpl(comphelper::getComponentContext(xSMgr)); } Sequence< Reference<container::XIndexAccess> > diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index 3eba12e2cc3c..6345b916690a 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/weak.hxx> #include <osl/mutex.hxx> @@ -110,7 +110,7 @@ { \ return ::com::sun::star::uno::Reference < \ ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) \ - new ImplName( comphelper::ComponentContext(rxMSF).getUNOContext() ) ); \ + new ImplName( comphelper::getComponentContext(rxMSF) ) ); \ } typedef ::com::sun::star::uno::Reference< |