diff options
| -rw-r--r-- | sw/source/core/edit/edlingu.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/lingu/olmenu.cxx | 18 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh1.cxx | 41 |
3 files changed, 43 insertions, 21 deletions
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index ef4c5af85743..1c03f321de69 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -963,12 +963,13 @@ bool SwEditShell::GetGrammarCorrection( SwPaM* pCursor = GetCursor(); SwPosition aPos( *pCursor->GetPoint() ); - Point aPt( *pPt ); SwCursorMoveState eTmpState( MV_SETONLYTEXT ); SwTextNode *pNode = nullptr; SwGrammarMarkUp *pWrong = nullptr; - if (GetLayout()->GetCursorOfst( &aPos, aPt, &eTmpState )) + if (pPt && GetLayout()->GetCursorOfst( &aPos, *(const_cast<Point*>(pPt)), &eTmpState )) pNode = aPos.nNode.GetNode().GetTextNode(); + if (nullptr == pNode) + pNode = pCursor->GetNode().GetTextNode(); if (nullptr != pNode) pWrong = pNode->GetGrammarCheck(); if (nullptr != pWrong && !pNode->IsInProtectSect()) diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index e627534fdf6e..4d2e83131636 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -718,22 +718,8 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) { uno::Reference< linguistic2::XDictionary > xDictionary = LinguMgr::GetIgnoreAllList(); if (m_bGrammarResults) { - try - { - m_xGrammarResult.xProofreader->ignoreRule( - m_xGrammarResult.aErrors[ m_nGrammarError ].aRuleIdentifier, - m_xGrammarResult.aLocale ); - // refresh the layout of the actual paragraph (faster) - SwPaM *pPaM = m_pSh->GetCursor(); - if (pPaM) - SwEditShell::IgnoreGrammarErrorAt( *pPaM ); - // refresh the layout of all paragraphs (workaround to launch a dictionary event) - xDictionary->setActive(false); - xDictionary->setActive(true); - } - catch( const uno::Exception& ) - { - } + SfxStringItem aIgnoreString(FN_PARAM_1, "IgnoreAll_Grammar"); + m_pSh->GetView().GetViewFrame()->GetDispatcher()->ExecuteList(SID_APPLY_SPELLCHECKING, SfxCallMode::SYNCHRON, { &aIgnoreString }); } else { OUString sWord(m_xSpellAlt->getWord()); linguistic::DictionaryError nAddRes = linguistic::AddEntryToDic( xDictionary, diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index fc940da44737..510c25432e32 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -103,6 +103,8 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/linguistic2/ProofreadingResult.hpp> +#include <com/sun/star/linguistic2/XDictionary.hpp> #include <editeng/unolingu.hxx> #include <unotools/syslocaleoptions.hxx> #include <doc.hxx> @@ -1437,19 +1439,52 @@ void SwTextShell::Execute(SfxRequest &rReq) sApplyText = pItem2->GetValue(); const OUString sIgnoreString("Ignore"); - //const OUString sIgnoreAllPrefix("IgnoreAll_"); + const OUString sIgnoreAllPrefix("IgnoreAll_"); //const OUString sSpellingRule("Spelling"); - //const OUString sGrammarRule("Grammar"); + const OUString sGrammarRule("Grammar"); //const OUString aReplacePrefix("Replace_"); // Ignore the word at the cursor pos - //sal_Int32 nPos = 0; + sal_Int32 nPos = 0; if (sApplyText == sIgnoreString) { SwPaM *pPaM = rWrtSh.GetCursor(); if (pPaM) SwEditShell::IgnoreGrammarErrorAt( *pPaM ); } + // Ignore all similar items as the current word + else if (-1 != (nPos = sApplyText.indexOf( sIgnoreAllPrefix ))) + { + sApplyText = sApplyText.replaceAt(nPos, sIgnoreAllPrefix.getLength(), ""); + if(sApplyText == sGrammarRule) + { + linguistic2::ProofreadingResult aGrammarCheckRes; + sal_Int32 nErrorInResult = -1; + uno::Sequence< OUString > aSuggestions; + sal_Int32 nErrorPosInText = -1; + SwRect aToFill; + bool bCorrectionRes = rWrtSh.GetGrammarCorrection( aGrammarCheckRes, nErrorPosInText, nErrorInResult, aSuggestions, nullptr, aToFill ); + if(bCorrectionRes) + { + try{ + uno::Reference< linguistic2::XDictionary > xDictionary = LinguMgr::GetIgnoreAllList(); + aGrammarCheckRes.xProofreader->ignoreRule( + aGrammarCheckRes.aErrors[ nErrorInResult ].aRuleIdentifier, + aGrammarCheckRes.aLocale ); + // refresh the layout of the actual paragraph (faster) + SwPaM *pPaM = rWrtSh.GetCursor(); + if (pPaM) + SwEditShell::IgnoreGrammarErrorAt( *pPaM ); + // refresh the layout of all paragraphs (workaround to launch a dictionary event) + xDictionary->setActive(false); + xDictionary->setActive(true); + } + catch( const uno::Exception& ) + { + } + } + } + } } break; default: |