Skip to content

C
core
Kaydet (Commit) d62bf7e0 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Avoid various desktop GUI elements when used from LibreOfficeKit 

Change-Id: Id283d185ab38427ce6887ead4e414055522e655c
üst 561fd3a1
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
sfx2/source/control/dispatch.cxx
Dosyayı görüntüle @ d62bf7e0
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XLayoutManager.hpp>
#include <comphelper/lok.hxx>
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <sfx2/app.hxx> #include <sfx2/app.hxx>
#include <sfx2/bindings.hxx> #include <sfx2/bindings.hxx>
...@@ -1168,7 +1169,7 @@ void SfxDispatcher::Update_Impl( bool bForce ) ...@@ -1168,7 +1169,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
return; return;
SfxViewFrame* pTop = xImp->pFrame ? xImp->pFrame->GetTopViewFrame() : NULL; 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() ) if ( !bUIActive && pTop && GetBindings() == &pTop->GetBindings() )
// keep own tools internally for collecting // keep own tools internally for collecting
...@@ -1232,7 +1233,7 @@ void SfxDispatcher::Update_Impl( bool bForce ) ...@@ -1232,7 +1233,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
} }
_Update_Impl( bUIActive, !bIsIPActive, bIsIPActive, pTaskWin ); _Update_Impl( bUIActive, !bIsIPActive, bIsIPActive, pTaskWin );
if ( bUIActive || bIsActive ) if ( (bUIActive || bIsActive) && !comphelper::LibreOfficeKit::isActive() )
pWorkWin->UpdateObjectBars_Impl(); pWorkWin->UpdateObjectBars_Impl();
if ( pBindings ) if ( pBindings )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment