diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-05 15:19:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 18:18:07 +0100 |
| commit | 9df0baaf0b2d0dc22b88d13848014b402937aac6 (patch) | |
| tree | a12df367d83caa5e52419b00e325dafdb6625e02 /i18npool/inc | |
| parent | c2bbc9797c2fef9078c11460100996972bebd971 (diff) | |
fdo#46808, convert i18n::BreakIterator impl to XComponentContext
Change-Id: I2e6800d0f5a6346fc743d5a57bab34d1e36b4ee4
Diffstat (limited to 'i18npool/inc')
| -rw-r--r-- | i18npool/inc/breakiteratorImpl.hxx | 4 | ||||
| -rw-r--r-- | i18npool/inc/cclass_unicode.hxx | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index 395c144ad53f..7a6ef2ac439e 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.hxx @@ -46,7 +46,7 @@ class BreakIteratorImpl : public cppu::WeakImplHelper2 > { public: - BreakIteratorImpl( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ); + BreakIteratorImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); BreakIteratorImpl(); ~BreakIteratorImpl(); @@ -123,8 +123,8 @@ private : std::vector<lookupTableItem*> lookupTable; com::sun::star::lang::Locale aLocale; com::sun::star::uno::Reference < XBreakIterator > xBI; + com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xMSF; sal_Bool SAL_CALL createLocaleSpecificBreakIterator( const rtl::OUString& aLocaleName ) throw( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const com::sun::star::lang::Locale& rLocale ) diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index 340b72fad63f..d515cfd2b3d3 100644 --- a/i18npool/inc/cclass_unicode.hxx +++ b/i18npool/inc/cclass_unicode.hxx @@ -22,7 +22,6 @@ #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/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase1.hxx> // helper for implementations #include <com/sun/star/lang/XServiceInfo.hpp> @@ -36,7 +35,7 @@ typedef sal_uInt32 UPT_FLAG_TYPE; class cclass_Unicode : public cppu::WeakImplHelper1 < XCharacterClassification > { public: - cclass_Unicode(com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xSMgr ); + cclass_Unicode(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); ~cclass_Unicode(); virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, @@ -118,7 +117,7 @@ private: static const sal_Unicode* StrChr( const sal_Unicode* pStr, sal_Unicode c ); - com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xMSF; + com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; /// used for parser only com::sun::star::lang::Locale aParserLocale; |