[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - sw/source

[Marco Cecchetti (via logerrit)]

 sw/source/uibase/docvw/AnnotationWin2.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 7a4a389910d51ffdded3b4fc901746ff6eb0c314
Author:     Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Fri Sep 20 18:51:27 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Oct 7 12:47:10 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/80243
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index e7a76574bf22..62caa0f0a1a3 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -585,6 +585,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 );