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 /sw | |
| parent | af06afdbe8c61604b4498ce1e11660dd3b647dcc (diff) | |
fdo#46808, use service constructor for i18n::Collator
Change-Id: I15a360723e335345aad09e73fcb0f6815ed9e0d4
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/bastyp/init.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/doc/docsort.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/app/docstyle.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/utlui/attrdesc.cxx | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 72eee3ac669f..73bc1df0070f 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -828,9 +828,8 @@ CollatorWrapper& GetAppCollator() if( !pCollator ) { const lang::Locale& rLcl = pBreakIt->GetLocale( GetAppLanguage() ); - uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - pCollator = new CollatorWrapper( xMSF ); + pCollator = new CollatorWrapper( ::comphelper::getProcessComponentContext() ); pCollator->loadDefaultCollator( rLcl, SW_COLLATOR_IGNORES ); } return *pCollator; @@ -840,9 +839,8 @@ CollatorWrapper& GetAppCaseCollator() if( !pCaseCollator ) { const lang::Locale& rLcl = pBreakIt->GetLocale( GetAppLanguage() ); - uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - pCaseCollator = new CollatorWrapper( xMSF ); + pCaseCollator = new CollatorWrapper( ::comphelper::getProcessComponentContext() ); pCaseCollator->loadDefaultCollator( rLcl, 0 ); } return *pCaseCollator; diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 9d78963c2a6c..40cc23e66c3d 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -86,8 +86,7 @@ void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt, } pLocale = new lang::Locale( LanguageTag( nLang ).getLocale() ); - pSortCollator = new CollatorWrapper( - ::comphelper::getProcessServiceFactory() ); + pSortCollator = new CollatorWrapper( ::comphelper::getProcessComponentContext() ); } void SwSortElement::Finit() diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 136a2a6e4cbf..fa38da7c538a 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -573,9 +573,7 @@ bool SwDocStyleSheet::HasClearParentSupport() const --------------------------------------------------------------------*/ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) { - IntlWrapper aIntlWrapper( - ::comphelper::getProcessServiceFactory(), - SvtSysLocale().GetLanguageTag()); + IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() ); rtl::OUString sPlus(" + "); if ( SFX_STYLE_FAMILY_PAGE == nFamily ) diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index f95e1e94e21e..7dee04c34f1f 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -73,7 +73,7 @@ void SwAttrSet::GetPresentation( if( Count() ) { SfxItemIter aIter( *this ); - const IntlWrapper rInt( ::comphelper::getProcessServiceFactory(), + const IntlWrapper rInt( ::comphelper::getProcessComponentContext(), GetAppLanguageTag() ); while( sal_True ) { |