diff options
author | Eike Rathke <erack@redhat.com> | 2017-10-27 13:10:11 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2017-10-27 18:29:43 +0200 |
commit | 2c1ab132685bee9251901be38e113e129c2c3fce (patch) | |
tree | 1018ee6b4c007ee18655bd2cafc1f02bc9045435 /i18npool/inc | |
parent | ad1bf2ce2612ffb025c8ef9967018db53527a796 (diff) |
Instanciate XLocaleData5 in all internal interfaces, tdf#81671
Change-Id: I71ab5008be930efdd3ba944b020554b9d65ed729
Diffstat (limited to 'i18npool/inc')
-rw-r--r-- | i18npool/inc/cclass_unicode.hxx | 4 | ||||
-rw-r--r-- | i18npool/inc/collatorImpl.hxx | 4 | ||||
-rw-r--r-- | i18npool/inc/numberformatcode.hxx | 4 | ||||
-rw-r--r-- | i18npool/inc/transliterationImpl.hxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index 8e2fe1c445c8..d276347fa78c 100644 --- a/i18npool/inc/cclass_unicode.hxx +++ b/i18npool/inc/cclass_unicode.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/i18n/XNativeNumberSupplier.hpp> #include <com/sun/star/i18n/XCharacterClassification.hpp> -#include <com/sun/star/i18n/XLocaleData4.hpp> +#include <com/sun/star/i18n/XLocaleData5.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -126,7 +126,7 @@ private: /// used for parser only css::lang::Locale aParserLocale; - css::uno::Reference < css::i18n::XLocaleData4 > mxLocaleData; + css::uno::Reference < css::i18n::XLocaleData5 > mxLocaleData; css::uno::Reference < css::i18n::XNativeNumberSupplier > xNatNumSup; OUString aStartChars; OUString aContChars; diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index b6f9dd25f791..47641a25f3a5 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.hxx @@ -21,7 +21,7 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/i18n/XLocaleData4.hpp> +#include <com/sun/star/i18n/XLocaleData5.hpp> #include <com/sun/star/i18n/XCollator.hpp> #include <com/sun/star/lang/Locale.hpp> #include <cppuhelper/weak.hxx> @@ -94,7 +94,7 @@ private: // Service Factory css::uno::Reference < css::uno::XComponentContext > m_xContext; // lang::Locale Data - css::uno::Reference < css::i18n::XLocaleData4 > mxLocaleData; + css::uno::Reference < css::i18n::XLocaleData5 > mxLocaleData; /// @throws css::uno::RuntimeException bool SAL_CALL createCollator(const css::lang::Locale& rLocale, const OUString& serviceName, diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx index d74231fc1560..a9c4a67c8b51 100644 --- a/i18npool/inc/numberformatcode.hxx +++ b/i18npool/inc/numberformatcode.hxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/i18n/XNumberFormatCode.hpp> -#include <com/sun/star/i18n/XLocaleData4.hpp> +#include <com/sun/star/i18n/XLocaleData5.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -55,7 +55,7 @@ public: private: osl::Mutex maMutex; - css::uno::Reference < css::i18n::XLocaleData4 > m_xLocaleData; + css::uno::Reference < css::i18n::XLocaleData5 > m_xLocaleData; typedef std::pair< css::lang::Locale, css::uno::Sequence< css::i18n::FormatElement > > FormatElementCacheItem; std::deque < FormatElementCacheItem > m_aFormatElementCache; diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index c5e83b254885..0d70de37bfd2 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX #define INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX -#include <com/sun/star/i18n/XLocaleData4.hpp> +#include <com/sun/star/i18n/XLocaleData5.hpp> #include <com/sun/star/i18n/XExtendedTransliteration.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/XComponentContext.hpp> @@ -87,7 +87,7 @@ private: sal_Int16 numCascade; bool caseignoreOnly; css::uno::Reference< css::uno::XComponentContext > mxContext; - css::uno::Reference< css::i18n::XLocaleData4 > mxLocaledata; + css::uno::Reference< css::i18n::XLocaleData5 > mxLocaledata; css::uno::Reference< css::i18n::XExtendedTransliteration > caseignore; /// @throws css::uno::RuntimeException |