strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use LanguageTag

Browse source 
Change-Id: I7277f40dcba1e079ede32a01f526342a5cde435b
This commit is contained in:
Eike Rathke 2012-11-17 00:11:48 +01:00
parent 4767bbb00d
commit 8efe5ff8a0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
canvas/source/cairo/cairo_canvasfont.cxx
View file

@ -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) )

4
canvas/source/vcl/canvasfont.cxx
View file

@ -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) )