[Libreoffice-commits] .: drawinglayer/source

[Libreoffice Gerrit user]

 drawinglayer/source/primitive2d/metafileprimitive2d.cxx |    8 ++++----
 drawinglayer/source/primitive2d/textlayoutdevice.cxx    |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 032164972c7f4c720937e6117c0e147cfdd448b0
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Nov 16 20:59:35 2012 +0100

    use LanguageTag
    
    Change-Id: I28b1dbb21e40585aaf2451e12ffd4f03783d4c4b

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 791801b..d168bef 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -48,7 +48,7 @@
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18npool/languagetag.hxx>
 #include <drawinglayer/primitive2d/textlineprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx>
 #include <drawinglayer/primitive2d/epsprimitive2d.hxx>
@@ -1312,7 +1312,7 @@ namespace
 
             // prepare FontColor and Locale
             const basegfx::BColor aFontColor(rProperty.getTextColor());
-            const com::sun::star::lang::Locale aLocale(MsLangId::convertLanguageToLocale(rProperty.getLanguageType()));
+            const com::sun::star::lang::Locale aLocale(LanguageTag(rProperty.getLanguageType()).getLocale());
             const bool bWordLineMode(rFont.IsWordLineMode());
 
             const bool bDecoratedIsNeeded(
@@ -1552,8 +1552,8 @@ namespace
                         // strikeout with character
                         const sal_Unicode aStrikeoutChar(
                             drawinglayer::primitive2d::TEXT_STRIKEOUT_SLASH == aTextStrikeout ? '/' : 'X');
-                        const com::sun::star::lang::Locale aLocale(MsLangId::convertLanguageToLocale(
-                            rProperty.getLanguageType()));
+                        const com::sun::star::lang::Locale aLocale(LanguageTag(
+                            rProperty.getLanguageType()).getLocale());
 
                         aTargetVector.push_back(
                             new drawinglayer::primitive2d::TextCharacterStrikeoutPrimitive2D(
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 4e1e873..6640999 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -24,7 +24,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/font.hxx>
 #include <vcl/metric.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18npool/languagetag.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <vcl/svapp.hxx>
 
@@ -403,7 +403,7 @@ namespace drawinglayer
             aRetval.SetItalic(rFontAttribute.getItalic() ? ITALIC_NORMAL : ITALIC_NONE);
             aRetval.SetOutline(rFontAttribute.getOutline());
             aRetval.SetPitch(rFontAttribute.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE);
-            aRetval.SetLanguage(MsLangId::convertLocaleToLanguage(rLocale));
+            aRetval.SetLanguage(LanguageTag(rLocale).getLanguageType(false));
 
 #ifdef WIN32
             // for WIN32 systems, correct the FontWidth if FontScaling is used