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

[Mike Kaganski (via logerrit)]

 sw/source/ui/chrdlg/drpcps.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 77b662189bd092934bcf13612eca632c1993a55a
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Jul 30 01:10:31 2020 +0300
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Mar 22 11:41:40 2021 +0100

    tdf#135244: prevent jumping when generating drop caps preview
    
    Change-Id: Ifd9ade76384c66312eda8c8ee7cb41891459b3f4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99757
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112828
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 0c539a16901d..0d0583f3d05e 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -196,6 +196,9 @@ void SwDropCapsPict::UpdatePaintSettings()
     vcl::Font aFont;
     if (mpPage)
     {
+        // tdf#135244: preview generation should not jump document view
+        auto aLock(mpPage->rSh.GetView().GetDocShell()->LockAllViews());
+
         if (!mpPage->m_xTemplateBox->get_active())
         {
             // query the Font at paragraph's beginning