framework/source/layoutmanager/layoutmanager.cxx | 8 ++++++-- sw/source/uibase/app/docsh.cxx | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit 5ed0006b385849896d399241639cc8883e9bca47 Author: László Németh <[email protected]> Date: Fri Apr 17 11:38:19 2015 +0200 Don't enable toolbar layout manager using LibreOfficeKit LibreOfficeKit doesn't need ToolbarLayoutManager. Change-Id: I10ec8733448407b0a93ca63e444f914f05410eff diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index e8b5d51..1b173e3 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 ) ); commit 21a9ddbc1c69f57dec7944dc7751b5377e9c50ff Author: László Németh <[email protected]> Date: Fri Apr 17 11:26:26 2015 +0200 Writer export: don't update doc stat using SkipImages to speed up text extraction Change-Id: Ifa81483f537c8a79326c40fb610201f0bbbcc97a diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index aadb707..c364136 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -589,7 +589,8 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) } // #i76360# Update document statistics - m_pDoc->getIDocumentStatistics().UpdateDocStat( false, true ); + if ( !rMedium.IsSkipImages() ) + m_pDoc->getIDocumentStatistics().UpdateDocStat( false, true ); CalcLayoutForOLEObjects(); // format for OLE objets // #i62875#
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
