summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranav Kant <pranavk@collabora.co.uk>2018-01-18 19:06:23 +0530
committerpranavk <pranavk@collabora.co.uk>2018-01-18 14:39:20 +0100
commit0e8d0fe001ceecea95ad7115b835527e13252a17 (patch)
tree0367e114ddab70eb50aef7c6a6f6d80993694f68
parentofz#5462 Direct-leak (diff)
downloadcore-0e8d0fe001ceecea95ad7115b835527e13252a17.tar.gz
core-0e8d0fe001ceecea95ad7115b835527e13252a17.zip
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@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
-rw-r--r--sfx2/source/view/viewfrm.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index de705dc9ff61..dd265c2769a6 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -67,6 +67,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>
@@ -2261,6 +2262,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() )
{