diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-20 17:38:31 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-20 17:38:34 +0100 |
| commit | 9a320f283f32f421e7fd14c030dbba2ad981d05f (patch) | |
| tree | 00b21f707fa3221c8337e5c062b6aef5de4ef96b /vcl | |
| parent | 7752d65999fd64454deb259ef134456e0bb4709f (diff) | |
use LanguageTag
Change-Id: I5fe231f26d29dbab214d414790936b2b484c2fe6
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index b7929c93e0ee..03e59a0b80e3 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -51,7 +51,7 @@ typedef boost::unordered_map<int,int> IntMap; // Graphite headers #ifdef ENABLE_GRAPHITE -#include <i18npool/mslangid.hxx> +#include <i18npool/languagetag.hxx> #include <graphite_layout.hxx> #include <graphite_features.hxx> #endif @@ -2737,7 +2737,8 @@ GraphiteWinLayout::GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplW mpFont = gr_make_font_with_advance_fn(static_cast<float>(-aLogFont.lfHeight), hDC, gr_fontAdvance, rWFD.GraphiteFace()); maImpl.SetFont(mpFont); - const rtl::OString aLang = MsLangId::convertLanguageToIsoByteString( rWFE.maFontSelData.meLanguage ); + const rtl::OString aLang = OUStringToOString( LanguageTag( rWFE.maFontSelData.meLanguage ).getBcp47(), + RTL_TEXTENCODING_ASCII_US); rtl::OString name = rtl::OUStringToOString( rWFE.maFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; |