Kaydet (Commit) ad1bf2ce authored tarafından Eike Rathke's avatar Eike Rathke

Supersede with XLocaleData5, LocaleData2, tdf#81671

Change-Id: I17332be77f9c66c4fcfb7e3f3144ec624b804f94
üst 281a84bd
......@@ -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;
......
......@@ -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 ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment