From 5ed0006b385849896d399241639cc8883e9bca47 Mon Sep 17 00:00:00 2001
From: László Németh <laszlo.nemeth@collabora.com>
Date: Fri, 17 Apr 2015 11:38:19 +0200
Subject: Don't enable toolbar layout manager using LibreOfficeKit

LibreOfficeKit doesn't need ToolbarLayoutManager.

Change-Id: I10ec8733448407b0a93ca63e444f914f05410eff
---
 framework/source/layoutmanager/layoutmanager.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'framework')

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e8b5d5125cae..1b173e3f5c9f 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -60,6 +60,7 @@
 #include <com/sun/star/util/URLTransformer.hpp>
 
 #include <comphelper/processfactory.hxx>
+#include <comphelper/lok.hxx>
 #include <svtools/imgdef.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/window.hxx>
@@ -139,8 +140,11 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
     m_aStatusBarElement.m_aType = "statusbar";
     m_aStatusBarElement.m_aName = STATUS_BAR_ALIAS;
 
-    m_pToolbarManager = new ToolbarLayoutManager( xContext, Reference<XUIElementFactory>(m_xUIElementFactoryManager, UNO_QUERY_THROW), this );
-    m_xToolbarManager = uno::Reference< ui::XUIConfigurationListener >( static_cast< OWeakObject* >( m_pToolbarManager ), uno::UNO_QUERY );
+    if (!comphelper::LibreOfficeKit::isActive())
+    {
+        m_pToolbarManager = new ToolbarLayoutManager( xContext, Reference<XUIElementFactory>(m_xUIElementFactoryManager, UNO_QUERY_THROW), this );
+        m_xToolbarManager = uno::Reference< ui::XUIConfigurationListener >( static_cast< OWeakObject* >( m_pToolbarManager ), uno::UNO_QUERY );
+    }
 
     Application::AddEventListener( LINK( this, LayoutManager, SettingsChanged ) );
 
-- 
cgit