diff options
Diffstat (limited to 'svl')
-rw-r--r-- | svl/inc/svl/zforlist.hxx | 12 | ||||
-rw-r--r-- | svl/source/numbers/supservs.cxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 22 | ||||
-rw-r--r-- | svl/source/numbers/zforscan.cxx | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index b7e6949f89d2..9167bfc33790 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -47,8 +47,8 @@ class ImpSvNumberInputScan; class SvNumberformat; namespace com { namespace sun { namespace star { - namespace lang { - class XMultiServiceFactory; + namespace uno { + class XComponentContext; } }}} @@ -325,7 +325,7 @@ public: /// Preferred ctor with service manager and language/country enum SvNumberFormatter( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMgr, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, LanguageType eLang ); @@ -788,7 +788,7 @@ public: static bool IsLocaleInstalled( LanguageType eLang ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; LanguageTag maLanguageTag; SvNumberFormatTable aFTable; // Table of format keys to format entries typedef std::map<sal_uInt32, sal_uInt32> DefaultFormatKeysMap; @@ -936,9 +936,9 @@ public: // new format codes are appended. void ReplaceSystemCL( LanguageType eOldLanguage ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > GetServiceManager() const + inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const { - return xServiceManager; + return m_xContext; } diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 905f2a09b15b..a82bb0a76c51 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -111,7 +111,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< #endif } - m_pOwnFormatter = new SvNumberFormatter(m_xORB, eNewFormatterLanguage); + m_pOwnFormatter = new SvNumberFormatter( comphelper::getComponentContext(m_xORB), eNewFormatterLanguage); m_pOwnFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_FORMAT_INTL ); SetNumberFormatter(m_pOwnFormatter); } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 482dee35cd76..e2fa5f6efb30 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -188,9 +188,9 @@ sal_uInt16 SvNumberFormatter::nSystemCurrencyPosition = 0; const sal_uInt16 SvNumberFormatter::UNLIMITED_PRECISION = ::std::numeric_limits<sal_uInt16>::max(); const sal_uInt16 SvNumberFormatter::INPUTSTRING_PRECISION = ::std::numeric_limits<sal_uInt16>::max()-1; -SvNumberFormatter::SvNumberFormatter( const Reference< XMultiServiceFactory >& xSMgr, +SvNumberFormatter::SvNumberFormatter( const Reference< XComponentContext >& rxContext, LanguageType eLang ) - : xServiceManager( xSMgr ) + : m_xContext( rxContext ) , maLanguageTag( eLang) { ImpConstruct( eLang ); @@ -234,12 +234,12 @@ void SvNumberFormatter::ImpConstruct( LanguageType eLang ) nDefaultSystemCurrencyFormat = NUMBERFORMAT_ENTRY_NOT_FOUND; maLanguageTag.reset( eLang ); - pCharClass = new CharClass( comphelper::getComponentContext(xServiceManager), maLanguageTag ); - xLocaleData.init( comphelper::getComponentContext(xServiceManager), maLanguageTag ); - xCalendar.init( comphelper::getComponentContext(xServiceManager), maLanguageTag.getLocale() ); - xTransliteration.init( comphelper::getComponentContext(xServiceManager), eLang, + pCharClass = new CharClass( m_xContext, maLanguageTag ); + xLocaleData.init( m_xContext, maLanguageTag ); + xCalendar.init( m_xContext, maLanguageTag.getLocale() ); + xTransliteration.init( m_xContext, eLang, ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE ); - xNatNum.init( comphelper::getComponentContext(xServiceManager) ); + xNatNum.init( m_xContext ); // cached locale data items const LocaleDataWrapper* pLoc = GetLocaleData(); @@ -474,7 +474,7 @@ void SvNumberFormatter::ReplaceSystemCL( LanguageType eOldLanguage ) pStdFormat->SetLastInsertKey( sal_uInt16(nLastKey - nCLOffset) ); // append new system additional formats - NumberFormatCodeWrapper aNumberFormatCode( comphelper::getComponentContext(xServiceManager), + NumberFormatCodeWrapper aNumberFormatCode( m_xContext, GetLanguageTag().getLocale() ); ImpGenerateAdditionalFormats( nCLOffset, aNumberFormatCode, true ); } @@ -736,7 +736,7 @@ bool SvNumberFormatter::Load( SvStream& rStream ) // different SYSTEM locale if ( !pConverter ) { - pConverter = new SvNumberFormatter( xServiceManager, eSysLang ); + pConverter = new SvNumberFormatter( m_xContext, eSysLang ); } pEntry->ConvertLanguage( *pConverter, eSaveSysLang, eLoadSysLang, true ); } @@ -781,7 +781,7 @@ bool SvNumberFormatter::Load( SvStream& rStream ) // generate additional i18n standard formats for all used locales LanguageType eOldLanguage = ActLnge; - NumberFormatCodeWrapper aNumberFormatCode( comphelper::getComponentContext(xServiceManager), + NumberFormatCodeWrapper aNumberFormatCode( m_xContext, GetLanguageTag().getLocale() ); std::vector<sal_uInt16> aList; GetUsedLanguages( aList ); @@ -2247,7 +2247,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio pFormatScanner->SetConvertMode(false); // switch off for this function } - NumberFormatCodeWrapper aNumberFormatCode( comphelper::getComponentContext(xServiceManager), + NumberFormatCodeWrapper aNumberFormatCode( m_xContext, GetLanguageTag().getLocale() ); SvNumberformat* pNewFormat = NULL; sal_Int32 nIdx; diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 24c14a739b09..73e6add49ca6 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -225,7 +225,7 @@ void ImpSvNumberformatScan::SetDependentKeywords() // requested Locale, otherwise number format codes might not match const LanguageTag& rLoadedLocale = pLocaleData->getLoadedLanguageTag(); LanguageType eLang = rLoadedLocale.getLanguageType( false); - NumberFormatCodeWrapper aNumberFormatCode( comphelper::getComponentContext(pFormatter->GetServiceManager()), + NumberFormatCodeWrapper aNumberFormatCode( pFormatter->GetComponentContext(), rLoadedLocale.getLocale() ); i18n::NumberFormatCode aFormat = aNumberFormatCode.getFormatCode( NF_NUMBER_STANDARD ); |