diff options
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 | 8 | ||||
-rw-r--r-- | i18npool/inc/transliterationImpl.hxx | 10 |
4 files changed, 13 insertions, 13 deletions
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index a9d78789d732..340b72fad63f 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/XLocaleData.hpp> +#include <com/sun/star/i18n/XLocaleData4.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase1.hxx> // helper for implementations #include <com/sun/star/lang/XServiceInfo.hpp> @@ -122,7 +122,7 @@ private: /// used for parser only com::sun::star::lang::Locale aParserLocale; - com::sun::star::uno::Reference < XLocaleData > xLocaleData; + com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData; com::sun::star::uno::Reference < com::sun::star::i18n::XNativeNumberSupplier > xNatNumSup; rtl::OUString aStartChars; rtl::OUString aContChars; 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); diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx index ee825eedff8f..9433b111d44e 100644 --- a/i18npool/inc/numberformatcode.hxx +++ b/i18npool/inc/numberformatcode.hxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase2.hxx> // helper for implementations #include <com/sun/star/i18n/XNumberFormatCode.hpp> -#include <com/sun/star/i18n/XLocaleData.hpp> +#include <com/sun/star/i18n/XLocaleData4.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -37,7 +37,7 @@ class NumberFormatCodeMapper : public cppu::WeakImplHelper2 { public: NumberFormatCodeMapper( const ::com::sun::star::uno::Reference < - ::com::sun::star::lang::XMultiServiceFactory >& rxMSF ); + ::com::sun::star::uno::XComponentContext >& rxContext ); ~NumberFormatCodeMapper(); virtual ::com::sun::star::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException); @@ -55,9 +55,9 @@ public: private: ::com::sun::star::lang::Locale aLocale; - ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > xMSF; + ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext > mxContext; ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > aFormatSeq; - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XLocaleData > xlocaleData; + ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XLocaleData4 > mxLocaleData; sal_Bool bFormatsValid; void setupLocale( const ::com::sun::star::lang::Locale& rLocale ); diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index 3ff345239da9..fd12616507d1 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -19,10 +19,10 @@ #ifndef _I18N_TRANSLITERATIONIMPL_HXX_ #define _I18N_TRANSLITERATIONIMPL_HXX_ -#include <com/sun/star/i18n/XLocaleData.hpp> +#include <com/sun/star/i18n/XLocaleData4.hpp> #include <com/sun/star/i18n/XExtendedTransliteration.hpp> #include <cppuhelper/implbase2.hxx> // helper for implementations -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <sal/types.h> @@ -44,7 +44,7 @@ class TransliterationImpl : public cppu::WeakImplHelper2 { public: // Constructors - TransliterationImpl(const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& xMSF); + TransliterationImpl(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& xContext); // Destructor ~TransliterationImpl(); @@ -104,8 +104,8 @@ private: com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > bodyCascade[maxCascade]; sal_Int16 numCascade; sal_Bool caseignoreOnly; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xSMgr; - com::sun::star::uno::Reference< XLocaleData > localedata; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; + com::sun::star::uno::Reference< XLocaleData4 > mxLocaledata; com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > caseignore; virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString& implName, |