diff options
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optdict.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 17 |
3 files changed, 6 insertions, 15 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 2f2f32374845..665643c91376 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -175,7 +175,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, co } m_pSearchEngine = new FmSearchEngine( - ::comphelper::getProcessServiceFactory(), fmscInitial.xCursor, fmscInitial.strUsedFields, fmscInitial.arrFields, SM_ALLOWSCHEDULE ); + ::comphelper::getProcessComponentContext(), fmscInitial.xCursor, fmscInitial.strUsedFields, fmscInitial.arrFields, SM_ALLOWSCHEDULE ); initCommon( fmscInitial.xCursor ); if (fmscInitial.sFieldDisplayNames.Len() != 0) diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 97c21fd733df..9855c8a31fb5 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -376,7 +376,7 @@ sal_uInt16 SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord) { sal_uInt16 nPos = USHRT_MAX; - IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag() ); + IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() ); const CollatorWrapper* pCollator = aIntlWrapper.getCollator(); sal_uInt16 j; for( j = 0; j < aWordsLB.GetEntryCount(); j++ ) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 024bcf877b8f..8dea32884d39 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -59,15 +59,6 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star; using namespace ::rtl; -static ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& GetProcessFact() -{ - static ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > xMSF = - ::comphelper::getProcessServiceFactory(); - return xMSF; -} - OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : SfxTabDialog( pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet ), aLanguageFT ( this, CUI_RES( FT_LANG ) ), @@ -887,7 +878,7 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, bSWriter = pMod == SfxModule::GetActiveModule(); LanguageTag aLanguageTag( eLastDialogLanguage ); - pCompareClass = new CollatorWrapper( GetProcessFact() ); + pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() ); pCompareClass->loadDefaultCollator( aLanguageTag.getLocale(), 0 ); pCharClass = new CharClass( aLanguageTag ); @@ -1090,7 +1081,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) delete pCharClass; LanguageTag aLanguageTag( eLastDialogLanguage ); - pCompareClass = new CollatorWrapper( GetProcessFact() ); + pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() ); pCompareClass->loadDefaultCollator( aLanguageTag.getLocale(), 0 ); pCharClass = new CharClass( aLanguageTag ); ModifyHdl(&aShortED); @@ -1381,7 +1372,7 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent, FreeResource(); ::com::sun::star::lang::Locale aLcl( LanguageTag(eLastDialogLanguage ).getLocale()); - pCompareClass = new CollatorWrapper( GetProcessFact() ); + pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() ); pCompareClass->loadDefaultCollator( aLcl, 0 ); aNewAbbrevPB.SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl)); @@ -1555,7 +1546,7 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) RefillReplaceBoxes(sal_False, eLang, eSet); eLastDialogLanguage = eSet; delete pCompareClass; - pCompareClass = new CollatorWrapper( GetProcessFact() ); + pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() ); pCompareClass->loadDefaultCollator( LanguageTag( eLastDialogLanguage ).getLocale(), 0 ); ModifyHdl(&aAbbrevED); ModifyHdl(&aDoubleCapsED); |