[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/source

[Jim Raykowski (via logerrit)]

 sw/source/uibase/shells/annotsh.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3d76a0edad1f10f846de59fbd706c2cd395b74c6
Author:     Jim Raykowski <rayk...@gmail.com>
AuthorDate: Fri Apr 1 22:08:42 2022 -0800
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Apr 5 10:51:10 2022 +0200

    tdf#147925 fix view scrolling back to comment
    
    fixes regression caused by fix done for commit
    85057da7f19e8e5d6023c16fa07d138e2b519a66
    
    Change-Id: I427513bd920f4e0047c64210feecfeac22ecfd10
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132451
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <rayk...@gmail.com>
    (cherry picked from commit 2d6af46a82c6b9f1565933e8a1175e7a184256ca)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132381
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index d7fb25861c92..ca8c0c133ff9 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -134,7 +134,8 @@ SwAnnotationShell::SwAnnotationShell( SwView& r )
 
 SwAnnotationShell::~SwAnnotationShell()
 {
-    m_rView.GetWrtShell().Edit();
+    if (m_rView.GetWrtShell().CanInsert())
+        m_rView.ShowCursor(true);
 }
 
 SfxUndoManager* SwAnnotationShell::GetUndoManager()