diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-05 15:07:20 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 18:18:06 +0100 |
| commit | c2bbc9797c2fef9078c11460100996972bebd971 (patch) | |
| tree | 914381462eceda8e659d773290b18a27c3825364 /svl | |
| parent | 60fa5057039d2413d56813df4d45e5cfdfbb40ac (diff) | |
fdo#46808, use service constructor for i18n::NativeNumberSupplier
Change-Id: I092ca8f912e26f0743909920c6e740d648b8677e
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/ondemand.hxx | 12 | ||||
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx index 70c028f2ef52..1aa78516b57a 100644 --- a/svl/inc/svl/ondemand.hxx +++ b/svl/inc/svl/ondemand.hxx @@ -329,7 +329,7 @@ public: */ class OnDemandNativeNumberWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; mutable NativeNumberWrapper* pPtr; bool bInitialized; @@ -339,12 +339,12 @@ public: , bInitialized(false) {} OnDemandNativeNumberWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) : pPtr(0) , bInitialized(false) { - init( rxSMgr ); + init( rxContext ); } ~OnDemandNativeNumberWrapper() { @@ -354,10 +354,10 @@ public: bool isInitialized() const { return bInitialized; } void init( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) { - xSMgr = rxSMgr; + m_xContext = rxContext; if ( pPtr ) { delete pPtr; @@ -371,7 +371,7 @@ public: NativeNumberWrapper* get() const { if ( !pPtr ) - pPtr = new NativeNumberWrapper( xSMgr ); + pPtr = new NativeNumberWrapper( m_xContext ); return pPtr; } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index a8bc1ca2bf30..9496d9acb841 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -240,7 +240,7 @@ void SvNumberFormatter::ImpConstruct( LanguageType eLang ) xCalendar.init( comphelper::getComponentContext(xServiceManager), maLanguageTag.getLocale() ); xTransliteration.init( comphelper::getComponentContext(xServiceManager), eLang, ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE ); - xNatNum.init( xServiceManager ); + xNatNum.init( comphelper::getComponentContext(xServiceManager) ); // cached locale data items const LocaleDataWrapper* pLoc = GetLocaleData(); |