download.lst | 4 ++-- sw/source/uibase/docvw/AnnotationWin2.cxx | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-)
New commits: commit 0c63e74737d3baaca96431cba1bbfcc445ff8056 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Oct 7 09:13:41 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Oct 7 12:48:23 2019 +0200 openssl 1.0.2t Change-Id: Ideb980a07632e75e2bc7fffa851b8419e727c13b Reviewed-on: https://gerrit.libreoffice.org/80340 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/download.lst b/download.lst index 1516608ab7d7..0191ddd37d50 100644 --- a/download.lst +++ b/download.lst @@ -192,8 +192,8 @@ export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55 export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 export OPENLDAP_TARBALL := openldap-2.4.45.tgz -export OPENSSL_SHA256SUM := ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 -export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz +export OPENSSL_SHA256SUM := 14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc +export OPENSSL_TARBALL := openssl-1.0.2t.tar.gz export ORCUS_SHA256SUM := aa9bd86da242bf67de1cb0785afd457b5398798c8a86d6c5492c9e6c3d3e8aa4 export ORCUS_TARBALL := liborcus-0.15.2.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit 86c180a1193e928385bd8344d7dc7be1bf828cf1 Author: Marco Cecchetti <[email protected]> AuthorDate: Fri Sep 20 18:51:27 2019 +0200 Commit: Michael Meeks <[email protected]> CommitDate: Mon Oct 7 12:48:20 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/80244 Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index acfc90b506e0..e73592f947b9 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -626,6 +626,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
