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 /sw/source/filter/ww8 | |
| 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 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index b4d08a89b97d..fe875092398d 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2342,7 +2342,7 @@ bool MSWordExportBase::GetNumberFmt(const SwField& rFld, String& rStr) if( pNumFmt ) { sal_uInt16 nLng = rFld.GetLanguage(); - LocaleDataWrapper aLocDat(pNFmtr->GetServiceManager(), + LocaleDataWrapper aLocDat(comphelper::getComponentContext(pNFmtr->GetServiceManager()), MsLangId::convertLanguageToLocale(nLng)); String sFmt(pNumFmt->GetMappedFormatstring(GetNfKeywordTable(), diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 8bb57ba606ec..f74bd1dc4702 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -5590,7 +5590,7 @@ WW8Fib::WW8Fib(sal_uInt8 nVer) Locale aTempLocale; SvxLanguageToLocale( aTempLocale, lid ); - LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), aTempLocale ); + LocaleDataWrapper aLocaleWrapper( aTempLocale ); nNumDecimalSep = aLocaleWrapper.getNumDecimalSep()[0]; } |