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

[Henry Castro (via logerrit)]

 sc/source/ui/app/scmod.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39db10ae83b0bd2f5b28ae5cc527eac90dd60d8f
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Thu May 9 23:28:23 2019 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Sep 16 15:50:07 2019 +0200

    lok: avoid locking table when ScSpecialFilterDlg is destroyed
    
    ScSpecialFilterDlg by default does not lock the table, but in tiled
    rendering case, switching sheets are locked when the dialog is closed
    
    Thanks Michael Meeks for debugging
    
    Change-Id: Ifa32fd63085f3e082b97ad0313dff7b826b95d2e
    Reviewed-on: https://gerrit.libreoffice.org/72074
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit c5457de07e9d6e6a202f577067cf2a0f904bfcd0)
    Reviewed-on: https://gerrit.libreoffice.org/72096
    Tested-by: Jenkins
    (cherry picked from commit bf74427bce9fff4370394d82dab62e0554109c36)
    Reviewed-on: https://gerrit.libreoffice.org/78786
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 27c145d15c76..954ac316c50e 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1624,7 +1624,7 @@ bool ScModule::IsTableLocked()
                 bLocked = pRefDlg->IsTableLocked();
             }
         }
-        else
+        else if (!comphelper::LibreOfficeKit::isActive())
             bLocked = true;     // for other views, see IsModalMode
     }