diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-17 00:11:48 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-17 00:11:52 +0100 |
| commit | 8efe5ff8a0fcaa01cafbb156e9b20dc34c4c97d4 (patch) | |
| tree | 630b9a3a869abc0d0e990d0236fdb28d152df77e /canvas | |
| parent | 4767bbb00dc9eacce6f6d60fd4c55107333cee2d (diff) | |
use LanguageTag
Change-Id: I7277f40dcba1e079ede32a01f526342a5cde435b
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvasfont.cxx | 4 | ||||
| -rw-r--r-- | canvas/source/vcl/canvasfont.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 44be8b30f5a9..0e8e58fce1df 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -25,7 +25,7 @@ #include <basegfx/numeric/ftools.hxx> #include <vcl/metric.hxx> -#include <i18npool/mslangid.hxx> +#include <i18npool/languagetag.hxx> #include "cairo_canvasfont.hxx" #include "cairo_textlayout.hxx" @@ -57,7 +57,7 @@ namespace cairocanvas rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED ? PITCH_FIXED : PITCH_VARIABLE); - maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale)); + maFont->SetLanguage( LanguageTag( rFontRequest.Locale).getLanguageType( false)); // adjust to stretched/shrinked font if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) ) diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index 49811824f685..12fe3094217c 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -22,7 +22,7 @@ #include <rtl/math.hxx> #include <basegfx/numeric/ftools.hxx> -#include <i18npool/mslangid.hxx> +#include <i18npool/languagetag.hxx> #include <vcl/metric.hxx> #include <com/sun/star/rendering/PanoseProportion.hpp> @@ -59,7 +59,7 @@ namespace vclcanvas rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED ? PITCH_FIXED : PITCH_VARIABLE); - maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale)); + maFont->SetLanguage( LanguageTag( rFontRequest.Locale).getLanguageType( false)); // adjust to stretched/shrinked font if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) ) |