diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-08 14:53:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-28 13:06:18 +0100 |
| commit | 56ea15091c69d280310aa8b28bb1e9488eaad756 (patch) | |
| tree | 5c97dee49a30aa1b51c7f54f7990723268f28878 /i18npool/source/indexentry | |
| parent | 7e708545e4e32910d93cd471eb8438dca4ab47b6 (diff) | |
fdo#46808, use service constructor for i18n::Collator
Change-Id: If6ad17fa9e274beff7ba872a095ced65438962af
Diffstat (limited to 'i18npool/source/indexentry')
3 files changed, 8 insertions, 8 deletions
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx index 90a92d19a651..f77bc7d4676c 100644 --- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -35,7 +35,7 @@ extern "C" { static void SAL_CALL thisModule() {} } #endif IndexEntrySupplier_asian::IndexEntrySupplier_asian( - const Reference < XMultiServiceFactory >& rxMSF ) : IndexEntrySupplier_Common(rxMSF) + const Reference < XComponentContext >& rxContext ) : IndexEntrySupplier_Common(rxContext) { implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian"; #ifndef DISABLE_DYNLOADING diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx index d2c2486d88bc..bd647b2b2476 100644 --- a/i18npool/source/indexentry/indexentrysupplier_common.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx @@ -28,10 +28,10 @@ using namespace ::rtl; namespace com { namespace sun { namespace star { namespace i18n { -IndexEntrySupplier_Common::IndexEntrySupplier_Common(const Reference < lang::XMultiServiceFactory >& rxMSF) +IndexEntrySupplier_Common::IndexEntrySupplier_Common(const Reference < uno::XComponentContext >& rxContext) { implementationName = "com.sun.star.i18n.IndexEntrySupplier_Common"; - collator = new CollatorImpl(rxMSF); + collator = new CollatorImpl(rxContext); usePhonetic = sal_False; } diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index 022cead9f9e0..eba5beed2c33 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -29,11 +29,11 @@ using namespace ::rtl; namespace com { namespace sun { namespace star { namespace i18n { IndexEntrySupplier_Unicode::IndexEntrySupplier_Unicode( - const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ) : - IndexEntrySupplier_Common(rxMSF) + const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ) : + IndexEntrySupplier_Common(rxContext) { implementationName = "com.sun.star.i18n.IndexEntrySupplier_Unicode"; - index = new Index(rxMSF); + index = new Index(rxContext); } IndexEntrySupplier_Unicode::~IndexEntrySupplier_Unicode() @@ -106,9 +106,9 @@ void IndexTable::init(sal_Unicode start_, sal_Unicode end_, IndexKey *keys, sal_ } } -Index::Index(const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF) +Index::Index(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext) { - collator = new CollatorImpl(rxMSF); + collator = new CollatorImpl(rxContext); } Index::~Index() |