mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid various desktop GUI elements when used from LibreOfficeKit

Browse Source 
Change-Id: Id283d185ab38427ce6887ead4e414055522e655c
This commit is contained in:
Tor Lillqvist
2015-06-03 12:14:52 +03:00
parent 5f39d1078f
commit c0b70ec34d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sfx2/source/control/dispatch.cxx
View File

@@ -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 )