canvas/source/cairo/cairo_canvasfont.cxx | 4 ++--
canvas/source/vcl/canvasfont.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8efe5ff8a0fcaa01cafbb156e9b20dc34c4c97d4
Author: Eike Rathke <er...@redhat.com>
Date: Sat Nov 17 00:11:48 2012 +0100
use LanguageTag
Change-Id: I7277f40dcba1e079ede32a01f526342a5cde435b
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx
b/canvas/source/cairo/cairo_canvasfont.cxx
index 44be8b3..0e8e58f 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 4981182..12fe309 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) )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
