diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-04-17 11:38:19 +0200 |
|---|---|---|
| committer | László Németh <laszlo.nemeth@collabora.com> | 2015-04-17 12:11:00 +0200 |
| commit | 5ed0006b385849896d399241639cc8883e9bca47 (patch) | |
| tree | a7db743ad311b3a5803d2aeed96a88363034326f /framework | |
| parent | 21a9ddbc1c69f57dec7944dc7751b5377e9c50ff (diff) | |
Don't enable toolbar layout manager using LibreOfficeKit
LibreOfficeKit doesn't need ToolbarLayoutManager.
Change-Id: I10ec8733448407b0a93ca63e444f914f05410eff
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
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 ) ); |