From d2c45d0460cf99aadde1aaec11e032f488fa277b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 2 Nov 2012 09:46:12 +0200 Subject: fdo#46808, Adapt i18n::Transliteration UNO service to new style Simply make the service implement XExtendedTransliteration, since all of the implementatins already do that. Change-Id: If03bf56a8d33931ad0230743a4603e2ae9b104ac --- svl/inc/svl/ondemand.hxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'svl') diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx index 47488504b073..364d48f5f27b 100644 --- a/svl/inc/svl/ondemand.hxx +++ b/svl/inc/svl/ondemand.hxx @@ -32,6 +32,15 @@ #include #include +namespace comphelper { + + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + getComponentContext( + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + const & factory); + +} + /* On demand instanciation and initialization of several i18n wrappers, helping the number formatter to not perform worse than it already does. @@ -300,7 +309,7 @@ public: if ( !bValid ) { if ( !pPtr ) - pPtr = new ::utl::TransliterationWrapper( xSMgr, nType ); + pPtr = new ::utl::TransliterationWrapper( comphelper::getComponentContext(xSMgr), nType ); pPtr->loadModuleIfNeeded( eLanguage ); bValid = true; } @@ -310,7 +319,7 @@ public: const ::utl::TransliterationWrapper* getForModule( const String& rModule, LanguageType eLang ) const { if ( !pPtr ) - pPtr = new ::utl::TransliterationWrapper( xSMgr, nType ); + pPtr = new ::utl::TransliterationWrapper( comphelper::getComponentContext(xSMgr), nType ); pPtr->loadModuleByImplName( rModule, eLang ); bValid = false; // reforce settings change in get() return pPtr; -- cgit