sw/source/core/doc/DocumentContentOperationsManager.cxx | 10 ---------- sw/source/uibase/wrtsh/wrtsh1.cxx | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-)
New commits: commit 10c638e520096a0cc282d91ac2a447509f674a6f Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Wed Oct 14 12:42:54 2020 +0200 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Wed Oct 14 21:39:18 2020 +0200 tdf#135260 sw_redlinehide: fix insert-with-delete differently The problem with the fix for tdf#127635 is that now the cursor doesn't move left on backspace if change tracking is on. (regression from 398ba26077f9029bdf6f7378bfc9ce8376b6f02d) Revert that and fix the autocorrect position in SwWrtShell::Insert() instead. Change-Id: I5989a589b654fc6e5ba3dd66922af15eff758ecc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104280 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> (cherry picked from commit be4616d6b49b8c9cf1a90b212b24ead3dabcab6c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104299 Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index ecd43d62dbbd..bee95bec1d3c 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -2008,11 +2008,6 @@ void DocumentContentOperationsManager::DeleteRange( SwPaM & rPam ) { lcl_DoWithBreaks( *this, rPam, &DocumentContentOperationsManager::DeleteRangeImpl ); - if (m_rDoc.getIDocumentRedlineAccess().IsRedlineOn()) - { - rPam.Normalize(false); // tdf#127635 put point at the end of deletion - } - if (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty()) { @@ -2189,11 +2184,6 @@ bool DocumentContentOperationsManager::DeleteAndJoin( SwPaM & rPam, : &DocumentContentOperationsManager::DeleteAndJoinImpl, bForceJoinNext ); - if (m_rDoc.getIDocumentRedlineAccess().IsRedlineOn()) - { - rPam.Normalize(false); // tdf#127635 put point at the end of deletion - } - return ret; } diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 0dbb7aaf0796..da49506b45f4 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -225,7 +225,11 @@ void SwWrtShell::Insert( const OUString &rStr ) StartUndo(SwUndoId::REPLACE, &aRewriter); bStarted = true; + Push(); bDeleted = DelRight(); + Pop(SwCursorShell::PopMode::DeleteCurrent); // Restore selection (if tracking changes) + NormalizePam(false); // tdf#127635 put point at the end of deletion + ClearMark(); } bCallIns ? _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits