diff options
Diffstat (limited to 'sc/source/core/data')
-rw-r--r-- | sc/source/core/data/documen2.cxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/documen6.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/documen8.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/dpobject.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/data/poolhelp.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/table3.cxx | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index dcdae98dd479..1d63dd93a64d 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -118,7 +118,6 @@ private: ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : - xServiceManager( ::comphelper::getProcessServiceFactory() ), mpUndoManager( NULL ), pEditEngine( NULL ), pNoteEngine( NULL ), diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index 819b7a572bcc..b08c5a9f1289 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -51,7 +51,7 @@ const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator() pScriptTypeData = new ScScriptTypeData; if ( !pScriptTypeData->xBreakIter.is() ) { - pScriptTypeData->xBreakIter = i18n::BreakIterator::create( comphelper::getComponentContext(xServiceManager) ); + pScriptTypeData->xBreakIter = i18n::BreakIterator::create( comphelper::getProcessComponentContext() ); } return pScriptTypeData->xBreakIter; } diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 9eefd8f00565..5c1949987c50 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -1593,7 +1593,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp { OSL_ENSURE( rMultiMark.IsMultiMarked(), "TransliterateText: no selection" ); - utl::TransliterationWrapper aTranslitarationWrapper( comphelper::getComponentContext(xServiceManager), nType ); + utl::TransliterationWrapper aTranslitarationWrapper( comphelper::getProcessComponentContext(), nType ); bool bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode(); sal_uInt16 nLanguage = LANGUAGE_SYSTEM; diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index dff56a52cd14..5b1017bd8272 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -3023,7 +3023,7 @@ const ScDPCache* ScDPCollection::DBCaches::getCache( SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDPCache> pCache(new ScDPCache(mpDoc)); SAL_WNODEPRECATED_DECLARATIONS_POP - SvNumberFormatter aFormat( comphelper::getComponentContext(mpDoc->GetServiceManager()), ScGlobal::eLnge); + SvNumberFormatter aFormat( comphelper::getProcessComponentContext(), ScGlobal::eLnge); DBConnector aDB(*pCache, xRowSet, *aFormat.GetNullDate()); if (!aDB.isValid()) return NULL; @@ -3137,7 +3137,7 @@ void ScDPCollection::DBCaches::updateCache( return; } - SvNumberFormatter aFormat( comphelper::getComponentContext(mpDoc->GetServiceManager()), ScGlobal::eLnge); + SvNumberFormatter aFormat( comphelper::getProcessComponentContext(), ScGlobal::eLnge); DBConnector aDB(rCache, xRowSet, *aFormat.GetNullDate()); if (!aDB.isValid()) return; diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index c2ba946938a2..b6f027a576f7 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -73,7 +73,7 @@ SvNumberFormatter* ScPoolHelper::GetFormTable() const { if ( !pFormTable ) { - pFormTable = new SvNumberFormatter( comphelper::getComponentContext(m_pSourceDoc->GetServiceManager()), ScGlobal::eLnge ); + pFormTable = new SvNumberFormatter( comphelper::getProcessComponentContext(), ScGlobal::eLnge ); pFormTable->SetColorLink( LINK( m_pSourceDoc, ScDocument, GetUserDefinedColor ) ); pFormTable->SetEvalDateFormat( NF_EVALDATEFORMAT_INTL_FORMAT ); diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index d1ef841faaee..0058cacd44b2 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -312,7 +312,7 @@ void ScTable::InitSortCollator( const ScSortParam& rPar ) if ( !rPar.aCollatorLocale.Language.isEmpty() ) { if ( !pSortCollator || IsSortCollatorGlobal() ) - pSortCollator = new CollatorWrapper( comphelper::getComponentContext(pDocument->GetServiceManager()) ); + pSortCollator = new CollatorWrapper( comphelper::getProcessComponentContext() ); pSortCollator->loadCollatorAlgorithm( rPar.aCollatorAlgorithm, rPar.aCollatorLocale, (rPar.bCaseSens ? 0 : SC_COLLATOR_IGNORES) ); } |