From f95a7c2c6d5c2158de12bb3ca6fd94b139e33c62 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 10 Jan 2013 16:40:27 +0200 Subject: fdo#46808, Convert SvNumberFormatter to use XComponentContext Change-Id: If4e8312dae6bc5eb8bb7655cf250f06ab37b7e5c --- forms/source/component/FormattedField.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'forms') diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index cc6e967f0855..0eb9406c8bf2 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -92,13 +92,13 @@ protected: static WeakReference< XNumberFormatsSupplier > s_xDefaultFormatsSupplier; public: - static Reference< XNumberFormatsSupplier > get( const Reference< XMultiServiceFactory >& _rxORB ); + static Reference< XNumberFormatsSupplier > get( const Reference< XComponentContext >& _rxORB ); using SvNumberFormatsSupplierObj::operator new; using SvNumberFormatsSupplierObj::operator delete; protected: - StandardFormatsSupplier(const Reference& _rxFactory,LanguageType _eSysLanguage); + StandardFormatsSupplier(const Reference< XComponentContext >& _rxFactory,LanguageType _eSysLanguage); ~StandardFormatsSupplier(); protected: @@ -110,9 +110,9 @@ protected: WeakReference< XNumberFormatsSupplier > StandardFormatsSupplier::s_xDefaultFormatsSupplier; //------------------------------------------------------------------ -StandardFormatsSupplier::StandardFormatsSupplier(const Reference< XMultiServiceFactory > & _rxFactory,LanguageType _eSysLanguage) +StandardFormatsSupplier::StandardFormatsSupplier(const Reference< XComponentContext > & _rxContext,LanguageType _eSysLanguage) :SvNumberFormatsSupplierObj() - ,m_pMyPrivateFormatter(new SvNumberFormatter(_rxFactory, _eSysLanguage)) + ,m_pMyPrivateFormatter(new SvNumberFormatter(_rxContext, _eSysLanguage)) { SetNumberFormatter(m_pMyPrivateFormatter); @@ -129,7 +129,7 @@ StandardFormatsSupplier::~StandardFormatsSupplier() } //------------------------------------------------------------------ -Reference< XNumberFormatsSupplier > StandardFormatsSupplier::get( const Reference< XMultiServiceFactory >& _rxORB ) +Reference< XNumberFormatsSupplier > StandardFormatsSupplier::get( const Reference< XComponentContext >& _rxORB ) { LanguageType eSysLanguage = LANGUAGE_SYSTEM; { @@ -661,7 +661,7 @@ Reference OFormattedModel::calcFormFormatsSupplier() co //------------------------------------------------------------------------------ Reference< XNumberFormatsSupplier > OFormattedModel::calcDefaultFormatsSupplier() const { - return StandardFormatsSupplier::get( getContext().getLegacyServiceFactory() ); + return StandardFormatsSupplier::get( getContext().getUNOContext() ); } // XBoundComponent -- cgit