diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-08 11:24:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-01-15 09:56:02 +0200 |
| commit | 549578a4ea996260437b355c39896593afc60726 (patch) | |
| tree | 661c536084db8ce176348be2b2539e2d1d72d6ee /i18npool/source/indexentry | |
| parent | f6c759a6e5ead55b857e5d4898aa423b7616e816 (diff) | |
fdo#46808, Convert services in i18npool to XComponentContext
Change-Id: I3aeaca995bc9a3d865b6955aa47cee4d9eb07750
Diffstat (limited to 'i18npool/source/indexentry')
| -rw-r--r-- | i18npool/source/indexentry/indexentrysupplier.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index 53fc96b9b180..9005d12e4f10 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -29,7 +29,7 @@ static const sal_Unicode under = sal_Unicode('_'); namespace com { namespace sun { namespace star { namespace i18n { -IndexEntrySupplier::IndexEntrySupplier( const Reference < XMultiServiceFactory >& rxMSF ) : xMSF( rxMSF ) +IndexEntrySupplier::IndexEntrySupplier( const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext ) { } @@ -101,8 +101,8 @@ OUString SAL_CALL IndexEntrySupplier::getIndexCharacter( const OUString& rIndexE sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException ) { - Reference < XInterface > xI = xMSF->createInstance( - OUString("com.sun.star.i18n.IndexEntrySupplier_") + name); + Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext( + OUString("com.sun.star.i18n.IndexEntrySupplier_") + name, m_xContext); if ( xI.is() ) { xI->queryInterface( ::getCppuType((const Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier>*)0) ) >>= xIES; @@ -117,7 +117,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c if (xIES.is() && rSortAlgorithm == aSortAlgorithm && rLocale.Language == aLocale.Language && rLocale.Country == aLocale.Country && rLocale.Variant == aLocale.Variant) return xIES; - else if (xMSF.is()) { + else { LocaleData ld; aLocale = rLocale; if (rSortAlgorithm.isEmpty()) |