diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-25 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-29 17:32:57 +0100 |
| commit | 8fff6bf6bdab6b7addcbbf472a226706edda1edb (patch) | |
| tree | a27347a5b8e0bef5c00757a56a0e9a217fcb2f59 /sc | |
| parent | fdo#46808: Fix previous commit (diff) | |
| download | core-8fff6bf6bdab6b7addcbbf472a226706edda1edb.tar.gz core-8fff6bf6bdab6b7addcbbf472a226706edda1edb.zip | |
fdo#46808, Adapt i18n::LocaleCalendar UNO service to new style
Did not need to create a new interface, because XCalendar3
already covers the whole service interface.
Change-Id: Iaf094014c16e872d2003ca6e8e7588abd081d882
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/global.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 2cefa9468cc5..4b9eaa66c6fc 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -1137,7 +1137,7 @@ CalendarWrapper* ScGlobal::GetCalendar() { if ( !pCalendar ) { - pCalendar = new CalendarWrapper( ::comphelper::getProcessServiceFactory() ); + pCalendar = new CalendarWrapper( ::comphelper::getProcessComponentContext() ); pCalendar->loadDefaultCalendar( *GetLocale() ); } return pCalendar; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 05521e20ecd8..f96663069816 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -28,6 +28,7 @@ #include "sc.hrc" +#include <comphelper/processfactory.hxx> #include <i18npool/mslangid.hxx> #include <sot/formats.hxx> #include <sfx2/mieclip.hxx> @@ -1296,7 +1297,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) ::utl::TransliterationWrapper aTransliteration( pDoc->GetServiceManager(), SC_TRANSLITERATION_IGNORECASE ); aTransliteration.loadModuleIfNeeded( eDocLang ); - CalendarWrapper aCalendar( pDoc->GetServiceManager() ); + CalendarWrapper aCalendar( comphelper::getComponentContext(pDoc->GetServiceManager()) ); aCalendar.loadDefaultCalendar( MsLangId::convertLanguageToLocale( eDocLang ) ); ::utl::TransliterationWrapper* pEnglishTransliteration = NULL; @@ -1306,7 +1307,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) pEnglishTransliteration = new ::utl::TransliterationWrapper ( pDoc->GetServiceManager(), SC_TRANSLITERATION_IGNORECASE ); aTransliteration.loadModuleIfNeeded( LANGUAGE_ENGLISH_US ); - pEnglishCalendar = new CalendarWrapper ( pDoc->GetServiceManager() ); + pEnglishCalendar = new CalendarWrapper ( comphelper::getComponentContext(pDoc->GetServiceManager()) ); pEnglishCalendar->loadDefaultCalendar( MsLangId::convertLanguageToLocale( LANGUAGE_ENGLISH_US ) ); } |