[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/core/drawdoc.cxx       |    3 ++-
 sd/source/filter/eppt/epptso.cxx |    4 ++--
 sd/source/ui/unoidl/unopool.cxx  |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit fe985aaa8ef3931bef5507806e8f3b795a107487
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Nov 19 18:26:43 2012 +0100

    use LanguageTag
    
    Change-Id: I4c55e30ec64f4e4d0217f226bc99ff693d054093

diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index efe0adb..6b5603c 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -65,6 +65,7 @@
 #include <unotools/saveopt.hxx>
 #include <comphelper/extract.hxx>
 #include <i18npool/mslangid.hxx>
+#include <i18npool/languagetag.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/pathoptions.hxx>
@@ -231,7 +232,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
     }
 
     LanguageType eRealLanguage = MsLangId::getRealLanguage( meLanguage );
-    mpLocale = new ::com::sun::star::lang::Locale( MsLangId::convertLanguageToLocale( eRealLanguage ));
+    mpLocale = new ::com::sun::star::lang::Locale( LanguageTag( eRealLanguage ).getLocale());
     mpCharClass = new CharClass( *mpLocale );
 
     // If the current application language is a language that uses right-to-left text...
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index d4632c6..67a444f 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -85,7 +85,7 @@
 #include <com/sun/star/table/BorderLine.hpp>
 #include <set>
 #include <oox/ole/olehelper.hxx>
-#include "i18npool/mslangid.hxx"
+#include "i18npool/languagetag.hxx"
 
 using namespace ::com::sun::star;
 
@@ -3862,7 +3862,7 @@ void TextObjBinary::WriteTextSpecInfo( SvStream* pStrm )
                 *pStrm  << static_cast< sal_uInt32 >( nPortionSize )
                         << nFlags
                         << static_cast< sal_Int16 >( 1 )    // spellinfo -> needs rechecking
-                        << static_cast< sal_Int16 >( MsLangId::convertLocaleToLanguageWithFallback( pPortion->meCharLocale ) )
+                        << static_cast< sal_Int16 >( LanguageTag( pPortion->meCharLocale ).makeFallback().getLanguageType() )
                         << static_cast< sal_Int16 >( 0 );   // alt language
             }
         }
diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx
index 907fd31..c441a4d 100644
--- a/sd/source/ui/unoidl/unopool.cxx
+++ b/sd/source/ui/unoidl/unopool.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <i18npool/mslangid.hxx>
+#include <i18npool/languagetag.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <editeng/eeitem.hxx>
 #include <svx/unopool.hxx>
@@ -35,7 +35,7 @@ LanguageType SdUnoGetLanguage( const lang::Locale& rLocale )
     if ( rLocale.Language.getLength() == 0 )
         return LANGUAGE_SYSTEM;
 
-    LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale );
+    LanguageType eRet = LanguageTag( rLocale ).getLanguageType( false);
     if ( eRet == LANGUAGE_NONE )
         eRet = LANGUAGE_SYSTEM;         //! or throw an exception?