summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-10-27 12:15:57 +0200
committerEike Rathke <erack@redhat.com>2017-10-27 18:29:43 +0200
commitad1bf2ce2612ffb025c8ef9967018db53527a796 (patch)
treea5dccafe9b75bccdf4c5cc99d2f1eb2155a22fdf
parent281a84bd33d1c34d51c4a933d395f17bd36190c6 (diff)
Supersede with XLocaleData5, LocaleData2, tdf#81671
Change-Id: I17332be77f9c66c4fcfb7e3f3144ec624b804f94
-rw-r--r--include/unotools/localedatawrapper.hxx4
-rw-r--r--unotools/source/i18n/localedatawrapper.cxx6
2 files changed, 5 insertions, 5 deletions
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index a5d675988a75..be53b7558add 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
#define INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <com/sun/star/i18n/XLocaleData4.hpp>
+#include <com/sun/star/i18n/XLocaleData5.hpp>
#include <com/sun/star/i18n/LocaleItem.hpp>
#include <com/sun/star/i18n/reservedWords.hpp>
#include <rtl/ustring.hxx>
@@ -56,7 +56,7 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper
static sal_uInt8 nLocaleDataChecking; // 0:=dontknow, 1:=yes, 2:=no
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- css::uno::Reference< css::i18n::XLocaleData4 > xLD;
+ css::uno::Reference< css::i18n::XLocaleData5 > xLD;
LanguageTag maLanguageTag;
std::shared_ptr< css::i18n::Calendar2 > xDefaultCalendar;
std::shared_ptr< css::i18n::Calendar2 > xSecondaryCalendar;
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 3ae1ac104f70..77940997ace6 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -30,7 +30,7 @@
#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/LocaleData2.hpp>
#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
#include <com/sun/star/i18n/NumberFormatIndex.hpp>
@@ -85,7 +85,7 @@ LocaleDataWrapper::LocaleDataWrapper(
)
:
m_xContext( rxContext ),
- xLD( LocaleData::create(rxContext) ),
+ xLD( LocaleData2::create(rxContext) ),
maLanguageTag( rLanguageTag ),
bLocaleDataItemValid( false ),
bReservedWordValid( false ),
@@ -99,7 +99,7 @@ LocaleDataWrapper::LocaleDataWrapper(
)
:
m_xContext( comphelper::getProcessComponentContext() ),
- xLD( LocaleData::create(m_xContext) ),
+ xLD( LocaleData2::create(m_xContext) ),
maLanguageTag( rLanguageTag ),
bLocaleDataItemValid( false ),
bReservedWordValid( false ),