[Libreoffice-commits] core.git: sc/source

[Michael Meeks (via logerrit)]

 sc/source/ui/app/scmod.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 35f7cacc8ac59146af728d1db126136771581c52
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri May 10 10:41:02 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri May 10 16:20:00 2019 +0200

    lok: assert that tabs are not locked.
    
    Should save a lot of debugging of out-of-sync part state between
    the calc core and lok clients.
    
    at   ScTabControl::Select ()
    from ScTabControl::SwitchToPageId (... nId=2)
    from doc_setPart (... nPart=1)
    
    we really don't want to hit this:
    
       if ( pScMod->IsTableLocked() )      // may not be switched now ?
       {                                                                                                                                │
           // restore the old state of TabControls
    
    Change-Id: I02b29e9e0e29ce37b64e3f082811bc080c0dc254
    Reviewed-on: https://gerrit.libreoffice.org/72114
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index a1ddebd26de7..76faf343953c 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1625,6 +1625,9 @@ bool ScModule::IsTableLocked()
             bLocked = true;     // for other views, see IsModalMode
     }
 
+    // We can't stop LOK clients from switching part, and getting out of sync.
+    assert(!bLocked || !comphelper::LibreOfficeKit::isActive());
+
     return bLocked;
 }