From 369e3fdcdafdb112a6963fb86fa4d4d0edb29c00 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 13 Sep 2012 12:47:11 +0200 Subject: fdo#46808, Adapt i18n::LocaleData UNO service to new style The implementation of the LocaleData implements the optional XLocaleData4, so rather than creating a new interface for the new-style service, we simply make the service implement XLocaleData4, which in turn implements XLocaleData3, XLocaleData2, XLocaleData. Change-Id: I3e9a48b031be6b2aa5e04b376b3940b942add85a --- connectivity/inc/connectivity/predicateinput.hxx | 4 ++-- connectivity/inc/connectivity/sqlparse.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'connectivity/inc') diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx index 63508215215f..56abc6e2959a 100644 --- a/connectivity/inc/connectivity/predicateinput.hxx +++ b/connectivity/inc/connectivity/predicateinput.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "connectivity/dbtoolsdllapi.hxx" @@ -48,7 +48,7 @@ namespace dbtools m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData > + ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData4 > m_xLocaleData; ::connectivity::OSQLParser diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index acdf43cb2d43..a4a64b3a2480 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -34,7 +34,7 @@ #endif #include #include -#include +#include #include "connectivity/IParseContext.hxx" #include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/sqlerror.hxx" @@ -165,7 +165,7 @@ namespace connectivity sal_Int32 m_nDateFormatKey; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification> m_xCharClass; - static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData> s_xLocaleData; + static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData4> s_xLocaleData; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData> xDummy; // can be deleted after 627 // convert a string into double trim it to scale of _nscale and than transform it back to string -- cgit v1.2.3