diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-07-10 22:08:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-07-10 22:08:12 +0200 |
commit | 435be8e8e15e5f0c6d156f55378baf2aa9460bac (patch) | |
tree | b3eacd522afcd236ef6fbf00f57b55e41dd17cff /sw | |
parent | c25ee07a77a5ff278804aa3dbd8dbfcc3ac3ca46 (diff) |
Remove redundant SvxGet* wrappers around LinguMgr functions
Change-Id: Ic431ce4880d0c1277ddb411ca59b3c8e8ca36518
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/uibase/lingu/olmenu.cxx | 12 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 2d931167906e..48d2e74e7357 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -351,14 +351,14 @@ SwSpellPopup::SwSpellPopup( pMenu = GetPopupMenu(MN_ADD_TO_DIC); pMenu->SetMenuFlags(MenuFlags::NoAutoMnemonics); //! necessary to retrieve the correct dictionary name in 'Execute' below - uno::Reference< linguistic2::XSearchableDictionaryList > xDicList( SvxGetDictionaryList() ); + uno::Reference< linguistic2::XSearchableDictionaryList > xDicList( LinguMgr::GetDictionaryList() ); sal_uInt16 nItemId = MN_DICTIONARIES_START; if (xDicList.is()) { // add the default positive dictionary to dic-list (if not already done). // This is to ensure that there is at least one dictionary to which // words could be added. - uno::Reference< linguistic2::XDictionary > xDic( SvxGetOrCreatePosDic() ); + uno::Reference< linguistic2::XDictionary > xDic( LinguMgr::GetStandardDic() ); if (xDic.is()) xDic->setActive( true ); @@ -369,7 +369,7 @@ SwSpellPopup::SwSpellPopup( for( sal_uInt16 i = 0; i < nDicCount; i++ ) { uno::Reference< linguistic2::XDictionary > xDicTmp( pDic[i], uno::UNO_QUERY ); - if (!xDicTmp.is() || SvxGetIgnoreAllList() == xDicTmp) + if (!xDicTmp.is() || LinguMgr::GetIgnoreAllList() == xDicTmp) continue; uno::Reference< frame::XStorable > xStor( xDicTmp, uno::UNO_QUERY ); @@ -712,7 +712,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) } m_pSh->Left(CRSR_SKIP_CHARS, false, 1, false ); { - uno::Reference<linguistic2::XSearchableDictionaryList> xDictionaryList( SvxGetDictionaryList() ); + uno::Reference<linguistic2::XSearchableDictionaryList> xDictionaryList( LinguMgr::GetDictionaryList() ); SvxDicListChgClamp aClamp( xDictionaryList ); m_pSh->GetView().GetViewFrame()->GetDispatcher()-> Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON ); @@ -730,7 +730,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) } else if (nId == MN_IGNORE_WORD) { - uno::Reference< linguistic2::XDictionary > xDictionary( SvxGetIgnoreAllList(), uno::UNO_QUERY ); + uno::Reference< linguistic2::XDictionary > xDictionary( LinguMgr::GetIgnoreAllList(), uno::UNO_QUERY ); if (m_bGrammarResults) { try { @@ -772,7 +772,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) aDicName = m_aDicNameSingle; uno::Reference< linguistic2::XDictionary > xDic; - uno::Reference< linguistic2::XSearchableDictionaryList > xDicList( SvxGetDictionaryList() ); + uno::Reference< linguistic2::XSearchableDictionaryList > xDicList( LinguMgr::GetDictionaryList() ); if (xDicList.is()) xDic = xDicList->getDictionaryByName( aDicName ); diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index c08525a0f2d2..9b66fdcbbc0b 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1135,7 +1135,7 @@ void SwView::Execute(SfxRequest &rReq) // reset ignore lists pDoc->SpellItAgainSam( true, false, false ); // clear ignore dictionary - uno::Reference< linguistic2::XDictionary > xDictionary( SvxGetIgnoreAllList(), uno::UNO_QUERY ); + uno::Reference< linguistic2::XDictionary > xDictionary( LinguMgr::GetIgnoreAllList(), uno::UNO_QUERY ); if( xDictionary.is() ) xDictionary->clear(); // put cursor to the start of the document |