summaryrefslogtreecommitdiff
path: root/i18npool/inc/collatorImpl.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-09-13 12:47:11 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-17 14:28:21 +0200
commit369e3fdcdafdb112a6963fb86fa4d4d0edb29c00 (patch)
tree9b7b52b0524feee2c6cfcaf5e5fb440816520fde /i18npool/inc/collatorImpl.hxx
parent9486e6c45f5e15e07f4717fdbaaf30afe6ed86b9 (diff)
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
Diffstat (limited to 'i18npool/inc/collatorImpl.hxx')
-rw-r--r--i18npool/inc/collatorImpl.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index f09edfef3466..7af96199cbbd 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -22,7 +22,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/i18n/XLocaleData.hpp>
+#include <com/sun/star/i18n/XLocaleData4.hpp>
#include <com/sun/star/i18n/XCollator.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <cppuhelper/weak.hxx>
@@ -97,7 +97,7 @@ private :
// Service Factory
com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xMSF;
// lang::Locale Data
- com::sun::star::uno::Reference < XLocaleData > localedata;
+ com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData;
sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const rtl::OUString& serviceName,
const rtl::OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException);