fdo#46808, use service constructor for i18n::Collator

Change-Id: If6ad17fa9e274beff7ba872a095ced65438962af

6 files changed, 9 insertions, 10 deletions

diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index cb50b257b062..83518d64a812 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -31,7 +31,7 @@ class ChapterCollator : public CollatorImpl
 {
 public:
     // Constructors
-    ChapterCollator( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+    ChapterCollator( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
     // Destructor
     ~ChapterCollator();
 
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 7af96199cbbd..52409c59796f 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -20,7 +20,6 @@
 #define _I18N_COLLATORIMPL_HXX_
 
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/i18n/XLocaleData4.hpp>
 #include <com/sun/star/i18n/XCollator.hpp>
@@ -44,7 +43,7 @@ class CollatorImpl : public cppu::WeakImplHelper2
 public:
 
     // Constructors
-    CollatorImpl( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+    CollatorImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
     // Destructor
     ~CollatorImpl();
 
@@ -95,7 +94,7 @@ private :
     lookupTableItem *cachedItem;
 
     // Service Factory
-    com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xMSF;
+    com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
     // lang::Locale Data
     com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData;
 
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index 454fab80fdaa..d15ae9703655 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 class IndexEntrySupplier_asian : public IndexEntrySupplier_Common {
 public:
-    IndexEntrySupplier_asian( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+    IndexEntrySupplier_asian( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
     ~IndexEntrySupplier_asian();
 
     rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index b5abbc3b0c99..65277c2b5220 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -38,7 +38,7 @@ class IndexEntrySupplier_Common : public cppu::WeakImplHelper2
 >
 {
 public:
-    IndexEntrySupplier_Common( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+    IndexEntrySupplier_Common( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
     ~IndexEntrySupplier_Common();
 
     virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList()
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index e915ea7d3091..757a849af46a 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -30,7 +30,7 @@ class Index;
 //  ----------------------------------------------------
 class IndexEntrySupplier_Unicode : public IndexEntrySupplier_Common {
 public:
-    IndexEntrySupplier_Unicode( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+    IndexEntrySupplier_Unicode( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
     ~IndexEntrySupplier_Unicode();
 
     virtual sal_Bool SAL_CALL loadAlgorithm(
@@ -81,7 +81,7 @@ public:
 class Index
 {
 public:
-    Index(const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF);
+    Index(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext);
     ~Index();
 
     void init(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm) throw (com::sun::star::uno::RuntimeException);
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index 5419f0607131..33c8f7378390 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 class IndexEntrySupplier_ja_phonetic : public IndexEntrySupplier_Common {
 public:
-    IndexEntrySupplier_ja_phonetic( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ) : IndexEntrySupplier_Common(rxMSF) {
+    IndexEntrySupplier_ja_phonetic( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ) : IndexEntrySupplier_Common(rxContext) {
         implementationName = "com.sun.star.i18n.IndexEntrySupplier_ja_phonetic";
     };
     virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,\
@@ -49,7 +49,7 @@ public:
 #define INDEXENTRYSUPPLIER_JA_PHONETIC( algorithm ) \
 class IndexEntrySupplier_##algorithm : public IndexEntrySupplier_ja_phonetic {\
 public:\
-    IndexEntrySupplier_##algorithm (const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF) : IndexEntrySupplier_ja_phonetic (rxMSF) {\
+    IndexEntrySupplier_##algorithm (const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext) : IndexEntrySupplier_ja_phonetic (rxContext) {\
         implementationName = "com.sun.star.i18n.IndexEntrySupplier_"#algorithm;\
     };\
     virtual sal_Bool SAL_CALL loadAlgorithm(\