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 /cui/source/options | |
| 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 'cui/source/options')
| -rw-r--r-- | cui/source/options/optasian.cxx | 3 | ||||
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 229af974baf2..20a6794835b3 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -349,8 +349,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl) } if(!bAvail) { - Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - LocaleDataWrapper aWrap( xMSF, aLocale ); + LocaleDataWrapper aWrap( aLocale ); ForbiddenCharacters aForbidden = aWrap.getForbiddenCharacters(); sStart = aForbidden.beginLine; sEnd = aForbidden.endLine; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 84a8d3e51f9a..006be93a1c19 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1697,7 +1697,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) { Locale aTempLocale; SvxLanguageToLocale( aTempLocale, Application::GetSettings().GetLanguage()); - LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), aTempLocale ); + LocaleDataWrapper aLocaleWrapper( aTempLocale ); aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper); } aDatePatternsED.SetText( aDatePatternsString); @@ -1894,7 +1894,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) // obtain corresponding locale data Locale aTempLocale; SvxLanguageToLocale( aTempLocale, eLang ); - LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), aTempLocale ); + LocaleDataWrapper aLocaleWrapper( aTempLocale ); // update the decimal separator key of the related CheckBox String sTempLabel(sDecimalSeparatorLabel); |