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

[Eike Rathke]

 svl/source/numbers/supservs.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 38b46a4a629f38c982e047da9a94ec28f6fe39c5
Author: Eike Rathke <er...@redhat.com>
Date:   Thu Feb 5 16:18:08 2015 +0100

    yet another Windows build fix
    
    'Locale' : ambiguous symbol, could be 'com::sun::star::lang::Locale' or 
'icu_54::Locale'
    
    Change-Id: Id5688195907624467d3956aff4b27f6839e03015

diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 0234b1e..a2f6099 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -87,7 +87,7 @@ void SAL_CALL 
SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
         SetNumberFormatter(m_pOwnFormatter);
     }
 
-    Type aExpectedArgType = ::cppu::UnoType<Locale>::get();
+    Type aExpectedArgType = ::cppu::UnoType<css::lang::Locale>::get();
     LanguageType eNewFormatterLanguage = LANGUAGE_ENGLISH_US;
         // the default
 
@@ -96,7 +96,7 @@ void SAL_CALL 
SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
     {
         if (pArgs->getValueType().equals(aExpectedArgType))
         {
-            Locale aLocale;
+            css::lang::Locale aLocale;
             *pArgs >>= aLocale;
             eNewFormatterLanguage = LanguageTag::convertToLanguageType( 
aLocale, false);
         }
@@ -159,7 +159,7 @@ void 
SvNumberFormatsSupplierServiceObject::implEnsureFormatter()
     {
         // get the office's UI locale
         SvtSysLocale aSysLocale;
-        Locale aOfficeLocale = 
aSysLocale.GetLocaleData().getLanguageTag().getLocale();
+        css::lang::Locale aOfficeLocale = 
aSysLocale.GetLocaleData().getLanguageTag().getLocale();
 
         // initi with this locale
         Sequence< Any > aFakedInitProps( 1 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits