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

[Pranav Kant]

 sfx2/source/view/viewfrm.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 8a5c2d9c57f9820fdd7c5bc2d0da1960309b5c54
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Jan 18 19:06:23 2018 +0530

    lokdialog: No modal mode in LOK
    
    ... otherwise the cursor in the document goes invisible as soon as the
    dialog is launched.
    
    Change-Id: I77bc30879550b354e1a9593db3c2db7ad3c68193
    Reviewed-on: https://gerrit.libreoffice.org/48126
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>
    (cherry picked from commit 0e8d0fe001ceecea95ad7115b835527e13252a17)
    Reviewed-on: https://gerrit.libreoffice.org/48127
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 751891d3cf0a..977efc4566d9 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -69,6 +69,7 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <unotools/ucbhelper.hxx>
+#include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/docpasswordrequest.hxx>
@@ -2313,6 +2314,10 @@ OUString SfxViewFrame::GetActualPresentationURL_Impl() const
 
 void SfxViewFrame::SetModalMode( bool bModal )
 {
+    // no real modality for LOK
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
+
     m_pImpl->bModal = bModal;
     if ( m_xObjSh.Is() )
     {