diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-02 16:07:50 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-15 08:28:43 +0100 |
| commit | 3f15a663b273e4a437fd68335d6eab2b11fc80c9 (patch) | |
| tree | 5651b63a998b26f12c5626f4a3fc8490bceed35b /sw | |
| parent | ed80674ec793f640916ad4162ee4121aeceac7f6 (diff) | |
fdo#46808, use service constructor for i18n::TextConversion
Modify the service to return XExtendedTextConversion,
since that is backwards compatible and the service
implements it.
Change-Id: I2923969135c396d643c501ed56e0528c0bd7c14a
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/hhcwrp.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/lingu/hhcwrp.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/uiview/viewling.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 8f33df4e0217..0be12b5f08d2 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -96,7 +96,7 @@ protected: public: SwHHCWrapper( SwView* pView, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, LanguageType nSourceLanguage, LanguageType nTargetLanguage, const Font *pTargetFont, sal_Int32 nConvOptions, sal_Bool bIsInteractive, diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 015de0cfc62c..7592c1612b73 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -99,14 +99,14 @@ public: SwHHCWrapper::SwHHCWrapper( SwView* pSwView, - const uno::Reference< lang::XMultiServiceFactory >& rxMSF, + const uno::Reference< uno::XComponentContext >& rxContext, LanguageType nSourceLanguage, LanguageType nTargetLanguage, const Font *pTargetFont, sal_Int32 nConvOptions, sal_Bool bIsInteractive, sal_Bool bStart, sal_Bool bOther, sal_Bool bSelection ) : - editeng::HangulHanjaConversion( &pSwView->GetEditWin(), rxMSF, + editeng::HangulHanjaConversion( &pSwView->GetEditWin(), rxContext, SvxCreateLocale( nSourceLanguage ), SvxCreateLocale( nTargetLanguage ), pTargetFont, diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 1c8fd6eb4eec..466fe5da8c4f 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -260,9 +260,9 @@ void SwView::StartTextConversion( sal_Bool bOther = !bSelection && !(pWrtShell->GetFrmType(0,sal_True) & FRMTYPE_BODY); { - const uno::Reference< lang::XMultiServiceFactory > xMgr( - comphelper::getProcessServiceFactory() ); - SwHHCWrapper aWrap( this, xMgr, nSourceLang, nTargetLang, pTargetFont, + const uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + SwHHCWrapper aWrap( this, xContext, nSourceLang, nTargetLang, pTargetFont, nOptions, bIsInteractive, bStart, bOther, bSelection ); aWrap.Convert(); |