From c0b70ec34d5e056bb92a66cbf83838923cb41fee Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Wed, 3 Jun 2015 12:14:52 +0300
Subject: Avoid various desktop GUI elements when used from LibreOfficeKit

Change-Id: Id283d185ab38427ce6887ead4e414055522e655c
---
 sfx2/source/control/dispatch.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index f9f2ef8896ab..274db68a1287 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
+#include <comphelper/lok.hxx>
 #include <rtl/strbuf.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
@@ -1168,7 +1169,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
         return;
 
     SfxViewFrame* pTop = xImp->pFrame ? xImp->pFrame->GetTopViewFrame() : NULL;
-    bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this;
+    bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this && !comphelper::LibreOfficeKit::isActive();
 
     if ( !bUIActive && pTop && GetBindings() == &pTop->GetBindings() )
         // keep own tools internally for collecting
@@ -1232,7 +1233,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
     }
 
     _Update_Impl( bUIActive, !bIsIPActive, bIsIPActive, pTaskWin );
-    if ( bUIActive || bIsActive )
+    if ( (bUIActive || bIsActive) && !comphelper::LibreOfficeKit::isActive() )
         pWorkWin->UpdateObjectBars_Impl();
 
     if ( pBindings )
-- 
cgit