[Libreoffice-commits] core.git: svx/source

[Eike Rathke]

 svx/source/dialog/langbox.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 9abd38ec81beda6fee18e791a1e573c6cfabf8a1
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Feb 5 18:34:12 2015 +0100

    yet yet yet yet yet yet another Windows build 'Locale' ambiguous symbol
    
    Change-Id: I910c37a19c1f627ec0c92dcb044db92e9e24c25e

diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index e8a0128..9ada26b 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -35,7 +35,6 @@
 #include <vcl/i18nhelp.hxx>
 
 using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::uno;
 
@@ -73,9 +72,9 @@ OUString GetDicInfoStr( const OUString& rName, const sal_uInt16 nLang, bool bNeg
 //  misc local helper functions
 
 
-static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
+static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< css::lang::Locale > &rSeq )
 {
-    const Locale *pLocale = rSeq.getConstArray();
+    const css::lang::Locale *pLocale = rSeq.getConstArray();
     sal_Int32 nCount = rSeq.getLength();
 
     Sequence< sal_Int16 >   aLangs( nCount );
@@ -201,7 +200,7 @@ void SvxLanguageBoxBase::SetLanguageList( sal_Int16 nLangList,
         Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr(), UNO_QUERY );
         if (xAvail.is())
         {
-            Sequence< Locale > aTmp;
+            Sequence< css::lang::Locale > aTmp;
 
             if (LANG_LIST_SPELL_AVAIL & nLangList)
             {
@@ -229,7 +228,7 @@ void SvxLanguageBoxBase::SetLanguageList( sal_Int16 nLangList,
         {
             Reference< XHyphenator > xTmp( SvxGetHyphenator() );
             if (xTmp.is()) {
-                Sequence < Locale > aLocaleSequence( xTmp->getLocales() );
+                Sequence < css::lang::Locale > aLocaleSequence( xTmp->getLocales() );
                 aHyphUsedLang = lcl_LocaleSeqToLangSeq( aLocaleSequence );
             }
         }
@@ -237,7 +236,7 @@ void SvxLanguageBoxBase::SetLanguageList( sal_Int16 nLangList,
         {
             Reference< XThesaurus > xTmp( SvxGetThesaurus() );
             if (xTmp.is()) {
-                Sequence < Locale > aLocaleSequence( xTmp->getLocales() );
+                Sequence < css::lang::Locale > aLocaleSequence( xTmp->getLocales() );
                 aThesUsedLang = lcl_LocaleSeqToLangSeq( aLocaleSequence );
             }
         }