fdo#46808, Convert services in i18npool to XComponentContext

Change-Id: I3aeaca995bc9a3d865b6955aa47cee4d9eb07750

1 files changed, 4 insertions, 5 deletions

diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index a78a4476f4f0..e7c76efae144 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 #define ERROR RuntimeException()
 
-CalendarImpl::CalendarImpl(const Reference< XMultiServiceFactory > &rxMSF) : xMSF(rxMSF)
+CalendarImpl::CalendarImpl(const Reference< XComponentContext > &rxContext) : m_xContext(rxContext)
 {
 }
 
@@ -71,16 +71,15 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr
     }
 
     if (i >= sal::static_int_cast<sal_Int32>(lookupTable.size())) {
-        Reference < XInterface > xI = xMSF->createInstance(
-                OUString("com.sun.star.i18n.Calendar_") + uniqueID);
+        Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
+                  OUString("com.sun.star.i18n.Calendar_") + uniqueID, m_xContext);
 
         if ( ! xI.is() ) {
             // check if the calendar is defined in localedata, load gregorian calendar service.
             Sequence< Calendar2 > xC = LocaleData().getAllCalendars2(rLocale);
             for (i = 0; i < xC.getLength(); i++) {
                 if (uniqueID == xC[i].Name) {
-                    xI = xMSF->createInstance(
-                        OUString("com.sun.star.i18n.Calendar_gregorian"));
+                    xI = m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.i18n.Calendar_gregorian", m_xContext);
                     break;
                 }
             }