From d2f6a87ac7adb3f60f7eae7c5a8f8a9076b7a75c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 5 Nov 2012 11:28:43 +0200 Subject: fdo#46808, use service constructor for i18n::NumberFormatMapper Also create a utility constructor for LocaleDataWrapper, which simplifies many of the calling sites. Change-Id: Ic8510b51c4201fa17fc0620e18d3e258e43636ba --- svtools/source/control/calendar.cxx | 2 +- svtools/source/control/fmtfield.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'svtools/source/control') diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 4cda4dbcc08f..84baaf091698 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -257,7 +257,7 @@ void Calendar::ImplInitSettings() Calendar::Calendar( Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle & (WB_TABSTOP | WB_GROUP | WB_BORDER | WB_3DLOOK | WB_RANGESELECT | WB_MULTISELECT) ), - maCalendarWrapper( comphelper::getComponentContext(Application::GetAppLocaleDataWrapper().getServiceFactory()) ), + maCalendarWrapper( Application::GetAppLocaleDataWrapper().getComponentContext() ), maOldFormatFirstDate( 0, 0, 1900 ), maOldFormatLastDate( 0, 0, 1900 ), maFirstDate( 0, 0, 1900 ), diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 3d543e28ac41..56195511230b 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -1146,7 +1146,7 @@ void DoubleNumericField::ResetConformanceTester() { Locale aLocale; MsLangId::convertLanguageToLocale( pFormatEntry->GetLanguage(), aLocale ); - LocaleDataWrapper aLocaleInfo(::comphelper::getProcessServiceFactory(), aLocale); + LocaleDataWrapper aLocaleInfo( aLocale ); String sSeparator = aLocaleInfo.getNumThousandSep(); if (sSeparator.Len()) @@ -1238,7 +1238,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat() // build a new format string with the base class' and my own settings Locale aLocale; MsLangId::convertLanguageToLocale( eLanguage, aLocale ); - LocaleDataWrapper aLocaleInfo(::comphelper::getProcessServiceFactory(), aLocale); + LocaleDataWrapper aLocaleInfo( aLocale ); XubString sNewFormat; if (bThSep) -- cgit