diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-20 12:57:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 13:59:46 +0100 |
| commit | f96db7d0ddeb737cf0e14eea6120daab860c54b7 (patch) | |
| tree | 6107a9464ff9fa889740a743255f543390791f22 /unotools/inc | |
| parent | af06afdbe8c61604b4498ce1e11660dd3b647dcc (diff) | |
fdo#46808, use service constructor for i18n::Collator
Change-Id: I15a360723e335345aad09e73fcb0f6815ed9e0d4
Diffstat (limited to 'unotools/inc')
| -rw-r--r-- | unotools/inc/unotools/collatorwrapper.hxx | 8 | ||||
| -rw-r--r-- | unotools/inc/unotools/intlwrapper.hxx | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/unotools/inc/unotools/collatorwrapper.hxx b/unotools/inc/unotools/collatorwrapper.hxx index 0752b653d8dc..c73be3518569 100644 --- a/unotools/inc/unotools/collatorwrapper.hxx +++ b/unotools/inc/unotools/collatorwrapper.hxx @@ -23,8 +23,8 @@ #include <com/sun/star/i18n/XCollator.hpp> -namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; +namespace com { namespace sun { namespace star { namespace uno { + class XComponentContext; }}}} class UNOTOOLS_DLLPUBLIC CollatorWrapper @@ -32,7 +32,7 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper private: ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory + ::com::sun::star::uno::XComponentContext > mxServiceFactory; ::com::sun::star::uno::Reference< @@ -43,7 +43,7 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper CollatorWrapper ( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > &xServiceFactoryIn); + ::com::sun::star::uno::XComponentContext > &rxContext); ~CollatorWrapper(); diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx index 7d1665264d4d..0320d2a8204e 100644 --- a/unotools/inc/unotools/intlwrapper.hxx +++ b/unotools/inc/unotools/intlwrapper.hxx @@ -49,7 +49,7 @@ class UNOTOOLS_DLLPUBLIC IntlWrapper private: LanguageTag maLanguageTag; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; LocaleDataWrapper* pLocaleData; CollatorWrapper* pCollator; @@ -61,7 +61,10 @@ private: public: IntlWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xSF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, + const LanguageTag& rLanguageTag + ); + IntlWrapper( const LanguageTag& rLanguageTag ); ~IntlWrapper(); |