diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-05 11:28:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-15 08:28:44 +0100 |
| commit | d2f6a87ac7adb3f60f7eae7c5a8f8a9076b7a75c (patch) | |
| tree | 0bcc19623fa6cda27b78df47c54192bd3e73ef41 /svtools | |
| parent | 5837402fb1daa437d9a1a37edc9ede57319944f1 (diff) | |
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
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/DocumentInfoPreview.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/calendar.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/fmtfield.cxx | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index 0b6ad20c74ff..fabd1befecc0 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -164,9 +164,7 @@ void ODocumentInfoPreview::insertDateTime( Time( value.Hours, value.Minutes, value.Seconds, value.HundredthSeconds)); if (aToolsDT.IsValidAndGregorian()) { - LocaleDataWrapper aLocaleWrapper( - comphelper::getProcessServiceFactory(), - Application::GetSettings().GetLocale()); + LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() ); rtl::OUStringBuffer buf(aLocaleWrapper.getDate(aToolsDT)); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); buf.append(aLocaleWrapper.getTime(aToolsDT)); 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) |