diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-06-03 12:14:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-06-03 12:16:50 +0300 |
| commit | c0b70ec34d5e056bb92a66cbf83838923cb41fee (patch) | |
| tree | ed6c2ec46cba09eba494c57c8ba1d4781eeb290e | |
| parent | 5f39d1078f01e440e719acca34688b2768d66807 (diff) | |
Avoid various desktop GUI elements when used from LibreOfficeKit
Change-Id: Id283d185ab38427ce6887ead4e414055522e655c
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 5 |
1 files 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 ) |