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

[Eike Rathke]

 svx/source/form/dbtoolsclient.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 101ea2fe4bd4ad27d43af2e326b9ff346a2ce9cb
Author: Eike Rathke <er...@redhat.com>
Date:   Thu Feb 5 18:43:16 2015 +0100

    yet yet yet yet yet yet yet another 'Locale' ambiguous symbol
    
    Change-Id: Ic6b813b3f826300d3b59b7105690ab611bb4bd44

diff --git a/svx/source/form/dbtoolsclient.cxx 
b/svx/source/form/dbtoolsclient.cxx
index 4eb00fb..7306e62 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -181,7 +181,7 @@ namespace svxform
     }
 
 
-    sal_Int32 OStaticDataAccessTools::getDefaultNumberFormat( const Reference< 
XPropertySet >& _xColumn, const Reference< XNumberFormatTypes >& _xTypes, const 
Locale& _rLocale )
+    sal_Int32 OStaticDataAccessTools::getDefaultNumberFormat( const Reference< 
XPropertySet >& _xColumn, const Reference< XNumberFormatTypes >& _xTypes, const 
css::lang::Locale& _rLocale )
     {
         sal_Int32 nReturn = 0;
         if ( ensureLoaded() )
@@ -219,7 +219,7 @@ namespace svxform
     }
 
     void OStaticDataAccessTools::TransferFormComponentProperties(const 
Reference< XPropertySet>& _rxOld,
-        const Reference< XPropertySet>& _rxNew, const Locale& _rLocale) const
+        const Reference< XPropertySet>& _rxNew, const css::lang::Locale& 
_rLocale) const
     {
         if ( ensureLoaded() )
             m_xDataAccessTools->TransferFormComponentProperties(_rxOld, 
_rxNew, _rLocale);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits