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 /sc | |
| parent | af06afdbe8c61604b4498ce1e11660dd3b647dcc (diff) | |
fdo#46808, use service constructor for i18n::Collator
Change-Id: I15a360723e335345aad09e73fcb0f6815ed9e0d4
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/global.cxx | 6 | ||||
| -rw-r--r-- | sc/source/core/data/table3.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 4d314ce1098a..dffdb1fb30e7 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -1146,7 +1146,7 @@ CollatorWrapper* ScGlobal::GetCollator() { if ( !pCollator ) { - pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() ); + pCollator = new CollatorWrapper( ::comphelper::getProcessComponentContext() ); pCollator->loadDefaultCollator( *GetLocale(), SC_COLLATOR_IGNORES ); } return pCollator; @@ -1155,7 +1155,7 @@ CollatorWrapper* ScGlobal::GetCaseCollator() { if ( !pCaseCollator ) { - pCaseCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() ); + pCaseCollator = new CollatorWrapper( ::comphelper::getProcessComponentContext() ); pCaseCollator->loadDefaultCollator( *GetLocale(), 0 ); } return pCaseCollator; @@ -1174,7 +1174,7 @@ IntlWrapper* ScGlobal::GetScIntlWrapper() { if ( !pScIntlWrapper ) { - pScIntlWrapper = new IntlWrapper( ::comphelper::getProcessServiceFactory(), LanguageTag( *GetLocale()) ); + pScIntlWrapper = new IntlWrapper( LanguageTag( *GetLocale()) ); } return pScIntlWrapper; } diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index d84fe1fc552d..f759427d48c1 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -319,7 +319,7 @@ void ScTable::InitSortCollator( const ScSortParam& rPar ) if ( !rPar.aCollatorLocale.Language.isEmpty() ) { if ( !pSortCollator || IsSortCollatorGlobal() ) - pSortCollator = new CollatorWrapper( pDocument->GetServiceManager() ); + pSortCollator = new CollatorWrapper( comphelper::getComponentContext(pDocument->GetServiceManager()) ); pSortCollator->loadCollatorAlgorithm( rPar.aCollatorAlgorithm, rPar.aCollatorLocale, (rPar.bCaseSens ? 0 : SC_COLLATOR_IGNORES) ); } diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 31e5b9b330b7..9b465a5d67c9 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -549,7 +549,7 @@ void ScTabPageSortOptions::Init() pColRes = new CollatorResource(); //! use CollatorWrapper from document? - pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() ); + pColWrap = new CollatorWrapper( comphelper::getProcessComponentContext() ); const ScSortItem& rSortItem = (const ScSortItem&) GetItemSet().Get( nWhichSort ); |