sw/source/uibase/docvw/AnnotationWin2.cxx | 8 ++++++++ 1 file changed, 8 insertions(+)
New commits: commit fcea4b4e46dcfa93f061a92c2e8d70bd3e2e582e Author: Marco Cecchetti <[email protected]> AuthorDate: Fri Sep 20 18:51:27 2019 +0200 Commit: Michael Meeks <[email protected]> CommitDate: Mon Oct 7 12:47:30 2019 +0200 lok: comments: fix hidden text cursor and sudden document scroll On Android, SwAnnotationWin::Rescale leads to invoke ImpEditEngine::UpdateViews which hides the text cursor. Moreover it causes sudden document scroll when modifying a commented text. Not clear the root cause, anyway skipping this method fixes the problem, and there should be no side effect, since the client has disabled annotations rendering. Change-Id: I572a9c6b3fe39473a596209413945d777bd79506 Reviewed-on: https://gerrit.libreoffice.org/80246 Tested-by: Jenkins Reviewed-by: Michael Meeks <[email protected]> diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 4d1f73987f7b..f2543715e4ee 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -590,6 +590,14 @@ void SwAnnotationWin::CheckMetaText() void SwAnnotationWin::Rescale() { + // On Android, this method leads to invoke ImpEditEngine::UpdateViews + // which hides the text cursor. Moreover it causes sudden document scroll + // when modifying a commented text. Not clear the root cause, + // anyway skipping this method fixes the problem, and there should be + // no side effect, since the client has disabled annotations rendering. + if (comphelper::LibreOfficeKit::isActive() && !comphelper::LibreOfficeKit::isTiledAnnotations()) + return; + MapMode aMode = GetParent()->GetMapMode(); aMode.SetOrigin( Point() ); mpOutliner->SetRefMapMode( aMode ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
