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

Eike Rathke erack at redhat.com
Thu Feb 5 08:00:02 PST 2015


 svl/source/numbers/zforlist.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cd246c13bfe5174b4e967856503bda290309beaa
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Feb 5 16:57:40 2015 +0100

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

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8a9b17a..c013f8c 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3568,7 +3568,7 @@ void SvNumberFormatter::ImpInitCurrencyTable()
         LocaleDataWrapper::getInstalledLocaleNames();
     sal_Int32 nLocaleCount = xLoc.getLength();
     SAL_INFO( "svl.numbers", "number of locales: \"" << nLocaleCount << "\"" );
-    Locale const * const pLocales = xLoc.getConstArray();
+    css::lang::Locale const * const pLocales = xLoc.getConstArray();
     NfCurrencyTable &rCurrencyTable = theCurrencyTable::get();
     NfCurrencyTable &rLegacyOnlyCurrencyTable = theLegacyOnlyCurrencyTable::get();
     NfInstalledLocales &rInstalledLocales = theInstalledLocales::get();


More information about the Libreoffice-commits mailing list