[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 2 commits - sfx2/source svtools/source

[Tor Lillqvist]

 sfx2/source/control/dispatch.cxx            |    5 +++--
 svtools/source/config/slidesorterbaropt.cxx |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 692b77f7855c44843359486a00b06b468a96c8f8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 3 12:14:52 2015 +0300

    Avoid various desktop GUI elements when used from LibreOfficeKit
    
    Change-Id: Id283d185ab38427ce6887ead4e414055522e655c

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 5e6f9bc..0b9555a 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 )
commit c84de2c9e8092285e6ee630b36fece23937a1f74
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Jun 3 10:19:28 2015 +0200

    lok: Avoid instantiation of the slide sorter bar
    
    Change-Id: Ia21bea54d1d6bd34256cb45ed704c6f7785fc2fc

diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx
index dd62de3..9c729c0 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
+#include <comphelper/lok.hxx>
 #include <rtl/instance.hxx>
 
 using namespace ::utl;
@@ -345,7 +346,7 @@ SvtSlideSorterBarOptions::~SvtSlideSorterBarOptions()
 
 bool SvtSlideSorterBarOptions::GetVisibleImpressView() const
 {
-    return m_pDataContainer->m_bVisibleImpressView;
+    return m_pDataContainer->m_bVisibleImpressView && !comphelper::LibreOfficeKit::isActive();
 }
 
 void SvtSlideSorterBarOptions::SetVisibleImpressView(bool bVisible)
@@ -385,7 +386,7 @@ void SvtSlideSorterBarOptions::SetVisibleHandoutView(bool bVisible)
 
 bool SvtSlideSorterBarOptions::GetVisibleSlideSorterView() const
 {
-    return m_pDataContainer->m_bVisibleSlideSorterView;
+    return m_pDataContainer->m_bVisibleSlideSorterView && !comphelper::LibreOfficeKit::isActive();
 }
 
 void SvtSlideSorterBarOptions::SetVisibleSlideSorterView(bool bVisible)