From 369e3fdcdafdb112a6963fb86fa4d4d0edb29c00 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
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
---
 unotools/source/i18n/localedatawrapper.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'unotools')

diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index db5e2b85e266..8e81c2f21b98 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -32,10 +32,12 @@
 #include "instance.hxx"
 #include <com/sun/star/i18n/KNumberFormatUsage.hpp>
 #include <com/sun/star/i18n/KNumberFormatType.hpp>
+#include <com/sun/star/i18n/LocaleData.hpp>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 #include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
-
 #include <com/sun/star/i18n/NumberFormatIndex.hpp>
+
+#include <comphelper/componentcontext.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/macros.h>
@@ -73,9 +75,7 @@ LocaleDataWrapper::LocaleDataWrapper(
         bReservedWordValid( sal_False )
 {
     setLocale( rLocale );
-    xLD = Reference< XLocaleData4 > (
-        intl_createInstance( xSMgr, "com.sun.star.i18n.LocaleData",
-                             "LocaleDataWrapper" ), uno::UNO_QUERY );
+    xLD = LocaleData::create(comphelper::ComponentContext(xSMgr).getUNOContext());
 }
 
 
-- 
cgit v1.2.3