diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-04-27 08:02:53 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-04-27 09:38:27 +0200 |
| commit | e6df5847379a97ad2de95a3c01cb11380c56e0f7 (patch) | |
| tree | 6f30900e4890c3408a87761a043cec51acb4eecf /emfio | |
| parent | b512ce255f46d90e682634e4dd17e146af7f9080 (diff) | |
Extract getting default locale for filters into separate unotools function
Change-Id: Ic97b1a4507d5629963f360147ecc20eb10f5d391
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92957
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'emfio')
| -rw-r--r-- | emfio/source/reader/mtftools.cxx | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 01c091be598c..06b0f813588d 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -34,9 +34,8 @@ #include <osl/diagnose.h> #include <vcl/virdev.hxx> #include <o3tl/safeint.hxx> -#include <officecfg/Setup.hxx> -#include <officecfg/Office/Linguistic.hxx> #include <unotools/configmgr.hxx> +#include <unotools/defaultencoding.hxx> #include <unotools/wincodepage.hxx> #if OSL_DEBUG_LEVEL > 1 @@ -164,20 +163,6 @@ namespace emfio bClosed = true; } - namespace { - - OUString getLODefaultLanguage() - { - if (utl::ConfigManager::IsFuzzing()) - return "en-US"; - OUString result(officecfg::Office::Linguistic::General::DefaultLocale::get()); - if (result.isEmpty()) - result = officecfg::Setup::L10N::ooSetupSystemLocale::get(); - return result; - } - - } - WinMtfFontStyle::WinMtfFontStyle( LOGFONTW const & rFont ) { rtl_TextEncoding eCharSet; @@ -185,7 +170,7 @@ namespace emfio || (rFont.alfFaceName == "MT Extra")) eCharSet = RTL_TEXTENCODING_SYMBOL; else if ((rFont.lfCharSet == DEFAULT_CHARSET) || (rFont.lfCharSet == OEM_CHARSET)) - eCharSet = utl_getWinTextEncodingFromLangStr(getLODefaultLanguage(), + eCharSet = utl_getWinTextEncodingFromLangStr(utl_getLocaleForGlobalDefaultEncoding(), rFont.lfCharSet == OEM_CHARSET); else eCharSet = rtl_getTextEncodingFromWindowsCharset( rFont.lfCharSet ); |