diff -Nru libreoffice-5.1.4/accessibility/source/extended/AccessibleGridControl.cxx libreoffice-5.1.5~rc2/accessibility/source/extended/AccessibleGridControl.cxx --- libreoffice-5.1.4/accessibility/source/extended/AccessibleGridControl.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/accessibility/source/extended/AccessibleGridControl.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -347,7 +347,14 @@ { if(_nEventId == AccessibleEventId::ACTIVE_DESCENDANT_CHANGED) { - Reference< XAccessible > xChild = m_xImpl->m_pTable->getAccessibleChild(m_aTable.GetCurrentRow()*m_aTable.GetColumnCount()+m_aTable.GetCurrentColumn()); + const sal_Int32 nCurrentRow = m_aTable.GetCurrentRow(); + const sal_Int32 nCurrentCol = m_aTable.GetCurrentColumn(); + css::uno::Reference< css::accessibility::XAccessible > xChild; + if (nCurrentRow > -1 && nCurrentCol > -1) + { + sal_Int32 nColumnCount = m_aTable.GetColumnCount(); + xChild = m_xImpl->m_pTable->getAccessibleChild(nCurrentRow * nCurrentCol + nColumnCount); + } m_xImpl->m_pTable->commitEvent(_nEventId, makeAny(xChild),_rOldValue); } else if(_nEventId == AccessibleEventId::TABLE_MODEL_CHANGED) diff -Nru libreoffice-5.1.4/avmedia/source/framework/mediaplayer.cxx libreoffice-5.1.5~rc2/avmedia/source/framework/mediaplayer.cxx --- libreoffice-5.1.4/avmedia/source/framework/mediaplayer.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/avmedia/source/framework/mediaplayer.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -79,13 +79,16 @@ void MediaFloater::dispose() { + if (IsFloatingMode()) + { + Show(false, ShowFlags::NoFocusChange); + SetFloatingMode(false); + } delete mpMediaWindow; mpMediaWindow = nullptr; SfxDockingWindow::dispose(); } - - void MediaFloater::Resize() { SfxDockingWindow::Resize(); @@ -94,8 +97,6 @@ mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) ); } - - void MediaFloater::ToggleFloatingMode() { ::avmedia::MediaItem aRestoreItem; diff -Nru libreoffice-5.1.4/basic/source/sbx/sbxscan.cxx libreoffice-5.1.5~rc2/basic/source/sbx/sbxscan.cxx --- libreoffice-5.1.4/basic/source/sbx/sbxscan.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/basic/source/sbx/sbxscan.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -160,6 +160,13 @@ eScanType = SbxDOUBLE; aBuf[ p - pStart ] = 'E'; p++; + if (*p == '+') + ++p; + else if (*p == '-') + { + aBuf.append('-'); + ++p; + } } else { diff -Nru libreoffice-5.1.4/chart2/source/controller/main/ChartWindow.cxx libreoffice-5.1.5~rc2/chart2/source/controller/main/ChartWindow.cxx --- libreoffice-5.1.4/chart2/source/controller/main/ChartWindow.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/chart2/source/controller/main/ChartWindow.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -49,7 +49,7 @@ : Window(pParent, nStyle) , m_pWindowController( pController ) , m_bInPaint(false) - , m_pOpenGLWindow(VclPtr::Create(this)) + , m_pOpenGLWindow(VclPtr::Create(this, false)) { this->SetHelpId( HID_SCH_WIN_DOCUMENT ); this->SetMapMode( MapMode(MAP_100TH_MM) ); diff -Nru libreoffice-5.1.4/chart2/source/view/main/ChartView.cxx libreoffice-5.1.5~rc2/chart2/source/view/main/ChartView.cxx --- libreoffice-5.1.4/chart2/source/view/main/ChartView.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/chart2/source/view/main/ChartView.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -2725,6 +2725,10 @@ //create chart view { + OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow(); + if (pWindow && ChartHelper::isGL3DDiagram(mrChartModel.getFirstDiagram())) + pWindow->Initialize(); + m_bViewDirty = false; m_bViewUpdatePending = false; createShapes(); diff -Nru libreoffice-5.1.4/comphelper/CppunitTest_comphelper_threadpool_test.mk libreoffice-5.1.5~rc2/comphelper/CppunitTest_comphelper_threadpool_test.mk --- libreoffice-5.1.4/comphelper/CppunitTest_comphelper_threadpool_test.mk 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.1.5~rc2/comphelper/CppunitTest_comphelper_threadpool_test.mk 2016-07-26 21:17:25.000000000 +0000 @@ -0,0 +1,30 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,comphelper_threadpool_test)) + +$(eval $(call gb_CppunitTest_add_exception_objects,comphelper_threadpool_test, \ + comphelper/qa/unit/threadpooltest \ +)) + +$(eval $(call gb_CppunitTest_use_externals,comphelper_threadpool_test,\ + boost_headers \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_threadpool_test)) + +$(eval $(call gb_CppunitTest_use_libraries,comphelper_threadpool_test, \ + comphelper \ + cppuhelper \ + cppu \ + sal \ + $(gb_UWINAPI) \ +)) + +# vim: set noet sw=4 ts=4: diff -Nru libreoffice-5.1.4/comphelper/Module_comphelper.mk libreoffice-5.1.5~rc2/comphelper/Module_comphelper.mk --- libreoffice-5.1.4/comphelper/Module_comphelper.mk 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/comphelper/Module_comphelper.mk 2016-07-26 21:17:25.000000000 +0000 @@ -28,6 +28,7 @@ )) $(eval $(call gb_Module_add_check_targets,comphelper,\ + CppunitTest_comphelper_threadpool_test \ CppunitTest_comphelper_syntaxhighlight_test \ CppunitTest_comphelper_variadictemplates_test \ CppunitTest_comphelper_test \ diff -Nru libreoffice-5.1.4/comphelper/qa/unit/threadpooltest.cxx libreoffice-5.1.5~rc2/comphelper/qa/unit/threadpooltest.cxx --- libreoffice-5.1.4/comphelper/qa/unit/threadpooltest.cxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.1.5~rc2/comphelper/qa/unit/threadpooltest.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -0,0 +1,55 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" + +#include +#include + +class ThreadPoolTest : public CppUnit::TestFixture +{ +public: + void testPreferredConcurrency(); + + CPPUNIT_TEST_SUITE(ThreadPoolTest); + CPPUNIT_TEST(testPreferredConcurrency); + CPPUNIT_TEST_SUITE_END(); +}; + +void ThreadPoolTest::testPreferredConcurrency() { + + // Check default. + auto nThreads = comphelper::ThreadPool::getPreferredConcurrency(); + sal_Int32 nExpected = 4; // UTs are capped to 4. + CPPUNIT_ASSERT_MESSAGE("Expected no more than 4 threads", nExpected >= nThreads); + +#ifndef _WIN32_WINNT + // The result should be cached, so this should change anything. + nThreads = std::thread::hardware_concurrency() * 2; + setenv("MAX_CONCURRENCY", std::to_string(nThreads).c_str(), true); + nThreads = comphelper::ThreadPool::getPreferredConcurrency(); + CPPUNIT_ASSERT_MESSAGE("Expected no more than hardware threads", + nThreads <= (sal_Int32)std::thread::hardware_concurrency()); + + // Revert and check. Again, nothing should change. + unsetenv("MAX_CONCURRENCY"); + nThreads = comphelper::ThreadPool::getPreferredConcurrency(); + CPPUNIT_ASSERT_MESSAGE("Expected no more than 4 threads", nExpected >= nThreads); +#endif +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ThreadPoolTest); + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.1.4/comphelper/source/misc/threadpool.cxx libreoffice-5.1.5~rc2/comphelper/source/misc/threadpool.cxx --- libreoffice-5.1.4/comphelper/source/misc/threadpool.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/comphelper/source/misc/threadpool.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -115,8 +116,8 @@ ThreadPoolStatic > { std::shared_ptr< ThreadPool > operator () () { - sal_Int32 nThreads = std::max( std::thread::hardware_concurrency(), 1U ); - return std::shared_ptr< ThreadPool >( new ThreadPool( nThreads ) ); + const sal_Int32 nThreads = ThreadPool::getPreferredConcurrency(); + return std::make_shared< ThreadPool >( nThreads ); }; }; @@ -125,6 +126,27 @@ return *ThreadPoolStatic::get().get(); } +sal_Int32 ThreadPool::getPreferredConcurrency() +{ + static sal_Int32 ThreadCount = 0; + if (ThreadCount == 0) + { + const sal_Int32 nHardThreads = std::max(std::thread::hardware_concurrency(), 1U); + sal_Int32 nThreads = nHardThreads; + const char *pEnv = getenv("MAX_CONCURRENCY"); + if (pEnv != nullptr) + { + // Override with user/admin preferrence. + nThreads = rtl_str_toInt32(pEnv, 10); + } + + nThreads = std::min(nHardThreads, nThreads); + ThreadCount = std::max(nThreads, 1); + } + + return ThreadCount; +} + void ThreadPool::waitAndCleanupWorkers() { waitUntilEmpty(); diff -Nru libreoffice-5.1.4/configure.ac libreoffice-5.1.5~rc2/configure.ac --- libreoffice-5.1.4/configure.ac 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/configure.ac 2016-07-26 21:17:25.000000000 +0000 @@ -9,7 +9,7 @@ # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.1.4.2],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.1.5.2],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) @@ -10530,7 +10530,7 @@ AC_SUBST([SYSTEM_COLLADA2GLTF]) if test "$enable_dconf" != no; then - PKG_CHECK_MODULES([DCONF], [dconf], [], [ + PKG_CHECK_MODULES([DCONF], [dconf >= 0.15.2], [], [ if test "$enable_dconf" = yes; then AC_MSG_ERROR([dconf not found]) else diff -Nru libreoffice-5.1.4/cppuhelper/source/weak.cxx libreoffice-5.1.5~rc2/cppuhelper/source/weak.cxx --- libreoffice-5.1.4/cppuhelper/source/weak.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/cppuhelper/source/weak.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -34,6 +34,7 @@ { // due to static Reflection destruction from usr, there must be a mutex leak (#73272#) +// this is used to lock all instances of OWeakConnectionPoint and OWeakRefListener as well as OWeakObject::m_pWeakConnectionPoint inline static Mutex & getWeakMutex() { static Mutex * s_pMutex = nullptr; @@ -104,6 +105,12 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(css::uno::RuntimeException) { + { + MutexGuard aGuard(getWeakMutex()); + // OWeakObject is not the only owner of this, so clear m_pObject + // so that queryAdapted() won't use it now that it's dead + m_pObject = nullptr; + } Any ex; OInterfaceIteratorHelper aIt( m_aReferences ); while( aIt.hasMoreElements() ) @@ -333,7 +340,7 @@ /// The reference counter. oslInterlockedCount m_aRefCount; - /// The connection point of the weak object + /// The connection point of the weak object, guarded by getWeakMutex() Reference< XAdapter > m_XWeakConnectionPoint; }; @@ -438,12 +445,7 @@ { if (m_pImpl) { - if (m_pImpl->m_XWeakConnectionPoint.is()) - { - m_pImpl->m_XWeakConnectionPoint->removeReference( - static_cast(m_pImpl)); - m_pImpl->m_XWeakConnectionPoint.clear(); - } + m_pImpl->dispose(); m_pImpl->release(); m_pImpl = nullptr; } @@ -488,6 +490,7 @@ { Reference< XAdapter > xAdp; { + // must lock to access m_XWeakConnectionPoint MutexGuard guard(cppu::getWeakMutex()); if( m_pImpl && m_pImpl->m_XWeakConnectionPoint.is() ) xAdp = m_pImpl->m_XWeakConnectionPoint; diff -Nru libreoffice-5.1.4/cui/source/dialogs/about.cxx libreoffice-5.1.5~rc2/cui/source/dialogs/about.cxx --- libreoffice-5.1.4/cui/source/dialogs/about.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/cui/source/dialogs/about.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -47,6 +47,8 @@ #include #include #include + +#include #include using namespace ::com::sun::star::uno; @@ -313,6 +315,17 @@ sVersion += m_aLocaleStr.replaceAll("$LOCALE", aLocaleStr); } + OUString aCalcMode = "Calc: "; // Calc calculation mode + bool bSWInterp = officecfg::Office::Common::Misc::UseSwInterpreter::get(); + bool bOpenCL = opencl::GPUEnv::isOpenCLEnabled(); + if (bOpenCL) + aCalcMode += "CL"; + else if (bSWInterp) + aCalcMode += "group"; + else + aCalcMode += "single"; + sVersion += "; " + aCalcMode; + return sVersion; } diff -Nru libreoffice-5.1.4/cui/source/options/optopencl.cxx libreoffice-5.1.5~rc2/cui/source/options/optopencl.cxx --- libreoffice-5.1.4/cui/source/options/optopencl.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/cui/source/options/optopencl.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -155,9 +155,6 @@ { officecfg::Office::Common::Misc::UseSwInterpreter::set(mpUseSwInterpreter->IsChecked(), batch); bModified = true; - - ScopedVclPtrInstance aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO); - aWarnBox->Execute(); } if (mpUseOpenCL->IsValueChangedFromSaved()) @@ -170,7 +167,11 @@ } if (bModified) + { + ScopedVclPtrInstance aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO); + aWarnBox->Execute(); batch->commit(); + } return bModified; } diff -Nru libreoffice-5.1.4/cui/source/options/optpath.cxx libreoffice-5.1.5~rc2/cui/source/options/optpath.cxx --- libreoffice-5.1.4/cui/source/options/optpath.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/cui/source/options/optpath.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -630,11 +630,12 @@ else { short nRet = xFolderPicker->execute(); - if ( ExecutableDialogResults::OK != nRet ) - return; - - OUString sFolder( xFolderPicker->getDirectory() ); - ChangeCurrentEntry( sFolder ); + if (nRet == ExecutableDialogResults::OK) + { + OUString sFolder(xFolderPicker->getDirectory()); + ChangeCurrentEntry(sFolder); + } + xFolderPicker.clear(); } } catch( Exception& ) @@ -702,21 +703,16 @@ } } - - IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { - if ( RET_OK == pEvt->DialogResult ) + assert(xFolderPicker.is() && "SvxPathTabPage::DialogClosedHdl(): no folder picker"); + if (RET_OK == pEvt->DialogResult) { - DBG_ASSERT( xFolderPicker.is(), "SvxPathTabPage::DialogClosedHdl(): no folder picker" ); - OUString sURL = xFolderPicker->getDirectory(); ChangeCurrentEntry( sURL ); } } - - void SvxPathTabPage::GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ) diff -Nru libreoffice-5.1.4/cui/source/tabpages/textattr.cxx libreoffice-5.1.5~rc2/cui/source/tabpages/textattr.cxx --- libreoffice-5.1.4/cui/source/tabpages/textattr.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/cui/source/tabpages/textattr.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -204,9 +204,9 @@ m_pTsbAutoGrowWidth->SaveValue(); // autogrowsize - if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWSIZE ) != SfxItemState::DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != SfxItemState::DONTCARE ) { - m_pTsbAutoGrowSize->SetState( static_cast( rAttrs->Get( SDRATTR_TEXT_AUTOGROWSIZE ) ). + m_pTsbAutoGrowSize->SetState( static_cast( rAttrs->Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbAutoGrowSize->EnableTriState( false ); } @@ -384,7 +384,7 @@ eState = m_pTsbAutoGrowSize->GetState(); if( m_pTsbAutoGrowSize->IsValueChangedFromSaved() ) { - rAttrs->Put( makeSdrTextAutoGrowSizeItem ( TRISTATE_TRUE == eState ) ); + rAttrs->Put( makeSdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbWordWrapText->GetState(); diff -Nru libreoffice-5.1.4/dbaccess/source/ui/querydesign/querydlg.cxx libreoffice-5.1.5~rc2/dbaccess/source/ui/querydesign/querydlg.cxx --- libreoffice-5.1.4/dbaccess/source/ui/querydesign/querydlg.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/dbaccess/source/ui/querydesign/querydlg.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -122,8 +122,7 @@ } else { - const sal_Int32 nCount = m_pLB_JoinType->GetEntryCount(); - for (sal_Int32 i = 0; i < nCount;) + for (sal_Int32 i = 0; i < m_pLB_JoinType->GetEntryCount();) { const sal_IntPtr nJoinTyp = reinterpret_cast(m_pLB_JoinType->GetEntryData(i)); if ( !bSupportFullJoin && nJoinTyp == ID_FULL_JOIN ) diff -Nru libreoffice-5.1.4/debian/changelog libreoffice-5.1.5~rc2/debian/changelog --- libreoffice-5.1.4/debian/changelog 2016-06-23 09:14:41.000000000 +0000 +++ libreoffice-5.1.5~rc2/debian/changelog 2016-07-27 17:32:23.000000000 +0000 @@ -1,4 +1,4 @@ -libreoffice (1:5.1.4-0ubuntu1~trusty1) trusty; urgency=medium +libreoffice (1:5.1.5~rc2-0ubuntu1~trusty1) trusty; urgency=medium * Backport from xenial * debian/rules: @@ -10,7 +10,13 @@ * Fix build with older boost: - revert-core-fix-build-with-system-boost-1.59.patch - -- Rico Tzschichholz Thu, 23 Jun 2016 11:09:33 +0200 + -- Rico Tzschichholz Wed, 27 Jul 2016 19:28:53 +0200 + +libreoffice (1:5.1.5~rc2-0ubuntu1~xenial1) xenial; urgency=medium + + * new upstream rc + + -- Bjoern Michaelsen Wed, 27 Jul 2016 00:31:36 +0200 libreoffice (1:5.1.4-0ubuntu1~xenial1) xenial; urgency=medium diff -Nru libreoffice-5.1.4/debian/rules libreoffice-5.1.5~rc2/debian/rules --- libreoffice-5.1.4/debian/rules 2016-06-23 09:14:41.000000000 +0000 +++ libreoffice-5.1.5~rc2/debian/rules 2016-07-27 17:32:23.000000000 +0000 @@ -70,7 +70,7 @@ GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice # bootstraping this from the source tree is breaking get-orig-source #lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,') -lo_sources_ver=5.1.4.2 +lo_sources_ver=5.1.5.2 # NOT in proper libreoffice-3-6 branch # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1 GIT_TAG=libreoffice-$(lo_sources_ver) diff -Nru libreoffice-5.1.4/desktop/inc/app.hxx libreoffice-5.1.5~rc2/desktop/inc/app.hxx --- libreoffice-5.1.4/desktop/inc/app.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/desktop/inc/app.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -84,6 +84,7 @@ static void OpenClients(); static void OpenDefault(); + static void CheckOpenCLCompute(const css::uno::Reference &); DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void); diff -Nru libreoffice-5.1.4/desktop/Library_sofficeapp.mk libreoffice-5.1.5~rc2/desktop/Library_sofficeapp.mk --- libreoffice-5.1.4/desktop/Library_sofficeapp.mk 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/desktop/Library_sofficeapp.mk 2016-07-26 21:17:25.000000000 +0000 @@ -48,6 +48,7 @@ deploymentmisc \ editeng \ i18nlangtag \ + $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \ sal \ salhelper \ sb \ @@ -93,6 +94,7 @@ desktop/source/app/langselect \ desktop/source/app/lockfile2 \ desktop/source/app/officeipcthread \ + desktop/source/app/opencl \ desktop/source/app/sofficemain \ desktop/source/app/userinstall \ desktop/source/migration/migration \ diff -Nru libreoffice-5.1.4/desktop/source/app/app.cxx libreoffice-5.1.5~rc2/desktop/source/app/app.cxx --- libreoffice-5.1.4/desktop/source/app/app.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/desktop/source/app/app.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -1573,6 +1573,11 @@ FatalError( MakeStartupErrorMessage(e.Message) ); } + // FIXME: move this somewhere sensible. +#if HAVE_FEATURE_OPENCL + CheckOpenCLCompute(xDesktop); +#endif + // Release solar mutex just before we wait for our client to connect { SolarMutexReleaser aReleaser; diff -Nru libreoffice-5.1.4/desktop/source/app/opencl.cxx libreoffice-5.1.5~rc2/desktop/source/app/opencl.cxx --- libreoffice-5.1.4/desktop/source/app/opencl.cxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.1.5~rc2/desktop/source/app/opencl.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -0,0 +1,186 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + * This module exists to validate the OpenCL implementation, + * where necessary during startup; and before we load or + * calculate using OpenCL. + */ + +#include "app.hxx" + +#include +#include + +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + +#include + +using namespace ::osl; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::frame; + +namespace desktop { + +#if HAVE_FEATURE_OPENCL + +bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &rURL) +{ + bool bSuccess = false; + css::uno::Reference< css::lang::XComponent > xComponent; + + sal_uInt64 nKernelFailures = opencl::kernelFailures; + + SAL_INFO("opencl", "Starting CL test spreadsheet"); + + try { + css::uno::Reference< css::frame::XComponentLoader > xLoader(xDesktop, css::uno::UNO_QUERY_THROW); + + css::uno::Sequence< css::beans::PropertyValue > aArgs(1); + aArgs[0].Name = "Hidden"; + aArgs[0].Value = makeAny(true); + + xComponent.set(xLoader->loadComponentFromURL(rURL, "_blank", 0, aArgs)); + + // What an unpleasant API to use. + css::uno::Reference< css::sheet::XCalculatable > xCalculatable( xComponent, css::uno::UNO_QUERY_THROW); + css::uno::Reference< css::sheet::XSpreadsheetDocument > xSpreadDoc( xComponent, css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::sheet::XSpreadsheets > xSheets( xSpreadDoc->getSheets(), css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::container::XIndexAccess > xIndex( xSheets, css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), css::uno::UNO_QUERY_THROW); + + // So we insert our MAX call at the end on a named range. + css::uno::Reference< css::table::XCell2 > xThresh( xSheet->getCellByPosition(1,1), css::uno::UNO_QUERY_THROW ); // B2 + double fThreshold = xThresh->getValue(); + + // We need pure OCL formulae all the way through the + // dependency chain, or we fall-back. + xCalculatable->calculateAll(); + + // So we insert our MAX call at the end on a named range. + css::uno::Reference< css::table::XCell2 > xCell( xSheet->getCellByPosition(1,0), css::uno::UNO_QUERY_THROW ); + xCell->setFormula("=MAX(results)"); + double fResult = xCell->getValue(); + + // Ensure the maximum variance is below our tolerance. + if (fResult > fThreshold) + { + SAL_WARN("opencl", "OpenCL results unstable - disabling; result: " + << fResult << " vs. " << fThreshold); + } + else + { + SAL_INFO("opencl", "calculating smoothly; result: " << fResult); + bSuccess = true; + } + } + catch (const css::uno::Exception &e) + { + (void)e; + SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message); + } + + if (nKernelFailures != opencl::kernelFailures) + { + // tdf# + SAL_WARN("opencl", "OpenCL kernels failed to compile, " + "or took SEH exceptions " + << nKernelFailures << " != " << opencl::kernelFailures); + bSuccess = false; + } + + if (!bSuccess) + OpenCLZone::hardDisable(); + if (xComponent.is()) + xComponent->dispose(); + + + return bSuccess; +} + +void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop) +{ + if (getenv("SAL_DISABLE_OPENCL") || + !officecfg::Office::Common::Misc::UseOpenCL::get()) + return; + + SAL_INFO("opencl", "Initiating test of OpenCL device"); + OpenCLZone aZone; + + OUString aDevice = officecfg::Office::Calc::Formula::Calculation::OpenCLDevice::get(); + OUString aSelectedCLDeviceVersionID; + if (!opencl::switchOpenCLDevice( + &aDevice, + officecfg::Office::Calc::Formula::Calculation::OpenCLAutoSelect::get(), + false /* bForceEvaluation */, + aSelectedCLDeviceVersionID)) + { + SAL_WARN("opencl", "Failed to initialize OpenCL for test"); + OpenCLZone::hardDisable(); + return; + } + + // Append our app version as well. + aSelectedCLDeviceVersionID += "--"; + aSelectedCLDeviceVersionID += LIBO_VERSION_DOTTED; + + // Append timestamp of the file. + OUString aURL("$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/opencl/cl-test.ods"); + rtl::Bootstrap::expandMacros(aURL); + + DirectoryItem aItem; + DirectoryItem::get( aURL, aItem ); + FileStatus aFileStatus( osl_FileStatus_Mask_ModifyTime ); + aItem.getFileStatus( aFileStatus ); + TimeValue aTimeVal = aFileStatus.getModifyTime(); + aSelectedCLDeviceVersionID += "--"; + aSelectedCLDeviceVersionID += OUString::number(aTimeVal.Seconds); + + if (aSelectedCLDeviceVersionID != officecfg::Office::Common::Misc::SelectedOpenCLDeviceIdentifier::get()) + { + // OpenCL device changed - sanity check it and disable if bad. + + boost::optional nOrigMinimumSize = officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get(); + { // set the group size to something small for quick testing. + std::shared_ptr xBatch(comphelper::ConfigurationChanges::create()); + officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::set(3 /* small */, xBatch); + xBatch->commit(); + } + + bool bSucceeded = testOpenCLCompute(xDesktop, aURL); + + // it passed -> save the device. + { + std::shared_ptr xBatch(comphelper::ConfigurationChanges::create()); + officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::set(nOrigMinimumSize, xBatch); + // allow the user to subsequently manually enable it. + officecfg::Office::Common::Misc::SelectedOpenCLDeviceIdentifier::set(aSelectedCLDeviceVersionID, xBatch); + xBatch->commit(); + } + + if (!bSucceeded) + OpenCLZone::hardDisable(); + } +} +#endif // HAVE_FEATURE_OPENCL + +} // end namespace desktop + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff -Nru libreoffice-5.1.4/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx libreoffice-5.1.5~rc2/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx --- libreoffice-5.1.4/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -91,7 +91,7 @@ virtual void execute() override; void downloadExtensions(); - void download(OUString const & aUrls, UpdateData & aUpdatData); + bool download(OUString const & aUrls, UpdateData & aUpdatData); void installExtensions(); void removeTempDownloads(); @@ -391,8 +391,8 @@ try { OSL_ENSURE(!seqDownloadURLs[j].isEmpty(), "Download URL is empty!"); - download(seqDownloadURLs[j], curData); - if (!curData.sLocalURL.isEmpty()) + bool bCancelled = download(seqDownloadURLs[j], curData); + if (bCancelled || !curData.sLocalURL.isEmpty()) break; } catch ( cssu::Exception & e ) @@ -578,12 +578,12 @@ } } -void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData) +bool UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData) { { SolarMutexGuard g; if (m_stop) { - return; + return m_stop; } } @@ -617,12 +617,14 @@ { SolarMutexGuard g; if (m_stop) { - return; + return m_stop; } //all errors should be handled by the command environment. aUpdateData.sLocalURL = destFolder + "/" + sTitle; } } + + return m_stop; } UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx, diff -Nru libreoffice-5.1.4/drawinglayer/source/processor2d/vclprocessor2d.cxx libreoffice-5.1.5~rc2/drawinglayer/source/processor2d/vclprocessor2d.cxx --- libreoffice-5.1.4/drawinglayer/source/processor2d/vclprocessor2d.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/drawinglayer/source/processor2d/vclprocessor2d.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include "vclprocessor2d.hxx" #include @@ -123,7 +124,9 @@ aLocalTransform.decompose(aFontScaling, aTranslate, fRotate, fShearX); bool bPrimitiveAccepted(false); - if(basegfx::fTools::equalZero(fShearX)) + // tdf#95581: Assume tiny shears are rounding artefacts or whatever and can be ignored, + // especially if the effect is less than a pixel. + if(std::abs(aFontScaling.getY() * fShearX) < 1) { if(basegfx::fTools::less(aFontScaling.getX(), 0.0) && basegfx::fTools::less(aFontScaling.getY(), 0.0)) { diff -Nru libreoffice-5.1.4/extensions/source/abpilot/datasourcehandling.cxx libreoffice-5.1.5~rc2/extensions/source/abpilot/datasourcehandling.cxx --- libreoffice-5.1.4/extensions/source/abpilot/datasourcehandling.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/extensions/source/abpilot/datasourcehandling.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -366,7 +366,8 @@ OSL_ENSURE( xStorable.is(),"DataSource is no XStorable!" ); if ( xStorable.is() ) { - SfxObjectShell* pObjectShell = SfxViewFrame::Current()->GetObjectShell(); + SfxViewFrame* pFrame = SfxViewFrame::Current(); + SfxObjectShell* pObjectShell = pFrame ? pFrame->GetObjectShell() : nullptr; OUString aOwnURL = lcl_getOwnURL(pObjectShell); if (aOwnURL.isEmpty() || !rSettings.bEmbedDataSource) { diff -Nru libreoffice-5.1.4/external/boost/boost.function.Wplacement-new.patch.1 libreoffice-5.1.5~rc2/external/boost/boost.function.Wplacement-new.patch.1 --- libreoffice-5.1.4/external/boost/boost.function.Wplacement-new.patch.1 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.1.5~rc2/external/boost/boost.function.Wplacement-new.patch.1 2016-07-26 21:17:25.000000000 +0000 @@ -0,0 +1,16 @@ +GCC 6 warns about function_buffer::data + +--- boost/boost/function/function_base.hpp.orig2 2016-06-29 13:54:55.270121431 +0200 ++++ boost/boost/function/function_base.hpp 2016-06-29 13:58:50.343103199 +0200 +@@ -37,6 +37,11 @@ + #include + #include + ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 600) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wplacement-new=" ++#endif ++ + #if defined(BOOST_MSVC) + # pragma warning( push ) + # pragma warning( disable : 4793 ) // complaint about native code generation diff -Nru libreoffice-5.1.4/external/boost/UnpackedTarball_boost.mk libreoffice-5.1.5~rc2/external/boost/UnpackedTarball_boost.mk --- libreoffice-5.1.4/external/boost/UnpackedTarball_boost.mk 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/external/boost/UnpackedTarball_boost.mk 2016-07-26 21:17:25.000000000 +0000 @@ -64,6 +64,7 @@ boost_patches += boost.wdeprecated-auto_ptr.patch.0 boost_patches += boost.signal2.Wshadow.warnings.patch boost_patches += boost.boost_static_assert_unused_attribute.patch.0 +boost_patches += boost.function.Wplacement-new.patch.1 boost_patches += ubsan.patch.0 boost_patches += rtti.patch.0 diff -Nru libreoffice-5.1.4/external/curl/ExternalProject_curl.mk libreoffice-5.1.5~rc2/external/curl/ExternalProject_curl.mk --- libreoffice-5.1.4/external/curl/ExternalProject_curl.mk 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/external/curl/ExternalProject_curl.mk 2016-07-26 21:17:25.000000000 +0000 @@ -81,7 +81,7 @@ $(call gb_ExternalProject_run,build,\ MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \ cfg=$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \ - EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ + EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI /D_USING_V110_SDK71_ $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ ,lib) endif diff -Nru libreoffice-5.1.4/external/firebird/firebird-c++11.patch.1 libreoffice-5.1.5~rc2/external/firebird/firebird-c++11.patch.1 --- libreoffice-5.1.4/external/firebird/firebird-c++11.patch.1 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/external/firebird/firebird-c++11.patch.1 2016-07-26 21:17:25.000000000 +0000 @@ -1,4 +1,19 @@ # -*- Mode: Diff -*- +--- firebird/src/dudley/exe.epp ++++ firebird/src/dudley/exe.epp +@@ -2884,9 +2884,9 @@ + blr_parameter, 0, 0, 0, + blr_parameter, 0, 1, 0, + blr_parameter, 1, 0, 0, +- blr_end, +- blr_end, +- blr_end, ++ SCHAR(blr_end), ++ SCHAR(blr_end), ++ SCHAR(blr_end), + blr_eoc + }; + static FB_API_HANDLE req_handle; --- firebird/src/gpre/c_cxx.cpp +++ firebird/src/gpre/c_cxx.cpp @@ -876,7 +876,7 @@ @@ -156,6 +171,17 @@ } else { sprintf(p, "%d", value); +--- firebird/src/gpre/sqe.cpp ++++ firebird/src/gpre/sqe.cpp +@@ -2529,7 +2529,7 @@ + return par_stat(request); + + if (MSC_match(KW_MINUS)) +- return MSC_unary(nod_negate, par_primitive_value(request, false, paren_count, false)); ++ return MSC_unary(nod_negate, par_primitive_value(request, false, paren_count, NULL)); + + MSC_match(KW_PLUS); + --- firebird/src/common/classes/alloc.cpp +++ firebird/src/common/classes/alloc.cpp @@ -1100,7 +1100,7 @@ diff -Nru libreoffice-5.1.4/external/firebird/firebird-c++11replfn.patch.0 libreoffice-5.1.5~rc2/external/firebird/firebird-c++11replfn.patch.0 --- libreoffice-5.1.4/external/firebird/firebird-c++11replfn.patch.0 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/external/firebird/firebird-c++11replfn.patch.0 2016-07-26 21:17:25.000000000 +0000 @@ -1,6 +1,6 @@ --- src/common/classes/alloc.h +++ src/common/classes/alloc.h -@@ -489,23 +489,11 @@ +@@ -489,23 +489,7 @@ inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; } // Global versions of operators new and delete @@ -12,8 +12,6 @@ -{ - return Firebird::MemoryPool::globalAlloc(s); -} -+void* operator new(size_t s) THROW_BAD_ALLOC; -+void* operator new[](size_t s) THROW_BAD_ALLOC; -inline void operator delete(void* mem) throw() -{ @@ -23,8 +21,6 @@ -{ - Firebird::MemoryPool::globalFree(mem); -} -+void operator delete(void* mem) throw(); -+void operator delete[](void* mem) throw(); #ifdef DEBUG_GDS_ALLOC inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char* file, int line) diff -Nru libreoffice-5.1.4/external/mdds/tdf90579.patch.0 libreoffice-5.1.5~rc2/external/mdds/tdf90579.patch.0 --- libreoffice-5.1.4/external/mdds/tdf90579.patch.0 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.1.5~rc2/external/mdds/tdf90579.patch.0 2016-07-26 21:17:25.000000000 +0000 @@ -0,0 +1,23 @@ +diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl +index 0e2a15a..fe9c767 100644 +--- include/mdds/multi_type_vector_def.inl ++++ include/mdds/multi_type_vector_def.inl +@@ -2306,6 +2306,9 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::swap_single_to_multi_blocks( + { + // Source range is at the top of a block. + ++ // Shrink the current block by erasing the top part. ++ element_block_func::erase(*blk_src->mp_data, 0, len); ++ + if (src_tail_len == 0) + { + // the whole block needs to be replaced. +@@ -2314,8 +2317,6 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::swap_single_to_multi_blocks( + } + else + { +- // Shrink the current block by erasing the top part. +- element_block_func::erase(*blk_src->mp_data, 0, len); + blk_src->m_size -= len; + } + diff -Nru libreoffice-5.1.4/external/mdds/UnpackedTarball_mdds.mk libreoffice-5.1.5~rc2/external/mdds/UnpackedTarball_mdds.mk --- libreoffice-5.1.4/external/mdds/UnpackedTarball_mdds.mk 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/external/mdds/UnpackedTarball_mdds.mk 2016-07-26 21:17:25.000000000 +0000 @@ -17,6 +17,7 @@ external/mdds/mdds_0.6.0.patch \ external/mdds/mdds-c++98.patch.0 \ external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 \ + external/mdds/tdf90579.patch.0 \ )) # vim: set noet sw=4 ts=4: diff -Nru libreoffice-5.1.4/filter/source/msfilter/svdfppt.cxx libreoffice-5.1.5~rc2/filter/source/msfilter/svdfppt.cxx --- libreoffice-5.1.4/filter/source/msfilter/svdfppt.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/filter/source/msfilter/svdfppt.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -306,6 +306,7 @@ sal_Int32 nTmp; rIn.ReadInt32(nTmp); rAtom.eLayout = static_cast(nTmp); + static_assert(sizeof(rAtom.aPlaceholderId) == 8, "wrong size of serialized array"); rIn.Read( rAtom.aPlaceholderId, 8 ); return rIn; } diff -Nru libreoffice-5.1.4/formula/source/core/resource/core_resource.src libreoffice-5.1.5~rc2/formula/source/core/resource/core_resource.src --- libreoffice-5.1.4/formula/source/core/resource/core_resource.src 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/formula/source/core/resource/core_resource.src 2016-07-26 21:17:25.000000000 +0000 @@ -663,7 +663,7 @@ String SC_OPCODE_PPMT { Text = "PPMT" ; }; String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; }; String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; }; - String SC_OPCODE_EFFECTIVE { Text = "EFFECTIVE" ; }; + String SC_OPCODE_EFFECTIVE { Text = "EFFECT" ; }; String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; }; String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; }; String SC_OPCODE_DB_SUM { Text = "DSUM" ; }; diff -Nru libreoffice-5.1.4/framework/source/dispatch/interceptionhelper.cxx libreoffice-5.1.5~rc2/framework/source/dispatch/interceptionhelper.cxx --- libreoffice-5.1.4/framework/source/dispatch/interceptionhelper.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/framework/source/dispatch/interceptionhelper.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -54,16 +54,23 @@ xInterceptor = pIt->xInterceptor; // b) No match by registration - but a valid interceptor list. - // Use first interceptor everytimes. - // Note: it doesn't matter, which direction this helper implementation use to ask interceptor objects. - // Using of member m_aInterceptorList will starts at the beginning everytimes. - // It depends from the filling operation, in which direction it works really! + // Find first interceptor w/o pattern, so we need to query it if (!xInterceptor.is() && m_lInterceptionRegs.size()>0) { - pIt = m_lInterceptionRegs.begin(); - xInterceptor = pIt->xInterceptor; + InterceptorList::const_iterator pIt2; + for (pIt2=m_lInterceptionRegs.begin(); pIt2!=m_lInterceptionRegs.end(); ++pIt2) + { + if (!pIt2->lURLPattern.getLength()) + { + // no pattern -> need to ask this guy! + xInterceptor = pIt2->xInterceptor; + break; + } + } + // if we didn't find any non-pattern interceptor, there's no-one + // registered for this command url (we already searched for matching + // patterns above) } - // c) No registered interceptor => use our direct slave. // This helper exist by design and must be valid everytimes ... // But to be more feature proof - we should check that .-) diff -Nru libreoffice-5.1.4/.gitreview libreoffice-5.1.5~rc2/.gitreview --- libreoffice-5.1.4/.gitreview 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/.gitreview 2016-07-26 21:17:25.000000000 +0000 @@ -3,5 +3,5 @@ port=29418 project=core defaultremote=logerrit -defaultbranch=libreoffice-5-1-4 +defaultbranch=libreoffice-5-1-5 diff -Nru libreoffice-5.1.4/i18npool/source/localedata/data/cs_CZ.xml libreoffice-5.1.5~rc2/i18npool/source/localedata/data/cs_CZ.xml --- libreoffice-5.1.4/i18npool/source/localedata/data/cs_CZ.xml 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/i18npool/source/localedata/data/cs_CZ.xml 2016-07-26 21:17:25.000000000 +0000 @@ -185,10 +185,10 @@ # ##0,-- [$Kč-405];[RED]-# ##0,-- [$Kč-405] - 0% + 0" "% - 0,00% + 0,00" "% 0,00E+000 diff -Nru libreoffice-5.1.4/i18npool/source/localedata/data/tr_TR.xml libreoffice-5.1.5~rc2/i18npool/source/localedata/data/tr_TR.xml --- libreoffice-5.1.4/i18npool/source/localedata/data/tr_TR.xml 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/i18npool/source/localedata/data/tr_TR.xml 2016-07-26 21:17:25.000000000 +0000 @@ -85,10 +85,10 @@ ##0,00E+00 - 0% + %0 - 0,00% + %0,00 [$₺-41F]#.##0;-[$₺-41F]#.##0 Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line10.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line10.png differ Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line1.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line1.png differ Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line2.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line2.png differ Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line3.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line3.png differ Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line4.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line4.png differ Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line5.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line5.png differ Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line6.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line6.png differ Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line7.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line7.png differ Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line8.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line8.png differ Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/icon-themes/sifr/svx/res/symphony/line9.png and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/icon-themes/sifr/svx/res/symphony/line9.png differ diff -Nru libreoffice-5.1.4/include/comphelper/threadpool.hxx libreoffice-5.1.5~rc2/include/comphelper/threadpool.hxx --- libreoffice-5.1.4/include/comphelper/threadpool.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/comphelper/threadpool.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -36,6 +36,12 @@ /// count for the CPU static ThreadPool& getSharedOptimalPool(); + /// returns a configurable max-concurrency + /// limit to avoid spawning an unnecessarily + /// large number of threads on high-core boxes. + /// MAX_CONCURRENCY envar controls the cap. + static sal_Int32 getPreferredConcurrency(); + ThreadPool( sal_Int32 nWorkers ); virtual ~ThreadPool(); diff -Nru libreoffice-5.1.4/include/cppuhelper/weakref.hxx libreoffice-5.1.5~rc2/include/cppuhelper/weakref.hxx --- libreoffice-5.1.4/include/cppuhelper/weakref.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/cppuhelper/weakref.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -39,8 +39,14 @@ class OWeakRefListener; -/** The WeakReferenceHelper holds a weak reference to an object. This object must implement - the css::uno::XWeak interface. The implementation is thread safe. +/** The WeakReferenceHelper holds a weak reference to an object. + + This object must implement the css::uno::XWeak interface. + + The WeakReferenceHelper itself is *not* thread safe, just as + Reference itself isn't, but the implementation of the listeners etc. + behind it *is* thread-safe, so multiple threads can have their own + WeakReferences to the same XWeak object. */ class CPPUHELPER_DLLPUBLIC WeakReferenceHelper { @@ -113,8 +119,14 @@ /// @endcond }; -/** The WeakReference<> holds a weak reference to an object. This object must implement - the css::uno::XWeak interface. The implementation is thread safe. +/** The WeakReference<> holds a weak reference to an object. + + This object must implement the css::uno::XWeak interface. + + The WeakReference itself is *not* thread safe, just as + Reference itself isn't, but the implementation of the listeners etc. + behind it *is* thread-safe, so multiple threads can have their own + WeakReferences to the same XWeak object. @tparam interface_type type of interface */ diff -Nru libreoffice-5.1.4/include/filter/msfilter/svdfppt.hxx libreoffice-5.1.5~rc2/include/filter/msfilter/svdfppt.hxx --- libreoffice-5.1.4/include/filter/msfilter/svdfppt.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/filter/msfilter/svdfppt.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -57,7 +57,7 @@ class DffRecordHeader; class SvxBulletItem; enum class PptSlideLayout; -enum class PptPlaceholder; +enum class PptPlaceholder : sal_uInt8; #define PPT_IMPORTFLAGS_NO_TEXT_ASSERT 1 @@ -1463,7 +1463,7 @@ }; // the following table describes the placeholder id's (values from reality followed by values taken from the documentation) -enum class PptPlaceholder +enum class PptPlaceholder : sal_uInt8 { NONE = 0, // 0 None MASTERTITLE = 1, // 1 Master title diff -Nru libreoffice-5.1.4/include/opencl/openclwrapper.hxx libreoffice-5.1.5~rc2/include/opencl/openclwrapper.hxx --- libreoffice-5.1.4/include/opencl/openclwrapper.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/opencl/openclwrapper.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -37,7 +37,7 @@ cl_program mpkProgram; }; -struct GPUEnv +struct OPENCL_DLLPUBLIC GPUEnv { //share vb in all modules in hb library cl_platform_id mpPlatformID; @@ -49,10 +49,14 @@ int mnCmdQueuePos; bool mnKhrFp64Flag; bool mnAmdFp64Flag; - cl_uint mnPreferredVectorWidthFloat; + bool mbNeedsTDRAvoidance; + + static bool isOpenCLEnabled(); }; extern OPENCL_DLLPUBLIC GPUEnv gpuEnv; +extern OPENCL_DLLPUBLIC sal_uInt64 kernelFailures; + OPENCL_DLLPUBLIC bool generatBinFromKernelSource( cl_program program, const char * clFileName ); OPENCL_DLLPUBLIC bool buildProgramFromBinary(const char* buildOption, GPUEnv* gpuEnv, const char* filename, int idx); OPENCL_DLLPUBLIC void setKernelEnv( KernelEnv *envInfo ); @@ -63,11 +67,13 @@ * * @param pDeviceId the id of the opencl device of type cl_device_id, NULL means use software calculation * @param bAutoSelect use the algorithm to select the best OpenCL device + * @param rOutSelectedDeviceVersionIDString returns the selected device's version string. * * @return returns true if there is a valid opencl device that has been set up */ OPENCL_DLLPUBLIC bool switchOpenCLDevice(const OUString* pDeviceId, bool bAutoSelect, - bool bForceEvaluation); + bool bForceEvaluation, + OUString& rOutSelectedDeviceVersionIDString); OPENCL_DLLPUBLIC void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& rPlatformId); diff -Nru libreoffice-5.1.4/include/opencl/OpenCLZone.hxx libreoffice-5.1.5~rc2/include/opencl/OpenCLZone.hxx --- libreoffice-5.1.4/include/opencl/OpenCLZone.hxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/opencl/OpenCLZone.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -0,0 +1,52 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX +#define INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX + +#include + +// FIXME: post back-port, templatize me and share with OpenGLZone. +class OPENCL_DLLPUBLIC OpenCLZone +{ + /// how many times have we entered a CL zone + static volatile sal_uInt64 gnEnterCount; + /// how many times have we left a new CL zone + static volatile sal_uInt64 gnLeaveCount; + + static void enter() + { + gnEnterCount++; + } + static void leave() + { + gnLeaveCount--; + } +public: + OpenCLZone() + { + gnEnterCount++; + } + + ~OpenCLZone() + { + gnLeaveCount++; + } + + static bool isInZone() + { + return gnEnterCount != gnLeaveCount; + } + + static void hardDisable(); +}; + +#endif // INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.1.4/include/sfx2/sidebar/ResourceManager.hxx libreoffice-5.1.5~rc2/include/sfx2/sidebar/ResourceManager.hxx --- libreoffice-5.1.4/include/sfx2/sidebar/ResourceManager.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/sfx2/sidebar/ResourceManager.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -43,11 +43,8 @@ ResourceManager(); ~ResourceManager(); - const DeckDescriptor* GetDeckDescriptor(const OUString& rsDeckId) const; - DeckDescriptor* GetDeckDescriptor(const OUString& rsDeckId); - - const PanelDescriptor* GetPanelDescriptor(const OUString& rsPanelId) const; - PanelDescriptor* GetPanelDescriptor(const OUString& rsPanelId); + std::shared_ptr GetDeckDescriptor(const OUString& rsDeckId) const; + std::shared_ptr GetPanelDescriptor(const OUString& rsPanelId) const; void UpdateModel(css::uno::Reference xModel); @@ -96,10 +93,10 @@ private: - typedef std::vector DeckContainer; + typedef std::vector> DeckContainer; DeckContainer maDecks; - typedef std::vector PanelContainer; + typedef std::vector> PanelContainer; PanelContainer maPanels; mutable std::set maProcessedApplications; @@ -119,8 +116,8 @@ const Context& rContext, const css::uno::Reference& rxController); - const DeckDescriptor* ImplGetDeckDescriptor(const OUString& rsDeckId) const; - const PanelDescriptor* ImplGetPanelDescriptor(const OUString& rsPanelId) const; + std::shared_ptr ImplGetDeckDescriptor(const OUString& rsDeckId) const; + std::shared_ptr ImplGetPanelDescriptor(const OUString& rsPanelId) const; }; } } // end of namespace sfx2::sidebar diff -Nru libreoffice-5.1.4/include/sfx2/sidebar/SidebarController.hxx libreoffice-5.1.5~rc2/include/sfx2/sidebar/SidebarController.hxx --- libreoffice-5.1.4/include/sfx2/sidebar/SidebarController.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/sfx2/sidebar/SidebarController.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -124,8 +124,8 @@ const static sal_Int32 gnMaximumSidebarWidth = 400; - void OpenThenSwitchToDeck ( - const ::rtl::OUString& rsDeckId); + void OpenThenSwitchToDeck(const OUString& rsDeckId); + void OpenThenToggleDeck(const OUString& rsDeckId); /** Show only the tab bar, not the deck. */ @@ -137,7 +137,7 @@ /** Returns true when the given deck is the currently visible deck */ - bool IsDeckVisible (const ::rtl::OUString& rsDeckId); + bool IsDeckVisible(const OUString& rsDeckId); FocusManager& GetFocusManager() { return maFocusManager;} @@ -148,14 +148,14 @@ Context GetCurrentContext() const { return maCurrentContext;} bool IsDocumentReadOnly (void) const { return mbIsDocumentReadOnly;} - void SwitchToDeck ( const ::rtl::OUString& rsDeckId); + void SwitchToDeck(const OUString& rsDeckId); void SwitchToDefaultDeck(); void CreateDeck(const ::rtl::OUString& rDeckId, bool bForceCreate = false); void CreatePanels(const ::rtl::OUString& rDeckId); ResourceManager::DeckContextDescriptorContainer GetMatchingDecks(); - ResourceManager::PanelContextDescriptorContainer GetMatchingPanels( const ::rtl::OUString& rDeckId); + ResourceManager::PanelContextDescriptorContainer GetMatchingPanels(const OUString& rDeckId); void notifyDeckTitle(const OUString& targetDeckId); @@ -174,7 +174,7 @@ css::uno::Reference mxCurrentController; /// Use a combination of SwitchFlag_* as value. sal_Int32 mnRequestedForceFlags; - ::rtl::OUString msCurrentDeckId; + OUString msCurrentDeckId; AsynchronousCall maPropertyChangeForwarder; AsynchronousCall maContextChangeUpdate; AsynchronousCall maAsynchronousDeckSwitch; @@ -216,12 +216,12 @@ css::uno::Reference CreateUIElement ( const css::uno::Reference& rxWindow, - const ::rtl::OUString& rsImplementationURL, + const OUString& rsImplementationURL, const bool bWantsCanvas, const Context& rContext); VclPtr CreatePanel ( - const ::rtl::OUString& rsPanelId, + const OUString& rsPanelId, vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const Context& rContext, diff -Nru libreoffice-5.1.4/include/sfx2/sidebar/Sidebar.hxx libreoffice-5.1.5~rc2/include/sfx2/sidebar/Sidebar.hxx --- libreoffice-5.1.4/include/sfx2/sidebar/Sidebar.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/sfx2/sidebar/Sidebar.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -38,7 +38,17 @@ this function probably returns before the requested panel is visible. */ static void ShowPanel ( - const ::rtl::OUString& rsPanelId, + const OUString& rsPanelId, + const css::uno::Reference& rxFrame); + + /** Switch to the deck that contains the specified panel and toggle + the visibility of the panel (expanded and scrolled into the + visible area when visible) + Note that most of the work is done asynchronously and that + this function probably returns before the requested panel is visible. + */ + static void TogglePanel ( + const OUString& rsPanelId, const css::uno::Reference& rxFrame); }; diff -Nru libreoffice-5.1.4/include/sfx2/sidebar/TabBar.hxx libreoffice-5.1.5~rc2/include/sfx2/sidebar/TabBar.hxx --- libreoffice-5.1.4/include/sfx2/sidebar/TabBar.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/sfx2/sidebar/TabBar.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -55,8 +55,8 @@ class DeckMenuData { public: - ::rtl::OUString msDisplayName; - ::rtl::OUString msDeckId; + OUString msDisplayName; + OUString msDeckId; bool mbIsCurrentDeck; bool mbIsActive; bool mbIsEnabled; @@ -67,7 +67,7 @@ TabBar ( vcl::Window* pParentWindow, const css::uno::Reference& rxFrame, - const ::std::function& rDeckActivationFunctor, + const ::std::function& rDeckActivationFunctor, const PopupMenuProvider& rPopupMenuProvider, SidebarController* rParentSidebarController); @@ -82,9 +82,9 @@ void SetDecks ( const ResourceManager::DeckContextDescriptorContainer& rDecks); - void HighlightDeck (const ::rtl::OUString& rsDeckId); + void HighlightDeck (const OUString& rsDeckId); void RemoveDeckHighlight (); - const ::rtl::OUString GetDeckIdForIndex (const sal_Int32 nIndex) const; + const OUString GetDeckIdForIndex (const sal_Int32 nIndex) const; void ToggleHideFlag (const sal_Int32 nIndex); void RestoreHideFlags(); @@ -99,13 +99,13 @@ DECL_LINK_TYPED(HandleClick, Button*, void); VclPtr mpButton; OUString msDeckId; - ::std::function maDeckActivationFunctor; + ::std::function maDeckActivationFunctor; bool mbIsHidden; bool mbIsHiddenByDefault; }; typedef ::std::vector ItemContainer; ItemContainer maItems; - const ::std::function maDeckActivationFunctor; + const ::std::function maDeckActivationFunctor; sal_Int32 mnMenuSeparatorY; PopupMenuProvider maPopupMenuProvider; diff -Nru libreoffice-5.1.4/include/svtools/treelistentry.hxx libreoffice-5.1.5~rc2/include/svtools/treelistentry.hxx --- libreoffice-5.1.4/include/svtools/treelistentry.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/svtools/treelistentry.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -114,6 +114,7 @@ void SetBackColor( const Color& aColor ) { maBackColor = aColor; } Color GetBackColor() const { return maBackColor; } + SvTreeListEntry* GetParent() const { return pParent; } }; #endif diff -Nru libreoffice-5.1.4/include/svx/fmtools.hxx libreoffice-5.1.5~rc2/include/svx/fmtools.hxx --- libreoffice-5.1.4/include/svx/fmtools.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/svx/fmtools.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -161,10 +161,10 @@ friend class FmXDisposeMultiplexer; FmXDisposeMultiplexer* m_pAdapter; - ::osl::Mutex& m_rMutex; + osl::Mutex m_aMutex; public: - FmXDisposeListener(::osl::Mutex& _rMutex) : m_pAdapter(nullptr), m_rMutex(_rMutex) { } + FmXDisposeListener() : m_pAdapter(nullptr) { } virtual ~FmXDisposeListener(); virtual void disposing(const css::lang::EventObject& _rEvent, sal_Int16 _nId) throw( css::uno::RuntimeException ) = 0; diff -Nru libreoffice-5.1.4/include/svx/svdotable.hxx libreoffice-5.1.5~rc2/include/svx/svdotable.hxx --- libreoffice-5.1.4/include/svx/svdotable.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/svx/svdotable.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -293,6 +293,8 @@ static void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); static void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); + virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; + private: void init( sal_Int32 nColumns, sal_Int32 nRows ); diff -Nru libreoffice-5.1.4/include/svx/svdundo.hxx libreoffice-5.1.5~rc2/include/svx/svdundo.hxx --- libreoffice-5.1.4/include/svx/svdundo.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/svx/svdundo.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -588,9 +588,10 @@ SdrUndoGroup* pUndoGroup; std::unique_ptr mpFillBitmapItem; bool mbHasFillBitmap; + bool mbSoleOwnerOfFillBitmapProps; public: - SdrUndoDelPage(SdrPage& rNewPg); + SdrUndoDelPage(SdrPage& rNewPg, bool bSoleOwnerOfFillBitmapProps); virtual ~SdrUndoDelPage(); virtual void Undo() override; @@ -763,7 +764,7 @@ virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1); // Page - virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); + virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage, bool bSoleOwnerOfFillBitmapProps = true); virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1); diff -Nru libreoffice-5.1.4/include/vcl/openglwin.hxx libreoffice-5.1.5~rc2/include/vcl/openglwin.hxx --- libreoffice-5.1.4/include/vcl/openglwin.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/include/vcl/openglwin.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -33,7 +33,7 @@ class VCL_DLLPUBLIC OpenGLWindow : public vcl::Window { public: - OpenGLWindow(vcl::Window* pParent); + OpenGLWindow(vcl::Window* pParent, bool bInit = true); virtual ~OpenGLWindow(); virtual void dispose() override; @@ -48,6 +48,10 @@ virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; + bool IsInitialized() const; + + void Initialize(); + private: std::unique_ptr mxImpl; IRenderer* mpRenderer; diff -Nru libreoffice-5.1.4/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx libreoffice-5.1.5~rc2/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx --- libreoffice-5.1.4/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -135,9 +135,9 @@ { if ( ! isdigit(*pCur)) { - //1.4.1_01-, 1.4.1_01a, the numerical part may only be 2 chars. - int len = pCur - pLast; - if (len > 2) + //1.8.0_102-, 1.8.0_01a, + size_t len = pCur - pLast; + if (len > sizeof(buf) - 1) return false; //we've got the update: 01, 02 etc strncpy(buf, pLast, len); diff -Nru libreoffice-5.1.4/officecfg/registry/schema/org/openoffice/Office/Common.xcs libreoffice-5.1.5~rc2/officecfg/registry/schema/org/openoffice/Office/Common.xcs --- libreoffice-5.1.4/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2016-07-26 21:17:25.000000000 +0000 @@ -5641,6 +5641,12 @@ Linux//Advanced Micro Devices, Inc\.//1445\.5 $sse2,avx$;//Advanced Micro Devices, Inc\.//;//Intel$R$ Corporation//;//NVIDIA Corporation// + + + The OpenCL device identifier of a device that was successfully selected and passed the OpenCL calculation tests. + + none + Determines whether Software Interpreter can be used to speed diff -Nru libreoffice-5.1.4/opencl/inc/opencl_device.hxx libreoffice-5.1.5~rc2/opencl/inc/opencl_device.hxx --- libreoffice-5.1.4/opencl/inc/opencl_device.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/opencl/inc/opencl_device.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -16,6 +16,9 @@ ds_device getDeviceSelection(OUString const & pFileName, bool bForceSelection = false); +struct GPUEnv; +void releaseOpenCLEnv( GPUEnv *gpuInfo ); + } #endif diff -Nru libreoffice-5.1.4/opencl/inc/opencl_device_selection.h libreoffice-5.1.5~rc2/opencl/inc/opencl_device_selection.h --- libreoffice-5.1.4/opencl/inc/opencl_device_selection.h 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/opencl/inc/opencl_device_selection.h 2016-07-26 21:17:25.000000000 +0000 @@ -24,6 +24,8 @@ #include #include +#include + #include enum ds_status @@ -127,6 +129,8 @@ inline ds_status initDSProfile(std::unique_ptr& rProfile, OString rVersion) { + OpenCLZone zone; + int numDevices; cl_uint numPlatforms; std::vector platforms; diff -Nru libreoffice-5.1.4/opencl/Library_opencl.mk libreoffice-5.1.5~rc2/opencl/Library_opencl.mk --- libreoffice-5.1.4/opencl/Library_opencl.mk 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/opencl/Library_opencl.mk 2016-07-26 21:17:25.000000000 +0000 @@ -34,10 +34,10 @@ $(eval $(call gb_Library_use_libraries,opencl,\ clew \ - configmgr \ comphelper \ cppu \ sal \ + salhelper \ tl \ )) @@ -46,6 +46,7 @@ opencl/source/openclwrapper \ opencl/source/opencl_device \ opencl/source/platforminfo \ + opencl/source/OpenCLZone \ )) ifeq ($(OS),LINUX) diff -Nru libreoffice-5.1.4/opencl/source/opencl_device.cxx libreoffice-5.1.5~rc2/opencl/source/opencl_device.cxx --- libreoffice-5.1.4/opencl/source/opencl_device.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/opencl/source/opencl_device.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -30,6 +30,8 @@ #include #include +#include + #include "opencl_device.hxx" #define INPUTSIZE 15360 @@ -200,14 +202,21 @@ /* Evaluating an OpenCL device */ SAL_INFO("opencl.device", "Device: \"" << rDevice.sDeviceName << "\" (OpenCL) evaluation..."); cl_int clStatus; + /* Check for 64-bit float extensions */ - size_t aDevExtInfoSize = 0; - clStatus = clGetDeviceInfo(rDevice.aDeviceID, CL_DEVICE_EXTENSIONS, 0, nullptr, &aDevExtInfoSize); - DS_CHECK_STATUS(clStatus, "evaluateScoreForDevice::clGetDeviceInfo"); - - std::unique_ptr aExtInfo(new char[aDevExtInfoSize]); - clStatus = clGetDeviceInfo(rDevice.aDeviceID, CL_DEVICE_EXTENSIONS, sizeof(char) * aDevExtInfoSize, aExtInfo.get(), nullptr); - DS_CHECK_STATUS(clStatus, "evaluateScoreForDevice::clGetDeviceInfo"); + std::unique_ptr aExtInfo; + { + size_t aDevExtInfoSize = 0; + + OpenCLZone zone; + clStatus = clGetDeviceInfo(rDevice.aDeviceID, CL_DEVICE_EXTENSIONS, 0, nullptr, &aDevExtInfoSize); + DS_CHECK_STATUS(clStatus, "evaluateScoreForDevice::clGetDeviceInfo"); + + aExtInfo.reset(new char[aDevExtInfoSize]); + clStatus = clGetDeviceInfo(rDevice.aDeviceID, CL_DEVICE_EXTENSIONS, sizeof(char) * aDevExtInfoSize, aExtInfo.get(), nullptr); + DS_CHECK_STATUS(clStatus, "evaluateScoreForDevice::clGetDeviceInfo"); + } + bool bKhrFp64Flag = false; bool bAmdFp64Flag = false; const char* buildOption = nullptr; @@ -244,6 +253,8 @@ { /* 64-bit float support present */ + OpenCLZone zone; + /* Create context and command queue */ cl_context clContext = clCreateContext(nullptr, 1, &rDevice.aDeviceID, nullptr, nullptr, &clStatus); DS_CHECK_STATUS(clStatus, "evaluateScoreForDevice::clCreateContext"); diff -Nru libreoffice-5.1.4/opencl/source/openclwrapper.cxx libreoffice-5.1.5~rc2/opencl/source/openclwrapper.cxx --- libreoffice-5.1.4/opencl/source/openclwrapper.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/opencl/source/openclwrapper.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -41,6 +42,10 @@ #define OPENCL_DLL_NAME "libOpenCL.so" #endif +#ifdef _WIN32_WINNT_WINBLUE +#include +#endif + #define DEVICE_NAME_LENGTH 1024 #define DRIVER_VERSION_LENGTH 1024 #define PLATFORM_VERSION_LENGTH 1024 @@ -57,6 +62,7 @@ namespace opencl { GPUEnv gpuEnv; +sal_uInt64 kernelFailures = 0; namespace { @@ -82,15 +88,19 @@ OString getCacheFolder() { - OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/"); - rtl::Bootstrap::expandMacros(url); + static OString aCacheFolder; - osl::Directory::create(url); + if (aCacheFolder.isEmpty()) + { + OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/"); + rtl::Bootstrap::expandMacros(url); - return rtl::OUStringToOString(url, RTL_TEXTENCODING_UTF8); -} + osl::Directory::create(url); -OString maCacheFolder = getCacheFolder(); + aCacheFolder = rtl::OUStringToOString(url, RTL_TEXTENCODING_UTF8); + } + return aCacheFolder; +} } @@ -132,8 +142,7 @@ OString aString = OString(deviceName) + driverVersion + platformVersion; OString aHash = generateMD5(aString.getStr(), aString.getLength()); - return maCacheFolder + fileName + "-" + - aHash + ".bin"; + return getCacheFolder() + fileName + "-" + aHash + ".bin"; } std::vector > binaryGenerated( const char * clFileName, cl_context context ) @@ -265,8 +274,12 @@ return false; } +} + void releaseOpenCLEnv( GPUEnv *gpuInfo ) { + OpenCLZone zone; + if ( !bIsInited ) { return; @@ -293,6 +306,8 @@ return; } +namespace { + bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx) { cl_int clStatus; @@ -319,7 +334,7 @@ return false; } - OString aBuildLogFileURL = maCacheFolder + "kernel-build.log"; + OString aBuildLogFileURL = getCacheFolder() + "kernel-build.log"; osl::File aBuildLogFile(rtl::OStringToOUString(aBuildLogFileURL, RTL_TEXTENCODING_UTF8)); osl::FileBase::RC status = aBuildLogFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); @@ -410,6 +425,8 @@ void checkDeviceForDoubleSupport(cl_device_id deviceId, bool& bKhrFp64, bool& bAmdFp64) { + OpenCLZone zone; + bKhrFp64 = false; bAmdFp64 = false; @@ -442,6 +459,10 @@ bool initOpenCLRunEnv( GPUEnv *gpuInfo ) { + OpenCLZone zone; + cl_uint nPreferredVectorWidthFloat; + char pName[64]; + bool bKhrFp64 = false; bool bAmdFp64 = false; @@ -450,11 +471,38 @@ gpuInfo->mnKhrFp64Flag = bKhrFp64; gpuInfo->mnAmdFp64Flag = bAmdFp64; - gpuInfo->mnPreferredVectorWidthFloat = 0; + gpuInfo->mbNeedsTDRAvoidance = false; clGetDeviceInfo(gpuInfo->mpDevID, CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT, sizeof(cl_uint), - &gpuInfo->mnPreferredVectorWidthFloat, nullptr); + &nPreferredVectorWidthFloat, nullptr); + clGetPlatformInfo(gpuInfo->mpPlatformID, CL_PLATFORM_NAME, 64, + pName, nullptr); + + bool bIsNotWinOrIsWin8OrGreater = true; + +// the Win32 SDK 8.1 deprecates GetVersionEx() +#ifdef _WIN32_WINNT_WINBLUE + bIsNotWinOrIsWin8OrGreater = IsWindows8OrGreater(); +#elif defined (_WIN32) + OSVERSIONINFO aVersionInfo; + memset( &aVersionInfo, 0, sizeof(aVersionInfo) ); + aVersionInfo.dwOSVersionInfoSize = sizeof( aVersionInfo ); + if (GetVersionEx( &aVersionInfo )) + { + // Windows 7 or lower? + if (aVersionInfo.dwMajorVersion < 6 || + (aVersionInfo.dwMajorVersion == 6 && aVersionInfo.dwMinorVersion < 2)) + bIsNotWinOrIsWin8OrGreater = false; + } +#endif + // Heuristic: Certain old low-end OpenCL implementations don't + // work for us with too large group lengths. Looking at the preferred + // float vector width seems to be a way to detect these devices, except + // the non-working NVIDIA cards on Windows older than version 8. + gpuInfo->mbNeedsTDRAvoidance = ( nPreferredVectorWidthFloat == 4 ) || + ( !bIsNotWinOrIsWin8OrGreater && + OUString::createFromAscii(pName).indexOf("NVIDIA") > -1 ); return false; } @@ -684,9 +732,9 @@ } -bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation) +bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation, OUString& rOutSelectedDeviceVersionIDString) { - if(fillOpenCLInfo().empty()) + if(fillOpenCLInfo().empty() || getenv("SAL_DISABLE_OPENCL")) return false; cl_device_id pDeviceId = nullptr; @@ -716,54 +764,62 @@ return pDeviceId != nullptr; } + cl_context context; cl_platform_id platformId; - cl_int nState = clGetDeviceInfo(pDeviceId, CL_DEVICE_PLATFORM, - sizeof(platformId), &platformId, nullptr); - - cl_context_properties cps[3]; - cps[0] = CL_CONTEXT_PLATFORM; - cps[1] = reinterpret_cast(platformId); - cps[2] = 0; - cl_context context = clCreateContext( cps, 1, &pDeviceId, nullptr, nullptr, &nState ); - if (nState != CL_SUCCESS) - SAL_WARN("opencl", "clCreateContext failed: " << errorString(nState)); + cl_command_queue command_queue[OPENCL_CMDQUEUE_SIZE]; - if(nState != CL_SUCCESS || context == nullptr) { - if(context != nullptr) - clReleaseContext(context); + OpenCLZone zone; + cl_int nState = clGetDeviceInfo(pDeviceId, CL_DEVICE_PLATFORM, + sizeof(platformId), &platformId, nullptr); + + cl_context_properties cps[3]; + cps[0] = CL_CONTEXT_PLATFORM; + cps[1] = reinterpret_cast(platformId); + cps[2] = 0; + context = clCreateContext( cps, 1, &pDeviceId, nullptr, nullptr, &nState ); + if (nState != CL_SUCCESS) + SAL_WARN("opencl", "clCreateContext failed: " << errorString(nState)); - SAL_WARN("opencl", "failed to set/switch opencl device"); - return false; - } - SAL_INFO("opencl", "Created context " << context << " for platform " << platformId << ", device " << pDeviceId); + if(nState != CL_SUCCESS || context == nullptr) + { + if(context != nullptr) + clReleaseContext(context); - cl_command_queue command_queue[OPENCL_CMDQUEUE_SIZE]; - for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i) - { - command_queue[i] = clCreateCommandQueue( - context, pDeviceId, 0, &nState); - if (nState != CL_SUCCESS) - SAL_WARN("opencl", "clCreateCommandQueue failed: " << errorString(nState)); + SAL_WARN("opencl", "failed to set/switch opencl device"); + return false; + } + SAL_INFO("opencl", "Created context " << context << " for platform " << platformId << ", device " << pDeviceId); - if (command_queue[i] == nullptr || nState != CL_SUCCESS) + for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i) { - // Release all command queues created so far. - for (int j = 0; j <= i; ++j) + command_queue[i] = clCreateCommandQueue( + context, pDeviceId, 0, &nState); + if (nState != CL_SUCCESS) + SAL_WARN("opencl", "clCreateCommandQueue failed: " << errorString(nState)); + + if (command_queue[i] == nullptr || nState != CL_SUCCESS) { - if (command_queue[j]) + // Release all command queues created so far. + for (int j = 0; j <= i; ++j) { - clReleaseCommandQueue(command_queue[j]); - command_queue[j] = nullptr; + if (command_queue[j]) + { + clReleaseCommandQueue(command_queue[j]); + command_queue[j] = nullptr; + } } + + clReleaseContext(context); + SAL_WARN("opencl", "failed to set/switch opencl device"); + return false; } - clReleaseContext(context); - SAL_WARN("opencl", "failed to set/switch opencl device"); - return false; + SAL_INFO("opencl", "Created command queue " << command_queue[i] << " for context " << context); } - SAL_INFO("opencl", "Created command queue " << command_queue[i] << " for context " << context); + OString sDeviceID = getDeviceInfoString(pDeviceId, CL_DEVICE_VENDOR) + " " + getDeviceInfoString(pDeviceId, CL_DRIVER_VERSION); + rOutSelectedDeviceVersionIDString = OStringToOUString(sDeviceID, RTL_TEXTENCODING_UTF8); } setOpenCLCmdQueuePosition(0); // Call this just to avoid the method being deleted from unused function deleter. @@ -859,6 +915,11 @@ #undef CASE } +bool GPUEnv::isOpenCLEnabled() +{ + return gpuEnv.mpDevID && gpuEnv.mpContext; +} + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.1.4/opencl/source/OpenCLZone.cxx libreoffice-5.1.5~rc2/opencl/source/OpenCLZone.cxx --- libreoffice-5.1.4/opencl/source/OpenCLZone.cxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.1.5~rc2/opencl/source/OpenCLZone.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -0,0 +1,50 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include +#include "opencl_device.hxx" + +#include + +#include +#include +#include + +// FIXME: templatize me vs. OpenGLZone. + +sal_uInt64 volatile OpenCLZone::gnEnterCount = 0; +sal_uInt64 volatile OpenCLZone::gnLeaveCount = 0; + +/** + * Called from a signal handler if we get + * a crash or hang in some CL code. + */ +void OpenCLZone::hardDisable() +{ + // protect ourselves from double calling etc. + static bool bDisabled = false; + if (!bDisabled) + { + bDisabled = true; + + std::shared_ptr xChanges(comphelper::ConfigurationChanges::create()); + officecfg::Office::Common::Misc::UseOpenCL::set(false, xChanges); + xChanges->commit(); + + // Force synchronous config write + auto xConfProvider = css::configuration::theDefaultProvider::get(comphelper::getProcessComponentContext()); + css::uno::Reference xFlushable(xConfProvider, css::uno::UNO_QUERY_THROW); + xFlushable->flush(); + + releaseOpenCLEnv(&opencl::gpuEnv); + } +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.1.4/package/inc/ZipOutputStream.hxx libreoffice-5.1.5~rc2/package/inc/ZipOutputStream.hxx --- libreoffice-5.1.4/package/inc/ZipOutputStream.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/package/inc/ZipOutputStream.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -40,6 +40,7 @@ ZipEntry *m_pCurrentEntry; comphelper::ThreadPool &m_rSharedThreadPool; std::vector< ZipOutputEntry* > m_aEntries; + ::css::uno::Any m_aDeflateException; public: ZipOutputStream( diff -Nru libreoffice-5.1.4/package/source/zipapi/ZipOutputStream.cxx libreoffice-5.1.5~rc2/package/source/zipapi/ZipOutputStream.cxx --- libreoffice-5.1.4/package/source/zipapi/ZipOutputStream.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/package/source/zipapi/ZipOutputStream.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -98,7 +98,12 @@ //Any exceptions thrown in the threads were caught and stored for now ::css::uno::Any aCaughtException(pCandidate->getParallelDeflateException()); if (aCaughtException.hasValue()) - ::cppu::throwException(aCaughtException); + { + m_aDeflateException = aCaughtException; // store it for later throwing + // the exception handler in DeflateThread should have cleaned temp file + delete pCandidate; + return; + } writeLOC(pCandidate->getZipEntry(), pCandidate->isEncrypt()); @@ -187,6 +192,11 @@ writeEND( nOffset, static_cast < sal_Int32 > (m_aChucker.GetPosition()) - nOffset); m_xStream->flush(); m_aZipList.clear(); + + if (m_aDeflateException.hasValue()) + { // throw once all threads are finished and m_aEntries can be released + ::cppu::throwException(m_aDeflateException); + } } css::uno::Reference< css::io::XOutputStream > ZipOutputStream::getStream() diff -Nru libreoffice-5.1.4/package/source/zippackage/ZipPackageStream.cxx libreoffice-5.1.5~rc2/package/source/zippackage/ZipPackageStream.cxx --- libreoffice-5.1.4/package/source/zippackage/ZipPackageStream.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/package/source/zippackage/ZipPackageStream.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -486,6 +486,17 @@ catch (const uno::Exception&) { mpEntry->setParallelDeflateException(::cppu::getCaughtException()); + try + { + if (mpEntry->m_xOutStream.is()) + mpEntry->closeBufferFile(); + if (!mpEntry->m_aTempURL.isEmpty()) + mpEntry->deleteBufferFile(); + } + catch (uno::Exception const&) + { + } + mpEntry->setFinished(); } } }; @@ -832,7 +843,7 @@ // cores and allow 4-times the amount for having the queue well filled. The // 2nd pparameter is the time to wait beweeen cleanups in 10th of a second. // Both values may be added to the configuration settings if needed. - static sal_Int32 nAllowedThreads(std::max(std::thread::hardware_concurrency(), 1U) * 4); + static sal_Int32 nAllowedThreads(comphelper::ThreadPool::getPreferredConcurrency() * 4); rZipOut.reduceScheduledThreadsToGivenNumberOrLess(nAllowedThreads, 1); // Start a new thread deflating this zip entry diff -Nru libreoffice-5.1.4/readlicense_oo/license/CREDITS.fodt libreoffice-5.1.5~rc2/readlicense_oo/license/CREDITS.fodt --- libreoffice-5.1.4/readlicense_oo/license/CREDITS.fodt 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/readlicense_oo/license/CREDITS.fodt 2016-07-26 21:17:25.000000000 +0000 @@ -1,10 +1,10 @@ - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.1.3.2$Linux_X86_64 LibreOffice_project/644e4637d1d8544fd9f56425bd6cec110e49301b2012-02-20T22:17:18.060000000

PT14M12S

JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA

+ Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.1.4.2$Linux_X86_64 LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.060000000

PT14M12S

JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA

- 554 + 633

501

41197

21645 @@ -16,9 +16,9 @@ 3676

3471

501 - 554 + 633 41697 - 22197 + 22276

false @@ -68,7 +68,7 @@ false

false

true - 5386755 + 5667997

false

false @@ -312,40 +312,40 @@ - + - + - + - + - +

- +

- + - + - +

- +

@@ -393,16 +393,16 @@

- + - + - + - +

@@ -410,7 +410,7 @@

- +

@@ -1033,7 +1033,7 @@ Credits - 1171 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-06-14 19:58:31. + 1178 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-07-26 22:12:40. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1060,10 +1060,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04

- Caolán McNamaraCommits: 19539Joined: 2000-10-10 + Caolán McNamaraCommits: 19720Joined: 2000-10-10

- Stephan BergmannCommits: 12208Joined: 2000-10-04 + Stephan BergmannCommits: 12455Joined: 2000-10-04

Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1071,35 +1071,35 @@

- Tor LillqvistCommits: 7422Joined: 2010-03-23 + Tor LillqvistCommits: 7448Joined: 2010-03-23

- *Noel GrandinCommits: 6029Joined: 2011-12-12 + *Noel GrandinCommits: 6130Joined: 2011-12-12

- Miklos VajnaCommits: 5663Joined: 2010-07-29 + Miklos VajnaCommits: 5760Joined: 2010-07-29

- Michael StahlCommits: 5480Joined: 2008-06-16 + Michael StahlCommits: 5534Joined: 2008-06-16

- Kohei YoshidaCommits: 5370Joined: 2009-06-19 + Kohei YoshidaCommits: 5372Joined: 2009-06-19

Frank Schoenheit [fs]Commits: 5008Joined: 2000-09-19

- *Markus MohrhardCommits: 4150Joined: 2011-03-17 + *Markus MohrhardCommits: 4402Joined: 2011-03-17

- Eike RathkeCommits: 3305Joined: 2000-10-11 + Eike RathkeCommits: 3376Joined: 2000-10-11

- David TardonCommits: 3252Joined: 2009-11-12 + David TardonCommits: 3267Joined: 2009-11-12

Hans-Joachim LankenauCommits: 3007Joined: 2000-09-19 @@ -1116,10 +1116,10 @@ Oliver SpechtCommits: 2545Joined: 2000-09-21

- Jan HolesovskyCommits: 2369Joined: 2009-06-23 + Jan HolesovskyCommits: 2384Joined: 2009-06-23

- Michael MeeksCommits: 2202Joined: 2004-08-05 + Michael MeeksCommits: 2209Joined: 2004-08-05

*Thomas ArnholdCommits: 2176Joined: 2011-01-16 @@ -1127,16 +1127,16 @@

- *Norbert ThiebaudCommits: 2160Joined: 2010-09-29 + *Norbert ThiebaudCommits: 2162Joined: 2010-09-29

- Bjoern MichaelsenCommits: 2113Joined: 2009-10-14 + Bjoern MichaelsenCommits: 2114Joined: 2009-10-14

Philipp Lohmann [pl]Commits: 2089Joined: 2000-09-21

- *Julien NabetCommits: 1924Joined: 2010-11-04 + *Julien NabetCommits: 1927Joined: 2010-11-04

@@ -1144,21 +1144,21 @@ Christian LippkaCommits: 1805Joined: 2000-09-25

- *Andras TimarCommits: 1690Joined: 2010-10-02 + *Andras TimarCommits: 1698Joined: 2010-10-02

- *Matúš KukanCommits: 1679Joined: 2011-04-06 + *Matúš KukanCommits: 1680Joined: 2011-04-06

- Luboš LuňákCommits: 1521Joined: 2010-09-21 + *Tomaž VajngerlCommits: 1530Joined: 2012-06-02

- *Tomaž VajngerlCommits: 1517Joined: 2012-06-02 + Luboš LuňákCommits: 1521Joined: 2010-09-21

- Fridrich ŠtrbaCommits: 1326Joined: 2007-02-22 + Fridrich ŠtrbaCommits: 1327Joined: 2007-02-22

Thomas Lange [tl]Commits: 1310Joined: 2000-09-22 @@ -1175,15 +1175,15 @@ Armin Le GrandCommits: 1188Joined: 2000-09-25

- Thorsten BehrensCommits: 1152Joined: 2001-04-25 + Thorsten BehrensCommits: 1157Joined: 2001-04-25

- *Matteo CasalinCommits: 1123Joined: 2011-11-13 + *Takeshi AbeCommits: 1130Joined: 2010-11-08

- *Takeshi AbeCommits: 1099Joined: 2010-11-08 + *Matteo CasalinCommits: 1125Joined: 2011-11-13

*Lionel Elie MamaneCommits: 985Joined: 2011-01-15 @@ -1273,10 +1273,10 @@ Jürgen SchmidtCommits: 512Joined: 2000-10-09

- *Peter FoleyCommits: 488Joined: 2011-09-04 + *Xisco FauliCommits: 498Joined: 2011-02-06

- *Xisco FauliCommits: 474Joined: 2011-02-06 + *Peter FoleyCommits: 488Joined: 2011-09-04

@@ -1284,13 +1284,13 @@ Andreas BregasCommits: 470Joined: 2000-09-25

- Christian LohmaierCommits: 438Joined: 2008-06-01 + Christian LohmaierCommits: 460Joined: 2008-06-01

Rene EngelhardCommits: 405Joined: 2005-03-14

- *Maxim MonastirskyCommits: 401Joined: 2013-10-27 + *Maxim MonastirskyCommits: 403Joined: 2013-10-27

@@ -1309,13 +1309,13 @@

- *Olivier HallotCommits: 356Joined: 2010-10-25 + *Olivier HallotCommits: 360Joined: 2010-10-25

- *Yousuf PhilipsCommits: 344Joined: 2014-09-21 + *Yousuf PhilipsCommits: 349Joined: 2014-09-21

- *Katarina BehrensCommits: 329Joined: 2010-10-13 + *Katarina BehrensCommits: 335Joined: 2010-10-13

*David OstrovskyCommits: 309Joined: 2012-04-01 @@ -1340,32 +1340,32 @@ *Pierre-André JacquodCommits: 276Joined: 2010-11-13

- Lars LanghansCommits: 260Joined: 2000-09-22 + *Samuel MehrbrodtCommits: 275Joined: 2011-06-08

- *Szymon KłosCommits: 253Joined: 2014-03-22 + *Szymon KłosCommits: 274Joined: 2014-03-22

- Muthu SubramanianCommits: 248Joined: 2010-08-25 + Lars LanghansCommits: 260Joined: 2000-09-22

- *Robert Antoni Buj GelonchCommits: 247Joined: 2014-06-11 + Muthu SubramanianCommits: 248Joined: 2010-08-25

- *Samuel MehrbrodtCommits: 245Joined: 2011-06-08 + *Robert Antoni Buj GelonchCommits: 247Joined: 2014-06-11

- *Khaled HosnyCommits: 240Joined: 2011-01-28 + *Adolfo Jayme BarrientosCommits: 242Joined: 2013-06-21

- *László NémethCommits: 235Joined: 2010-09-29 + *Khaled HosnyCommits: 240Joined: 2011-01-28

- *Adolfo Jayme BarrientosCommits: 232Joined: 2013-06-21 + *Laszlo NemethCommits: 236Joined: 2010-09-29

Ingo SchmidtCommits: 202Joined: 2004-02-05 @@ -1393,76 +1393,79 @@

- *Artur DordaCommits: 151Joined: 2012-04-15 + *Stanislav HoracekCommits: 158Joined: 2012-12-09

- *Gert FallerCommits: 151Joined: 2010-10-25 + *Arnaud VersiniCommits: 155Joined: 2010-10-05

- *Alexander WilmsCommits: 151Joined: 2012-05-26 + *Artur DordaCommits: 151Joined: 2012-04-15

- *Arnaud VersiniCommits: 150Joined: 2010-10-05 + *Andrea GelminiCommits: 151Joined: 2014-10-30

- *Andrea GelminiCommits: 149Joined: 2014-10-30 + *Gert FallerCommits: 151Joined: 2010-10-25

- *Jan-Marek GlogowskiCommits: 146Joined: 2013-11-14 + *Alexander WilmsCommits: 151Joined: 2012-05-26

- *Stanislav HoracekCommits: 144Joined: 2012-12-09 + *Jan-Marek GlogowskiCommits: 147Joined: 2013-11-14

- Gregor HartmannCommits: 141Joined: 2000-10-12 + *Marco CecchettiCommits: 144Joined: 2011-04-14

- *Artur DryomovCommits: 137Joined: 2013-03-14 + *Laurent Balland-PoirierCommits: 142Joined: 2011-08-31

- *Marco CecchettiCommits: 133Joined: 2011-04-14 + Gregor HartmannCommits: 141Joined: 2000-10-12

- *Jesús CorriusCommits: 130Joined: 2010-10-07 + *Artur DryomovCommits: 137Joined: 2013-03-14

- *Philipp WeissenbacherCommits: 129Joined: 2011-10-28 + *Zdeněk CrhonekCommits: 134Joined: 2016-05-19

- *Ariel Constenla-HaileCommits: 126Joined: 2012-01-16 + *Winfried DonkersCommits: 133Joined: 2011-11-11

- *haochenCommits: 126Joined: 2013-10-10 + *Jesús CorriusCommits: 130Joined: 2010-10-07

- Helge Delfs [hde]Commits: 126Joined: 2009-07-28 + *Philipp WeissenbacherCommits: 129Joined: 2011-10-28

- *Laurent Balland-PoirierCommits: 123Joined: 2011-08-31 + *Ariel Constenla-HaileCommits: 126Joined: 2012-01-16

- *Tomáš ChvátalCommits: 123Joined: 2011-07-27 + *haochenCommits: 126Joined: 2013-10-10

- Takashi OnoCommits: 122Joined: 2009-12-10 + Helge Delfs [hde]Commits: 126Joined: 2009-07-28

- *Sebastian SpaethCommits: 119Joined: 2010-09-28 + *Tomáš ChvátalCommits: 123Joined: 2011-07-27

- *Winfried DonkersCommits: 119Joined: 2011-11-11 + Takashi OnoCommits: 122Joined: 2009-12-10

+ *Sebastian SpaethCommits: 119Joined: 2010-09-28 + + Kalman Szalai - KAMICommits: 116Joined: 2010-09-14

@@ -1471,11 +1474,11 @@ *Douglas MenckenCommits: 113Joined: 2013-12-11 +

+ *I-Jui (Ray) SungCommits: 112Joined: 2013-09-30 - - *andreas kainzCommits: 107Joined: 2015-03-18 @@ -1485,61 +1488,72 @@ *Louis-Francis Ratté-BoulianneCommits: 102Joined: 2014-10-29 + + + + *Jochen NitschkeCommits: 102Joined: 2016-02-02 + *Thomas KlausnerCommits: 98Joined: 2010-10-01 - -

*Laurent GodardCommits: 93Joined: 2011-05-06

*Stefan KnorrCommits: 91Joined: 2011-07-04 + +

*Krisztian PinterCommits: 90Joined: 2013-02-18

*Pranav KantCommits: 90Joined: 2015-03-01 - -

- *Daniel BankstonCommits: 88Joined: 2012-04-03 + *Albert ThuswaldnerCommits: 88Joined: 2011-01-26

- *Tim RetoutCommits: 88Joined: 2012-02-14 + *Daniel BankstonCommits: 88Joined: 2012-04-03 + +

- *Albert ThuswaldnerCommits: 87Joined: 2011-01-26 + *Tim RetoutCommits: 88Joined: 2012-02-14

*Adam CoCommits: 86Joined: 2013-04-28 - -

Mihaela KedikovaCommits: 85Joined: 2009-10-30

*Javier FernandezCommits: 84Joined: 2013-03-06 + +

Tobias KrauseCommits: 83Joined: 2007-10-02

*Minh NgoCommits: 83Joined: 2013-05-02 - -

*Ricardo MontaniaCommits: 82Joined: 2012-08-18

+ *Rishabh KumarCommits: 81Joined: 2015-02-13 + + + + *Korrawit PruegsanusakCommits: 81Joined: 2011-05-28 - *Jochen NitschkeCommits: 76Joined: 2016-02-02 + *Akshay DeepCommits: 75Joined: 2016-01-23 + + + Bartosz KosiorekCommits: 75Joined: 2010-09-17

*Tobias MadlCommits: 74Joined: 2014-09-15 @@ -1547,13 +1561,13 @@

- *Gergo MocsiCommits: 72Joined: 2013-02-14 + *Henry CastroCommits: 73Joined: 2015-01-09

- *weigaoCommits: 72Joined: 2014-05-07 + *Gergo MocsiCommits: 72Joined: 2013-02-14

- Bartosz KosiorekCommits: 71Joined: 2010-09-17 + *weigaoCommits: 72Joined: 2014-05-07

Thorsten BosbachCommits: 70Joined: 2008-06-18 @@ -1561,6 +1575,9 @@

+ *Justin LuthCommits: 69Joined: 2014-09-30 + + *Michaël LefèvreCommits: 68Joined: 2011-02-22

@@ -1569,16 +1586,13 @@ *Kevin HunterCommits: 67Joined: 2010-10-22 - - *Jelle van der WaaCommits: 66Joined: 2013-06-16 -

- *Riccardo MagliocchettiCommits: 66Joined: 2012-01-25 + *Jelle van der WaaCommits: 66Joined: 2013-06-16

- *Henry CastroCommits: 65Joined: 2015-01-09 + *Riccardo MagliocchettiCommits: 66Joined: 2012-01-25

*Michael WeghornCommits: 63Joined: 2014-09-10 @@ -1595,16 +1609,13 @@ Wolfram Garten [wg]Commits: 61Joined: 2009-10-23

- *Akshay DeepCommits: 60Joined: 2016-01-23 - - Oliver Craemer [oc]Commits: 60Joined: 2009-10-23 - - *Jean-Pierre LedureCommits: 59Joined: 2013-10-12 + + Marc Neumann [msc]Commits: 59Joined: 2008-06-20 @@ -1614,6 +1625,9 @@ *Simon SteinbeissCommits: 58Joined: 2015-06-01 + + Giuseppe CastagnoCommits: 57Joined: 2007-12-09 +

@@ -1626,34 +1640,34 @@ *Martin HoskenCommits: 56Joined: 2011-02-25

- Giuseppe CastagnoCommits: 55Joined: 2007-12-09 + *Matthew J. FrancisCommits: 55Joined: 2014-08-25

- *Justin LuthCommits: 55Joined: 2014-09-30 + Nikolai PretzellCommits: 54Joined: 2001-03-09

- *Matthew J. FrancisCommits: 55Joined: 2014-08-25 + *Mihály PalenikCommits: 54Joined: 2013-07-11

- Nikolai PretzellCommits: 54Joined: 2001-03-09 + *yangzhangCommits: 54Joined: 2013-11-04

- *Mihály PalenikCommits: 54Joined: 2013-07-11 + *Mike KaganskiCommits: 53Joined: 2015-04-26

- *yangzhangCommits: 54Joined: 2013-11-04 - - *Martin KepplingerCommits: 53Joined: 2011-02-18

*Rob SneldersCommits: 53Joined: 2011-02-08

+ *Juergen FunkCommits: 52Joined: 2014-09-17 + + *Efe Gürkan YALAMANCommits: 52Joined: 2012-08-01 @@ -1676,19 +1690,16 @@ *Niklas JohanssonCommits: 51Joined: 2011-11-07 - *Juergen FunkCommits: 50Joined: 2014-09-17 - - *Rosemary SebastianCommits: 50Joined: 2015-06-23 *Ptyl DragonCommits: 50Joined: 2013-05-09 - - *Urs FässlerCommits: 48Joined: 2013-02-14 + + *Marcel MetzCommits: 48Joined: 2011-12-05 @@ -1698,11 +1709,11 @@ *mingli juCommits: 48Joined: 2013-11-05 - - *J. Graeme LingardCommits: 47Joined: 2010-09-29 + + *Alexandre VicenziCommits: 46Joined: 2014-01-15 @@ -1712,25 +1723,25 @@ *Lior KaplanCommits: 46Joined: 2010-10-05 - - *Mihai VargaCommits: 46Joined: 2014-02-27 + +

mb93783Commits: 45Joined: 2009-07-15

- *Rishabh KumarCommits: 45Joined: 2015-02-13 + *Eilidh McAdamCommits: 45Joined: 2011-03-10

- *Eilidh McAdamCommits: 45Joined: 2011-03-10 + *Muhammet KaraCommits: 45Joined: 2016-03-20 - - *Daniel RobertsonCommits: 44Joined: 2015-06-27 + + Volker Ahrendt [va]Commits: 44Joined: 2002-04-15 @@ -1740,16 +1751,19 @@ *Rohan KumarCommits: 43Joined: 2016-02-23 + + *Mark HungCommits: 43Joined: 2014-11-04 +

*Peter JentschCommits: 42Joined: 2011-01-07

- *Mike KaganskiCommits: 42Joined: 2015-04-26 + *Mark WielaardCommits: 42Joined: 2013-05-13

- *Mark WielaardCommits: 42Joined: 2013-05-13 + *Varun DhallCommits: 42Joined: 2015-03-07

*Philippe JungCommits: 42Joined: 2015-05-01 @@ -1763,17 +1777,14 @@ *Christian M. HellerCommits: 41Joined: 2013-02-24

- *Varun DhallCommits: 41Joined: 2015-03-07 + *Armin Le GrandCommits: 41Joined: 2015-11-09

- *Mark HungCommits: 41Joined: 2014-11-04 + *Tsutomu UchinoCommits: 41Joined: 2014-01-08

- *Tsutomu UchinoCommits: 41Joined: 2014-01-08 - - *Francisco SaitoCommits: 40Joined: 2011-03-21

@@ -1782,11 +1793,11 @@ *minwangCommits: 39Joined: 2013-11-04 -

- *Valentin KettnerCommits: 38Joined: 2014-03-17 + + *abdulmajeed ahmedCommits: 37Joined: 2012-07-07 @@ -1796,11 +1807,11 @@ *Iain BillettCommits: 37Joined: 2012-04-11 - - *Jennifer LiebelCommits: 37Joined: 2014-08-29 + + *Vinaya MandkeCommits: 36Joined: 2013-02-08 @@ -1810,11 +1821,11 @@ *Csikós TamásCommits: 36Joined: 2013-07-01 - - *Guillaume PousselCommits: 36Joined: 2010-12-22 + + *Priyanka GaikwadCommits: 36Joined: 2013-11-12 @@ -1824,11 +1835,11 @@ *Santiago MartinezCommits: 35Joined: 2012-01-20 - - *Łukasz HryniukCommits: 35Joined: 2015-01-02 + + *xukai liuCommits: 35Joined: 2013-11-01 @@ -1838,11 +1849,11 @@ *Tobias LippertCommits: 35Joined: 2014-01-02 - - *Regina HenschelCommits: 35Joined: 2010-11-04 + + *dechuangCommits: 35Joined: 2013-11-04 @@ -1852,11 +1863,11 @@ *Steve YinCommits: 34Joined: 2013-11-14 - - *Dennis FrancisCommits: 34Joined: 2015-04-15 + + *Marc-André LaverdièreCommits: 34Joined: 2011-06-21 @@ -1866,6 +1877,9 @@ *Andreas MantkeCommits: 33Joined: 2010-09-29 + + *Pranav KantCommits: 32Joined: 2016-02-12 +

@@ -1878,11 +1892,14 @@ *Sushil ShindeCommits: 31Joined: 2013-10-21

- *fengzengCommits: 31Joined: 2013-11-04 + *Ashod NakashianCommits: 31Joined: 2016-01-10

+ *fengzengCommits: 31Joined: 2013-11-04 + + *muleiCommits: 30Joined: 2013-11-01

@@ -1891,11 +1908,11 @@ *Wols ListsCommits: 30Joined: 2010-11-07 +

+ *Christoph HerzogCommits: 30Joined: 2011-01-07 - - *Manal AlhassounCommits: 30Joined: 2012-09-10 @@ -1905,9 +1922,6 @@ *Elton ChungCommits: 29Joined: 2012-01-31 - - *Zdeněk CrhonekCommits: 29Joined: 2016-05-19 -

@@ -1928,19 +1942,16 @@ *Aurimas FišerasCommits: 28Joined: 2010-10-11

- *Armin Le GrandCommits: 28Joined: 2015-11-09 - - *Pallavi JadhavCommits: 28Joined: 2013-02-08 Andre Fischer<andre.f.fischerCommits: 28Joined: 2010-07-21 - - *Andres GomezCommits: 27Joined: 2013-04-09 + + *Gökçen EraslanCommits: 27Joined: 2012-04-15 @@ -1950,30 +1961,33 @@ *Luke DellerCommits: 27Joined: 2012-11-26 + + *José Guilherme VanzCommits: 27Joined: 2012-09-26 +

- *José Guilherme VanzCommits: 27Joined: 2012-09-26 + *Bryan QuigleyCommits: 27Joined: 2012-12-12

*Joel MaderoCommits: 26Joined: 2012-06-15

- *Pranav KantCommits: 26Joined: 2016-02-12 + *Josh HeidenreichCommits: 26Joined: 2011-07-20

- *Josh HeidenreichCommits: 26Joined: 2011-07-20 + *Nicolas ChristenerCommits: 26Joined: 2011-03-10

- *Nicolas ChristenerCommits: 26Joined: 2011-03-10 + *Jorenz ParagasCommits: 26Joined: 2015-06-23

- *Maxime de RoucyCommits: 26Joined: 2012-03-08 + *Vasily MelenchukCommits: 26Joined: 2015-01-27

- *Bryan QuigleyCommits: 26Joined: 2012-12-12 + *Maxime de RoucyCommits: 26Joined: 2012-03-08

*Damjan JovanovicCommits: 25Joined: 2015-08-26 @@ -1981,6 +1995,9 @@

+ *VortCommits: 25Joined: 2014-01-21 + + *Prashant PandeyCommits: 25Joined: 2013-02-20

@@ -1989,39 +2006,39 @@ *Uray M. JánosCommits: 24Joined: 2012-07-17 +

+ *Baptiste DaroussinCommits: 24Joined: 2011-01-31 - -

*Tomofumi YagiCommits: 24Joined: 2011-10-20

- *VortCommits: 24Joined: 2014-01-21 + *Jakub TrzebiatowskiCommits: 24Joined: 2016-03-07

*Daniel SikelerCommits: 24Joined: 2014-08-28 + + *Felix ZhangCommits: 23Joined: 2011-10-19 - -

- *Julien ChaffraixCommits: 23Joined: 2011-04-12 + *Susobhan GhoshCommits: 23Joined: 2016-01-03

- *Jorenz ParagasCommits: 23Joined: 2015-06-23 + *Julien ChaffraixCommits: 23Joined: 2011-04-12

*Pedro GiffuniCommits: 23Joined: 2011-10-28 + + *Lucas BaudinCommits: 23Joined: 2011-01-25 - - *Sören MöllerCommits: 23Joined: 2011-01-03 @@ -2029,9 +2046,6 @@ *Robert RothCommits: 23Joined: 2010-10-31 - *Muhammet KaraCommits: 23Joined: 2016-03-20 - - *Christian DywanCommits: 23Joined: 2011-04-14 @@ -2068,10 +2082,10 @@ *tageziCommits: 22Joined: 2015-09-16

- *Rohit DeshmukhCommits: 21Joined: 2013-09-30 + *WastackCommits: 21Joined: 2016-03-08

- *Ashod NakashianCommits: 21Joined: 2016-01-10 + *Rohit DeshmukhCommits: 21Joined: 2013-09-30

*Tushar BendeCommits: 20Joined: 2013-09-27 @@ -2082,27 +2096,27 @@ *Brad SowdenCommits: 20Joined: 2011-12-27

- *Vasily MelenchukCommits: 20Joined: 2015-01-27 - - *Andy HolderCommits: 20Joined: 2010-12-06 Eric BachardCommits: 20Joined: 2005-10-19 + + *Petr VorelCommits: 20Joined: 2012-02-17 +

- *Petr VorelCommits: 20Joined: 2012-02-17 + *Mark PageCommits: 20Joined: 2016-04-29

*Peilin XiaoCommits: 19Joined: 2013-12-09

- *WastackCommits: 19Joined: 2016-03-08 + *Lennard WasserthalCommits: 19Joined: 2012-08-11

- *Lennard WasserthalCommits: 19Joined: 2012-08-11 + *krishna keshavCommits: 19Joined: 2016-05-05

@@ -2141,14 +2155,17 @@ *Alfonso EusebioCommits: 17Joined: 2011-01-16

- *Jian Hong ChengCommits: 17Joined: 2012-06-26 + *Cor NouwsCommits: 17Joined: 2011-11-19

- *Jakub TrzebiatowskiCommits: 17Joined: 2016-03-07 + *Aleksas PantechovskisCommits: 17Joined: 2016-03-03

+ *Jian Hong ChengCommits: 17Joined: 2012-06-26 + + *Bálint DózsaCommits: 17Joined: 2011-02-10

@@ -2157,42 +2174,36 @@ *Umesh KadamCommits: 17Joined: 2014-01-10 - - *navin patidarCommits: 17Joined: 2013-01-06 -

- *Niko RönkköCommits: 16Joined: 2010-10-31 + *navin patidarCommits: 17Joined: 2013-01-06

- *Jean-Noël RouvignacCommits: 16Joined: 2013-01-09 + *Niko RönkköCommits: 16Joined: 2010-10-31

- *tsahi glikCommits: 16Joined: 2013-06-04 + *Yeliz TaneroğluCommits: 16Joined: 2015-10-03

- *Cor NouwsCommits: 16Joined: 2011-11-19 + *Jean-Noël RouvignacCommits: 16Joined: 2013-01-09

- *Anders JonssonCommits: 16Joined: 2010-12-11 - - - *krishna keshavCommits: 16Joined: 2016-05-05 + *tsahi glikCommits: 16Joined: 2013-06-04

- *Aleksas PantechovskisCommits: 16Joined: 2016-03-03 + *Anders JonssonCommits: 16Joined: 2010-12-11

*Jordan AyersCommits: 16Joined: 2010-11-04 - - *Chris LaplanteCommits: 16Joined: 2014-04-07 + + Florian ReuterCommits: 16Joined: 2010-09-14 @@ -2202,11 +2213,11 @@ *Luke DixonCommits: 16Joined: 2010-10-26 - - *Lei De BinCommits: 16Joined: 2012-07-04 + + *Nikhil WalvekarCommits: 15Joined: 2013-11-01 @@ -2214,52 +2225,44 @@ *Luke SymesCommits: 15Joined: 2010-10-01 - *Yeliz TaneroğluCommits: 15Joined: 2015-10-03 - - - - *Catalin IacobCommits: 15Joined: 2012-02-10 *Heena GuptaCommits: 15Joined: 2014-06-17 + +

*Joachim TremourouxCommits: 15Joined: 2010-11-19

Octavio AlvarezCommits: 15Joined: 2010-09-13 - -

*Yifan JCommits: 15Joined: 2010-12-16

*Arnaud VersiniCommits: 15Joined: 2013-08-10 + +

*Alexander BergmannCommits: 15Joined: 2012-01-13

*Povilas KanapickasCommits: 15Joined: 2010-10-18 - -

*Cosimo CecchiCommits: 15Joined: 2011-11-02

- *Susobhan GhoshCommits: 14Joined: 2016-01-03 - - *Zhe WangCommits: 14Joined: 2012-06-20 + + *Sun YingCommits: 14Joined: 2012-08-16 - - *Björgvin RagnarssonCommits: 14Joined: 2012-02-13 @@ -2269,28 +2272,36 @@ *Tim HardeckCommits: 14Joined: 2011-11-03 + + *Zsolt BölönyCommits: 14Joined: 2015-01-10 - -

*gerhard oettlCommits: 13Joined: 2012-08-27

+ *Mohammed Abdul AzeemCommits: 13Joined: 2016-02-08 + + *Prashant ShahCommits: 13Joined: 2010-10-10 + +

*LeMoyne CastleCommits: 13Joined: 2010-10-25

*Mathias HasselmannCommits: 13Joined: 2013-01-14 - - + + *slideonCommits: 13Joined: 2016-03-27 + *Muhammad HaggagCommits: 13Joined: 2012-02-01 + + *Alia AlmusaireaeCommits: 13Joined: 2012-11-05 @@ -2300,10 +2311,13 @@ *Mariusz DykierekCommits: 12Joined: 2012-01-16 + + *Greg Kroah-HartmanCommits: 12Joined: 2012-02-06 +

- *Greg Kroah-HartmanCommits: 12Joined: 2012-02-06 + *Akash JainCommits: 12Joined: 2016-03-25

*Gábor StefanikCommits: 12Joined: 2012-04-07 @@ -2317,6 +2331,9 @@

+ *tymyjanCommits: 12Joined: 2016-04-03 + + *Wilhelm PfluegerCommits: 12Joined: 2011-02-05

@@ -2325,40 +2342,40 @@ *Olivier RCommits: 12Joined: 2011-08-01 - - *Jean-Baptiste FaureCommits: 12Joined: 2011-02-20 -

- *kadertarlanCommits: 11Joined: 2015-12-14 + *Jean-Baptiste FaureCommits: 12Joined: 2011-02-20

- *Jung-uk KimCommits: 11Joined: 2012-08-13 + *kadertarlanCommits: 11Joined: 2015-12-14

- *Akash JainCommits: 11Joined: 2016-03-25 + *Arnold DumasCommits: 11Joined: 2016-02-14

- *Enrico Weigelt, metux ITSCommits: 11Joined: 2012-11-14 + *Jung-uk KimCommits: 11Joined: 2012-08-13

- *Phillip SzCommits: 11Joined: 2015-03-16 + *Enrico Weigelt, metux ITSCommits: 11Joined: 2012-11-14

- *Jonas Finnemann JensenCommits: 11Joined: 2010-10-01 + *Abdulaziz A AlayedCommits: 11Joined: 2013-01-22

- *Abdulaziz A AlayedCommits: 11Joined: 2013-01-22 + *Phillip SzCommits: 11Joined: 2015-03-16

- *David BolenCommits: 11Joined: 2012-03-07 + *Jonas Finnemann JensenCommits: 11Joined: 2010-10-01

+ *David BolenCommits: 11Joined: 2012-03-07 + + *Peter RabiCommits: 11Joined: 2011-07-14

@@ -2367,11 +2384,11 @@ Frank PetersCommits: 11Joined: 2010-05-20 +

+ *Michael JaumannCommits: 11Joined: 2014-09-02 - - *Charu TyagiCommits: 11Joined: 2014-06-25 @@ -2381,11 +2398,11 @@ *Jianyuan LiCommits: 10Joined: 2012-08-16 + + *Benjamin NiCommits: 10Joined: 2015-04-02 - - *Kristian RietveldCommits: 10Joined: 2011-10-15 @@ -2395,11 +2412,11 @@ *Mirek MazelCommits: 10Joined: 2012-06-05 + + *Theo van KlaverenCommits: 10Joined: 2011-03-10 - - *Luke PetrolekasCommits: 10Joined: 2011-02-12 @@ -2407,9 +2424,6 @@ *Stefan WeibergCommits: 10Joined: 2014-08-28 - *Mark PageCommits: 10Joined: 2016-04-29 - - *Timo HeinoCommits: 10Joined: 2010-11-22 @@ -2424,11 +2438,14 @@ *Steven ButlerCommits: 9Joined: 2011-01-07

- *Robinson TryonCommits: 9Joined: 2012-06-21 + *skswalesCommits: 9Joined: 2016-05-06

+ *Robinson TryonCommits: 9Joined: 2012-06-21 + + *Michael DunphyCommits: 9Joined: 2013-04-18

@@ -2437,9 +2454,6 @@ *Aybuke OzdemirCommits: 9Joined: 2015-10-07 - - *slideonCommits: 9Joined: 2016-03-27 -

@@ -2485,9 +2499,6 @@

- *tymyjanCommits: 8Joined: 2016-04-03 - - *Ursache VladimirCommits: 8Joined: 2015-02-10

@@ -2496,11 +2507,11 @@ *Ahmad H. Al HarthiCommits: 8Joined: 2012-12-31 -

- Fong LinCommits: 8Joined: 2010-09-14 + + *RajashriCommits: 8Joined: 2013-12-06 @@ -2510,11 +2521,11 @@ *HeiherCommits: 8Joined: 2015-07-07 - - *Timothy PearsonCommits: 8Joined: 2012-08-18 + + *Daisuke NishinoCommits: 8Joined: 2011-11-06 @@ -2524,11 +2535,11 @@ *karthCommits: 8Joined: 2013-01-07 - - *Nathan YeeCommits: 8Joined: 2015-01-01 + + *Jonathan AdamsCommits: 8Joined: 2012-03-16 @@ -2538,11 +2549,11 @@ *Jenei GáborCommits: 8Joined: 2011-07-29 - - *IanCommits: 8Joined: 2015-08-06 + + *RaalCommits: 7Joined: 2014-12-31 @@ -2552,11 +2563,11 @@ *keremCommits: 7Joined: 2015-10-12 - - *David DelmaCommits: 7Joined: 2014-05-13 + + *Roi IllouzCommits: 7Joined: 2013-10-20 @@ -2566,13 +2577,16 @@ *Mathias MichelCommits: 7Joined: 2012-11-19 + + *Giuseppe BilottaCommits: 7Joined: 2014-09-09 +

- *Giuseppe BilottaCommits: 7Joined: 2014-09-09 + *iremCommits: 7Joined: 2015-10-11

- *Mohammed Abdul AzeemCommits: 7Joined: 2016-02-08 + *apurvapriyadarshiCommits: 7Joined: 2016-05-27

*Sergey DavidoffCommits: 7Joined: 2011-04-11 @@ -2589,14 +2603,17 @@ *Christopher CopitsCommits: 7Joined: 2012-09-19

- *Deena FrancisCommits: 7Joined: 2014-07-29 + *Pranav KantCommits: 7Joined: 2016-01-27

- *Keith CurtisCommits: 7Joined: 2013-12-20 + *Deena FrancisCommits: 7Joined: 2014-07-29

+ *Keith CurtisCommits: 7Joined: 2013-12-20 + + *Issa AlkurtassCommits: 7Joined: 2012-09-04

@@ -2605,11 +2622,11 @@ *Wang LeiCommits: 7Joined: 2012-06-14 +

+ *Trent MacAlpineCommits: 7Joined: 2014-03-06 - - *Christoph LutzCommits: 7Joined: 2011-09-06 @@ -2619,11 +2636,11 @@ *Eric SeynaeveCommits: 7Joined: 2013-02-04 + + *Samuel CantrellCommits: 7Joined: 2011-06-11 - - *Stefan RingCommits: 7Joined: 2014-01-09 @@ -2633,13 +2650,10 @@ *Brennan VincentCommits: 7Joined: 2012-04-02 - - *Xavier ALTCommits: 6Joined: 2011-03-06 -

- *Arnold DumasCommits: 6Joined: 2016-02-14 + *Xavier ALTCommits: 6Joined: 2011-03-06

*Thomas CollertonCommits: 6Joined: 2011-11-18 @@ -2653,22 +2667,19 @@

- *skswalesCommits: 6Joined: 2016-05-06 - - *Anurag JainCommits: 6Joined: 2011-04-05

*Kay SchenkCommits: 6Joined: 2014-09-19

- *iremCommits: 6Joined: 2015-10-11 + *David VerrierCommits: 6Joined: 2013-02-26 - - - *David VerrierCommits: 6Joined: 2013-02-26 + *Aron BudeaCommits: 6Joined: 2014-12-22 + + *tianyaoCommits: 6Joined: 2013-11-09 @@ -2678,11 +2689,11 @@ *Jeroen NijhofCommits: 6Joined: 2014-05-01 - - *Ricardo MorenoCommits: 6Joined: 2010-11-03 + + *Arul MichaelCommits: 6Joined: 2016-01-05 @@ -2692,6 +2703,9 @@ *shiraharaCommits: 6Joined: 2011-01-28 + + *Gabor KelemenCommits: 6Joined: 2013-06-18 +

@@ -2760,209 +2774,206 @@ *Marc-Andre LaverdiereCommits: 5Joined: 2011-07-19

- *apurvapriyadarshiCommits: 5Joined: 2016-05-27 + *Tobias RosenbergerCommits: 5Joined: 2011-01-31

- *Tobias RosenbergerCommits: 5Joined: 2011-01-31 - - *Pasi LallinahoCommits: 5Joined: 2015-06-02 - *Aron BudeaCommits: 5Joined: 2014-12-22 - - *Kohei YoshidaCommits: 5Joined: 2013-09-07 - -

*Bence BabatiCommits: 5Joined: 2012-08-13

*Michael T. WhiteleyCommits: 5Joined: 2011-11-25 + +

*Fabio BusoCommits: 5Joined: 2015-11-01

*Gustavo Buzzatti PachecoCommits: 5Joined: 2011-12-15 - -

*David HobleyCommits: 5Joined: 2010-10-04

*Gil ForcadaCommits: 5Joined: 2010-09-28 + +

*Lionel DricotCommits: 5Joined: 2012-06-04

*Jeffrey ChangCommits: 5Joined: 2011-06-01 - -

*Pavel KysilkaCommits: 5Joined: 2012-06-25

*Tom TromeyCommits: 4Joined: 2011-08-11 + +

*Santiago AlessandriCommits: 4Joined: 2010-11-11

*Ken BiondiCommits: 4Joined: 2014-03-05 - -

*Andrew C. E. DentCommits: 4Joined: 2010-10-24

*Kate GossCommits: 4Joined: 2012-02-11 + +

*ClioCommits: 4Joined: 2011-01-30

*Elie RouxCommits: 4Joined: 2013-05-29 - -

*Simon DannerCommits: 4Joined: 2014-08-02

*Thomas ViehmannCommits: 4Joined: 2014-08-15 + +

*pasqual milvaquesCommits: 4Joined: 2015-12-02

*Alex HenrieCommits: 4Joined: 2014-03-05 - -

*Derrick RochaCommits: 4Joined: 2015-08-26

*Maja DjordjevicCommits: 4Joined: 2011-01-06 + +

*Michael MuenchCommits: 4Joined: 2011-02-13

*Ulrich KitzingerCommits: 4Joined: 2013-11-30 - -

*Kevin SuoCommits: 4Joined: 2014-11-06

*Sameer DeshmukhCommits: 4Joined: 2013-04-20 + +

*Burcin AkalinCommits: 4Joined: 2015-12-18

*XiaoliCommits: 4Joined: 2013-03-23 - -

*Mariana MarasoiuCommits: 4Joined: 2012-03-14

*coypuCommits: 4Joined: 2016-02-03 + +

*Kumar ThangavelCommits: 4Joined: 2016-01-04

*Nicholas ShanksCommits: 4Joined: 2012-09-04 - -

*Sahasranaman M SCommits: 4Joined: 2015-10-04

*Jeffrey StedfastCommits: 4Joined: 2014-07-26 + +

*An LeendersCommits: 4Joined: 2011-01-25

*Tim EvesCommits: 4Joined: 2016-02-23 - -

*aqcoderCommits: 4Joined: 2015-12-13

*Chris SherlockCommits: 4Joined: 2015-12-23 + +

*Florian BircherCommits: 4Joined: 2010-10-16

*Mihkel TõnnovCommits: 4Joined: 2012-07-02 - -

*Wolfgang PechlanerCommits: 4Joined: 2011-09-04

*tinoCommits: 4Joined: 2012-12-03 + +

*GurkaranCommits: 4Joined: 2016-03-17

*André SchnabelCommits: 4Joined: 2011-05-31 - -

*Jean-Tiare LE BIGOTCommits: 4Joined: 2012-08-08

*V Stuart FooteCommits: 4Joined: 2014-12-04 + +

*Nourah.AlShoeibiCommits: 4Joined: 2013-07-07

*Yong Lin MaCommits: 4Joined: 2012-06-07 - -

*Fridrich StrbaCommits: 4Joined: 2013-03-08

*Pantelis KoukousoulasCommits: 4Joined: 2011-03-14 + + + + *Gökhan GurbetoğluCommits: 4Joined: 2016-06-06 +

*Andreas BeckerCommits: 4Joined: 2011-04-04

*Florian ReisingerCommits: 4Joined: 2012-06-22 - - *Zheng FanCommits: 4Joined: 2013-04-22 + + *erdemdemirkapiCommits: 4Joined: 2016-01-30 @@ -2972,11 +2983,11 @@ *Honza HavlíčekCommits: 4Joined: 2013-07-27 - - *Samphan RaruenromCommits: 4Joined: 2011-03-24 + + *Alan DuCommits: 3Joined: 2010-10-12 @@ -2986,15 +2997,18 @@ *Petr KrausCommits: 3Joined: 2013-03-26 - - *Gioele BarabucciCommits: 3Joined: 2010-11-18 + +

*Simon LongCommits: 3Joined: 2015-07-08

+ *nadithCommits: 3Joined: 2016-07-14 + + *Cameron PaulCommits: 3Joined: 2012-02-27

@@ -3023,14 +3037,17 @@ *Michael BauerCommits: 3Joined: 2011-11-23

- *Popa Adrian MariusCommits: 3Joined: 2015-03-23 + *Rishabh KumarCommits: 3Joined: 2016-01-23

- *Mathieu VonlanthenCommits: 3Joined: 2012-07-19 + *Popa Adrian MariusCommits: 3Joined: 2015-03-23

+ *Mathieu VonlanthenCommits: 3Joined: 2012-07-19 + + *Matthew NichollsCommits: 3Joined: 2015-04-01

@@ -3039,11 +3056,11 @@ *n.r.pearsonCommits: 3Joined: 2015-09-09 +

+ *Dávid VastagCommits: 3Joined: 2013-02-04 - - *Andrea PescettiCommits: 3Joined: 2013-10-07 @@ -3053,11 +3070,11 @@ *Dimitri DucCommits: 3Joined: 2011-04-19 + + *Peter Senna TschudinCommits: 3Joined: 2014-05-26 - - *Marek DoleželCommits: 3Joined: 2015-07-06 @@ -3067,11 +3084,11 @@ *David NalleyCommits: 3Joined: 2011-03-03 + + *Golnaz IrannejadCommits: 3Joined: 2013-04-02 - - *Tantai TanakanokCommits: 3Joined: 2011-02-09 @@ -3079,16 +3096,24 @@ *Luboš LuňákCommits: 3Joined: 2014-03-18 + *Sérgio MarquesCommits: 3Joined: 2011-11-25 + + + + *baltasarqCommits: 3Joined: 2016-02-24 + *Marco A. G. PintoCommits: 3Joined: 2016-02-02 + + *Tom ThorogoodCommits: 3Joined: 2012-02-28 - - *Chris Carpenter(mordocai)Commits: 3Joined: 2011-02-02 + + *Pader RezsoCommits: 3Joined: 2013-07-01 @@ -3098,11 +3123,11 @@ *Bertrand LorentzCommits: 3Joined: 2012-08-03 - - *Marina PlakalovicCommits: 3Joined: 2012-12-14 + + *Tobias MuellerCommits: 3Joined: 2014-02-10 @@ -3112,11 +3137,11 @@ *Jacopo NespoloCommits: 3Joined: 2010-10-01 - - *Robert M CampbellCommits: 3Joined: 2013-11-13 + + *Renato FerreiraCommits: 3Joined: 2014-11-15 @@ -3126,11 +3151,11 @@ *Pascal UllrichCommits: 3Joined: 2010-12-28 - - *Dmitry AshkadovCommits: 3Joined: 2011-08-29 + + *Istvan TuriCommits: 3Joined: 2012-08-16 @@ -3140,11 +3165,11 @@ Keith StribleyCommits: 3Joined: 2010-06-29 - - *Mike EberdtCommits: 3Joined: 2011-07-12 + + *Joan MontaneCommits: 3Joined: 2013-02-22 @@ -3154,11 +3179,11 @@ *Benjamin DrungCommits: 3Joined: 2012-06-08 - - *Jason HulmeCommits: 3Joined: 2013-06-05 + + *Oliver GüntherCommits: 3Joined: 2012-08-09 @@ -3168,36 +3193,28 @@ *Guto MaiaCommits: 3Joined: 2011-03-18 - - *Roland BaudinCommits: 3Joined: 2011-05-16 - - *Gabor KelemenCommits: 3Joined: 2013-06-18 - + +

*Nagy AkosCommits: 3Joined: 2013-06-27

*Anthony DurityCommits: 3Joined: 2011-04-18 - - - - *Sérgio MarquesCommits: 3Joined: 2011-11-25 -

*Xuacu SaturioCommits: 3Joined: 2010-12-19

*Jan DarmochwalCommits: 3Joined: 2011-01-27 + + *AlexFCommits: 3Joined: 2015-11-12 - - *Jeremy BrownCommits: 3Joined: 2012-09-19 @@ -3207,29 +3224,37 @@ *alexey.chemichevCommits: 2Joined: 2015-11-18 + + *Sean McNamaraCommits: 2Joined: 2010-09-29 - -

*Christoph NoackCommits: 2Joined: 2010-12-13

+ *Kenneth KoskiCommits: 2Joined: 2016-02-20 + + *Mohammad ElahiCommits: 2Joined: 2011-08-27 + +

*Gary HoustonCommits: 2Joined: 2014-12-15

*UrmasCommits: 2Joined: 2012-02-13 - -

*Martyn RussellCommits: 2Joined: 2012-06-07

+ *Valter MuraCommits: 2Joined: 2015-06-07 + + + + *Andrew HigginsonCommits: 2Joined: 2012-04-10

@@ -3238,11 +3263,11 @@ *Andras BartekCommits: 2Joined: 2012-08-06 -

- *Matthias KloseCommits: 2Joined: 2011-03-01 + + *Donizete WaterkemperCommits: 2Joined: 2013-05-23 @@ -3252,106 +3277,98 @@ *Kelly AndersonCommits: 2Joined: 2011-05-31 - - - - *RishabhCommits: 2Joined: 2016-01-23 - *Ri GangHuCommits: 2Joined: 2013-07-28 + +

*Krunoslav ŠebetićCommits: 2Joined: 2016-04-03

*Akash ShetyeCommits: 2Joined: 2013-03-23 - -

*Michal KubecekCommits: 2Joined: 2016-06-02

*Ricardo PalomaresCommits: 2Joined: 2016-01-16 + +

*Michal SvecCommits: 2Joined: 2011-07-12

*Adam MrózCommits: 2Joined: 2013-02-24 - -

*Ed DeanCommits: 2Joined: 2011-01-14

*Jean Charles PapinCommits: 2Joined: 2011-02-11 + +

*Tobias KranzCommits: 2Joined: 2011-02-17

*Kishor BhatCommits: 2Joined: 2015-01-28 - -

*Anderson RobertoCommits: 2Joined: 2014-01-15

*Dwayne BaileyCommits: 2Joined: 2010-11-03 + +

Loiseleur MichelCommits: 2Joined: 2010-09-14

*Mukhiddin YusupovCommits: 2Joined: 2014-05-19 - -

*Sergey FarbotkaCommits: 2Joined: 2012-09-21

*Daniel StoneCommits: 2Joined: 2014-10-29 + +

*Boris EgorovCommits: 2Joined: 2014-09-08

*Clarence GuoCommits: 2Joined: 2014-05-26 - -

*Laszlo Kis-AdamCommits: 2Joined: 2015-03-12

*Jesso Clarence MuruganCommits: 2Joined: 2012-06-23 + +

*Andreas SchierlCommits: 2Joined: 2012-01-30

*Viktor VargaCommits: 2Joined: 2013-08-28 - -

*gamebusterzCommits: 2Joined: 2015-02-19

*Clément LassieurCommits: 2Joined: 2014-12-21 - - *Marco A. G. PintoCommits: 2Joined: 2016-02-02 - + + *Justin MalcolmCommits: 2Joined: 2010-09-29 - - *Andreu Correa CasablancaCommits: 2Joined: 2011-09-11 @@ -3361,11 +3378,11 @@ *YiiChang YenCommits: 2Joined: 2014-10-16 + + *Yogesh DesaiCommits: 2Joined: 2016-01-05 - - *Jonathan CallenCommits: 2Joined: 2011-01-29 @@ -3375,11 +3392,11 @@ *Lubosz SarneckiCommits: 2Joined: 2015-08-20 + + *Mox SoiniCommits: 2Joined: 2015-06-02 - - *Sean McMurrayCommits: 2Joined: 2010-10-20 @@ -3389,11 +3406,11 @@ *Seo SanghyeonCommits: 2Joined: 2010-09-29 + + *Marc GarciaCommits: 2Joined: 2012-05-04 - - *Ferran VidalCommits: 2Joined: 2012-04-21 @@ -3403,11 +3420,11 @@ *Mateusz ZasuwikCommits: 2Joined: 2011-12-20 + + *Rimas KudelisCommits: 2Joined: 2015-01-06 - - *danielat998Commits: 2Joined: 2016-02-11 @@ -3417,11 +3434,11 @@ *David SteeleCommits: 2Joined: 2012-04-24 + + *William GathoyeCommits: 2Joined: 2012-02-28 - - *PKEuSCommits: 2Joined: 2012-02-05 @@ -3431,11 +3448,11 @@ *Austin ChenCommits: 2Joined: 2015-03-25 + + *Gregg KingCommits: 2Joined: 2013-02-26 - - *Marcin eXine MCommits: 2Joined: 2010-11-02 @@ -3445,11 +3462,11 @@ *Mark WilliamsCommits: 2Joined: 2014-12-17 + + *Rolf HemmerlingCommits: 2Joined: 2013-06-15 - - *Arne de BruijnCommits: 2Joined: 2012-12-11 @@ -3459,11 +3476,11 @@ *Martin HollmichelCommits: 2Joined: 2015-06-29 + + *Flex LiuCommits: 2Joined: 2012-09-04 - - *Jingtao YanCommits: 2Joined: 2015-03-23 @@ -3473,11 +3490,11 @@ *Hussian AlamriCommits: 2Joined: 2014-05-14 + + *Christos StrubulisCommits: 2Joined: 2012-12-09 - - *Jose Santiago Jimenez SarmientoCommits: 2Joined: 2012-04-24 @@ -3487,11 +3504,11 @@ *Michael NattererCommits: 2Joined: 2011-04-08 + + *Neil MooreCommits: 2Joined: 2013-08-09 - - *Greggory HernandezCommits: 2Joined: 2012-02-22 @@ -3501,11 +3518,11 @@ *Arno TeigsethCommits: 2Joined: 2011-09-14 + + *Karsten GerloffCommits: 2Joined: 2011-02-06 - - *Sophie GautierCommits: 2Joined: 2010-12-19 @@ -3515,11 +3532,11 @@ *Maxim IorshCommits: 2Joined: 2011-10-05 + + *dbeurleCommits: 2Joined: 2015-01-12 - - *Carlos LuqueCommits: 2Joined: 2015-07-16 @@ -3529,11 +3546,11 @@ *Emanuele FiaCommits: 2Joined: 2011-11-02 + + *Janit AnjariaCommits: 2Joined: 2013-04-19 - - *Sheikha AL-HinaiCommits: 2Joined: 2015-12-28 @@ -3543,11 +3560,11 @@ *Abeer SethiCommits: 2Joined: 2012-04-12 + + *Jan HubickaCommits: 2Joined: 2011-09-12 - - *ackepenekCommits: 2Joined: 2016-02-21 @@ -3557,11 +3574,11 @@ *Cyril RoelandtCommits: 2Joined: 2011-04-26 + + *Yury TarasievichCommits: 2Joined: 2011-11-23 - - *Hideki IkedaCommits: 2Joined: 2014-06-25 @@ -3571,11 +3588,11 @@ *Daniel HerdeCommits: 2Joined: 2012-08-09 + + *Markus WernigCommits: 2Joined: 2015-03-18 - - *Johann MessnerCommits: 2Joined: 2012-08-28 @@ -3585,11 +3602,11 @@ *Bisal NayalCommits: 2Joined: 2014-05-07 + + *Supreme AryalCommits: 2Joined: 2014-12-04 - - *Nurhak ALTINCommits: 1Joined: 2016-05-01 @@ -3599,13 +3616,10 @@ *Ross BurtonCommits: 1Joined: 2012-04-18 - - *Martin BrownCommits: 1Joined: 2013-02-23 -

- *Kenneth KoskiCommits: 1Joined: 2016-02-20 + *Martin BrownCommits: 1Joined: 2013-02-23

*Philipp KaluzaCommits: 1Joined: 2012-10-21 @@ -3656,11 +3670,14 @@ *Debarshi RayCommits: 1Joined: 2016-01-08

- *Mattias PõldaruCommits: 1Joined: 2014-12-06 + *Jean-Yves RoyerCommits: 1Joined: 2011-03-07

+ *Mattias PõldaruCommits: 1Joined: 2014-12-06 + + *Kevin HausmannCommits: 1Joined: 2012-08-17

@@ -3669,28 +3686,36 @@ *Jeff AignerCommits: 1Joined: 2011-06-09 +

+ + + *Otto KekäläinenCommits: 1Joined: 2016-07-03 + *Ta Duc TungCommits: 1Joined: 2011-08-08 - -

*Alex KempshallCommits: 1Joined: 2011-08-14

*Robin KumarCommits: 1Joined: 2014-06-17 + +

*Neven ĆosićCommits: 1Joined: 2012-10-08

*Lennart PoetteringCommits: 1Joined: 2014-10-09 - - + + *Zhengqiang WangCommits: 1Joined: 2016-06-02 + *Mathieu DCommits: 1Joined: 2012-11-19 + + *Krunoslav ŠebetićCommits: 1Joined: 2016-03-10 @@ -3698,178 +3723,170 @@ *Benjamin OtteCommits: 1Joined: 2013-06-15 - *Valter MuraCommits: 1Joined: 2015-06-07 - - - - *Nathan WellsCommits: 1Joined: 2015-09-03 *Willian BriottoCommits: 1Joined: 2015-11-21 + +

*Dobra GaborCommits: 1Joined: 2015-04-02

*Naser SharifiCommits: 1Joined: 2012-11-26 - -

*Shreyansh GandhiCommits: 1Joined: 2014-06-10

*Michael KovarikCommits: 1Joined: 2015-01-07 + +

*Mathias SuppCommits: 1Joined: 2014-02-25

*Eric S. RaymondCommits: 1Joined: 2013-06-07 - -

*Bernhard M. WiedemannCommits: 1Joined: 2011-10-17

*Neil Voss (fourier)Commits: 1Joined: 2013-05-24 + +

*tinderboxCommits: 1Joined: 2013-04-11

*pgajdosCommits: 1Joined: 2011-01-31 - -

*Roman EiseleCommits: 1Joined: 2011-11-23

*Simon WilperCommits: 1Joined: 2015-01-24 + +

*Andreas K. Huettel (dilfridge)Commits: 1Joined: 2015-01-04

*JesseCommits: 1Joined: 2011-12-14 - -

*Javier CatalaCommits: 1Joined: 2012-04-26

*Apachev IvanCommits: 1Joined: 2016-03-08 + +

*shubhamtibraCommits: 1Joined: 2016-01-16

*yjw9012Commits: 1Joined: 2013-12-30 - -

*armijnCommits: 1Joined: 2010-12-30

*Ondřej SmržCommits: 1Joined: 2013-03-10 + +

*Italo VignoliCommits: 1Joined: 2012-03-09

*massinissaHamidiCommits: 1Joined: 2015-05-07 - -

*Andor ErtseyCommits: 1Joined: 2011-09-04

*Patrick LubyCommits: 1Joined: 2015-10-04 + +

*ritztroCommits: 1Joined: 2015-04-11

*Jihui ChoiCommits: 1Joined: 2015-06-22 - -

*Srijan ChoudharyCommits: 1Joined: 2013-08-10

*Marcel HBCommits: 1Joined: 2011-05-03 + +

*Xavi Escriche GalindoCommits: 1Joined: 2012-04-24

*Stefan WeigelCommits: 1Joined: 2011-10-17 - -

*Keigo KawamuraCommits: 1Joined: 2015-11-16

*Helena SvobodovaCommits: 1Joined: 2016-05-25 + +

*Seraphime KirkovskiCommits: 1Joined: 2016-04-29

*Paula MannesCommits: 1Joined: 2012-11-30 - -

*Trevor MurphyCommits: 1Joined: 2010-10-20

*mmeof2Commits: 1Joined: 2015-05-09 + +

*Marco BiscaroCommits: 1Joined: 2012-08-27

*Johannes WidmerCommits: 1Joined: 2013-03-23 - -

*Ryo ONODERACommits: 1Joined: 2014-04-07

*umairshahidCommits: 1Joined: 2015-05-29 + +

*Masataka ShinkeCommits: 1Joined: 2012-02-15

*Phil HartCommits: 1Joined: 2012-06-29 - -

*Vicente Rafael Estevez VacasCommits: 1Joined: 2012-04-22

*Michal SiedlaczekCommits: 1Joined: 2014-01-25 - - *Jean-Yves RoyerCommits: 1Joined: 2011-03-07 - + + *Victor LeeCommits: 1Joined: 2011-12-24 - - *AWASHIRO IkuyaCommits: 1Joined: 2011-01-04 @@ -3879,11 +3896,11 @@ *Giovanni CaligarisCommits: 1Joined: 2015-11-30 + + *Joshua CogliatiCommits: 1Joined: 2012-01-06 - - *Mihovil StanićCommits: 1Joined: 2015-11-11 @@ -3891,198 +3908,206 @@ *Johnny_MCommits: 1Joined: 2016-05-12 + *JBurantCommits: 1Joined: 2016-04-05 + + + + *Chen ZuoJunCommits: 1Joined: 2012-10-08 *Javier Silva SanahujaCommits: 1Joined: 2012-04-23 - -

*Andrew RistCommits: 1Joined: 2012-10-05

*Travis CarterCommits: 1Joined: 2012-06-22 + +

*Péter SzathmáryCommits: 1Joined: 2015-01-07

*Hiroto KagotaniCommits: 1Joined: 2014-08-19 - -

*Alberto RuizCommits: 1Joined: 2011-03-31

*Petr GajdosCommits: 1Joined: 2015-04-07 + +

*Stefano FacchiniCommits: 1Joined: 2013-08-22

*Milan ZelenkaCommits: 1Joined: 2014-03-26 - -

*Mark WrightCommits: 1Joined: 2013-02-09

*Piet van OostrumCommits: 1Joined: 2015-03-12 + +

*roopak12345Commits: 1Joined: 2014-03-09

*Juan Pablo Martínez CortésCommits: 1Joined: 2011-11-28 - -

*Vincent PovirkCommits: 1Joined: 2011-12-19

*Christopher BackhouseCommits: 1Joined: 2010-12-06 + +

*Andy HearnCommits: 1Joined: 2011-01-09

*Karl KoehlerCommits: 1Joined: 2011-11-11 - -

*Alexandre FournierCommits: 1Joined: 2010-11-06

*Martin OwensCommits: 1Joined: 2014-07-27 + +

*Edmund LaugassonCommits: 1Joined: 2015-01-07

*Douglas Rodrigues de AlmeidaCommits: 1Joined: 2012-09-15 - -

*Hamza AbdelkebirCommits: 1Joined: 2013-02-23

*Jacqueline RahemipourCommits: 1Joined: 2013-03-23 + +

*Aditya KaleCommits: 1Joined: 2014-04-01

*Jonathan RiddellCommits: 1Joined: 2014-11-22 - -

*James CCommits: 1Joined: 2011-12-20

*Tim RichardsonCommits: 1Joined: 2013-06-04 + +

*Hannah LyhneCommits: 1Joined: 2014-04-01

*Florent GallaireCommits: 1Joined: 2012-04-21 - -

*Milos SramekCommits: 1Joined: 2012-01-20

*Steve HartCommits: 1Joined: 2015-11-17 + +

*Evertjan GarretsenCommits: 1Joined: 2010-10-04

*William LachanceCommits: 1Joined: 2011-06-08 - -

*krishnan parthasarathiCommits: 1Joined: 2010-10-07

*Rico TzschichholzCommits: 1Joined: 2016-02-09 + +

*ZirkCommits: 1Joined: 2015-01-07

*Kevin PengCommits: 1Joined: 2012-07-20 - -

*Paolo PozzanCommits: 1Joined: 2010-12-19

*Rolf KoetterCommits: 1Joined: 2013-11-05 + +

*Ward van WanrooijCommits: 1Joined: 2012-06-25

*Arkadiusz MiśkiewiczCommits: 1Joined: 2014-10-09 - -

*Pierre SauterCommits: 1Joined: 2015-12-01

*NeilBrownCommits: 1Joined: 2010-09-28 + +

*Miguel FernándezCommits: 1Joined: 2012-04-26

*Gábor NyersCommits: 1Joined: 2013-03-02 - -

*Jean-François Fortin TamCommits: 1Joined: 2013-06-10

*Tadele AssefaCommits: 1Joined: 2013-01-15 + +

*Martin LiškaCommits: 1Joined: 2014-03-26

*Jason GerlowskiCommits: 1Joined: 2014-03-07 - -

*Jose ManuelCommits: 1Joined: 2012-04-25

*Fernando PiraniCommits: 1Joined: 2015-08-04 + +

*Michael DuelliCommits: 1Joined: 2013-08-01

*Vojta KoukalCommits: 1Joined: 2013-03-03 - - + + *PrashantCommits: 1Joined: 2016-05-17 + *Chris CheneyCommits: 1Joined: 2011-04-27 + + *Marc BessièresCommits: 1Joined: 2016-01-29 @@ -4092,11 +4117,11 @@ *Martin NathansenCommits: 1Joined: 2016-04-18 - - *Fahad Al-SaidiCommits: 1Joined: 2014-07-16 + + *ricardobottoCommits: 1Joined: 2013-05-18 @@ -4106,11 +4131,11 @@ *Gabriele PonzoCommits: 1Joined: 2016-01-29 - - *Cassio NeriCommits: 1Joined: 2011-05-01 + + *Danny BrownCommits: 1Joined: 2013-09-18 @@ -4120,11 +4145,11 @@ *Manas JoshiCommits: 1Joined: 2014-03-17 - - *Mohamed ThabetCommits: 1Joined: 2016-03-13 + + *sagarCommits: 1Joined: 2012-09-15 @@ -4134,11 +4159,11 @@ *Steven MeyerCommits: 1Joined: 2013-03-13 - - *Paulo JoséCommits: 1Joined: 2011-04-01 + + *ccshellerCommits: 1Joined: 2015-10-08 @@ -4148,11 +4173,11 @@ *Aldo Román NureñaCommits: 1Joined: 2012-04-09 - - *Kalman KemenczyCommits: 1Joined: 2010-10-28 + + *Naruhiko OgasawaraCommits: 1Joined: 2014-10-25 @@ -4162,15 +4187,18 @@ *Babu VincentCommits: 1Joined: 2014-09-19 - - *Heiko ScheidtCommits: 1Joined: 2014-08-03 + +

*Arfrever Frehtes Taifersar ArahesisCommits: 1Joined: 2012-04-02

+ *anwilli5Commits: 1Joined: 2016-06-06 + + *OKANO TakayoshiCommits: 1Joined: 2013-01-29

@@ -4182,19 +4210,16 @@ *sonakshi nathaniCommits: 1Joined: 2013-06-26

- *Pranav KantCommits: 1Joined: 2016-01-27 - - *Gleb MishchenkoCommits: 1Joined: 2016-03-22 *Sam TukeCommits: 1Joined: 2015-05-21 - - *Hansgerd SchneiderCommits: 1Joined: 2013-04-02 + + *Ayantha RandikaCommits: 1Joined: 2014-01-23 @@ -4204,11 +4229,11 @@ *Dan CorneanuCommits: 1Joined: 2010-12-29 - - *PeterCommits: 1Joined: 2016-05-03 + + *Joseph BrownCommits: 1Joined: 2012-08-14 @@ -4218,11 +4243,11 @@ *Pavel KacerCommits: 1Joined: 2013-04-11 - - *Fernando GovernatoreCommits: 1Joined: 2012-02-25 + + *Christophe StrobbeCommits: 1Joined: 2011-08-09 @@ -4232,11 +4257,11 @@ *Dag WieersCommits: 1Joined: 2016-03-13 - - *Karthick Prasad GunasekaranCommits: 1Joined: 2015-03-22 + + *Olivier PlotonCommits: 1Joined: 2012-12-12 @@ -4246,11 +4271,11 @@ *J. Fernando LagrangeCommits: 1Joined: 2014-02-02 - - *Jan NieuwenhuizenCommits: 1Joined: 2011-04-28 + + *Pieter AdriaensenCommits: 1Joined: 2014-12-21 @@ -4260,11 +4285,11 @@ *Reem.ALotaibiCommits: 1Joined: 2013-07-25 - - *dbarisakkurtCommits: 1Joined: 2012-02-02 + + *Sam TygierCommits: 1Joined: 2016-05-22 @@ -4274,11 +4299,11 @@ *xjclCommits: 1Joined: 2014-08-04 - - *Serge KrotCommits: 1Joined: 2015-10-25 + + *Apostolos SyropoulosCommits: 1Joined: 2014-05-07 @@ -4288,11 +4313,11 @@ *Quentin PradetCommits: 1Joined: 2012-12-21 - - *Adrià Cereto MassaguéCommits: 1Joined: 2010-10-26 + + *Freek de KruijfCommits: 1Joined: 2010-12-19 @@ -4302,11 +4327,11 @@ *Slávek BankoCommits: 1Joined: 2015-10-10 - - *HaidongWuCommits: 1Joined: 2016-03-09 + + *Ionut BiruCommits: 1Joined: 2012-05-14 @@ -4316,11 +4341,11 @@ *sunwebCommits: 1Joined: 2016-04-08 - - *Joan ParaisoCommits: 1Joined: 2015-09-25 + + *Rafael CabralCommits: 1Joined: 2011-03-31 @@ -4330,11 +4355,11 @@ *Serg BormantCommits: 1Joined: 2011-11-28 - - *Tim-Philipp MüllerCommits: 1Joined: 2012-07-29 + + *Sujith SudhakaranCommits: 1Joined: 2015-04-07 @@ -4344,11 +4369,11 @@ *Carsten NiehausCommits: 1Joined: 2012-02-09 - - *Tarun KumarCommits: 1Joined: 2014-03-07 + + *Jonathan SchultzCommits: 1Joined: 2013-05-22 @@ -4358,11 +4383,11 @@ *Monica Ramirez ArcedaCommits: 1Joined: 2012-04-23 - - *camilleCommits: 1Joined: 2010-12-13 + + *Denis LackovicCommits: 1Joined: 2010-10-05 @@ -4372,11 +4397,11 @@ *Peter TillemansCommits: 1Joined: 2012-06-26 - - *Andrey TurkinCommits: 1Joined: 2011-02-09 + + *Tomas TurekCommits: 1Joined: 2013-03-24 @@ -4386,11 +4411,11 @@ *Maxime CôtéCommits: 1Joined: 2011-04-19 - - *AdrienCommits: 1Joined: 2013-08-18 + + *Nusaiba Al-KindiCommits: 1Joined: 2016-01-21 @@ -4400,11 +4425,11 @@ *robert BabiakCommits: 1Joined: 2015-03-25 - - *Rubén JáñezCommits: 1Joined: 2010-10-11 + + *Laureano G. LindeCommits: 1Joined: 2012-04-15 @@ -4414,11 +4439,11 @@ *GhasanCommits: 1Joined: 2015-11-09 - - *Johannes HaufCommits: 1Joined: 2015-12-31 + + *Jaime NavarroCommits: 1Joined: 2012-04-20 @@ -4428,95 +4453,95 @@ *vincentCommits: 1Joined: 2013-03-22 - - *Erik AuerswaldCommits: 1Joined: 2013-07-09 - - *Gökhan GurbetoğluCommits: 1Joined: 2016-06-06 - + +

*brinzingCommits: 1Joined: 2015-08-22

*Henning DiedlerCommits: 1Joined: 2013-11-02 - -

*Jun NOGATACommits: 1Joined: 2015-01-07

*Ota ChasákCommits: 1Joined: 2013-04-24 + +

*Jan BobisudCommits: 1Joined: 2013-04-29

*Ashish BanerjeeCommits: 1Joined: 2013-04-04 - -

*Alaa.BukhariCommits: 1Joined: 2013-07-04

*marstayCommits: 1Joined: 2015-10-18 + +

*Guillaume FillolCommits: 1Joined: 2011-01-29

*Andrew WestCommits: 1Joined: 2011-10-21 - -

*Antoine CœurCommits: 1Joined: 2015-06-11

*Dennis E. HamiltonCommits: 1Joined: 2013-01-19 + +

*Hugo Beauzée-LuyssenCommits: 1Joined: 2011-09-28

*Modestas RimkusCommits: 1Joined: 2011-11-21 - -

*Brian FraserCommits: 1Joined: 2013-09-03

*Michael HornCommits: 1Joined: 2015-03-21 + +

*pkoroau pkoroauCommits: 1Joined: 2012-12-20

*Audrey TangCommits: 1Joined: 2014-08-05 - -

*Krunoslav ŠebetićCommits: 1Joined: 2013-07-18

*Victor PortellaCommits: 1Joined: 2014-11-05 + +

*gdm.manmeetCommits: 1Joined: 2014-03-18

*Juergen SteinhilberCommits: 1Joined: 2012-03-05 - - + + *Mike SaundersCommits: 1Joined: 2016-06-20 + *Timothée IsnardCommits: 1Joined: 2015-10-11 + + *Juan A. Suarez RomeroCommits: 1Joined: 2014-12-15 @@ -4526,11 +4551,11 @@ *Daniel NaberCommits: 1Joined: 2012-05-09 - - *Martin RichardCommits: 1Joined: 2012-01-31 + + *Neil StalkerCommits: 1Joined: 2010-10-02 @@ -4540,11 +4565,11 @@ *Wolfgang SilbermayrCommits: 1Joined: 2010-10-21 - - *emahaldar/emCommits: 1Joined: 2016-06-13 + + *William BonnetCommits: 1Joined: 2015-12-05 @@ -4554,11 +4579,11 @@ *Sergey FukanchikCommits: 1Joined: 2015-09-17 - - *Andrew BranchCommits: 1Joined: 2013-02-20 + + *Honza MinarikCommits: 1Joined: 2013-04-03 @@ -4568,11 +4593,11 @@ *Raymond WellsCommits: 1Joined: 2013-09-02 - - *Matt PrattCommits: 1Joined: 2011-11-02 + + *Reto SchneiderCommits: 1Joined: 2015-11-20 @@ -4582,11 +4607,11 @@ *Dave RichardsCommits: 1Joined: 2012-08-22 - - *Alex GulyásCommits: 1Joined: 2014-04-27 + + *Yurii KolesnykovCommits: 1Joined: 2015-05-10 @@ -4596,11 +4621,11 @@ *Richard HughesCommits: 1Joined: 2013-10-01 - - *Nikita OfitserovCommits: 1Joined: 2011-01-10 + + *Linus BehrensCommits: 1Joined: 2015-04-23 @@ -4610,11 +4635,11 @@ *pavelCommits: 1Joined: 2010-12-10 - - *Nico WeyandCommits: 1Joined: 2012-09-02 + + *Kenneth AafløyCommits: 1Joined: 2012-01-11 @@ -4624,11 +4649,11 @@ *Danny RobertsCommits: 1Joined: 2011-02-18 - - *LesterCommits: 1Joined: 2012-10-23 + + *christianjuCommits: 1Joined: 2014-02-10 @@ -4638,11 +4663,11 @@ *Florian EffenbergerCommits: 1Joined: 2015-08-04 - - *Michal HorakCommits: 1Joined: 2014-04-21 + + *Lucian ConstantinCommits: 1Joined: 2013-03-24 @@ -4652,11 +4677,11 @@ *Yohei YukawaCommits: 1Joined: 2013-05-06 - - *Jakub GolebiewskiCommits: 1Joined: 2013-04-09 + + *PhyzerCommits: 1Joined: 2014-09-13 @@ -4666,18 +4691,19 @@ *Dolives BenoitCommits: 1Joined: 2011-07-04 - - *Damien ChambeCommits: 1Joined: 2014-06-15 + + *galbarnissanCommits: 1Joined: 2014-12-03 - +

Contributors to bundled templates @@ -4688,6 +4714,9 @@ + *Samuel MehrbrodtCommits: 6Joined: 2013-01-16 + + *Andras TimarCommits: 5Joined: 2011-04-25

@@ -4696,11 +4725,11 @@ *Olivier HallotCommits: 3Joined: 2012-03-26 +

+ *Caolán McNamaraCommits: 3Joined: 2011-01-07 - - *Michael MeeksCommits: 2Joined: 2010-12-08 @@ -4710,11 +4739,11 @@ *David TardonCommits: 2Joined: 2012-08-20 + + *Jun NOGATACommits: 1Joined: 2015-01-07 - - *Péter SzathmáryCommits: 1Joined: 2015-01-07 @@ -4724,13 +4753,10 @@ *Michael MuenchCommits: 1Joined: 2011-06-09 - - *Jacqueline RahemipourCommits: 1Joined: 2013-03-23 -

- *Samuel MehrbrodtCommits: 1Joined: 2013-01-16 + *Jacqueline RahemipourCommits: 1Joined: 2013-03-23

*Michael KovarikCommits: 1Joined: 2015-01-07 @@ -5282,7 +5308,7 @@

We do not distinguish between commits that were imported from the OOo code base and those who went directly into the LibreOffice code base as: - + a) it is technically not possible to distinguish between commits that go directly into the LibreOffice code base and commits that were merged in from the OpenOffice.org code base, and @@ -5292,7 +5318,7 @@ Do note that LibreOffice used to be divided into 20 git repositories. Pushing a change into all repositories will be counted as 20 commits as there is no way to distinguish this from 20 separate commits. Total contributions to the TDF Wiki - 2397 individuals contributed: + 2425 individuals contributed:

@@ -5300,44 +5326,44 @@

- Roczek, Dennis (6527) + Roczek, Dennis (6779)

- K-j (6109) + K-j (6186)

- Uroveits (4085) + Uroveits (4086)

- Pierre-yves samyn (3862) + Pierre-yves samyn (3891)

- Tryon, Robinson (3693) + Tryon, Robinson (3698)

- Goncharuk, Lera (3174) + Goncharuk, Lera (3244)

- Gautier, Sophie (2923) + Gautier, Sophie (2944)

- Kü (2883) + Kü (2898)

- Balland-Poirier, Laurent (2189) + Balland-Poirier, Laurent (2202)

- Bielefeld, Rainer (2075) + Jeanweber (2092)

- Jeanweber (2049) + Bielefeld, Rainer (2075)

- Effenberger, Florian (1602) + Effenberger, Florian (1604)

@@ -5348,7 +5374,7 @@ Marcpare (1382)

- João Mac-Cormick (1280) + João Mac-Cormick (1311)

Adailton (1203) @@ -5365,7 +5391,7 @@ Haas, Uwe (1095)

- GerryT (1041) + GerryT (1045)

@@ -5376,7 +5402,7 @@ Tom (926)

- Filmsi (900) + Filmsi (919)

Clement21.philippe (896) @@ -5384,27 +5410,27 @@

- Ostrovsky, David (893) + Ostrovsky, David (894)

Meeks, Michael (856)

- Naruoga (823) + Naruoga (841)

- Jayme Barrientos, Adolfo (810) + Jayme Barrientos, Adolfo (831)

- Hallot, Olivier (794) + Hallot, Olivier (804)

- Kompilainenn (749) + Kompilainenn (796)

- Enoki (740) + Enoki (763)

Teo91 (733) @@ -5418,10 +5444,10 @@ H-k (634)

- Nouws, Cor (612) + Nouws, Cor (614)

- Behrens, Thorsten (599) + Behrens, Thorsten (602)

@@ -5429,16 +5455,19 @@ Jmadero (596) + Iversen, Jan (591) + + Hazel (559) ChristophNoack (549) + + de Souza Lima, Paulo (546) - - Knorr, Stefan (521) @@ -5448,89 +5477,86 @@ Davidnelson (517) - - Elianedomingos (508) -

- Reisinger, Florian (490) + Elianedomingos (508)

- Mladek, Petr (450) + Reisinger, Florian (490)

- Rathke, Eike (443) + Rathke, Eike (452)

- Carrera, Sigrid (437) + Mladek, Petr (450)

- Rmfaile (436) + Carrera, Sigrid (437)

- Chris69 (419) + Rmfaile (436)

- Gecko (419) + Hibagonsan (421)

- Vajna, Miklos (419) + Vajna, Miklos (420)

- Holešovský, Jan (410) + Chris69 (419)

- Hibagonsan (409) + Gecko (419)

- Luz Coelho, Rogério (409) + Holešovský, Jan (410)

- Alexander Wilms (392) + Luz Coelho, Rogério (409)

- Yoshida, Kohei (389) + Alexander Wilms (392)

- McNamara, Caolán (385) + Yoshida, Kohei (389)

- Foral (384) + Foote, V Stuart (387)

- StefanW (379) + McNamara, Caolán (385)

- Raulpacheco (377) + Raulpacheco (385)

- Emanuel Marcatinco (374) + Foral (384)

- Foote, V Stuart (374) + StefanW (379)

- Lohmaier, Christian (371) + Lohmaier, Christian (377)

- AndrasTimar (347) + Emanuel Marcatinco (374)

- Philips, Yousuf (342) + Philips, Yousuf (349)

- Iversen, Jan (339) + AndrasTimar (347)

Thiebaud, Norbert (339) @@ -5538,7 +5564,7 @@

- Tardon, David (335) + Tardon, David (338)

Pruegsanusak, Korrawit (330) @@ -5558,15 +5584,18 @@ Heinzws (292)

- Emanuel A. Marcatinco B. (290) + Mohrhard, Markus (292)

- Librelegal (290) + Emanuel A. Marcatinco B. (290)

- Mohrhard, Markus (288) + Librelegal (290) + + + SteenRønnow (281)

RobertG (273) @@ -5574,11 +5603,11 @@ Christian, Erich (268) +

+ Helen russian (266) - - Tseng, Cheng-Chia (254) @@ -5588,11 +5617,11 @@ Elcico (249) + + Deemonizer (248) - - Adrianoafonso (245) @@ -5602,42 +5631,50 @@ Steve (237) + + Bosdonnat, Cédric (231) - -

Dippold, Bernhard (226)

+ Sam m (226) + + Almusaireae (219) + + + + Lillqvist, Tor (219) +

Kkwet38 (218)

- Lillqvist, Tor (216) + Beluga (215) - - Khirano (215) + +

- Gilvanvilarim (213) + Veracape (215)

- Beluga (207) + Gilvanvilarim (213)

Jbfaure (206) - - Andreschnabel (205) + + Hackert, Thomas (205) @@ -5645,27 +5682,27 @@ XsLiDian (203) - Sam m (201) + Henschel, Regina (201) - - Wheatbix (198) + +

- Erhardt (193) + Mike.saunders (195)

- Veracape (190) + Erhardt (193)

Schulz, Charles-H. (189) - - DmitryBowie (188) + + Tarnhold (187) @@ -5675,13 +5712,13 @@ Méixome, Antón (179) - - Alkurtass, Issa (178) + +

- Henschel, Regina (177) + Kerwyn (178)

Raw text (175) @@ -5689,67 +5726,67 @@ Madl, Tobias (175) -

- Fridrich (172) + +

Luizheli (172)

- Kerwyn (171) - - Furusho (169) - - - - Mike.saunders (168) -

Jiang, Yifan (168)

Bergmann, Stephan (166) + + + + Pitkänen, Harri (163) + Matuaki (163) - -

See (160)

Snelders, Rob (159) + +

- Pitkänen, Harri (157) + Pietro (150)

Vignoli, Italo (149) - -

Herzog, Christoph (149)

Gonzalez, Daniel (146) + +

Mipmap (144)

- Michelr (140) + Michelr (141) + + + Lorenzo (140) - - De Cuyper, Joren (138) + + Weissenbacher, Philipp (138) @@ -5759,10 +5796,13 @@ P.guimberteau (137) + + Norah (135) +

- Norah (135) + Óvári (134)

Rodriguez, Daniel Armando (133) @@ -5782,16 +5822,13 @@ Michel, Mathias (129)

- Óvári (129) - - Nik (127) - - Ikuya (123) + + Krackedpress (123) @@ -5801,11 +5838,11 @@ Lodahl (122) - - Trapezus (122) + + JohnSmith (120) @@ -5815,15 +5852,18 @@ Abe, Takeshi (119) - - Spaeth, Sebastian (115) + +

Markers (114)

+ Massimo.zaffaina (113) + + Vohe (113)

@@ -5849,13 +5889,13 @@ Schulthess, Franziska (107)

- Ki Drupadi (106) + Shunesburg69 (107)

- Bitsfritz (104) + Ki Drupadi (106)

- Shunesburg69 (104) + Bitsfritz (104)

@@ -5863,16 +5903,19 @@ Mantke, Andreas (103) + Deneb (101) + + JZA (101) Nemeth (100) + + Android272 (99) - - JeHa (99) @@ -5882,13 +5925,13 @@ AlanC (98) - - Kevin, Suo (锁琨珑) (95) - - Deneb (94) + Htietze (96) + + + Kevin, Suo (锁琨珑) (95)

Junmeguro (93) @@ -5896,11 +5939,11 @@ Andreasg (92) +

+ Llunak (92) - - MagicFab (92) @@ -5908,9 +5951,6 @@ Frombenny (90) - Htietze (90) - - Zeki (89) @@ -5936,7 +5976,7 @@ Klaibson (83)

- Nabet, Julien (82) + Nabet, Julien (83)

JamesWalker (81) @@ -5964,14 +6004,17 @@ Xosé (78)

- Albino (75) + Nogajun (76)

- K.K.Ashisuto (75) + Albino (75)

+ K.K.Ashisuto (75) + + Fišeras, Aurimas (74)

@@ -5980,12 +6023,12 @@ Lbalbalba (74) - - Nogajun (74) -

+ Dougvigliazzi (73) + + Castermans, Luc (72)

@@ -5994,11 +6037,11 @@ Aury88 (71) +

+ Evy (71) - - RalfHB (71) @@ -6008,11 +6051,11 @@ Jfnif (70) + + Jo7ueb (70) - - Baffclan (69) @@ -6022,11 +6065,11 @@ Freetank (68) + + Fábio Farias (68) - - Gghh (68) @@ -6036,11 +6079,11 @@ Donaldo (67) + + Ptux (67) - - Karbasion, Bersam (65) @@ -6050,9 +6093,6 @@ Oipila (64) - - Dougvigliazzi (63) -

@@ -6132,18 +6172,18 @@ Heben2 (53)

- Sunny2038 (53) + Horáček, Stanislav (53)

- Timur LOL (53) + Sunny2038 (53)

- Petrizzo (52) + Timur LOL (53)

- Horáček, Stanislav (52) + Petrizzo (52)

Vpanter (52) @@ -6199,18 +6239,18 @@ Buj Gelonch, Robert Antoni (47)

- Sk94 (46) + Quest-88 (46)

- Bfo (45) + Sk94 (46)

- Jung, Philippe (45) + Bfo (45)

- Quest-88 (45) + Jung, Philippe (45)

Bhorst (44) @@ -6227,16 +6267,19 @@ Gareth (43)

+ Ikh1 (43) + + Wilper, Simon (43) Bluedwarf (42) + + KAMI (42) - - Another sam (41) @@ -6246,11 +6289,11 @@ Joey (41) + + Pedlino (41) - - Raal (41) @@ -6260,56 +6303,64 @@ MDDN (40) + + + + Xystina (40) + Enervation (38) - -

Donkers, Winfried (38)

Alex Thurgood (37) + +

Cjenkins (37)

Köse, Gülşah (37) - -

Ivanslf (37)

Aragunde Pérez, Jacobo (37) + +

Kano (37)

Kinshuksunil (37) - -

Castle, John LeMoyne (37)

Pje335 (37) + +

RaducuG (37)

Danishka (36) - - + + Fanthomas (36) + Patheticcockroach (36) + + Sci citation (36) @@ -6319,11 +6370,11 @@ Liongold (35) - - Nora (35) + + Pingping111 (35) @@ -6333,68 +6384,68 @@ Stalker08 (35) - - Subramanian, Muthu (35) + +

Caco13 (34)

- Ikh1 (34) - - Mahfiaz (34) - -

Yanpas (34)

Corrius, Jesús (33) + +

Lmartinezh (33)

Mars (33) - -

Mateus.m.luna (33)

Pereriksson (33) + +

Rafi (33)

Shirahara (33) - -

Clio (32)

Daud (32) + +

Dryomov, Artur (32)

Xuacu (32) - -

Alexanderwerner (31)

+ Kosiorek, Bartosz (31) + + + + IvanM (31)

@@ -6403,11 +6454,11 @@ Njsg (30) -

- Sherlock, Chris (30) + + Tclovis (30) @@ -6417,11 +6468,11 @@ Cida.Coltro (29) - - Darbe (29) + + EdvaldoSCruz (29) @@ -6431,11 +6482,11 @@ Ptoye (29) - - RodolfoRG (29) + + Серж (29) @@ -6445,11 +6496,11 @@ Riemer, Philipp (28) - - Jihui choi (28) + + Vulcain (28) @@ -6459,6 +6510,9 @@ Bormant (27) + + Marcofilippozzi (27) +

@@ -6535,74 +6589,77 @@ Lboccia (25)

+ Manuel De Franceschi (25) + + Noelson (25) Freund, Matthias (25) + + + + Valdirbarbosa (25) + Winniemiel05 (25) - -

Gaianer (24)

Gérard24 (24) + +

Ksoviero (24)

Nik vr (24) - -

PaoloPelloni (24)

PeppinoLib (24) + +

Lenochod (23)

Olorin (23) - -

TaeWong (23)

Team One (23) + +

Tommy27 (23)

X1sc0 (23) - - - - Xystina (23) -

Aphaia (22)

Bellerophon (22) + + Balazs, Bjoern (22) - -

- Kosiorek, Bartosz (22) + Franklin (22)

HenryGR (22) @@ -6610,16 +6667,13 @@ JChimene (22) - - Olivier (22) -

- Toxitom (22) + Olivier (22)

- Valdirbarbosa (22) + Toxitom (22)

Youngman, Anthony W. (22) @@ -6653,11 +6707,14 @@ Necdetyucel (21)

- WalterPape (21) + Puster (21)

+ WalterPape (21) + + Wayra (21)

@@ -6666,11 +6723,11 @@ Grasip (20) +

+ HeinF (20) - - LLyaudet (20) @@ -6680,56 +6737,64 @@ Steve- - (20) + + + + Vmalep (20) + XMatence (20) - -

Yorick (20)

Zapata (20) + +

Elpapki (19)

Guateconexion (19) - -

Icobgr (19)

JaronBaron (19) + +

Jem (19)

Kentarch (19) - -

Thumperward (19)

Bubli (18) + + + + Clarice Vigliazzi (18) +

Jingtao, Yan (18)

Jstaerk (18) - - Narayan (18) + + Power, Noel (18) @@ -6739,10 +6804,13 @@ Schiavinatto (18) + + Sooth (18) +

- Sooth (18) + Teseu (18)

UriHerrera (18) @@ -6815,19 +6883,16 @@ Dhersh (16)

- Franklin (16) - - Houbsi (16) MoIshihara (16) - - Oweng (16) + + P.Guimberteau (16) @@ -6837,64 +6902,56 @@ Ristoi (16) - - - - Vmalep (16) - Vuhung (16) + +

APerson (15)

Andy98 (15) - -

Bertob (15)

Irmhild (15) + +

Khlood Elsayed (15)

Lefevre00 (15) - -

Luctur (15)

Miko (15) + +

Naudy (15)

Dominguez, Rafael (15) - -

Patriciasc (15)

Raul.malea (15) - - Teseu (15) - + + Thorogood, Tom (15) - - Ulf hamburg (15) @@ -6904,11 +6961,11 @@ Elrath (14) + + Fina (14) - - Guuml (14) @@ -6918,11 +6975,11 @@ Jstnlth (14) + + Lfernandocarvalho (14) - - Librosaurus (14) @@ -6932,11 +6989,11 @@ Kaganski, Mike (14) + + Rania (14) - - Reinsle (14) @@ -6946,113 +7003,121 @@ Tamiliam (14) + + Testnoda (14) - -

Thangamani-arun (14)

+ Vdragon (14) + + Vipin121 (14) + +

Akoscomp (13)

Alrt84 (13) - -

Alyssonware (13)

Beuss (13) + +

Cedric31 (13)

Gallaecio (13) - -

Glogowski, Jan-Marek (13)

Kadekilo (13) + +

Leomota (13)

Ljelly (13) - -

Luc (13)

Luked (13) + +

Mabbb (13)

Mihkel (13) - -

Mortense (13)

Odd123 (13) + +

Pete Boyd (13)

Royerjy (13) - -

S.Gecko (13)

Samtuke (13) + +

Sanyii (13)

Simplicity Instinct (13) - -

ThierryM (13)

Tnishiki (13) + +

Vivaelcelta (13)

Vkkodali (13) - -

Webmink (13)

+ Akki95 (12) + + + + And471 (12)

@@ -7061,11 +7126,11 @@ Bhaskar (12) -

- Cralin (12) + + Al-Otaibi, Faisal M. (12) @@ -7075,11 +7140,11 @@ Immanuelg (12) - - Godard, Laurent (12) + + Pcapeluto (12) @@ -7087,6 +7152,9 @@ Gupta, Rachit (12) + Möller, Sören — spelled Soeren Moeller in some patches (12) + + Staticsafe (12) @@ -7165,14 +7233,14 @@ Raruenrom, Samphan (11) - Möller, Sören — spelled Soeren Moeller in some patches (11) - - Sunk8 (11) Gomez, Andres (11) + + Vrlivre (11) +

@@ -7431,19 +7499,16 @@ Ausserirdischegesund (8)

- Clarice Vigliazzi (8) - - Cocofan (8) Cusiri (8) - - Dashohoxha (8) + + Dennisfrancis (8) @@ -7453,10 +7518,13 @@ Ed Eyles (8) + + Elacheche (8) +

- Elacheche (8) + Kłos, Szymon (8)

Horst (8) @@ -7473,16 +7541,19 @@ JR (8)

+ Jrsiqueira (8) + + Jslozier (8) Hoffimann Mendes, Júlio (8) + + Dywan, Christian (8) - - Kednar (8) @@ -7492,11 +7563,11 @@ Lee (8) + + Leigh, Jack (8) - - Leo.h.hildebrandt (8) @@ -7506,11 +7577,11 @@ Mrmox2 (8) + + NightMonkey (8) - - Paulo.tavares (8) @@ -7520,11 +7591,11 @@ Kant, Pranav (8) + + Ricardolau (8) - - Seomarketing221 (8) @@ -7534,11 +7605,11 @@ Tibbylickle (8) + + Troumad (8) - - Vbkaisetsu (8) @@ -7548,16 +7619,13 @@ Yakusha (8) - - Yostane (8) -

- Kabatsayev, Ruslan (7) + Yostane (8)

- Akki95 (7) + Kabatsayev, Ruslan (7)

Alberthuddle1 (7) @@ -7602,18 +7670,18 @@ Esbardu (7)

- Kłos, Szymon (7) + GuKK-Devel (7)

- GuKK-Devel (7) + Hunter, Kevin (7)

- Hunter, Kevin (7) + Ingotian (7)

- Ingotian (7) + Jlv (7)

Johnrudelee (7) @@ -8187,16 +8255,19 @@ Tranzistors (5)

+ Wasdin (5) + + Wt (5) AHi (4) + + Aaronkyle (4) - - Aas (4) @@ -8206,11 +8277,11 @@ Albertoeda (4) + + Nureña, Aldo Román (4) - - Alex1 (4) @@ -8220,11 +8291,11 @@ Alzoo (4) + + Amire80 (4) - - AndikaTriwidada (4) @@ -8234,11 +8305,11 @@ Andréb (4) + + Archlid (4) - - Arhitectul (4) @@ -8248,151 +8319,151 @@ Ayhanyalcinsoy (4) + + Azorpid (4) - -

Bardo (4)

+ Bearon (4) + + Bigbek (4) + +

Bk829849 (4)

Blender3dartist (4) - -

Bntser (4)

Br983288 (4) + +

Cam AW (4)

ConquerorsHaki (4) - -

Crankybot (4)

CyrilBeaussier (4) + +

Deivan (4)

Devil123 (4) - -

Dinni01 (4)

Dmerker (4) + +

DmitryRamones (4)

Doubi (4) - -

Dragon (4)

Robertson, Daniel (4) + +

Edmund.laugasson (4)

Eisaks (4) - -

Eric11 (4)

Erx700 (4) + +

Fmolinero (4)

Ftigeot (4) - -

GKFX (4)

Garrowolf (4) + +

Gmjs (4)

Hossein (4) - -

ImperfectlyInformed (4)

Jamesleader (4) + +

Jiehong (4)

Jjmeric (4) - -

JnRouvignac (4)

Jonata (4) + +

Jones (4)

Jooste (4) - -

Joriki (4)

- Jrsiqueira (4) - - Le Bigot, Jean-Tiare (4) + + Lethargilistic (4) - - Loren.rogers (4) @@ -8402,11 +8473,11 @@ MPascual (4) + + Rumianowski, Maciej (4) - - Marco c (4) @@ -8416,462 +8487,470 @@ Midimarcus (4) + + Mikedoherty ca (4) - - + + Rimkus, Modestas (4) +

Morgan greywolf (4)

Mortgage01 (4) + +

NGHLibreOffice (4)

Ogervasi (4) - -

Orson69 (4)

Oscar90210 (4) + +

Paolopoz (4)

Pegasus (4) - -

Pgassmann (4)

Pjacquod (4) + +

Prolog.guy (4)

Psao (4) - -

Qubit-test (4)

Rana121 (4) + +

Reyn100 (4)

Ricgal (4) - -

Rodhos (4)

Samson (4) + +

Sasha (4)

Sealview (4) - -

Smithjohne256 (4)

SpencerMann (4) + +

Sswales (4)

Stevenmw (4) - -

Surat (4)

Svante (4) + +

Tct (4)

Thetic (4) - -

Tk (4)

Txwikinger (4) + +

Ufas (4)

UlKu (4) - -

Umeshpatel (4)

Melenchuk, Vasily (4) + +

V., Artem (4)

Wcolen (4) - -

Wigglejimmy (4)

Wikiuser (4) + +

Williamjmorenor (4)

Wpeixoto (4) - -

Денис (4)

Aalam (3) + +

Adept (3)

Aexyn (3) - -

Alex.simoes (3)

Alexsfagundes (3) + +

Almorca (3)

Andrey Usov (3) - -

Antanasb (3)

Armin (3) + +

Armin W. (3)

Arthur Zennig (3) - -

Aurelien (3)

Baena (3) + +

Belkacem77 (3)

Bellerophon2 (3) - -

Benjwgarner (3)

Bholisingh (3) + +

Bindassanant (3)

Bodhi-Baum (3) - -

Bootingman (3)

Bos (3) + +

Brub (3)

Burdakov (3) - -

CIB.Mathias (3)

CallieCarney (3) + +

Castro (3)

Charu (3) - -

Chuchano2 (3)

Claudiosegovia (3) + +

Cmorgan (3)

Colokalle (3) - -

Cono (3)

D0ugparker (3) + +

DaSch (3)

DanShearer (3) - -

Beurle, Darcy (3)

Bankston, Daniel (3) + +

Dmtrs32 (3)

Donbrookman (3) - -

Dubyk (3)

EdgeE (3) + +

Eeha0120 (3)

Elproferoman (3) - -

ErSey (3)

Eric.ficheux (3) + +

Ericatamiris (3)

Estebanmonge (3) - -

Farukuzun (3)

Fraang (3) + +

Franzjakob (3)

Frob tea (3) - -

Fulldecent (3)

FunkyPenguin (3) + +

Gokcen (3)

Gurbetoğlu, Gökhan (3) - -

Gouchi (3)

Smaha, Guillaume (3) + +

Hansgerd.schneider (3)

Herrmarder (3) - -

IanL (3)

Imcon (3) + +

It-christian (3)

JDM (3) - -

Jamescarter (3)

Jennifer.park (3) + +

Murugan, Jesso Clarence (3)

Jhbn (3) - -

Joe312213 (3)

Johannes Rohr (3) + +

Joseroberto (3)

Juanpabl (3) - -

K Karthikeyan (3)

Kbiondi (3) + +

Kevinob (3)

Kfogel (3) - -

Khunshan (3)

Kisamar7 (3) + +

Kkrothapalli (3)

Kristof (3) - -

Kumartinkusingh08 (3)

LO Rob (3) + +

Lennoazevedo (3)

LewisCowles (3) - -

Libcub (3)

LucaCappelletti (3) + +

Hryniuk, Łukasz (3)

Luuk (3) - - + + Pinto, Marco A.G. (3) + Margott (3) + + Matteocam (3) @@ -8881,11 +8960,11 @@ Maxwell (3) - - Melike (3) + + Mhsmsantos (3) @@ -8895,11 +8974,11 @@ Neookano (3) - - Nicolas.abel (3) + + Niconil (3) @@ -8909,11 +8988,11 @@ Nloira (3) - - Noel Power (3) + + OOarthurOo (3) @@ -8923,11 +9002,11 @@ Ojeremyj (3) - - Oliverguenther (3) + + Oprea luci (3) @@ -8937,11 +9016,11 @@ van Oostrum, Piet (3) - - Prakash72 (3) + + Radha013 (3) @@ -8951,11 +9030,11 @@ Rajkumar0044 (3) - - Rapha.ksf (3) + + Rauloliverpaes (3) @@ -8965,11 +9044,11 @@ RebeccaHodgson (3) - - ReneEngelhard (3) + + Rick (3) @@ -8979,11 +9058,11 @@ Rosemary (3) - - Sander Klootwijk (3) + + Sangeeta (3) @@ -8993,11 +9072,11 @@ Satabin (3) - - Saurav111 (3) + + Sayt (3) @@ -9007,11 +9086,11 @@ Sergey Aka (3) - - Shelandy (3) + + Skinnerbird (3) @@ -9021,11 +9100,11 @@ Songchuan (3) - - Soued031 (3) + + StefanRing (3) @@ -9035,11 +9114,11 @@ Strugee (3) - - Suren (3) + + Sushils (3) @@ -9049,11 +9128,11 @@ TheWebalyst (3) - - Timsamoff (3) + + Tititou36 (3) @@ -9063,11 +9142,11 @@ Toki (3) - - Tomi Toivio (3) + + Toxifier (3) @@ -9077,6 +9156,9 @@ Tushantin (3) + + Ubap (3) +

@@ -10100,6 +10182,7 @@ Lliehu (2)

LovisaKessler (2) @@ -10172,9 +10255,6 @@

- Pinto, Marco A.G. (2) - - MargeretRiley (2)

@@ -10183,10 +10263,13 @@ MarillaMarsh7 (2) + + Marius (2) +

- Marius (2) + Markcooper (2)

Marric (2) @@ -10212,7 +10295,6 @@ MattieSchleinit (2)

Mazuritz (2) @@ -10246,16 +10328,19 @@ Mgiri (2)

+ Mhoes (2) + + Michaelx (2) Michel Gagnon (2) + + Michiel (2) - - MikeyZ (2) @@ -10265,11 +10350,11 @@ Mind4z (2) + + MinervaLuna8 (2) - - Mitcoes (2) @@ -10279,11 +10364,11 @@ Mklever (2) + + Lechner, Marco (2) - - Mloiseleur (2) @@ -10293,9 +10378,6 @@ Mnsoto (2) - - Rimkus, Modestas (2) -

@@ -10767,16 +10849,13 @@ Tux40000 (2)

- Ubap (2) - - Usik64 (2) - - ValessioBrito (2) + + VanHogan7 (2) @@ -10786,11 +10865,11 @@ VasylynaKendall (2) - - VerneDodd5 (2) + + VernitaDonley (2) @@ -10800,11 +10879,11 @@ VeronicaGrimes (2) - - ViolaPraed (2) + + Viper550 (2) @@ -10814,11 +10893,11 @@ VladimirBassett (2) - - VladimirPrince (2) + + VladislavA (2) @@ -10828,11 +10907,11 @@ VolodymyraGagnon (2) - - Vossman (2) + + WaclawaSavage (2) @@ -10842,11 +10921,11 @@ WallaceSolano (2) - - WarrenChristian (2) + + WashingtonOakley (2) @@ -10856,11 +10935,11 @@ WeronikaKeene (2) - - WikiImporter (2) + + WilhelminaEaton (2) @@ -10870,11 +10949,11 @@ Willsoncartlea (2) - - WincentyMorrison (2) + + Wirelessben (2) @@ -10884,11 +10963,11 @@ Wulei (2) - - Xoristzatziki (2) + + Yaw (2) @@ -10898,11 +10977,11 @@ ZoraWinkler1 (2) - - ريماس هيثم (2) + + 流星依旧 (2) @@ -10912,11 +10991,11 @@ A H (1) - - AaronPeterson (1) + + Abde.jarti99 (1) @@ -10926,11 +11005,11 @@ Absolute Garcinia (1) - - Acetfntfh (1) + + Kepenek, Ahmet Can (1) @@ -10940,11 +11019,11 @@ Adlard.matthew (1) - - Advicesformen (1) + + Aevora (1) @@ -10954,11 +11033,11 @@ Ainurshakirov (1) - - Ajaxfiore (1) + + Albrechtloh (1) @@ -10968,11 +11047,11 @@ Henrie, Alex (1) - - Alex38-68 (1) + + Alex80 (1) @@ -10982,11 +11061,11 @@ AlexP111223 (1) - - Alexandrevicenzi (1) + + Alexandri (1) @@ -10996,11 +11075,11 @@ Alexis Wilke (1) - - Alexnivan (1) + + Alexone (1) @@ -11010,11 +11089,11 @@ Ali (1) - - AlphonsDen (1) + + Alvaropg (1) @@ -11024,11 +11103,11 @@ Amacater (1) - - Andarilhobotto (1) + + AndreasEk (1) @@ -11038,11 +11117,11 @@ AndreasNeudecker (1) - - AndresZapata (1) + + Andrey.turkin (1) @@ -11052,11 +11131,11 @@ AngelaRusconi (1) - - AngelinChisolm (1) + + AniVar (1) @@ -11064,6 +11143,9 @@ Anjilajoli (1) + Anjilojilo (1) + + AntoineVe (1) @@ -11139,6 +11221,9 @@ + Attydknise (1) + + Tang, Audrey (1)

@@ -11147,11 +11232,11 @@ AundreaPqf (1) +

+ AvaPANumrgiabjx (1) - - Ayoooub (1) @@ -11161,11 +11246,11 @@ Bailiwick (1) + + Bailly02 (1) - - Bami (1) @@ -11175,11 +11260,11 @@ Barbara21F (1) + + BarryLovegrove (1) - - Vincent, Babu (1) @@ -11189,11 +11274,11 @@ BelindaApplerot (1) + + BernardHannafor (1) - - Bestdating (1) @@ -11203,11 +11288,11 @@ Beznogov (1) + + Bezzy (1) - - Bgloberman (1) @@ -11217,11 +11302,11 @@ BillyBurke (1) + + Biofool (1) - - Bjossir (1) @@ -11231,11 +11316,11 @@ Bkolaimeraq (1) + + BlakeGartrell (1) - - BlancheBelstead (1) @@ -11245,11 +11330,11 @@ Blandyna (1) + + Bobmarley (1) - - Bolo (1) @@ -11259,11 +11344,11 @@ Borowcm (1) + + Bortis (1) - - Sowden, Brad (1) @@ -11273,11 +11358,11 @@ BridgettC (1) + + Brinzing, Oliver (1) - - BroderiHolyman (1) @@ -11287,11 +11372,11 @@ BryceMoorhouse (1) + + Budo (1) - - Burcin (1) @@ -11301,11 +11386,11 @@ Burger.ga (1) + + Bzsolt (1) - - BáthoryPéter (1) @@ -11315,11 +11400,11 @@ CalebWgypcu (1) + + CamillaPena (1) - - Paul, Cameron (1) @@ -11329,11 +11414,11 @@ Capira (1) + + CarloASilva (1) - - Carlos (1) @@ -11343,11 +11428,11 @@ CarlotaF42 (1) + + Castarco (1) - - CedricQ73ktehvp (1) @@ -11357,11 +11442,11 @@ ChantalWalker (1) + + Charles12 (1) - - CharlesJenkins (1) @@ -11371,11 +11456,11 @@ Chmilblick (1) + + Beauzée-Luyssen, Hugo (1) - - Christoph.herzog (1) @@ -11385,11 +11470,11 @@ Ciampix (1) + + CiaraLockie (1) - - Ciriaco (1) @@ -11399,11 +11484,11 @@ Cleitongalvao (1) + + Clem (1) - - CletaValentino (1) @@ -11413,11 +11498,11 @@ Comcasthelp (1) + + Company (1) - - Cora17 (1) @@ -11427,11 +11512,11 @@ Cosmopolitan (1) + + Cpatrick08 (1) - - Cpinedar (1) @@ -11439,282 +11524,290 @@ Cpmipn (1) + Craigsbookclub (1) + + + + CrystleGravatt (1) Cœur, Antoine (1) - -

DaisieDavison (1)

DamionThorp (1) + +

Danichocolate (1)

Danielt998 (1) - -

Dar18proore (1)

Darcy0243gd (1) + +

DarylAlcantar (1)

DarylBoot (1) - -

Datesmen (1)

Dave (1) + +

Davidmichel (1)

DawnOgles (1) - -

Di Marco, Daniel (1)

De-jourdain (1) + +

DeShark (1)

DeannaQuaife (1) - -

DeanneKer (1)

Ray, Debarshi (1) + +

DebbraWingfield (1)

DeborahW18 (1) - -

DelbertChristie (1)

DelilahBock (1) + +

Denytracom (1)

Dezsiszabi (1) - -

Kis-Ádám, László (1)

Herde, Daniel (1) + +

Dhiren (1)

Kettner, Valentin (1) - -

Do Nhu Vy (1)

DocuFree (1) + +

Dominiko (1)

Dominuk (1) - -

Donadel (1)

DoreenDuell (1) + +

Douglasm (1)

Drizamanuber (1) - -

Drlandi (1)

Drtimwright (1) + +

Dusek (1)

Dxider (1) - -

EEFElishaqjbzjy (1)

EHGSammyevumvzq (1) + +

EarnestLamaro (1)

EarnestT57 (1) - -

Echada (1)

Edsonlead (1) + +

Edz (1)

Efcis (1) - -

Efegurkan (1)

Brill, Christoph (1) + +

Ehenryb (1)

ElahiMohammad (1) - -

EleanoreC (1)

Elisa0474wgwgq (1) + +

Elliot1415 (1)

ElmaWalcott (1) - -

Elshize (1)

Emyr (1) + +

Enesates (1)

Ennael (1) - -

Erasmo (1)

Erdemdemirkapi (1) + +

Eric (1)

ErickRijoJr (1) - -

Ernsttremel (1)

Roux, Elie (1) + +

Esben aaberg (1)

EstebanUD (1) - -

EstelaAWTxiu (1)

Evelyn3794 (1) + +

Evfool (1)

Factooor (1) - -

Falatooni (1)

Falcao (1) + +

Farhaf (1)

+ Farhank (1) + + FarzanehSarafraz (1) - - Faseeh1218 (1) + + FelipaSwan (1) @@ -11724,11 +11817,11 @@ Ferlodev (1) - - FerminAndrade (1) + + Feyza (1) @@ -11738,11 +11831,11 @@ Flirtwomens (1) - - Foobar (1) + + Fourdollars (1) @@ -11752,6 +11845,9 @@ Fred.th (1) + + Fredbenj24 (1) +

@@ -12072,11 +12168,14 @@ Chaffraix, Julien (1)

- JeanAmessdvaei (1) + Jean.fr (1)

+ JeanAmessdvaei (1) + + JeanMcPhillamy (1)

@@ -12085,11 +12184,11 @@ JeannetteGaertn (1) +

+ Jeeva03789 (1) - - JefferyMackenna (1) @@ -12099,11 +12198,11 @@ JerryShi (1) + + JessicaParker (1) - - Jessie (1) @@ -12113,11 +12212,11 @@ Bruhn, Jan-Henrik (1) + + Jimmyhaynbj (1) - - Jinocvla (1) @@ -12127,11 +12226,11 @@ Jj151515 (1) + + Jmarchn (1) - - Joachim (1) @@ -12141,11 +12240,11 @@ Joaofernando (1) + + JoelH (1) - - Johnny M (1) @@ -12155,11 +12254,11 @@ Johnsim (1) + + JolieZepps (1) - - JomarSilva (1) @@ -12169,11 +12268,11 @@ JonnaCainzabvwf (1) + + Wu, Haidong (1) - - JordanS (1) @@ -12183,11 +12282,11 @@ Jorgemendes (1) + + Joselaurian (1) - - Joshun (1) @@ -12197,11 +12296,11 @@ JoyLittler (1) + + Jp.santi (1) - - Jpl (1) @@ -12211,11 +12310,11 @@ JudeMcCafferty (1) + + Juergen (1) - - JuliannSnider (1) @@ -12225,11 +12324,11 @@ Picca, Juan (1) + + Jwcampbell (1) - - KSBMiranda (1) @@ -12239,11 +12338,11 @@ Kahnusman (1) + + Kakukaka (1) - - Kamran Mackey (1) @@ -12253,11 +12352,11 @@ KatjaG (1) + + Bhat, Kishor (1) - - KendraDunstan (1) @@ -12267,11 +12366,11 @@ Kenton3255 (1) + + KerrieMarino (1) - - KieraY22at (1) @@ -12281,11 +12380,11 @@ Koeleman (1) + + Kosmous (1) - - KourtneNester (1) @@ -12295,320 +12394,320 @@ Kumar, Thangavel (1) + + + + Kushavaha (1) + Kying (1) - -

LKPSharylptwsdo (1)

LMKemm (1) + +

LOFF (1)

LaPingvino (1) - -

Laskov (1)

LatoshaZnu (1) + +

LaunaEgpeeoc (1)

LaurelLangton (1) - -

LaverneNavarret (1)

LavinaVandermar (1) + +

LavonneSchindle (1)

Learner (1) - -

Learnwellwithme93 (1)

Librek (1) + +

Librestez54 (1)

Likoski (1) - -

LilianG44nxresx (1)

LillianaRad (1) + +

LillieNlowccx (1)

Lineinthesand (1) - -

Literacyglenys (1)

Liturgist (1) + +

Llalllal1 (1)

Scheidt, Heiko (1) - -

Lopp Rs (1)

Lorne (1) + +

Luca (1)

Lucas Filho (1) - -

LudieNutter (1)

Luiz Cláudio (1) + +

Luke (1)

LydiaDgxuysav (1) - -

LyndonCastiglio (1)

M.sacharewicz (1) + +

M1ndfr3ak (1)

MJW (1) - -

Maahicool (1)

Mabel7997eelu (1) + +

MadelineShort (1)

Maemst (1) - -

Magicienap (1)

Magmag (1) + +

Mahdiekrani (1)

Mahmudul (1) - -

Maliuta (1)

Manveru1986 (1) + +

MarcelProut (1)

MarcelaHeffron (1) - -

MarcoZ (1)

Biscaro, Marco (1) + +

MarcosHanson (1)

Marcosps (1) - -

MargaretaNorthc (1)

MargoBergman (1) + +

MarianaConnell (1)

Mariano Gaudix (1) - -

MarinaManess (1)

MarkWielaaard (1) + +

Markcoomes (1)

Markzog21 (1) - -

MarlonMarcum (1)

MarthaWaterman (1) + +

Marwan (1)

MaryellenW31 (1) - -

MarylynKu (1)

Masaki tamakoshi (1) + +

Massao (1)

Mastizada (1) - -

Matsuura (1)

MattTheGeek (1) + +

Campanelli, Matteo (1)

Matěj (1) - -

MavisReit (1)

Maxjf1 (1) + +

Bechler, Moritz (1)

Mdanrana0123 (1) - -

Doležel, Marek (1)

Megan44Dgxg (1) + +

Melikeyurtoglu (1)

MelisaBroughton (1) - -

MellisaIQU (1)

Menturi (1) + +

MeriMerideth (1)

Mete0r (1) - -

Mhaehnel (1)

Mhcrnl (1) + +

Mhenriday (1)

- Mhoes (1) - - - - MicaelaLaurantu (1)

@@ -12617,11 +12716,11 @@ Michka B (1) +

+ Midomidi2013 (1) - - MiguelKastner (1) @@ -12631,11 +12730,11 @@ Mikedorson (1) + + Mikolg (1) - - MilagroWilkerso (1) @@ -12645,11 +12744,11 @@ Miles (1) + + Minarja4 (1) - - Mirsad (1) @@ -12659,11 +12758,11 @@ Miurahr (1) + + Mixer (1) - - Mixstah (1) @@ -12673,11 +12772,11 @@ Moberg (1) + + ModestoZzc (1) - - Mohammedzalta (1) @@ -12687,11 +12786,11 @@ Monikayadav (1) + + Soini, Mox (1) - - Muhammadsufyanzainalabidin (1) @@ -12701,11 +12800,11 @@ Mw (1) + + MyraBlacklow (1) - - N3rd4i (1) @@ -12715,112 +12814,120 @@ NNe8Lx2gc (1) + + NannetteFreedma (1) - -

Nanotron (1)

+ Nattu (1) + + Ncaio (1) + +

Nedrichards (1)

NellieSMWX (1) - -

Neteler (1)

Nevanos (1) + +

Ngoswami (1)

Nickko (1) - -

NiklasHor (1)

Nilss (1) + +

Ngo, Minh (1)

Nnino2 (1) - -

Normac01 (1)

Northwestfirestarters (1) + +

Norty (1)

Notafish (1) - -

NotesTracker (1)

Nouiurm (1) + +

Norbert X (1)

Nurohman (1) - -

OBMLorraine (1)

Oclei (1) + +

Oig (1)

Oiouitt (1) - -

Okusi (1)

Olea (1) + +

OliverHoffnung (1)

+ Oliversmithusa3 (1) + + Omansmith (1) - - Omerta (1) + + Onurkucuk67 (1) @@ -12828,6 +12935,9 @@ Oosterkamp (1) + Opestawon (1) + + Ophelia2399 (1) @@ -12856,11 +12966,14 @@ PPRShaywuttpocn (1)

- Padenton (1) + Pal, Pawan (1)

+ Padenton (1) + + PamalaDorsch (1)

@@ -12869,11 +12982,11 @@ Papesky (1) +

+ Passerpunt (1) - - Pastim (1) @@ -12883,155 +12996,163 @@ PatriceMerrick (1) + + + + Paulmenzel (1) + Paulolima (1) - -

PearlFelton (1)

PearlMoyazw (1) + +

Pelambrera (1)

PenelopHewlett (1) - -

Nowee, Peter (1)

Vorel, Petr (1) + +

Pharmankur (1)

Phb.nbnet.nb.ca (1) - -

Pherjung (1)

PhilDur (1) + +

Philhart (1)

PhilipTimms (1) - -

Philippe43 (1)

PhillippBethea (1) + +

Phomes (1)

Paraiso, Joan (1) - -

Piero (1)

PieterDeBruijn (1) + +

Pietro.caballeri (1)

Pilavi (1) - -

Piratu (1)

Piternoize (1) + +

Pjotr (1)

Pkavinda (1) - -

Plastique (1)

Plastovicka (1) + +

Moscu, Alexandru (1)

Poonama (1) - -

PoppyHart (1)

PopularOutcast (1) + +

PorfiriMansergh (1)

PorterEncarnaci (1) - -

Carter, Travis (1)

Prosper (1) + +

Psauthor (1)

Psychicread531 (1) - -

QGBWinonajrdtpj (1)

Qiguo (1) + +

Qokoqoko (1)

Qtwallaert (1) - -

Qwe (1)

+ R425075 (1) + + + + RafaelaTrudel (1)

@@ -13040,11 +13161,11 @@ Rainy (1) -

- Ramonturner (1) + + Randolp1949 (1) @@ -13054,11 +13175,11 @@ Ratias (1) - - Rcampbelllaos (1) + + RebeccaToscano (1) @@ -13068,11 +13189,11 @@ Rettichschnidi (1) - - ReubenFow (1) + + RexRTEJnlzus (1) @@ -13082,11 +13203,11 @@ Rhoslyn (1) - - Richardprins (1) + + RickieHpejt (1) @@ -13096,11 +13217,11 @@ Rif (1) - - Ringlerloje (1) + + Rion (1) @@ -13110,11 +13231,11 @@ Rizobix (1) - - Rizwan1218 (1) + + Robert Wetzlmayr (1) @@ -13124,11 +13245,11 @@ Robineh (1) - - Robotdesoja (1) + + Robotdesojaa (1) @@ -13138,11 +13259,11 @@ RoccoAPIUqpuoia (1) - - Rockcows31 (1) + + Rockers (1) @@ -13152,11 +13273,11 @@ RogelioTrost (1) - - Deshmukh, Rohit (1) + + Rojerdesoja (1) @@ -13166,11 +13287,11 @@ Ron1 (1) - - Ronny (1) + + Roscoe5731 (1) @@ -13180,11 +13301,11 @@ Rpott (1) - - Rsedak (1) + + RuleAndLine (1) @@ -13194,11 +13315,11 @@ Ryho (1) - - ONODERA, Ryo (1) + + SallyMorales (1) @@ -13208,11 +13329,11 @@ Tygier, Sam (1) - - SamuelPoltpalin (1) + + Samuse (1) @@ -13222,11 +13343,11 @@ Sanipache (1) - - Saracans (1) + + Sbar1 (1) @@ -13236,11 +13357,11 @@ Scito (1) - - Scno (1) + + Sctenebro (1) @@ -13250,11 +13371,11 @@ Ak, Sedat (1) - - ShannaCockrell (1) + + ShaynaMan (1) @@ -13264,11 +13385,11 @@ SherrillGabriel (1) - - SherylMillingto (1) + + Shin en (1) @@ -13278,11 +13399,11 @@ Siegi (1) - - Silvestr (1) + + Simonbr (1) @@ -13292,6 +13413,9 @@ SiobhanLandale (1) + + Skierpage (1) +

@@ -13689,7 +13813,7 @@ 鄒延 (1) - +

diff -Nru libreoffice-5.1.4/reportdesign/source/core/inc/ReportUndoFactory.hxx libreoffice-5.1.5~rc2/reportdesign/source/core/inc/ReportUndoFactory.hxx --- libreoffice-5.1.4/reportdesign/source/core/inc/ReportUndoFactory.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/reportdesign/source/core/inc/ReportUndoFactory.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -59,7 +59,7 @@ virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) override; // page - virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage) override; + virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage, bool bSoleOwnerOfFillBitmapProps = true) override; virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage) override; virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage) override; virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) override; diff -Nru libreoffice-5.1.4/reportdesign/source/core/sdr/ReportUndoFactory.cxx libreoffice-5.1.5~rc2/reportdesign/source/core/sdr/ReportUndoFactory.cxx --- libreoffice-5.1.4/reportdesign/source/core/sdr/ReportUndoFactory.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/reportdesign/source/core/sdr/ReportUndoFactory.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -133,9 +133,9 @@ } // page -SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) +SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage, bool bSoleOwnerOfFillBitmapProps) { - return m_pUndoFactory->CreateUndoDeletePage( rPage ); + return m_pUndoFactory->CreateUndoDeletePage(rPage, bSoleOwnerOfFillBitmapProps); } SdrUndoAction* OReportUndoFactory::CreateUndoNewPage(SdrPage& rPage) diff -Nru libreoffice-5.1.4/reportdesign/source/ui/dlg/CondFormat.cxx libreoffice-5.1.5~rc2/reportdesign/source/ui/dlg/CondFormat.cxx --- libreoffice-5.1.4/reportdesign/source/ui/dlg/CondFormat.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/reportdesign/source/ui/dlg/CondFormat.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -500,7 +500,10 @@ } case MouseNotifyEvent::GETFOCUS: { - if ( m_bDeletingCondition ) + if (m_bDeletingCondition) + break; + + if (!m_pConditionPlayground) //e.g. during dispose break; const vcl::Window* pGetFocusWindow( _rNEvt.GetWindow() ); diff -Nru libreoffice-5.1.4/reportdesign/source/ui/dlg/Condition.cxx libreoffice-5.1.5~rc2/reportdesign/source/ui/dlg/Condition.cxx --- libreoffice-5.1.4/reportdesign/source/ui/dlg/Condition.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/reportdesign/source/ui/dlg/Condition.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -329,6 +329,7 @@ m_pAddCondition.clear(); m_pRemoveCondition.clear(); m_pColorFloat.disposeAndClear(); + disposeBuilder(); VclHBox::dispose(); } diff -Nru libreoffice-5.1.4/Repository.mk libreoffice-5.1.5~rc2/Repository.mk --- libreoffice-5.1.4/Repository.mk 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/Repository.mk 2016-07-26 21:17:25.000000000 +0000 @@ -820,6 +820,7 @@ vcl_opengl_blacklist \ ) \ $(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \ + $(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \ )) $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\ diff -Nru libreoffice-5.1.4/sc/inc/column.hxx libreoffice-5.1.5~rc2/sc/inc/column.hxx --- libreoffice-5.1.4/sc/inc/column.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/inc/column.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -527,8 +527,8 @@ void StartListening( SvtListener& rLst, SCROW nRow ); void EndListening( SvtListener& rLst, SCROW nRow ); - void StartListening( sc::StartListeningContext& rCxt, SCROW nRow, SvtListener& rListener ); - void EndListening( sc::EndListeningContext& rCxt, SCROW nRow, SvtListener& rListener ); + void StartListening( sc::StartListeningContext& rCxt, const ScAddress& rAddress, SvtListener& rListener ); + void EndListening( sc::EndListeningContext& rCxt, const ScAddress& rAddress, SvtListener& rListener ); void StartListeners( sc::StartListeningContext& rCxt, bool bAll ); void SetDirtyIfPostponed(); void BroadcastRecalcOnRefMove(); diff -Nru libreoffice-5.1.4/sc/inc/document.hxx libreoffice-5.1.5~rc2/sc/inc/document.hxx --- libreoffice-5.1.4/sc/inc/document.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/inc/document.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -290,7 +290,7 @@ rtl::Reference xPoolHelper; std::shared_ptr mpCellStringPool; - std::unique_ptr mpFormulaGroupCxt; + std::shared_ptr mpFormulaGroupCxt; mutable std::unique_ptr mpDocLinkMgr; ScCalcConfig maCalcConfig; @@ -924,7 +924,7 @@ svl::SharedString GetSharedString( const ScAddress& rPos ) const; - sc::FormulaGroupContext& GetFormulaGroupContext(); + std::shared_ptr& GetFormulaGroupContext(); SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rString ); sal_uInt16 GetStringForFormula( const ScAddress& rPos, OUString& rString ); diff -Nru libreoffice-5.1.4/sc/inc/table.hxx libreoffice-5.1.5~rc2/sc/inc/table.hxx --- libreoffice-5.1.4/sc/inc/table.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/inc/table.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -1078,8 +1078,8 @@ void StartListening( const ScAddress& rAddress, SvtListener* pListener ); void EndListening( const ScAddress& rAddress, SvtListener* pListener ); - void StartListening( sc::StartListeningContext& rCxt, SCCOL nCol, SCROW nRow, SvtListener& rListener ); - void EndListening( sc::EndListeningContext& rCxt, SCCOL nCol, SCROW nRow, SvtListener& rListener ); + void StartListening( sc::StartListeningContext& rCxt, const ScAddress& rAddress, SvtListener& rListener ); + void EndListening( sc::EndListeningContext& rCxt, const ScAddress& rAddress, SvtListener& rListener ); void AttachFormulaCells( sc::StartListeningContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); void DetachFormulaCells( sc::EndListeningContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); diff -Nru libreoffice-5.1.4/sc/Module_sc.mk libreoffice-5.1.5~rc2/sc/Module_sc.mk --- libreoffice-5.1.4/sc/Module_sc.mk 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/Module_sc.mk 2016-07-26 21:17:25.000000000 +0000 @@ -15,6 +15,7 @@ Library_scd \ Library_scfilt \ $(call gb_Helper_optional,DESKTOP,Library_scui) \ + $(call gb_Helper_optional,OPENCL,Package_opencl) \ )) $(eval $(call gb_Module_add_l10n_targets,sc,\ diff -Nru libreoffice-5.1.4/sc/Package_opencl.mk libreoffice-5.1.5~rc2/sc/Package_opencl.mk --- libreoffice-5.1.4/sc/Package_opencl.mk 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/Package_opencl.mk 2016-07-26 21:17:25.000000000 +0000 @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,sc_opencl_runtimetest,$(SRCDIR)/sc/source/core/opencl)) + +$(eval $(call gb_Package_add_files,sc_opencl_runtimetest,$(LIBO_ETC_FOLDER)/opencl,\ + cl-test.ods \ +)) + +# vim: set noet sw=4 ts=4: diff -Nru libreoffice-5.1.4/sc/qa/unit/ucalc.cxx libreoffice-5.1.5~rc2/sc/qa/unit/ucalc.cxx --- libreoffice-5.1.4/sc/qa/unit/ucalc.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/qa/unit/ucalc.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -5259,6 +5259,12 @@ CPPUNIT_ASSERT(pNote); CPPUNIT_ASSERT_EQUAL(OUString("Note2"), pNote->GetText()); + // Test that GetNotesInRange includes the end of its range + // and so can find the note + std::vector aNotes; + m_pDoc->GetNotesInRange(ScRange(1,7,0), aNotes); + CPPUNIT_ASSERT_EQUAL(size_t(1), aNotes.size()); + m_pDoc->DeleteTab(0); } diff -Nru libreoffice-5.1.4/sc/source/core/data/column2.cxx libreoffice-5.1.5~rc2/sc/source/core/data/column2.cxx --- libreoffice-5.1.4/sc/source/core/data/column2.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/column2.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -2326,7 +2326,7 @@ rCxt.ensureStrArray(rColArray, nArrayLen); for (; itData != itDataEnd; ++itData, ++nPos) - (*rColArray.mpStrArray)[nPos] = itData->getDataIgnoreCase(); + (*rColArray.mpStrArray)[nPos] = itData->getData(); } break; case sc::element_type_edittext: @@ -2338,7 +2338,7 @@ for (; itData != itDataEnd; ++itData, ++nPos) { OUString aStr = ScEditUtil::GetString(**itData, pDoc); - (*rColArray.mpStrArray)[nPos] = rPool.intern(aStr).getDataIgnoreCase(); + (*rColArray.mpStrArray)[nPos] = rPool.intern(aStr).getData(); } } break; @@ -2439,7 +2439,7 @@ sc::string_block::iterator itEnd = it; std::advance(itEnd, nLen); for (; it != itEnd; ++it, ++itArray) - *itArray = it->getDataIgnoreCase(); + *itArray = it->getData(); } break; case sc::element_type_edittext: @@ -2453,7 +2453,7 @@ { EditTextObject* pText = *it; OUString aStr = ScEditUtil::GetString(*pText, &rDoc); - *itArray = rPool.intern(aStr).getDataIgnoreCase(); + *itArray = rPool.intern(aStr).getData(); } } break; @@ -2550,7 +2550,7 @@ return formula::VectorRefArray(formula::VectorRefArray::Invalid); // See if the requested range is already cached. - sc::FormulaGroupContext& rCxt = pDocument->GetFormulaGroupContext(); + sc::FormulaGroupContext& rCxt = *(pDocument->GetFormulaGroupContext()); sc::FormulaGroupContext::ColArray* pColArray = rCxt.getCachedColArray(nTab, nCol, nRow2+1); if (pColArray) { @@ -2988,29 +2988,29 @@ maBroadcasters.set_empty(nRow, nRow); } -void ScColumn::StartListening( sc::StartListeningContext& rCxt, SCROW nRow, SvtListener& rLst ) +void ScColumn::StartListening( sc::StartListeningContext& rCxt, const ScAddress& rAddress, SvtListener& rLst ) { - if (!ValidRow(nRow)) + if (!ValidRow(rAddress.Row())) return; - sc::ColumnBlockPosition* p = rCxt.getBlockPosition(nTab, nCol); + sc::ColumnBlockPosition* p = rCxt.getBlockPosition(rAddress.Tab(), rAddress.Col()); if (!p) return; sc::BroadcasterStoreType::iterator& it = p->miBroadcasterPos; - std::pair aPos = maBroadcasters.position(it, nRow); + std::pair aPos = maBroadcasters.position(it, rAddress.Row()); it = aPos.first; // store the block position for next iteration. - startListening(maBroadcasters, it, aPos.second, nRow, rLst); + startListening(maBroadcasters, it, aPos.second, rAddress.Row(), rLst); } -void ScColumn::EndListening( sc::EndListeningContext& rCxt, SCROW nRow, SvtListener& rListener ) +void ScColumn::EndListening( sc::EndListeningContext& rCxt, const ScAddress& rAddress, SvtListener& rListener ) { - sc::ColumnBlockPosition* p = rCxt.getBlockPosition(nTab, nCol); + sc::ColumnBlockPosition* p = rCxt.getBlockPosition(rAddress.Tab(), rAddress.Col()); if (!p) return; sc::BroadcasterStoreType::iterator& it = p->miBroadcasterPos; - std::pair aPos = maBroadcasters.position(it, nRow); + std::pair aPos = maBroadcasters.position(it, rAddress.Row()); it = aPos.first; // store the block position for next iteration. if (it->type != sc::element_type_broadcaster) return; @@ -3021,7 +3021,7 @@ rListener.EndListening(*pBC); if (!pBC->HasListeners()) // There is no more listeners for this cell. Add it to the purge list for later purging. - rCxt.addEmptyBroadcasterPosition(nTab, nCol, nRow); + rCxt.addEmptyBroadcasterPosition(rAddress.Tab(), rAddress.Col(), rAddress.Row()); } namespace { diff -Nru libreoffice-5.1.4/sc/source/core/data/column4.cxx libreoffice-5.1.5~rc2/sc/source/core/data/column4.cxx --- libreoffice-5.1.4/sc/source/core/data/column4.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/column4.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -700,6 +700,7 @@ std::pair aEndPos = maCellNotes.position(nEndRow); sc::CellNoteStoreType::const_iterator itEnd = aEndPos.first; + std::advance(itEnd, 1); std::for_each(it, itEnd, NoteEntryCollector(rNotes, nTab, nCol, nStartRow, nEndRow)); } diff -Nru libreoffice-5.1.4/sc/source/core/data/column.cxx libreoffice-5.1.5~rc2/sc/source/core/data/column.cxx --- libreoffice-5.1.4/sc/source/core/data/column.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/column.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -1208,6 +1208,10 @@ ScPostIt* pNote = maCellNotes.get(nSrcRow); if (pNote) { + pNote = pNote->Clone(ScAddress(nCol, nSrcRow, nTab), + rDestCol.GetDoc(), + ScAddress(rDestCol.nCol, nDestRow, rDestCol.nTab), + false); rDestCol.maCellNotes.set(nDestRow, pNote); pNote->UpdateCaptionPos(ScAddress(rDestCol.nCol, nDestRow, rDestCol.nTab)); } diff -Nru libreoffice-5.1.4/sc/source/core/data/documen2.cxx libreoffice-5.1.5~rc2/sc/source/core/data/documen2.cxx --- libreoffice-5.1.4/sc/source/core/data/documen2.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/documen2.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -808,7 +808,6 @@ sc::AutoCalcSwitch aACSwitch(*this, false); sc::RefUpdateInsertTabContext aCxt( *this, nNewPos, 1); - sc::StartListeningContext aSLCxt(*this); if (bValid) { @@ -855,6 +854,7 @@ if (*it && it != maTabs.begin()+nOldPos && it != maTabs.begin() + nNewPos) (*it)->UpdateCompile(); SetNoListening( false ); + sc::StartListeningContext aSLCxt(*this); for (TableContainer::iterator it = maTabs.begin(); it != maTabs.end(); ++it) if (*it && it != maTabs.begin()+nOldPos && it != maTabs.begin()+nNewPos) (*it)->StartListeners(aSLCxt, true); @@ -891,6 +891,7 @@ maTabs[nOldPos]->UpdateCompile(); maTabs[nNewPos]->UpdateCompile( true ); // maybe already compiled in Clone, but used names need recompilation SetNoListening( false ); + sc::StartListeningContext aSLCxt(*this); maTabs[nOldPos]->StartListeners(aSLCxt, true); maTabs[nNewPos]->StartListeners(aSLCxt, true); diff -Nru libreoffice-5.1.4/sc/source/core/data/documen7.cxx libreoffice-5.1.5~rc2/sc/source/core/data/documen7.cxx --- libreoffice-5.1.4/sc/source/core/data/documen7.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/documen7.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -313,7 +313,7 @@ if (!pTab) return; - pTab->StartListening(rCxt, rPos.Col(), rPos.Row(), rListener); + pTab->StartListening(rCxt, rPos, rListener); } void ScDocument::EndListeningCell( @@ -323,7 +323,7 @@ if (!pTab) return; - pTab->EndListening(rCxt, rPos.Col(), rPos.Row(), rListener); + pTab->EndListening(rCxt, rPos, rListener); } void ScDocument::EndListeningFormulaCells( std::vector& rCells ) diff -Nru libreoffice-5.1.4/sc/source/core/data/document.cxx libreoffice-5.1.5~rc2/sc/source/core/data/document.cxx --- libreoffice-5.1.4/sc/source/core/data/document.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/document.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -3442,12 +3442,12 @@ return maTabs[rPos.Tab()]->GetSharedString(rPos.Col(), rPos.Row()); } -sc::FormulaGroupContext& ScDocument::GetFormulaGroupContext() +std::shared_ptr& ScDocument::GetFormulaGroupContext() { if (!mpFormulaGroupCxt) mpFormulaGroupCxt.reset(new sc::FormulaGroupContext); - return *mpFormulaGroupCxt; + return mpFormulaGroupCxt; } void ScDocument::GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rString ) diff -Nru libreoffice-5.1.4/sc/source/core/data/dpresfilter.cxx libreoffice-5.1.5~rc2/sc/source/core/data/dpresfilter.cxx --- libreoffice-5.1.4/sc/source/core/data/dpresfilter.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/dpresfilter.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -219,6 +219,24 @@ pMember = itMem->second; } + if (pMember->maValues.empty()) + { + // Descend into dimension member children while there is no result and + // exactly one dimension field with exactly one member item, for which + // no further constraint (filter) has to match. + const MemberNode* pFieldMember = pMember; + while (pFieldMember->maChildDimensions.size() == 1) + { + DimensionsType::const_iterator itDim( pFieldMember->maChildDimensions.begin()); + const DimensionNode* pDim = itDim->second; + if (pDim->maChildMembers.size() != 1) + break; // while + pFieldMember = pDim->maChildMembers.begin()->second; + if (!pFieldMember->maValues.empty()) + return &pFieldMember->maValues; + } + } + return &pMember->maValues; } diff -Nru libreoffice-5.1.4/sc/source/core/data/drwlayer.cxx libreoffice-5.1.5~rc2/sc/source/core/data/drwlayer.cxx --- libreoffice-5.1.4/sc/source/core/data/drwlayer.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/drwlayer.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -411,7 +411,7 @@ if (bRecording) { SdrPage* pPage = GetPage(static_cast(nTab)); - AddCalcUndo(new SdrUndoDelPage(*pPage)); // Undo-Action becomes the page owner + AddCalcUndo(new SdrUndoDelPage(*pPage, true)); // Undo-Action becomes the page owner RemovePage( static_cast(nTab) ); // just deliver, not deleting } else diff -Nru libreoffice-5.1.4/sc/source/core/data/formulacell.cxx libreoffice-5.1.5~rc2/sc/source/core/data/formulacell.cxx --- libreoffice-5.1.4/sc/source/core/data/formulacell.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/formulacell.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -4039,9 +4039,8 @@ #ifdef WNT // Heuristic: Certain old low-end OpenCL implementations don't // work for us with too large group lengths. 1000 was determined - // empirically to be a good compromise. Looking at the preferred - // float vector width seems to be a way to detect these devices. - if (opencl::gpuEnv.mnPreferredVectorWidthFloat == 4) + // empirically to be a good compromise. + if (opencl::gpuEnv.mbNeedsTDRAvoidance) nMaxGroupLength = 1000; #endif diff -Nru libreoffice-5.1.4/sc/source/core/data/grouptokenconverter.cxx libreoffice-5.1.5~rc2/sc/source/core/data/grouptokenconverter.cxx --- libreoffice-5.1.4/sc/source/core/data/grouptokenconverter.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/grouptokenconverter.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -135,6 +135,15 @@ formula::SingleVectorRefToken aTok(aArray, nLen, nTrimLen); mrGroupTokens.AddToken(aTok); + + if (nTrimLen && !mxFormulaGroupContext) + { + //tdf#98880 if the SingleVectorRefToken relies on the + //underlying storage provided by the Document + //FormulaGroupContext, take a reference to it here to + //ensure that backing storage exists for our lifetime + mxFormulaGroupContext = mrDoc.GetFormulaGroupContext(); + } } else { @@ -210,6 +219,15 @@ formula::DoubleVectorRefToken aTok(aArrays, nRequestedLength, nArrayLength, nRefRowSize, bAbsFirst, bAbsLast); mrGroupTokens.AddToken(aTok); + + if (nArrayLength && !aArrays.empty() && !mxFormulaGroupContext) + { + //tdf#98880 if the DoubleVectorRefToken relies on the + //underlying storage provided by the Document + //FormulaGroupContext, take a reference to it here to + //ensure that backing storage exists for our lifetime + mxFormulaGroupContext = mrDoc.GetFormulaGroupContext(); + } } break; case svIndex: diff -Nru libreoffice-5.1.4/sc/source/core/data/table5.cxx libreoffice-5.1.5~rc2/sc/source/core/data/table5.cxx --- libreoffice-5.1.4/sc/source/core/data/table5.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/data/table5.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -1103,20 +1103,20 @@ aCol[rAddress.Col()].EndListening( *pListener, rAddress.Row() ); } -void ScTable::StartListening( sc::StartListeningContext& rCxt, SCCOL nCol, SCROW nRow, SvtListener& rListener ) +void ScTable::StartListening( sc::StartListeningContext& rCxt, const ScAddress& rAddress, SvtListener& rListener ) { - if (!ValidCol(nCol)) + if (!ValidCol(rAddress.Col())) return; - aCol[nCol].StartListening(rCxt, nRow, rListener); + aCol[rAddress.Col()].StartListening(rCxt, rAddress, rListener); } -void ScTable::EndListening( sc::EndListeningContext& rCxt, SCCOL nCol, SCROW nRow, SvtListener& rListener ) +void ScTable::EndListening( sc::EndListeningContext& rCxt, const ScAddress& rAddress, SvtListener& rListener ) { - if (!ValidCol(nCol)) + if (!ValidCol(rAddress.Col())) return; - aCol[nCol].EndListening(rCxt, nRow, rListener); + aCol[rAddress.Col()].EndListening(rCxt, rAddress, rListener); } void ScTable::SetPageStyle( const OUString& rName ) diff -Nru libreoffice-5.1.4/sc/source/core/inc/grouptokenconverter.hxx libreoffice-5.1.5~rc2/sc/source/core/inc/grouptokenconverter.hxx --- libreoffice-5.1.4/sc/source/core/inc/grouptokenconverter.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/inc/grouptokenconverter.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -20,6 +20,7 @@ { ScTokenArray& mrGroupTokens; ScDocument& mrDoc; + std::shared_ptr mxFormulaGroupContext; ScFormulaCell& mrCell; const ScAddress& mrPos; Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/sc/source/core/opencl/cl-test.ods and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/sc/source/core/opencl/cl-test.ods differ diff -Nru libreoffice-5.1.4/sc/source/core/opencl/formulagroupcl.cxx libreoffice-5.1.5~rc2/sc/source/core/opencl/formulagroupcl.cxx --- libreoffice-5.1.4/sc/source/core/opencl/formulagroupcl.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/opencl/formulagroupcl.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -2630,6 +2630,19 @@ const formula::DoubleVectorRefToken* pDVR = static_cast(pChild); + // FIXME: The Right Thing to do would be to compare the accumulated kernel + // parameter size against the CL_DEVICE_MAX_PARAMETER_SIZE of the device, but + // let's just do this sanity check for now. The kernel compilation will + // hopefully fail anyway if the size of parameters exceeds the limit and this + // sanity check is just to make us bail out a bit earlier. + + // The number 50 comes from the fact that the minimum size of + // CL_DEVICE_MAX_PARAMETER_SIZE is 256, which for 32-bit code probably means 64 + // of them. Round down a bit. + + if (pDVR->GetArrays().size() > 50) + throw UnhandledToken(pChild, ("Kernel would have ridiculously many parameters (" + std::to_string(2 + pDVR->GetArrays().size()) + ")").c_str()); + for (size_t j = 0; j < pDVR->GetArrays().size(); ++j) { SAL_INFO("sc.opencl", "i=" << i << " j=" << j << @@ -4044,6 +4057,7 @@ catch (...) { SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled compiler error"); + ::opencl::kernelFailures++; return nullptr; } return pDynamicKernel; @@ -4154,21 +4168,25 @@ catch (const UnhandledToken& ut) { SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled token: " << ut.mMessage << " at " << ut.mFile << ":" << ut.mLineNumber); + ::opencl::kernelFailures++; return CLInterpreterResult(); } catch (const OpenCLError& oce) { SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error from " << oce.mFunction << ": " << ::opencl::errorString(oce.mError) << " at " << oce.mFile << ":" << oce.mLineNumber); + ::opencl::kernelFailures++; return CLInterpreterResult(); } catch (const Unhandled& uh) { SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled case at " << uh.mFile << ":" << uh.mLineNumber); + ::opencl::kernelFailures++; return CLInterpreterResult(); } catch (...) { SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled compiler error"); + ::opencl::kernelFailures++; return CLInterpreterResult(); } diff -Nru libreoffice-5.1.4/sc/source/core/opencl/opinlinefun_statistical.cxx libreoffice-5.1.5~rc2/sc/source/core/opencl/opinlinefun_statistical.cxx --- libreoffice-5.1.4/sc/source/core/opencl/opinlinefun_statistical.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/opencl/opinlinefun_statistical.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -1361,181 +1361,6 @@ " else\n" " return nVal;\n" "}\n"; -std::string lcl_Erfc0600Decl= -"void lcl_Erfc0600( double x, double *fVal );\n"; -std::string lcl_Erfc0600 = -"void lcl_Erfc0600( double x, double *fVal )\n" -"{\n" -" double fPSum = 0.0;\n" -" double fQSum = 0.0;\n" -" double fXPow = 1.0;\n" -" double *pn;\n" -" double *qn;\n" -" if ( x < 2.2 )\n" -" {\n" -" double pn22[] = { \n" -" 9.99999992049799098E-1, \n" -" 1.33154163936765307, \n" -" 8.78115804155881782E-1, \n" -" 3.31899559578213215E-1, \n" -" 7.14193832506776067E-2, \n" -" 7.06940843763253131E-3 \n" -" }; \n" -" double qn22[] = { \n" -" 1.00000000000000000, \n" -" 2.45992070144245533, \n" -" 2.65383972869775752, \n" -" 1.61876655543871376, \n" -" 5.94651311286481502E-1, \n" -" 1.26579413030177940E-1, \n" -" 1.25304936549413393E-2 \n" -" }; \n" -" pn = pn22; \n" -" qn = qn22; \n" -" } \n" -" else \n" -" \n" -" { \n" -" double pn60[] = {\n" -" 9.99921140009714409E-1,\n" -" 1.62356584489366647,\n" -" 1.26739901455873222,\n" -" 5.81528574177741135E-1,\n" -" 1.57289620742838702E-1,\n" -" 2.25716982919217555E-2\n" -" };\n" -" double qn60[] = {\n" -" 1.00000000000000000,\n" -" 2.75143870676376208,\n" -" 3.37367334657284535,\n" -" 2.38574194785344389,\n" -" 1.05074004614827206,\n" -" 2.78788439273628983E-1,\n" -" 4.00072964526861362E-2\n" -" };\n" -" pn = pn60;\n" -" qn = qn60;\n" -" }\n" -" for ( unsigned int i = 0; i < 6; ++i ) \n" -" {\n" -" fPSum += pn[i]*fXPow;\n" -" fQSum += qn[i]*fXPow;\n" -" fXPow *= x;\n" -" }\n" -" fQSum += qn[6]*fXPow;\n" -" *fVal = exp((-1.0)*x*x)*fPSum*pow(fQSum, -1.0);\n" -" }\n"; -std::string lcl_Erfc2654Decl= -"void lcl_Erfc2654( double x, double *fVal );\n"; -std::string lcl_Erfc2654 = -"void lcl_Erfc2654( double x, double *fVal )\n" -"{\n" -" double pn[] = {\n" -" 5.64189583547756078E-1,\n" -" 8.80253746105525775,\n" -" 3.84683103716117320E1,\n" -" 4.77209965874436377E1,\n" -" 8.08040729052301677\n" -" };\n" -" double qn[] = {\n" -" 1.00000000000000000,\n" -" 1.61020914205869003E1,\n" -" 7.54843505665954743E1,\n" -" 1.12123870801026015E2,\n" -" 3.73997570145040850E1\n" -" };\n" -"\n" -" double fPSum = 0.0;\n" -" double fQSum = 0.0;\n" -" double fXPow = 1.0;\n" -"\n" -" for ( unsigned int i = 0; i <= 4; ++i )\n" -" {\n" -" fPSum += pn[i]*fXPow; \n" -" fQSum += qn[i]*fXPow;\n" -" fXPow *= pow(x*x, -1.0);\n" -" }\n" -" *fVal = exp((-1.0)*x*x)*fPSum*pow(x*fQSum, -1.0);\n" -"}\n"; -std::string lcl_Erf0065Decl= -"void lcl_Erf0065( double x, double *fVal );\n"; -std::string lcl_Erf0065 = -"void lcl_Erf0065( double x, double *fVal )\n" -" {\n" -" double pn[] = {\n" -" 1.12837916709551256,\n" -" 1.35894887627277916E-1,\n" -" 4.03259488531795274E-2,\n" -" 1.20339380863079457E-3,\n" -" 6.49254556481904354E-5\n" -" };\n" -" double qn[] = {\n" -" 1.00000000000000000,\n" -" 4.53767041780002545E-1,\n" -" 8.69936222615385890E-2,\n" -" 8.49717371168693357E-3,\n" -" 3.64915280629351082E-4\n" -" };\n" -" double fPSum = 0.0;\n" -" double fQSum = 0.0;\n" -" double fXPow = 1.0;\n" -" for ( unsigned int i = 0; i <= 4; ++i )\n" -" {\n" -" fPSum += pn[i]*fXPow;\n" -" fQSum += qn[i]*fXPow;\n" -" fXPow *= x*x;\n" -" }\n" -" *fVal = x * fPSum * pow(fQSum, -1.0);\n" -" }\n"; -std::string rtl_math_erf_rdDecl= -"double rtl_math_erf_rd( double x );\n"; -std::string rtl_math_erf_rd = -" double rtl_math_erf_rd( double x )\n" -" {\n" -" if( x == 0.0 )\n" -" return 0.0;\n" -" bool bNegative = false;\n" -" if ( x < 0.0 )\n" -" {\n" -" x = fabs( x );\n" -" bNegative = true;\n" -" }\n" -" double fErf = 1.0;\n" -" if ( x < 1.0e-10 )\n" -" fErf = (double) (x*1.1283791670955125738961589031215452);\n" -" else if ( x < 0.65 )\n" -" lcl_Erf0065( x, &fErf );\n" -" if ( bNegative )\n" -" fErf *= (-1.0);\n" -" return fErf;\n" -" }\n"; -std::string rtl_math_erfc_rdDecl= -"double rtl_math_erfc_rd( double x );\n"; -std::string rtl_math_erfc_rd = -" double rtl_math_erfc_rd( double x )\n" -" {\n" -" if ( x == 0.0 )\n" -" return 1.0;\n" -" bool bNegative = false;\n" -" if ( x < 0.0 )\n" -" {\n" -" x = fabs( x );\n" -" bNegative = true;\n" -" }\n" -" double fErfc = 0.0;\n" -" if ( x >= 0.65 )\n" -" {\n" -" if ( x < 6.0 )\n" -" lcl_Erfc0600( x, &fErfc );\n" -" else\n" -" lcl_Erfc2654( x, &fErfc );\n" -" }\n" -" else\n" -" fErfc = 1.0 - rtl_math_erf_rd( x );\n" -" if ( bNegative )\n" -" fErfc = 2.0 - fErfc;\n" -" return fErfc;\n" -" }\n"; #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.1.4/sc/source/core/opencl/op_spreadsheet.cxx libreoffice-5.1.5~rc2/sc/source/core/opencl/op_spreadsheet.cxx --- libreoffice-5.1.4/sc/source/core/opencl/op_spreadsheet.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/opencl/op_spreadsheet.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -45,12 +45,41 @@ CheckSubArgumentIsNan(ss,vSubArguments,arg++); int secondParaWidth = 1; + // tdf#99512 - for now only allow non-dynamic indicees (the + // common-case) to validate consistent return types vs. the input. + int index = 0; + int indexArg = vSubArguments.size() - 2; + if (vSubArguments[indexArg]->GetFormulaToken()->GetType() == formula::svDouble) + { + const formula::FormulaDoubleToken *dblToken = static_cast(vSubArguments[indexArg]->GetFormulaToken()); + index = ::rtl::math::approxFloor(dblToken->GetDouble()); + } + if (vSubArguments[1]->GetFormulaToken()->GetType() == formula::svDoubleVectorRef) { FormulaToken *tmpCur = vSubArguments[1]->GetFormulaToken(); const formula::DoubleVectorRefToken*pCurDVR = static_cast(tmpCur); - secondParaWidth = pCurDVR->GetArrays().size(); + const std::vector items = pCurDVR->GetArrays(); + + secondParaWidth = items.size(); + + if (index < 1 || index > secondParaWidth) + throw Unhandled(__FILE__, __LINE__); // oob index. + + if (items[index - 1].mpStringArray) + { + rtl_uString **pStrings = items[index - 1].mpStringArray; + for (size_t i = 0; i < pCurDVR->GetArrayLength(); ++i) + { + if (pStrings[i] != nullptr) + { // TODO: the GroupTokenConverter should do better. + throw Unhandled(__FILE__, __LINE__); // mixed arguments. + } + } + } } + else + throw Unhandled(__FILE__, __LINE__); // unusual vlookup. arg += secondParaWidth; CheckSubArgumentIsNan(ss,vSubArguments,arg++); diff -Nru libreoffice-5.1.4/sc/source/core/opencl/op_statistical.cxx libreoffice-5.1.5~rc2/sc/source/core/opencl/op_statistical.cxx --- libreoffice-5.1.4/sc/source/core/opencl/op_statistical.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/opencl/op_statistical.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -4098,21 +4098,6 @@ ss << "return tmp;\n"; ss << "}\n"; } -void OpNormsdist::BinInlineFun(std::set& decls, - std::set& funs) -{ - decls.insert(lcl_Erfc0600Decl); - funs.insert(lcl_Erfc0600); - decls.insert(lcl_Erfc2654Decl); - funs.insert(lcl_Erfc2654); - decls.insert(lcl_Erf0065Decl); - funs.insert(lcl_Erf0065); - decls.insert(rtl_math_erf_rdDecl); - funs.insert(rtl_math_erf_rd); - decls.insert(rtl_math_erfc_rdDecl); - funs.insert(rtl_math_erfc_rd); -} - void OpNormsdist::GenSlidingWindowFunction( std::stringstream &ss,const std::string &sSymName, SubArguments &vSubArguments) @@ -4166,7 +4151,7 @@ } } ss << " x = tmp0;\n"; - ss << " double tmp = 0.5 * rtl_math_erfc_rd((-1)*x * 0.7071067811865475);\n"; + ss << " double tmp = 0.5 * erfc((-1)*x * 0.7071067811865475);\n"; ss << " return tmp;\n"; ss << "}\n"; } diff -Nru libreoffice-5.1.4/sc/source/core/opencl/op_statistical.hxx libreoffice-5.1.5~rc2/sc/source/core/opencl/op_statistical.hxx --- libreoffice-5.1.4/sc/source/core/opencl/op_statistical.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/opencl/op_statistical.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -241,7 +241,6 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) override; - virtual void BinInlineFun(std::set& ,std::set&) override; virtual std::string BinFuncName() const override { return "OpNormsdist"; } }; class OpNorminv:public Normal{ diff -Nru libreoffice-5.1.4/sc/source/core/tool/compiler.cxx libreoffice-5.1.5~rc2/sc/source/core/tool/compiler.cxx --- libreoffice-5.1.4/sc/source/core/tool/compiler.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/tool/compiler.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -2672,6 +2672,28 @@ } } } + else if (mxSymbols->isOOXML()) + { + // OOXML names that are not written in the current mapping but to be + // recognized as old versions wrote them. + struct FunctionName + { + const sal_Char* pName; + OpCode eOp; + }; + static const FunctionName aOoxmlAliases[] = { + { "EFFECTIVE", ocEffective } // EFFECTIVE -> EFFECT + }; + for (const FunctionName& rOoxmlAlias : aOoxmlAliases) + { + if (rName.equalsIgnoreAsciiCaseAscii( rOoxmlAlias.pName)) + { + maRawToken.SetOpCode( rOoxmlAlias.eOp); + bFound = true; + break; // for + } + } + } if (!bFound) { OUString aIntName; diff -Nru libreoffice-5.1.4/sc/source/core/tool/formulagroup.cxx libreoffice-5.1.5~rc2/sc/source/core/tool/formulagroup.cxx --- libreoffice-5.1.4/sc/source/core/tool/formulagroup.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/tool/formulagroup.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -32,7 +32,7 @@ #include #if HAVE_FEATURE_OPENCL -#include +# include #endif namespace sc { @@ -331,20 +331,16 @@ return false; } - bool bSuccess = ::opencl::switchOpenCLDevice(&rDeviceId, bAutoSelect, bForceEvaluation); + + OUString aSelectedCLDeviceVersionID; + bool bSuccess = ::opencl::switchOpenCLDevice(&rDeviceId, bAutoSelect, bForceEvaluation, aSelectedCLDeviceVersionID); if(!bSuccess) return false; delete msInstance; - msInstance = nullptr; + msInstance = new sc::opencl::FormulaGroupInterpreterOpenCL(); - if (bOpenCLEnabled) - { - msInstance = new sc::opencl::FormulaGroupInterpreterOpenCL(); - return msInstance != nullptr; - } - - return false; + return true; } void FormulaGroupInterpreter::getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int32& rPlatformId) diff -Nru libreoffice-5.1.4/sc/source/core/tool/interpr1.cxx libreoffice-5.1.5~rc2/sc/source/core/tool/interpr1.cxx --- libreoffice-5.1.4/sc/source/core/tool/interpr1.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/tool/interpr1.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -3613,6 +3613,8 @@ case svDouble : { fVal = GetDouble(); + if ( nGlobalError ) + return; values.push_back(fVal); fSum += fVal; rValCount++; @@ -3625,6 +3627,8 @@ if (aCell.hasNumeric()) { fVal = GetCellValue(aAdr, aCell); + if ( nGlobalError ) + return; values.push_back(fVal); fSum += fVal; rValCount++; @@ -3652,6 +3656,11 @@ } while ((nErr == 0) && aValIter.GetNext(fVal, nErr)); } + if ( nErr ) + { + SetError(nErr); + return; + } } break; case svMatrix : diff -Nru libreoffice-5.1.4/sc/source/core/tool/interpr2.cxx libreoffice-5.1.5~rc2/sc/source/core/tool/interpr2.cxx --- libreoffice-5.1.4/sc/source/core/tool/interpr2.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/tool/interpr2.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -282,6 +282,12 @@ nYear = (sal_Int16) ::rtl::math::approxFloor( GetDouble() ); if ( nYear < 100 ) nYear = pFormatter->ExpandTwoDigitYear( nYear ); + if (nYear < 1583 || nYear > 9956) + { + // Valid Gregorian and maximum year constraints not met. + PushIllegalArgument(); + return; + } // don't worry, be happy :) int B,C,D,E,F,G,H,I,K,L,M,N,O; N = nYear % 19; @@ -318,8 +324,9 @@ if ( nWeekendDays.size() != 7 ) return errIllegalArgument; + // Weekend days defined by string, Sunday...Saturday for ( int i = 0; i < 7; i++ ) - bWeekendMask[ i ] = ( bool ) nWeekendDays[ i ]; + bWeekendMask[ i ] = ( bool ) nWeekendDays[ ( i == 6 ? 0 : i + 1 ) ]; } } else diff -Nru libreoffice-5.1.4/sc/source/core/tool/interpr4.cxx libreoffice-5.1.5~rc2/sc/source/core/tool/interpr4.cxx --- libreoffice-5.1.4/sc/source/core/tool/interpr4.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/tool/interpr4.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -1990,7 +1990,12 @@ ScExternalRefCache::TokenRef pToken; PopExternalSingleRef(pToken); if (!nGlobalError && pToken) - nVal = pToken->GetDouble(); + { + if (pToken->GetType() == svDouble || pToken->GetType() == svEmptyCell) + nVal = pToken->GetDouble(); + else + nVal = ConvertStringToValue( pToken->GetString().getString()); + } } break; case svExternalDoubleRef: diff -Nru libreoffice-5.1.4/sc/source/core/tool/token.cxx libreoffice-5.1.5~rc2/sc/source/core/tool/token.cxx --- libreoffice-5.1.4/sc/source/core/tool/token.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/core/tool/token.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -4250,7 +4250,10 @@ if (pDeletedRange && aAbs.aStart.Row() <= pDeletedRange->aStart.Row()) { SCROW nOffset = pDeletedRange->aStart.Row() - aAbs.aStart.Row(); - rBounds.push_back(rPos.Row()+nOffset); + SCROW nRow = rPos.Row() + nOffset; + // Unlike for rCheckRange, for pDeletedRange nRow can be anywhere>=0. + if (ValidRow(nRow)) + rBounds.push_back(nRow); } if (aAbs.aEnd.Row() >= rCheckRange.aEnd.Row()) @@ -4272,7 +4275,10 @@ if (pDeletedRange && aAbs.aEnd.Row() >= pDeletedRange->aEnd.Row()) { SCROW nOffset = pDeletedRange->aEnd.Row() + 1 - aAbs.aStart.Row(); - rBounds.push_back(rPos.Row()+nOffset); + SCROW nRow = rPos.Row() + nOffset; + // Unlike for rCheckRange, for pDeletedRange nRow can be ~anywhere. + if (ValidRow(nRow)) + rBounds.push_back(nRow); } } diff -Nru libreoffice-5.1.4/sc/source/filter/excel/xetable.cxx libreoffice-5.1.5~rc2/sc/source/filter/excel/xetable.cxx --- libreoffice-5.1.4/sc/source/filter/excel/xetable.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/filter/excel/xetable.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -2134,7 +2134,7 @@ // This is staggeringly slow, and each element operates only // on its own data. const size_t nRows = maRowMap.size(); - const size_t nThreads = nRows < 128 ? 1 : std::max(std::thread::hardware_concurrency(), 1U); + const size_t nThreads = nRows < 128 ? 1 : comphelper::ThreadPool::getPreferredConcurrency(); #else const size_t nThreads = 1; // globally disable multi-threading for now. #endif diff -Nru libreoffice-5.1.4/sc/source/filter/oox/workbookfragment.cxx libreoffice-5.1.5~rc2/sc/source/filter/oox/workbookfragment.cxx --- libreoffice-5.1.4/sc/source/filter/oox/workbookfragment.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/filter/oox/workbookfragment.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -306,7 +306,7 @@ void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVector& rSheets ) { - sal_Int32 nThreads = std::min( rSheets.size(), (size_t) std::max(std::thread::hardware_concurrency(), 1U) ); + sal_Int32 nThreads = std::min( rSheets.size(), (size_t) comphelper::ThreadPool::getPreferredConcurrency() ); Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); diff -Nru libreoffice-5.1.4/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx libreoffice-5.1.5~rc2/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx --- libreoffice-5.1.4/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -672,6 +672,11 @@ void ScChangeTrackingExportHelper::WorkWithChangeAction(ScChangeAction* pAction) { + if (pAction->GetType() == SC_CAT_NONE) + { + SAL_WARN("sc.filter", "WorkWithChangeAction: type is not writable"); + return; + } rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pAction->GetActionNumber())); GetAcceptanceState(pAction); if (pAction->IsRejecting()) @@ -688,7 +693,7 @@ WriteRejection(pAction); else { - OSL_FAIL("not a writeable type"); + assert(false); // tdf#73335 this would create duplicate attributes } rExport.CheckAttrList(); } diff -Nru libreoffice-5.1.4/sc/source/ui/app/transobj.cxx libreoffice-5.1.5~rc2/sc/source/ui/app/transobj.cxx --- libreoffice-5.1.4/sc/source/ui/app/transobj.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/app/transobj.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -116,6 +116,8 @@ aObjDesc( rDesc ), nDragHandleX( 0 ), nDragHandleY( 0 ), + nSourceCursorX( MAXCOL + 1 ), + nSourceCursorY( MAXROW + 1 ), nDragSourceFlags( 0 ), bDragWasInternal( false ), bUsedForLink( false ), @@ -517,6 +519,19 @@ nDragHandleY = nY; } +void ScTransferObj::SetSourceCursorPos( SCCOL nX, SCROW nY ) +{ + nSourceCursorX = nX; + nSourceCursorY = nY; +} + +bool ScTransferObj::WasSourceCursorInSelection() const +{ + return + nSourceCursorX >= aBlock.aStart.Col() && nSourceCursorX <= aBlock.aEnd.Col() && + nSourceCursorY >= aBlock.aStart.Row() && nSourceCursorY <= aBlock.aEnd.Row(); +} + void ScTransferObj::SetVisibleTab( SCTAB nNew ) { nVisibleTab = nNew; diff -Nru libreoffice-5.1.4/sc/source/ui/cctrl/checklistmenu.cxx libreoffice-5.1.5~rc2/sc/source/ui/cctrl/checklistmenu.cxx --- libreoffice-5.1.4/sc/source/ui/cctrl/checklistmenu.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/cctrl/checklistmenu.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -845,10 +845,11 @@ { } -ScCheckListMenuWindow::Member::Member() +ScCheckListMember::ScCheckListMember() : mbVisible(true) , mbDate(false) , mbLeaf(false) + , meDatePartType(YEAR) , mpParent(nullptr) { } @@ -1136,7 +1137,7 @@ aLabel = maMembers[i].maName; if (aLabel.isEmpty()) aLabel = ScGlobal::GetRscString(STR_EMPTYDATA); - maChecks->ShowCheckEntry( aLabel, maMembers[i].mpParent, true, bSet); + maChecks->ShowCheckEntry( aLabel, maMembers[i], true, bSet); } if (!maConfig.mbAllowEmptySet) @@ -1223,29 +1224,61 @@ size_t n = maMembers.size(); size_t nSelCount = 0; OUString aLabelDisp; + bool bSomeDateDeletes = false; for (size_t i = 0; i < n; ++i) { - aLabelDisp = maMembers[i].maName; + bool bIsDate = maMembers[i].mbDate; + bool bPartialMatch = false; + aLabelDisp = maMembers[i].maName; if ( aLabelDisp.isEmpty() ) aLabelDisp = ScGlobal::GetRscString( STR_EMPTYDATA ); + if ( !bSearchTextEmpty ) + { + if ( !bIsDate ) + bPartialMatch = ( aLabelDisp.toAsciiLowerCase().indexOf( aSearchText ) != -1 ); + else if ( maMembers[i].meDatePartType == ScCheckListMember::DAY ) // Match with both numerical and text version of month + bPartialMatch = bPartialMatch || ( OUString( maMembers[i].maRealName + maMembers[i].maDateParts[1] ) + .toAsciiLowerCase().indexOf( aSearchText ) != -1 ); + else + continue; + } + else if ( bIsDate && maMembers[i].meDatePartType != ScCheckListMember::DAY ) + continue; + if ( bSearchTextEmpty ) { - maChecks->ShowCheckEntry( aLabelDisp, maMembers[i].mpParent, true, maMembers[i].mbVisible ); + SvTreeListEntry* pLeaf = maChecks->ShowCheckEntry( aLabelDisp, maMembers[i], true, maMembers[i].mbVisible ); + updateMemberParents( pLeaf, i ); if ( maMembers[i].mbVisible ) ++nSelCount; continue; } - if ( aLabelDisp.toAsciiLowerCase().indexOf( aSearchText ) != -1 ) + if ( bPartialMatch ) { - maChecks->ShowCheckEntry( aLabelDisp, maMembers[i].mpParent ); + SvTreeListEntry* pLeaf = maChecks->ShowCheckEntry( aLabelDisp, maMembers[i] ); + updateMemberParents( pLeaf, i ); ++nSelCount; } else - maChecks->ShowCheckEntry( aLabelDisp, maMembers[i].mpParent, false, false ); + { + maChecks->ShowCheckEntry( aLabelDisp, maMembers[i], false, false ); + if( bIsDate ) + bSomeDateDeletes = true; + } + } + + if ( bSomeDateDeletes ) + { + for (size_t i = 0; i < n; ++i) + { + if ( !maMembers[i].mbDate ) continue; + if ( maMembers[i].meDatePartType != ScCheckListMember::DAY ) continue; + updateMemberParents( nullptr, i ); + } } if ( nSelCount == n ) @@ -1336,6 +1369,42 @@ return maTabStopCtrls[mnCurTabStop]; } +void ScCheckListMenuWindow::updateMemberParents( SvTreeListEntry* pLeaf, size_t nIdx ) +{ + + if ( !maMembers[nIdx].mbDate || maMembers[nIdx].meDatePartType != ScCheckListMember::DAY ) + return; + + OUString aYearName = maMembers[nIdx].maDateParts[0]; + OUString aMonthName = maMembers[nIdx].maDateParts[1]; + auto aItr = maYearMonthMap.find(aYearName + aMonthName); + + if ( pLeaf ) + { + SvTreeListEntry* pMonthEntry = pLeaf->GetParent(); + SvTreeListEntry* pYearEntry = ( pMonthEntry ) ? pMonthEntry->GetParent() : nullptr; + + maMembers[nIdx].mpParent = pMonthEntry; + if ( aItr != maYearMonthMap.end() ) + { + size_t nMonthIdx = aItr->second; + maMembers[nMonthIdx].mpParent = pYearEntry; + } + } + else + { + SvTreeListEntry* pYearEntry = maChecks->FindEntry( nullptr, aYearName ); + if ( aItr != maYearMonthMap.end() && !pYearEntry ) + { + size_t nMonthIdx = aItr->second; + maMembers[nMonthIdx].mpParent = nullptr; + maMembers[nIdx].mpParent = nullptr; + } + else if ( pYearEntry && !maChecks->FindEntry( pYearEntry, aMonthName ) ) + maMembers[nIdx].mpParent = nullptr; + } +} + Reference ScCheckListMenuWindow::CreateAccessible() { if (!mxAccessible.is()) @@ -1392,19 +1461,23 @@ OUString aMonthName = aMonths[nMonth-1].FullName; OUString aDayName = OUString::number(nDay); + if ( aDayName.getLength() == 1 ) + aDayName = "0" + aDayName; + maChecks->SetUpdateMode(false); SvTreeListEntry* pYearEntry = maChecks->FindEntry(nullptr, aYearName); if (!pYearEntry) { pYearEntry = maChecks->InsertEntry(aYearName, nullptr, true); - Member aMemYear; + ScCheckListMember aMemYear; aMemYear.maName = aYearName; aMemYear.maRealName = rsName; aMemYear.mbDate = true; aMemYear.mbLeaf = false; aMemYear.mbVisible = bVisible; aMemYear.mpParent = nullptr; + aMemYear.meDatePartType = ScCheckListMember::YEAR; maMembers.push_back(aMemYear); } @@ -1412,27 +1485,33 @@ if (!pMonthEntry) { pMonthEntry = maChecks->InsertEntry(aMonthName, pYearEntry, true); - Member aMemMonth; + ScCheckListMember aMemMonth; aMemMonth.maName = aMonthName; aMemMonth.maRealName = rsName; aMemMonth.mbDate = true; aMemMonth.mbLeaf = false; aMemMonth.mbVisible = bVisible; aMemMonth.mpParent = pYearEntry; + aMemMonth.meDatePartType = ScCheckListMember::MONTH; maMembers.push_back(aMemMonth); + maYearMonthMap[aYearName + aMonthName] = maMembers.size() - 1; } SvTreeListEntry* pDayEntry = maChecks->FindEntry(pMonthEntry, aDayName); if (!pDayEntry) { maChecks->InsertEntry(aDayName, pMonthEntry); - Member aMemDay; + ScCheckListMember aMemDay; aMemDay.maName = aDayName; aMemDay.maRealName = rsName; + aMemDay.maDateParts.resize(2); + aMemDay.maDateParts[0] = aYearName; + aMemDay.maDateParts[1] = aMonthName; aMemDay.mbDate = true; aMemDay.mbLeaf = true; aMemDay.mbVisible = bVisible; aMemDay.mpParent = pMonthEntry; + aMemDay.meDatePartType = ScCheckListMember::DAY; maMembers.push_back(aMemDay); } @@ -1441,7 +1520,7 @@ void ScCheckListMenuWindow::addMember(const OUString& rName, bool bVisible) { - Member aMember; + ScCheckListMember aMember; aMember.maName = rName; aMember.mbDate = false; aMember.mbLeaf = true; @@ -1543,13 +1622,31 @@ } } -void ScCheckListBox::ShowCheckEntry( const OUString& sName, SvTreeListEntry* pParent, bool bShow, bool bCheck ) +SvTreeListEntry* ScCheckListBox::ShowCheckEntry( const OUString& sName, ScCheckListMember& rMember, bool bShow, bool bCheck ) { - SvTreeListEntry* pEntry = FindEntry( pParent, sName ); + SvTreeListEntry* pEntry = nullptr; + if ( !rMember.mbDate || ( rMember.mbDate && rMember.mpParent ) ) + pEntry = FindEntry( rMember.mpParent, sName ); + if ( bShow ) { if ( !pEntry ) { + if ( rMember.mbDate ) + { + SvTreeListEntry* pYearEntry = FindEntry( nullptr, rMember.maDateParts[0] ); + if ( !pYearEntry ) + pYearEntry = InsertEntry( rMember.maDateParts[0], nullptr, true ); + SvTreeListEntry* pMonthEntry = FindEntry( pYearEntry, rMember.maDateParts[1] ); + if ( !pMonthEntry ) + pMonthEntry = InsertEntry( rMember.maDateParts[1], pYearEntry, true ); + SvTreeListEntry* pDayEntry = FindEntry( pMonthEntry, rMember.maName ); + if ( !pDayEntry ) + pDayEntry = InsertEntry( rMember.maName, pMonthEntry ); + + return pDayEntry; // Return leaf node + } + pEntry = InsertEntry( sName); @@ -1560,7 +1657,17 @@ CheckEntry( pEntry, bCheck ); } else if ( pEntry ) - RemoveParentKeepChildren( pEntry ); + { + GetModel()->Remove( pEntry ); + SvTreeListEntry* pParent = rMember.mpParent; + while ( pParent && !pParent->HasChildren() ) + { + SvTreeListEntry* pTmp = pParent; + pParent = pTmp->GetParent(); + GetModel()->Remove( pTmp ); + } + } + return nullptr; } SvTreeListEntry* ScCheckListBox::CountCheckedEntries( SvTreeListEntry* pParent, sal_uLong& nCount ) const diff -Nru libreoffice-5.1.4/sc/source/ui/docshell/docfunc.cxx libreoffice-5.1.5~rc2/sc/source/ui/docshell/docfunc.cxx --- libreoffice-5.1.4/sc/source/ui/docshell/docfunc.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/docshell/docfunc.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -1631,6 +1631,16 @@ { ScDocShellModificator aModificator( rDocShell ); + if (rDocShell.GetDocument().GetChangeTrack() && + ((eCmd == INS_CELLSDOWN && (rRange.aStart.Col() != 0 || rRange.aEnd.Col() != MAXCOL)) || + (eCmd == INS_CELLSRIGHT && (rRange.aStart.Row() != 0 || rRange.aEnd.Row() != MAXROW)))) + { + // We should not reach this via UI disabled slots. + assert(bApi); + SAL_WARN("sc.ui","ScDocFunc::InsertCells - no change-tracking of partial cell shift"); + return false; + } + ScRange aTargetRange( rRange ); // If insertion is for full cols/rows and after the current @@ -2093,6 +2103,16 @@ { ScDocShellModificator aModificator( rDocShell ); + if (rDocShell.GetDocument().GetChangeTrack() && + ((eCmd == DEL_CELLSUP && (rRange.aStart.Col() != 0 || rRange.aEnd.Col() != MAXCOL)) || + (eCmd == DEL_CELLSLEFT && (rRange.aStart.Row() != 0 || rRange.aEnd.Row() != MAXROW)))) + { + // We should not reach this via UI disabled slots. + assert(bApi); + SAL_WARN("sc.ui","ScDocFunc::DeleteCells - no change-tracking of partial cell shift"); + return false; + } + SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row(); SCTAB nStartTab = rRange.aStart.Tab(); diff -Nru libreoffice-5.1.4/sc/source/ui/inc/checklistmenu.hxx libreoffice-5.1.5~rc2/sc/source/ui/inc/checklistmenu.hxx --- libreoffice-5.1.4/sc/source/ui/inc/checklistmenu.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/inc/checklistmenu.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -19,6 +19,7 @@ #include #include +#include namespace com { namespace sun { namespace star { @@ -190,6 +191,8 @@ VclPtr mpParentMenu; }; +struct ScCheckListMember; + class ScCheckListBox : public SvTreeListBox { SvLBoxButtonData* mpCheckButton; @@ -204,13 +207,35 @@ void Init(); void CheckEntry( const OUString& sName, SvTreeListEntry* pParent, bool bCheck = true ); void CheckEntry( SvTreeListEntry* pEntry, bool bCheck = true ); - void ShowCheckEntry( const OUString& sName, SvTreeListEntry* pParent, bool bShow = true, bool bCheck = true ); + SvTreeListEntry* ShowCheckEntry( const OUString& sName, ScCheckListMember& rMember, bool bShow = true, bool bCheck = true ); bool IsChecked( const OUString& sName, SvTreeListEntry* pParent ); SvTreeListEntry* FindEntry( SvTreeListEntry* pParent, const OUString& sNode ); sal_uInt16 GetCheckedEntryCount() const; void ExpandChildren( SvTreeListEntry* pParent ); virtual void KeyInput( const KeyEvent& rKEvt ) override; }; + +struct ScCheckListMember +{ + enum DatePartType + { + YEAR, + MONTH, + DAY, + }; + + OUString maName; // node name + OUString maRealName; + bool mbVisible; + bool mbDate; + bool mbLeaf; + DatePartType meDatePartType; + // To store Year and Month if the member if DAY type + std::vector maDateParts; + ScCheckListMember(); + SvTreeListEntry* mpParent; +}; + /** * This class implements a popup window for field button, for quick access * of hide-item list, and possibly more stuff related to field options. @@ -280,17 +305,6 @@ virtual void handlePopupEnd() override; private: - struct Member - { - OUString maName; // node name - OUString maRealName; - bool mbVisible; - bool mbDate; - bool mbLeaf; - - Member(); - SvTreeListEntry* mpParent; - }; class CancelButton : public ::CancelButton { @@ -327,6 +341,7 @@ void setAllMemberState(bool bSet); void selectCurrentMemberOnly(bool bSet); void cycleFocus(bool bReverse = false); + void updateMemberParents( SvTreeListEntry* pLeaf, size_t nIdx ); DECL_LINK_TYPED( ButtonHdl, Button*, void ); DECL_LINK_TYPED( TriStateHdl, Button*, void ); @@ -347,7 +362,10 @@ std::vector > maTabStopCtrls; size_t mnCurTabStop; - std::vector maMembers; + std::vector maMembers; + // For Dates + std::map maYearMonthMap; + std::unique_ptr mpExtendedData; std::unique_ptr mpOKAction; std::unique_ptr mpPopupEndAction; diff -Nru libreoffice-5.1.4/sc/source/ui/inc/transobj.hxx libreoffice-5.1.5~rc2/sc/source/ui/inc/transobj.hxx --- libreoffice-5.1.4/sc/source/ui/inc/transobj.hxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/inc/transobj.hxx 2016-07-26 21:17:25.000000000 +0000 @@ -49,6 +49,8 @@ css::uno::Reference xDragSourceRanges; SCCOL nDragHandleX; SCROW nDragHandleY; + SCCOL nSourceCursorX; + SCROW nSourceCursorY; SCTAB nVisibleTab; sal_uInt16 nDragSourceFlags; bool bDragWasInternal; @@ -83,8 +85,11 @@ SCROW GetNonFilteredRows() const { return nNonFiltered; } SCCOL GetDragHandleX() const { return nDragHandleX; } SCROW GetDragHandleY() const { return nDragHandleY; } + bool WasSourceCursorInSelection() const; + SCCOL GetSourceCursorX() const { return nSourceCursorX; } + SCROW GetSourceCursorY() const { return nSourceCursorY; } SCTAB GetVisibleTab() const { return nVisibleTab; } - sal_uInt16 GetDragSourceFlags() const { return nDragSourceFlags; } + sal_uInt16 GetDragSourceFlags() const { return nDragSourceFlags; } bool HasFilteredRows() const { return bHasFiltered; } bool GetUseInApi() const { return bUseInApi; } ScDocShell* GetSourceDocShell(); @@ -93,6 +98,7 @@ void SetDrawPersist( const SfxObjectShellRef& rRef ); void SetDragHandlePos( SCCOL nX, SCROW nY ); + void SetSourceCursorPos( SCCOL nX, SCROW nY ); void SetVisibleTab( SCTAB nNew ); void SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark ); void SetDragSourceFlags( sal_uInt16 nFlags ); diff -Nru libreoffice-5.1.4/sc/source/ui/miscdlgs/datafdlg.cxx libreoffice-5.1.5~rc2/sc/source/ui/miscdlgs/datafdlg.cxx --- libreoffice-5.1.4/sc/source/ui/miscdlgs/datafdlg.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/miscdlgs/datafdlg.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -216,8 +216,14 @@ m_pBtnNext.clear(); m_pBtnClose.clear(); m_pSlider.clear(); - m_pGrid.clear(); m_pFixedText.clear(); + for ( auto aFTIter = maFixedTexts.begin(); aFTIter != maFixedTexts.end(); ++aFTIter ) + aFTIter->disposeAndClear(); + for ( auto aEditIter = maEdits.begin(); aEditIter != maEdits.end(); ++aEditIter ) + aEditIter->disposeAndClear(); + maFixedTexts.clear(); + maEdits.clear(); + m_pGrid.clear(); ModalDialog::dispose(); } diff -Nru libreoffice-5.1.4/sc/source/ui/miscdlgs/solverutil.cxx libreoffice-5.1.5~rc2/sc/source/ui/miscdlgs/solverutil.cxx --- libreoffice-5.1.4/sc/source/ui/miscdlgs/solverutil.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/miscdlgs/solverutil.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -65,20 +65,27 @@ OUString sName = xInfo->getImplementationName(); OUString sDescription; - uno::Reference xSolver( - xCFac->createInstanceWithContext(xCtx), uno::UNO_QUERY ); - uno::Reference xDesc( xSolver, uno::UNO_QUERY ); - if ( xDesc.is() ) - sDescription = xDesc->getComponentDescription(); + try + { + uno::Reference xSolver( + xCFac->createInstanceWithContext(xCtx), uno::UNO_QUERY ); + uno::Reference xDesc( xSolver, uno::UNO_QUERY ); + if ( xDesc.is() ) + sDescription = xDesc->getComponentDescription(); - if ( sDescription.isEmpty() ) - sDescription = sName; // use implementation name if no description available + if ( sDescription.isEmpty() ) + sDescription = sName; // use implementation name if no description available - rImplNames.realloc( nCount+1 ); - rImplNames[nCount] = sName; - rDescriptions.realloc( nCount+1 ); - rDescriptions[nCount] = sDescription; - ++nCount; + rImplNames.realloc( nCount+1 ); + rImplNames[nCount] = sName; + rDescriptions.realloc( nCount+1 ); + rDescriptions[nCount] = sDescription; + ++nCount; + } + catch (const css::uno::Exception& e) + { + SAL_INFO("sc", "ScSolverUtil::GetImplementations: cannot instantiate: " << sName << ", because: " << e.Message); + } } } } diff -Nru libreoffice-5.1.4/sc/source/ui/unoobj/cellsuno.cxx libreoffice-5.1.5~rc2/sc/source/ui/unoobj/cellsuno.cxx --- libreoffice-5.1.4/sc/source/ui/unoobj/cellsuno.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/unoobj/cellsuno.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -3600,7 +3600,17 @@ if (bAdd) aMarkData.SetMultiMarkArea(aIter.GetPos()); } + } + + if (nContentFlags & sheet::CellFlags::ANNOTATION) + { + std::vector aNotes; + rDoc.GetNotesInRange(aRanges, aNotes); + for (const auto& i : aNotes) + { + aMarkData.SetMultiMarkArea(i.maPos); + } } ScRangeList aNewRanges; diff -Nru libreoffice-5.1.4/sc/source/ui/view/cellsh2.cxx libreoffice-5.1.5~rc2/sc/source/ui/view/cellsh2.cxx --- libreoffice-5.1.4/sc/source/ui/view/cellsh2.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/view/cellsh2.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -342,8 +342,8 @@ ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - AbstractScDataFormDlg* pDlg = pFact->CreateScDataFormDlg( - pTabViewShell->GetDialogParent(), pTabViewShell); + std::unique_ptr pDlg(pFact->CreateScDataFormDlg( + pTabViewShell->GetDialogParent(), pTabViewShell)); OSL_ENSURE(pDlg, "Dialog create fail!"); pDlg->Execute(); diff -Nru libreoffice-5.1.4/sc/source/ui/view/gridwin.cxx libreoffice-5.1.5~rc2/sc/source/ui/view/gridwin.cxx --- libreoffice-5.1.4/sc/source/ui/view/gridwin.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/view/gridwin.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -4325,8 +4325,18 @@ { pView->MarkRange( aDest, false ); - SCCOL nDCol = pViewData->GetCurX() - aSource.aStart.Col() + nCorrectCursorPosCol; - SCROW nDRow = pViewData->GetCurY() - aSource.aStart.Row() + nCorrectCursorPosRow; + SCCOL nDCol; + SCROW nDRow; + if (pTransObj->WasSourceCursorInSelection()) + { + nDCol = pTransObj->GetSourceCursorX() - aSource.aStart.Col() + nCorrectCursorPosCol; + nDRow = pTransObj->GetSourceCursorY() - aSource.aStart.Row() + nCorrectCursorPosRow; + } + else + { + nDCol = 0; + nDRow = 0; + } pView->SetCursor( aDest.aStart.Col() + nDCol, aDest.aStart.Row() + nDRow ); } diff -Nru libreoffice-5.1.4/sc/source/ui/view/select.cxx libreoffice-5.1.5~rc2/sc/source/ui/view/select.cxx --- libreoffice-5.1.4/sc/source/ui/view/select.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/view/select.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -198,6 +198,7 @@ SCCOL nHandleX = (nPosX >= (SCsCOL) nStartX) ? nPosX - nStartX : 0; SCROW nHandleY = (nPosY >= (SCsROW) nStartY) ? nPosY - nStartY : 0; pTransferObj->SetDragHandlePos( nHandleX, nHandleY ); + pTransferObj->SetSourceCursorPos( pViewData->GetCurX(), pViewData->GetCurY() ); pTransferObj->SetVisibleTab( nTab ); pTransferObj->SetDragSource( pDocSh, rMark ); diff -Nru libreoffice-5.1.4/sc/source/ui/view/tabcont.cxx libreoffice-5.1.5~rc2/sc/source/ui/view/tabcont.cxx --- libreoffice-5.1.4/sc/source/ui/view/tabcont.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sc/source/ui/view/tabcont.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -477,6 +477,8 @@ pTransferObj->SetDragSource( pDocSh, aTabMark ); + pTransferObj->SetSourceCursorPos( pViewData->GetCurX(), pViewData->GetCurY() ); + vcl::Window* pWindow = pViewData->GetActiveWin(); SC_MOD()->SetDragObject( pTransferObj, nullptr ); // for internal D&D pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); Binary files /tmp/tmpHYn3xj/nP2KjXNOsz/libreoffice-5.1.4/sd/qa/unit/tiledrendering/data/table-column.odp and /tmp/tmpHYn3xj/fOI_AiDoHV/libreoffice-5.1.5~rc2/sd/qa/unit/tiledrendering/data/table-column.odp differ diff -Nru libreoffice-5.1.4/sd/qa/unit/tiledrendering/tiledrendering.cxx libreoffice-5.1.5~rc2/sd/qa/unit/tiledrendering/tiledrendering.cxx --- libreoffice-5.1.4/sd/qa/unit/tiledrendering/tiledrendering.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sd/qa/unit/tiledrendering/tiledrendering.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -31,6 +31,7 @@ #include #include #include +#include using namespace css; @@ -57,6 +58,7 @@ void testSearchAll(); void testSearchAllSelections(); void testResizeTable(); + void testResizeTableColumn(); #endif CPPUNIT_TEST_SUITE(SdTiledRenderingTest); @@ -72,6 +74,7 @@ CPPUNIT_TEST(testSearchAll); CPPUNIT_TEST(testSearchAllSelections); CPPUNIT_TEST(testResizeTable); + CPPUNIT_TEST(testResizeTableColumn); #endif CPPUNIT_TEST_SUITE_END(); @@ -80,6 +83,7 @@ SdXImpressDocument* createDoc(const char* pName); static void callback(int nType, const char* pPayload, void* pData); void callbackImpl(int nType, const char* pPayload); + xmlDocPtr parseXmlDump(); #endif uno::Reference mxComponent; @@ -90,13 +94,15 @@ sal_Int32 m_nPart; std::vector m_aSearchResultSelection; std::vector m_aSearchResultPart; + xmlBufferPtr m_pXmlBuffer; #endif }; SdTiledRenderingTest::SdTiledRenderingTest() #if !defined(WNT) && !defined(MACOSX) : m_bFound(true), - m_nPart(0) + m_nPart(0), + m_pXmlBuffer(nullptr) #endif { } @@ -113,6 +119,11 @@ if (mxComponent.is()) mxComponent->dispose(); +#if !defined(_WIN32) && !defined(MACOSX) + if (m_pXmlBuffer) + xmlBufferFree(m_pXmlBuffer); +#endif + test::BootstrapFixture::tearDown(); } @@ -211,6 +222,28 @@ } } +xmlDocPtr SdTiledRenderingTest::parseXmlDump() +{ + if (m_pXmlBuffer) + xmlBufferFree(m_pXmlBuffer); + + // Create the xml writer. + m_pXmlBuffer = xmlBufferCreate(); + xmlTextWriterPtr pXmlWriter = xmlNewTextWriterMemory(m_pXmlBuffer, 0); + xmlTextWriterStartDocument(pXmlWriter, nullptr, nullptr, nullptr); + + // Create the dump. + SdXImpressDocument* pImpressDocument = dynamic_cast(mxComponent.get()); + CPPUNIT_ASSERT(pImpressDocument); + pImpressDocument->GetDoc()->dumpAsXml(pXmlWriter); + + // Delete the xml writer. + xmlTextWriterEndDocument(pXmlWriter); + xmlFreeTextWriter(pXmlWriter); + + return xmlParseMemory(reinterpret_cast(xmlBufferContent(m_pXmlBuffer)), xmlBufferLength(m_pXmlBuffer)); +} + void SdTiledRenderingTest::testRegisterCallback() { SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); @@ -502,6 +535,60 @@ comphelper::LibreOfficeKit::setActive(false); } +void SdTiledRenderingTest::testResizeTableColumn() +{ + // Load the document. + comphelper::LibreOfficeKit::setActive(); + SdXImpressDocument* pXImpressDocument = createDoc("table-column.odp"); + sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); + SdPage* pActualPage = pViewShell->GetActualPage(); + SdrObject* pObject = pActualPage->GetObj(0); + auto pTableObject = dynamic_cast(pObject); + CPPUNIT_ASSERT(pTableObject); + + // Select the table by marking it + starting and ending text edit. + SdrView* pView = pViewShell->GetView(); + pView->MarkObj(pObject, pView->GetSdrPageView()); + pView->SdrBeginTextEdit(pObject); + pView->SdrEndTextEdit(); + + // Remember the original cell widths. + xmlDocPtr pXmlDoc = parseXmlDump(); + OString aPrefix = "/sdrModel/sdPage/sdrObjList/sdrTableObj/sdrTableObjImpl/tableLayouter/columns/"; + sal_Int32 nExpectedColumn1 = getXPath(pXmlDoc, aPrefix + "layout[1]", "size").toInt32(); + sal_Int32 nExpectedColumn2 = getXPath(pXmlDoc, aPrefix + "layout[2]", "size").toInt32(); + xmlFreeDoc(pXmlDoc); + pXmlDoc = nullptr; + + // Resize the left column, decrease its width by 1 cm. + Point aInnerRowEdge = pObject->GetSnapRect().Center(); + pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_START, convertMm100ToTwip(aInnerRowEdge.getX()), convertMm100ToTwip(aInnerRowEdge.getY())); + pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_END, convertMm100ToTwip(aInnerRowEdge.getX() - 1000), convertMm100ToTwip(aInnerRowEdge.getY())); + + // Remember the resized column widths. + pXmlDoc = parseXmlDump(); + sal_Int32 nResizedColumn1 = getXPath(pXmlDoc, aPrefix + "layout[1]", "size").toInt32(); + CPPUNIT_ASSERT(nResizedColumn1 < nExpectedColumn1); + sal_Int32 nResizedColumn2 = getXPath(pXmlDoc, aPrefix + "layout[2]", "size").toInt32(); + CPPUNIT_ASSERT(nResizedColumn2 > nExpectedColumn2); + xmlFreeDoc(pXmlDoc); + pXmlDoc = nullptr; + + // Now undo the resize. + pXImpressDocument->GetDocShell()->GetUndoManager()->Undo(); + + // Check the undo result. + pXmlDoc = parseXmlDump(); + sal_Int32 nActualColumn1 = getXPath(pXmlDoc, aPrefix + "layout[1]", "size").toInt32(); + // Expected was 7049, actual was 6048, i.e. the first column width after undo was 1cm smaller than expected. + CPPUNIT_ASSERT_EQUAL(nExpectedColumn1, nActualColumn1); + sal_Int32 nActualColumn2 = getXPath(pXmlDoc, aPrefix + "layout[2]", "size").toInt32(); + CPPUNIT_ASSERT_EQUAL(nExpectedColumn2, nActualColumn2); + xmlFreeDoc(pXmlDoc); + pXmlDoc = nullptr; + comphelper::LibreOfficeKit::setActive(false); +} + #endif CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest); diff -Nru libreoffice-5.1.4/sd/source/core/drawdoc3.cxx libreoffice-5.1.5~rc2/sd/source/core/drawdoc3.cxx --- libreoffice-5.1.4/sd/source/core/drawdoc3.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sd/source/core/drawdoc3.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -796,8 +796,17 @@ aTest == aMPLayout && eKind == pTest->GetPageKind() ) { - if( bUndo ) - AddUndo(GetSdrUndoFactory().CreateUndoDeletePage(*pRefPage)); + if (bUndo) + { + bool bSoleOwnerOfStyleSheet = true; + if (pRefPage->IsMasterPage()) + { + const SfxStyleSheet* pRefSheet = pRefPage->getSdrPageProperties().GetStyleSheet(); + const SfxStyleSheet* pTestSheet = pTest->getSdrPageProperties().GetStyleSheet(); + bSoleOwnerOfStyleSheet = pRefSheet != pTestSheet; + } + AddUndo(GetSdrUndoFactory().CreateUndoDeletePage(*pRefPage, bSoleOwnerOfStyleSheet)); + } RemoveMasterPage(nPage); diff -Nru libreoffice-5.1.4/sd/source/ui/docshell/docshel4.cxx libreoffice-5.1.5~rc2/sd/source/ui/docshell/docshel4.cxx --- libreoffice-5.1.4/sd/source/ui/docshell/docshel4.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sd/source/ui/docshell/docshel4.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -62,6 +62,7 @@ #include "ViewShell.hxx" #include "sdmod.hxx" #include "View.hxx" +#include "CustomAnimationEffect.hxx" #include "sdpage.hxx" #include "sdresid.hxx" #include "DrawViewShell.hxx" @@ -547,6 +548,23 @@ } mpDoc->StopWorkStartupDelay(); + //With custom animation, if Outliner is modified, update text before saving + if( mpViewShell ) + { + SdPage* pPage = mpViewShell->getCurrentPage(); + if( pPage && pPage->getMainSequence()->getCount() ) + { + SdrObject* pObj = mpViewShell->GetView()->GetTextEditObject(); + SdrOutliner* pOutl = mpViewShell->GetView()->GetTextEditOutliner(); + if( pObj && pOutl && pOutl->IsModified() ) + { + OutlinerParaObject* pNewText = pOutl->CreateParaObject( 0, pOutl->GetParagraphCount() ); + pObj->SetOutlinerParaObject( pNewText ); + pOutl->ClearModifyFlag(); + } + } + } + //TODO/LATER: why this?! if( GetCreateMode() == SfxObjectCreateMode::STANDARD ) SfxObjectShell::SetVisArea( Rectangle() ); diff -Nru libreoffice-5.1.4/sd/source/ui/framework/tools/FrameworkHelper.cxx libreoffice-5.1.5~rc2/sd/source/ui/framework/tools/FrameworkHelper.cxx --- libreoffice-5.1.4/sd/source/ui/framework/tools/FrameworkHelper.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sd/source/ui/framework/tools/FrameworkHelper.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -518,6 +518,41 @@ } } +namespace +{ + +void updateEditMode(const Reference &xView, const EditMode eEMode, bool updateFrameView) +{ + // Ensure we have the expected edit mode + // The check is only for DrawViewShell as OutlineViewShell + // and SlideSorterViewShell have no master mode + const ::std::shared_ptr pCenterViewShell (FrameworkHelper::GetViewShell(xView)); + DrawViewShell* pDrawViewShell + = dynamic_cast(pCenterViewShell.get()); + if (pDrawViewShell != nullptr) + { + pCenterViewShell->Broadcast ( + ViewShellHint(ViewShellHint::HINT_CHANGE_EDIT_MODE_START)); + + pDrawViewShell->ChangeEditMode(eEMode, pDrawViewShell->IsLayerModeActive()); + if (updateFrameView) + pDrawViewShell->WriteFrameViewData(); + + pCenterViewShell->Broadcast ( + ViewShellHint(ViewShellHint::HINT_CHANGE_EDIT_MODE_END)); + } +} + +void asyncUpdateEditMode(FrameworkHelper* const pHelper, const EditMode eEMode) +{ + Reference xPaneId ( + FrameworkHelper::CreateResourceId(framework::FrameworkHelper::msCenterPaneURL)); + Reference xView (pHelper->GetView(xPaneId)); + updateEditMode(xView, eEMode, true); +} + +} + void FrameworkHelper::HandleModeChangeSlot ( sal_uLong nSlotId, SfxRequest& rRequest) @@ -552,7 +587,6 @@ Reference xPaneId ( CreateResourceId(framework::FrameworkHelper::msCenterPaneURL)); Reference xView (GetView(xPaneId)); - ::std::shared_ptr pCenterViewShell (GetViewShell(xView)); // Compute requested view OUString sRequestedView; @@ -595,26 +629,15 @@ if (!(xView.is() && xView->getResourceId()->getResourceURL().equals(sRequestedView))) { + const auto xId = CreateResourceId(sRequestedView, msCenterPaneURL); mxConfigurationController->requestResourceActivation( - CreateResourceId(sRequestedView, msCenterPaneURL), + xId, ResourceActivationMode_REPLACE); + RunOnResourceActivation(xId, std::bind(&asyncUpdateEditMode, this, eEMode)); } - - // Ensure we have the expected edit mode - // The check is only for DrawViewShell as OutlineViewShell - // and SlideSorterViewShell have no master mode - DrawViewShell* pDrawViewShell - = dynamic_cast(pCenterViewShell.get()); - if (pDrawViewShell != nullptr) + else { - pCenterViewShell->Broadcast ( - ViewShellHint(ViewShellHint::HINT_CHANGE_EDIT_MODE_START)); - - pDrawViewShell->ChangeEditMode ( - eEMode, pDrawViewShell->IsLayerModeActive()); - - pCenterViewShell->Broadcast ( - ViewShellHint(ViewShellHint::HINT_CHANGE_EDIT_MODE_END)); + updateEditMode(xView, eEMode, false); } } catch (RuntimeException&) diff -Nru libreoffice-5.1.4/sd/source/ui/view/ViewShellBase.cxx libreoffice-5.1.5~rc2/sd/source/ui/view/ViewShellBase.cxx --- libreoffice-5.1.4/sd/source/ui/view/ViewShellBase.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sd/source/ui/view/ViewShellBase.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -1233,13 +1233,13 @@ SfxWhichIter aSetIterator (rSet); sal_uInt16 nItemId (aSetIterator.FirstWhich()); - FrameView *pFrameView; while (nItemId > 0) { bool bState (false); Reference xResourceId; try { + // Check if the right view is active switch (nItemId) { case SID_LEFT_PANE_IMPRESS: @@ -1254,16 +1254,13 @@ bState = xConfiguration->hasResource(xResourceId); break; + case SID_DRAWINGMODE: case SID_NORMAL_MULTI_PANE_GUI: - pFrameView = mrBase.GetMainViewShell()->GetFrameView(); - bState = pFrameView->GetViewShEditMode() == EM_PAGE - && pFrameView->GetPageKind() == PK_STANDARD; - break; - case SID_SLIDE_MASTER_MODE: - pFrameView = mrBase.GetMainViewShell()->GetFrameView(); - bState = pFrameView->GetViewShEditMode() == EM_MASTERPAGE - && pFrameView->GetPageKind() == PK_STANDARD; + xResourceId = ResourceId::createWithAnchorURL( + xContext, FrameworkHelper::msImpressViewURL, + FrameworkHelper::msCenterPaneURL); + bState = xConfiguration->hasResource(xResourceId); break; case SID_SLIDE_SORTER_MULTI_PANE_GUI: @@ -1284,21 +1281,18 @@ break; case SID_HANDOUT_MASTER_MODE: - pFrameView = mrBase.GetMainViewShell()->GetFrameView(); - bState = pFrameView->GetViewShEditMode() == EM_MASTERPAGE - && pFrameView->GetPageKind() == PK_HANDOUT; + xResourceId = ResourceId::createWithAnchorURL( + xContext, FrameworkHelper::msHandoutViewURL, + FrameworkHelper::msCenterPaneURL); + bState = xConfiguration->hasResource(xResourceId); break; case SID_NOTES_MODE: - pFrameView = mrBase.GetMainViewShell()->GetFrameView(); - bState = pFrameView->GetViewShEditMode() == EM_PAGE - && pFrameView->GetPageKind() == PK_NOTES; - break; - case SID_NOTES_MASTER_MODE: - pFrameView = mrBase.GetMainViewShell()->GetFrameView(); - bState = pFrameView->GetViewShEditMode() == EM_MASTERPAGE - && pFrameView->GetPageKind() == PK_NOTES; + xResourceId = ResourceId::createWithAnchorURL( + xContext, FrameworkHelper::msNotesViewURL, + FrameworkHelper::msCenterPaneURL); + bState = xConfiguration->hasResource(xResourceId); break; case SID_TOGGLE_TABBAR_VISIBILITY: @@ -1315,32 +1309,27 @@ { } - // Take the master page mode into account. - switch (nItemId) + // Check if edit mode fits too + if (bState) { - case SID_NORMAL_MULTI_PANE_GUI: - case SID_NOTES_MODE: + ViewShell* const pCenterViewShell = FrameworkHelper::Instance(mrBase)->GetViewShell( + FrameworkHelper::msCenterPaneURL).get(); + DrawViewShell* const pShell = dynamic_cast(pCenterViewShell); + if (pShell) { - // Determine the master page mode. - ViewShell* pCenterViewShell = FrameworkHelper::Instance(mrBase)->GetViewShell( - FrameworkHelper::msCenterPaneURL).get(); - bool bMasterPageMode (false); - if (DrawViewShell* pShell = dynamic_cast(pCenterViewShell)) + switch (nItemId) { - if (pShell->GetEditMode() == EM_MASTERPAGE) - { - bMasterPageMode = true; - } + case SID_DRAWINGMODE: + case SID_NORMAL_MULTI_PANE_GUI: + case SID_NOTES_MODE: + bState = pShell->GetEditMode() == EM_PAGE; + break; + case SID_SLIDE_MASTER_MODE: + case SID_NOTES_MASTER_MODE: + bState = pShell->GetEditMode() == EM_MASTERPAGE; + break; } - - bState &= !bMasterPageMode; - break; } - - case SID_HANDOUT_MASTER_MODE: - // There is only the master page mode for the handout - // view so ignore the master page flag. - break; } // And finally set the state. diff -Nru libreoffice-5.1.4/sd/source/ui/view/ViewShellImplementation.cxx libreoffice-5.1.5~rc2/sd/source/ui/view/ViewShellImplementation.cxx --- libreoffice-5.1.4/sd/source/ui/view/ViewShellImplementation.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sd/source/ui/view/ViewShellImplementation.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -120,6 +120,8 @@ if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 ) { // First make sure that the sidebar is visible + mrViewShell.GetDrawView()->SdrEndTextEdit(); + mrViewShell.GetDrawView()->UnmarkAll(); mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR); sfx2::sidebar::Sidebar::ShowPanel( "SdLayoutsPanel", diff -Nru libreoffice-5.1.4/sfx2/source/appl/shutdownicon.cxx libreoffice-5.1.5~rc2/sfx2/source/appl/shutdownicon.cxx --- libreoffice-5.1.4/sfx2/source/appl/shutdownicon.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/appl/shutdownicon.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -122,19 +122,16 @@ bool ShutdownIcon::bModalMode = false; ShutdownIcon* ShutdownIcon::pShutdownIcon = nullptr; -#if !defined( ENABLE_QUICKSTART_APPLET ) -// To remove conditionals extern "C" { static void disabled_initSystray() { } static void disabled_deInitSystray() { } } -#endif namespace { boost::logic::tribool loaded(boost::logic::indeterminate); -oslGenericFunction pInitSystray(nullptr); -oslGenericFunction pDeInitSystray(nullptr); +oslGenericFunction pInitSystray = disabled_initSystray; +oslGenericFunction pDeInitSystray = disabled_deInitSystray; bool LoadModule() { @@ -170,10 +167,6 @@ loaded = true; } # endif // UNX -#else - pInitSystray = disabled_initSystray; - pDeInitSystray = disabled_deInitSystray; - loaded = false; #endif // ENABLE_QUICKSTART_APPLET } assert(!boost::logic::indeterminate(loaded)); diff -Nru libreoffice-5.1.4/sfx2/source/control/recentdocsview.cxx libreoffice-5.1.5~rc2/sfx2/source/control/recentdocsview.cxx --- libreoffice-5.1.4/sfx2/source/control/recentdocsview.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/control/recentdocsview.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -232,8 +232,14 @@ ThumbnailViewItem* pItem = ImplGetItem(nPos); if (pItem && nPos == mnLastMouseDownItem) + { pItem->MouseButtonUp(rMEvt); + ThumbnailViewItem* pNewItem = ImplGetItem(nPos); + if(pNewItem) + pNewItem->setHighlight(true); + } + mnLastMouseDownItem = THUMBNAILVIEW_ITEM_NOTFOUND; if (pItem) diff -Nru libreoffice-5.1.4/sfx2/source/doc/docfile.cxx libreoffice-5.1.5~rc2/sfx2/source/doc/docfile.cxx --- libreoffice-5.1.4/sfx2/source/doc/docfile.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/doc/docfile.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -1620,10 +1620,10 @@ OSL_ENSURE( !pImp->m_aName.isEmpty(), "The exception _must_ contain the temporary URL!\n" ); } } - - if ( !GetError() ) - SetError( ERRCODE_IO_GENERAL, OSL_LOG_PREFIX ); } + + if (!GetError()) + SetError( ERRCODE_IO_GENERAL, OSL_LOG_PREFIX ); } catch ( const uno::Exception& ) { diff -Nru libreoffice-5.1.4/sfx2/source/sidebar/ResourceManager.cxx libreoffice-5.1.5~rc2/sfx2/source/sidebar/ResourceManager.cxx --- libreoffice-5.1.4/sfx2/source/sidebar/ResourceManager.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/sidebar/ResourceManager.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -109,61 +109,57 @@ DeckContainer::iterator iDeck; for (iDeck = maDecks.begin(); iDeck != maDecks.end(); ++iDeck) { - bool bIsEnabled; - const ContextList::Entry* pMatchingEntry = iDeck->maContextList.GetMatch(rContext); + std::shared_ptr& rDeck = *iDeck; + + const ContextList::Entry* pMatchingEntry = rDeck->maContextList.GetMatch(rContext); + bool bIsEnabled; if (pMatchingEntry) bIsEnabled = pMatchingEntry->mbIsInitiallyVisible; else bIsEnabled = false; - iDeck->mbIsEnabled = bIsEnabled; + rDeck->mbIsEnabled = bIsEnabled; } } -const DeckDescriptor* ResourceManager::ImplGetDeckDescriptor(const OUString& rsDeckId) const +std::shared_ptr ResourceManager::ImplGetDeckDescriptor(const OUString& rsDeckId) const { DeckContainer::const_iterator iDeck; for (iDeck = maDecks.begin(); iDeck != maDecks.end(); ++iDeck) { - if (iDeck->mbExperimental && !maMiscOptions.IsExperimentalMode()) + const std::shared_ptr& rDeck = *iDeck; + + if (rDeck->mbExperimental && !maMiscOptions.IsExperimentalMode()) continue; - if (iDeck->msId.equals(rsDeckId)) - return &*iDeck; + if (rDeck->msId.equals(rsDeckId)) + return rDeck; } return nullptr; } -const DeckDescriptor* ResourceManager::GetDeckDescriptor(const OUString& rsDeckId) const -{ - return ImplGetDeckDescriptor( rsDeckId ); -} -DeckDescriptor* ResourceManager::GetDeckDescriptor(const OUString& rsDeckId) +std::shared_ptr ResourceManager::GetDeckDescriptor(const OUString& rsDeckId) const { - const ResourceManager* constMe = this; - return const_cast( constMe->ImplGetDeckDescriptor(rsDeckId) ); + return ImplGetDeckDescriptor( rsDeckId ); } -const PanelDescriptor* ResourceManager::ImplGetPanelDescriptor(const OUString& rsPanelId) const +std::shared_ptr ResourceManager::ImplGetPanelDescriptor(const OUString& rsPanelId) const { PanelContainer::const_iterator iPanel; for (iPanel = maPanels.begin(); iPanel != maPanels.end(); ++iPanel) { - if (iPanel->msId.equals(rsPanelId)) - return &*iPanel; + const std::shared_ptr& rPanel = *iPanel; + + if (rPanel->msId.equals(rsPanelId)) + return rPanel; } return nullptr; } -const PanelDescriptor* ResourceManager::GetPanelDescriptor(const OUString& rsPanelId) const -{ - return ImplGetPanelDescriptor( rsPanelId ); -} -PanelDescriptor* ResourceManager::GetPanelDescriptor(const OUString& rsPanelId) +std::shared_ptr ResourceManager::GetPanelDescriptor(const OUString& rsPanelId) const { - const ResourceManager* constMe = this; - return const_cast( constMe->ImplGetPanelDescriptor(rsPanelId) ); + return ImplGetPanelDescriptor( rsPanelId ); } const ResourceManager::DeckContextDescriptorContainer& ResourceManager::GetMatchingDecks ( @@ -178,10 +174,12 @@ DeckContainer::const_iterator iDeck; for (iDeck = maDecks.begin(); iDeck != maDecks.end(); ++iDeck) { - if (iDeck->mbExperimental && !maMiscOptions.IsExperimentalMode()) + const std::shared_ptr& rDeck = *iDeck; + + if (rDeck->mbExperimental && !maMiscOptions.IsExperimentalMode()) continue; - const DeckDescriptor& rDeckDescriptor (*iDeck); + const DeckDescriptor& rDeckDescriptor (*rDeck); if (rDeckDescriptor.maContextList.GetMatch(rContext) == nullptr) continue; @@ -212,16 +210,18 @@ const OUString& rsDeckId, const Reference& rxController) { + OUString sDeckId(rsDeckId); ReadLegacyAddons(rxController); std::multimap aOrderedIds; PanelContainer::const_iterator iPanel; for (iPanel = maPanels.begin(); iPanel != maPanels.end(); ++iPanel) { - const PanelDescriptor& rPanelDescriptor (*iPanel); + const std::shared_ptr& rPanel = *iPanel; + const PanelDescriptor& rPanelDescriptor (*rPanel); if (rPanelDescriptor.mbExperimental && !maMiscOptions.IsExperimentalMode()) continue; - if ( ! rPanelDescriptor.msDeckId.equals(rsDeckId)) + if ( ! rPanelDescriptor.msDeckId.equals(sDeckId)) continue; const ContextList::Entry* pEntry = rPanelDescriptor.maContextList.GetMatch(rContext); @@ -258,15 +258,15 @@ const Sequence aDeckNodeNames (aDeckRootNode.getNodeNames()); const sal_Int32 nCount(aDeckNodeNames.getLength()); - maDecks.resize(nCount); - sal_Int32 nWriteIndex(0); + maDecks.clear(); for (sal_Int32 nReadIndex(0); nReadIndex()); + DeckDescriptor& rDeckDescriptor (*maDecks.back()); rDeckDescriptor.msTitle = getString(aDeckNode, "Title"); rDeckDescriptor.msId = getString(aDeckNode, "Id"); @@ -276,7 +276,6 @@ rDeckDescriptor.msHighContrastTitleBarIconURL = getString(aDeckNode, "HighContrastTitleBarIconURL"); rDeckDescriptor.msHelpURL = getString(aDeckNode, "HelpURL"); rDeckDescriptor.msHelpText = rDeckDescriptor.msTitle; - // rDeckDescriptor.mbIsEnabled = true; // TODO ??? update rDeckDescriptor.mbIsEnabled according to context , see IsDeckEnabled ? rDeckDescriptor.mnOrderIndex = getInt32(aDeckNode, "OrderIndex"); rDeckDescriptor.mbExperimental = getBool(aDeckNode, "IsExperimental"); @@ -288,25 +287,21 @@ OUString()); } - - // When there where invalid nodes then we have to adapt the size - // of the deck vector. - if (nWriteIndexmaContextList.GetMatch(rContext); + const std::shared_ptr& rDeck = *iDeck; + + const ContextList::Entry* pMatchingEntry = rDeck->maContextList.GetMatch(rContext); if (pMatchingEntry) { - const DeckDescriptor* pDeckDesc = GetDeckDescriptor(iDeck->msId); - if (pDeckDesc) - SaveDeckSettings(pDeckDesc); + std::shared_ptr xDeckDesc = GetDeckDescriptor(rDeck->msId); + if (xDeckDesc) + SaveDeckSettings(xDeckDesc.get()); } } @@ -350,20 +345,20 @@ for ( SharedPanelContainer::iterator iPanel(rPanels.begin()), iEnd(rPanels.end()); iPanel!=iEnd; ++iPanel) - { - Panel* aPanel = *iPanel; - OUString panelId = aPanel->GetId(); - const PanelDescriptor* pPanelDesc = GetPanelDescriptor(panelId); + { + Panel* aPanel = *iPanel; + OUString panelId = aPanel->GetId(); + std::shared_ptr xPanelDesc = GetPanelDescriptor(panelId); - ::uno::Sequence< OUString > sPanelContextList = BuildContextList(pPanelDesc->maContextList); + ::uno::Sequence< OUString > sPanelContextList = BuildContextList(xPanelDesc->maContextList); - utl::OConfigurationNode aPanelNode (aPanelRootNode.openNode(pPanelDesc->msNodeName)); + utl::OConfigurationNode aPanelNode (aPanelRootNode.openNode(xPanelDesc->msNodeName)); - aPanelNode.setNodeValue("Title", makeAny(pPanelDesc->msTitle)); - aPanelNode.setNodeValue("OrderIndex", makeAny(pPanelDesc->mnOrderIndex)); - aPanelNode.setNodeValue("ContextList", makeAny( sPanelContextList )); + aPanelNode.setNodeValue("Title", makeAny(xPanelDesc->msTitle)); + aPanelNode.setNodeValue("OrderIndex", makeAny(xPanelDesc->mnOrderIndex)); + aPanelNode.setNodeValue("ContextList", makeAny( sPanelContextList )); - } + } aPanelRootNode.commit(); @@ -380,15 +375,15 @@ const Sequence aPanelNodeNames (aPanelRootNode.getNodeNames()); const sal_Int32 nCount (aPanelNodeNames.getLength()); - maPanels.resize(nCount); - sal_Int32 nWriteIndex (0); + maPanels.clear(); for (sal_Int32 nReadIndex(0); nReadIndex()); + PanelDescriptor& rPanelDescriptor(*maPanels.back()); rPanelDescriptor.msTitle = getString(aPanelNode, "Title"); rPanelDescriptor.mbIsTitleBarOptional = getBool(aPanelNode, "TitleBarIsOptional"); @@ -408,11 +403,6 @@ ReadContextList(aPanelNode, rPanelDescriptor.maContextList, sDefaultMenuCommand); } - - // When there where invalid nodes then we have to adapt the size - // of the deck vector. - if (nWriteIndex aMatchingNodeNames; GetToolPanelNodeNames(aMatchingNodeNames, aLegacyRootNode); const sal_Int32 nCount (aMatchingNodeNames.size()); - size_t nDeckWriteIndex (maDecks.size()); - size_t nPanelWriteIndex (maPanels.size()); - maDecks.resize(maDecks.size() + nCount); - maPanels.resize(maPanels.size() + nCount); for (sal_Int32 nReadIndex(0); nReadIndex()); + DeckDescriptor& rDeckDescriptor(*maDecks.back()); rDeckDescriptor.msTitle = getString(aChildNode, "UIName"); rDeckDescriptor.msId = rsNodeName; rDeckDescriptor.msIconURL = getString(aChildNode, "ImageURL"); @@ -622,7 +609,8 @@ rDeckDescriptor.mnOrderIndex = 100000 + nReadIndex; rDeckDescriptor.maContextList.AddContextDescription(Context(sModuleName, OUString("any")), true, OUString()); - PanelDescriptor& rPanelDescriptor (maPanels[nPanelWriteIndex++]); + maPanels.push_back(std::make_shared()); + PanelDescriptor& rPanelDescriptor(*maPanels.back()); rPanelDescriptor.msTitle = getString(aChildNode, "UIName"); rPanelDescriptor.mbIsTitleBarOptional = true; rPanelDescriptor.msId = rsNodeName; @@ -636,13 +624,6 @@ rPanelDescriptor.mbWantsCanvas = false; rPanelDescriptor.maContextList.AddContextDescription(Context(sModuleName, OUString("any")), true, OUString()); } - - // When there where invalid nodes then we have to adapt the size - // of the deck and panel vectors. - if (nDeckWriteIndex < maDecks.size()) - maDecks.resize(nDeckWriteIndex); - if (nPanelWriteIndex < maPanels.size()) - maPanels.resize(nPanelWriteIndex); } void ResourceManager::StorePanelExpansionState ( @@ -653,9 +634,11 @@ PanelContainer::iterator iPanel; for (iPanel = maPanels.begin(); iPanel != maPanels.end(); ++iPanel) { - if (iPanel->msId.equals(rsPanelId)) + const std::shared_ptr& rPanel = *iPanel; + + if (rPanel->msId.equals(rsPanelId)) { - ContextList::Entry* pEntry(iPanel->maContextList.GetMatch(rContext)); + ContextList::Entry* pEntry(rPanel->maContextList.GetMatch(rContext)); if (pEntry != nullptr) pEntry->mbIsInitiallyVisible = bExpansionState; } @@ -726,10 +709,12 @@ { for (DeckContainer::iterator itr = maDecks.begin(); itr != maDecks.end(); ++itr) { - if (!itr->mpDeck) + std::shared_ptr& rDeck = *itr; + + if (!rDeck->mpDeck) continue; - const SharedPanelContainer& rContainer = itr->mpDeck->GetPanels(); + const SharedPanelContainer& rContainer = rDeck->mpDeck->GetPanels(); for (SharedPanelContainer::const_iterator it = rContainer.begin(); it != rContainer.end(); ++it) { @@ -742,7 +727,10 @@ void ResourceManager::disposeDecks() { for (DeckContainer::iterator itr = maDecks.begin(); itr != maDecks.end(); ++itr) - itr->mpDeck.disposeAndClear(); + { + std::shared_ptr& rDeck = *itr; + rDeck->mpDeck.disposeAndClear(); + } } } } // end of namespace sfx2::sidebar diff -Nru libreoffice-5.1.4/sfx2/source/sidebar/SidebarController.cxx libreoffice-5.1.5~rc2/sfx2/source/sidebar/SidebarController.cxx --- libreoffice-5.1.4/sfx2/source/sidebar/SidebarController.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/sidebar/SidebarController.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -94,7 +94,7 @@ mpTabBar(VclPtr::Create( mpParentWindow, rxFrame, - [this](const ::rtl::OUString& rsDeckId) { return this->OpenThenSwitchToDeck(rsDeckId); }, + [this](const ::rtl::OUString& rsDeckId) { return this->OpenThenToggleDeck(rsDeckId); }, [this](const Rectangle& rButtonBox,const ::std::vector& rMenuData) { return this->ShowPopupMenu(rButtonBox,rMenuData); }, this)), mxFrame(rxFrame), @@ -219,7 +219,7 @@ iDeck(aDecks.begin()), iEnd(aDecks.end()); iDeck!=iEnd; ++iDeck) { - const DeckDescriptor* deckDesc = mpResourceManager->GetDeckDescriptor(iDeck->msId); + std::shared_ptr deckDesc = mpResourceManager->GetDeckDescriptor(iDeck->msId); VclPtr aDeck = deckDesc->mpDeck; if (aDeck) @@ -313,7 +313,7 @@ throw(css::uno::RuntimeException, std::exception) { sal_Int32 nMinimalWidth = 0; - if (mpCurrentDeck) + if (mpCurrentDeck && !mpCurrentDeck->isDisposed()) { mpCurrentDeck->RequestLayout(); nMinimalWidth = mpCurrentDeck->GetMinimalWidth(); @@ -361,7 +361,7 @@ else bIsDeckVisible = false; - if (mpCurrentDeck) + if (mpCurrentDeck && !mpCurrentDeck->isDisposed()) { SfxSplitWindow* pSplitWindow = GetSplitWindow(); WindowAlign eAlign = pSplitWindow ? pSplitWindow->GetAlign() : WindowAlign::Right; @@ -395,7 +395,7 @@ // Determine if the closer of the deck can be shown. sal_Int32 nMinimalWidth = 0; - if (mpCurrentDeck) + if (mpCurrentDeck && !mpCurrentDeck->isDisposed()) { DeckTitleBar* pTitleBar = mpCurrentDeck->GetTitleBar(); if (pTitleBar != nullptr && pTitleBar->IsVisible()) @@ -491,19 +491,17 @@ // with the deck. mpTabBar->HighlightDeck(sNewDeckId); - const DeckDescriptor* pDescriptor = mpResourceManager->GetDeckDescriptor(sNewDeckId); + std::shared_ptr xDescriptor = mpResourceManager->GetDeckDescriptor(sNewDeckId); - if (pDescriptor) + if (xDescriptor) { - SwitchToDeck( - *pDescriptor, - maCurrentContext); + SwitchToDeck(*xDescriptor, maCurrentContext); } } } -void SidebarController::OpenThenSwitchToDeck ( - const ::rtl::OUString& rsDeckId) +void SidebarController::OpenThenToggleDeck ( + const OUString& rsDeckId) { SfxSplitWindow* pSplitWindow = GetSplitWindow(); if ( pSplitWindow && !pSplitWindow->IsFadeIn() ) @@ -525,6 +523,19 @@ mpTabBar->HighlightDeck(rsDeckId); } +void SidebarController::OpenThenSwitchToDeck ( + const OUString& rsDeckId) +{ + SfxSplitWindow* pSplitWindow = GetSplitWindow(); + if ( pSplitWindow && !pSplitWindow->IsFadeIn() ) + // tdf#83546 Collapsed sidebar should expand first + pSplitWindow->FadeIn(); + RequestOpenDeck(); + SwitchToDeck(rsDeckId); + mpTabBar->Invalidate(); + mpTabBar->HighlightDeck(rsDeckId); +} + void SidebarController::SwitchToDefaultDeck() { SwitchToDeck(gsDefaultDeckId); @@ -537,43 +548,43 @@ || ! mbIsDeckOpen || mnRequestedForceFlags!=SwitchFlag_NoForce) { - const DeckDescriptor* pDeckDescriptor = mpResourceManager->GetDeckDescriptor(rsDeckId); + std::shared_ptr xDeckDescriptor = mpResourceManager->GetDeckDescriptor(rsDeckId); - if (pDeckDescriptor != nullptr) - SwitchToDeck(*pDeckDescriptor, maCurrentContext); + if (xDeckDescriptor) + SwitchToDeck(*xDeckDescriptor, maCurrentContext); } } void SidebarController::CreateDeck(const ::rtl::OUString& rDeckId, bool bForceCreate) { - DeckDescriptor* pDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId); + std::shared_ptr xDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId); - if (pDeckDescriptor) + if (xDeckDescriptor) { - VclPtr aDeck = pDeckDescriptor->mpDeck; + VclPtr aDeck = xDeckDescriptor->mpDeck; if (aDeck.get()==nullptr || bForceCreate) { if (aDeck.get()!=nullptr) aDeck.disposeAndClear(); aDeck = VclPtr::Create( - *pDeckDescriptor, + *xDeckDescriptor, mpParentWindow, [this]() { return this->RequestCloseDeck(); }); } - pDeckDescriptor->mpDeck = aDeck; + xDeckDescriptor->mpDeck = aDeck; CreatePanels(rDeckId); } } void SidebarController::CreatePanels(const ::rtl::OUString& rDeckId) { - DeckDescriptor* pDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId); + std::shared_ptr xDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId); // init panels bounded to that deck, do not wait them being displayed as may be accessed through API - VclPtr pDeck = pDeckDescriptor->mpDeck; + VclPtr pDeck = xDeckDescriptor->mpDeck; ResourceManager::PanelContextDescriptorContainer aPanelContextDescriptors; @@ -764,14 +775,14 @@ const Context& rContext, VclPtr pDeck) { - const PanelDescriptor* pPanelDescriptor = mpResourceManager->GetPanelDescriptor(rsPanelId); + std::shared_ptr xPanelDescriptor = mpResourceManager->GetPanelDescriptor(rsPanelId); - if (pPanelDescriptor == nullptr) + if (!xPanelDescriptor) return nullptr; // Create the panel which is the parent window of the UIElement. VclPtr pPanel = VclPtr::Create( - *pPanelDescriptor, + *xPanelDescriptor, pParentWindow, bIsInitiallyExpanded, [pDeck]() { return pDeck.get()->RequestLayout(); }, @@ -781,8 +792,8 @@ // Create the XUIElement. Reference xUIElement (CreateUIElement( pPanel->GetComponentInterface(), - pPanelDescriptor->msImplementationURL, - pPanelDescriptor->mbWantsCanvas, + xPanelDescriptor->msImplementationURL, + xPanelDescriptor->mbWantsCanvas, rContext)); if (xUIElement.is()) { @@ -1229,13 +1240,13 @@ const ResourceManager& rResourceManager = *mpResourceManager; // Update the deck icon. - const DeckDescriptor* pDeckDescriptor = rResourceManager.GetDeckDescriptor(mpCurrentDeck->GetId()); - if (pDeckDescriptor != nullptr && mpCurrentDeck->GetTitleBar()) + std::shared_ptr xDeckDescriptor = rResourceManager.GetDeckDescriptor(mpCurrentDeck->GetId()); + if (xDeckDescriptor && mpCurrentDeck->GetTitleBar()) { const OUString sIconURL( bIsHighContrastModeActive - ? pDeckDescriptor->msHighContrastTitleBarIconURL - : pDeckDescriptor->msTitleBarIconURL); + ? xDeckDescriptor->msHighContrastTitleBarIconURL + : xDeckDescriptor->msTitleBarIconURL); mpCurrentDeck->GetTitleBar()->SetIcon(Tools::GetImage(sIconURL, mxFrame)); } @@ -1250,13 +1261,13 @@ continue; if ((*iPanel)->GetTitleBar() == nullptr) continue; - const PanelDescriptor* pPanelDescriptor = rResourceManager.GetPanelDescriptor((*iPanel)->GetId()); - if (pPanelDescriptor == nullptr) + std::shared_ptr xPanelDescriptor = rResourceManager.GetPanelDescriptor((*iPanel)->GetId()); + if (!xPanelDescriptor) continue; const OUString sIconURL ( bIsHighContrastModeActive - ? pPanelDescriptor->msHighContrastTitleBarIconURL - : pPanelDescriptor->msTitleBarIconURL); + ? xPanelDescriptor->msHighContrastTitleBarIconURL + : xPanelDescriptor->msTitleBarIconURL); (*iPanel)->GetTitleBar()->SetIcon(Tools::GetImage(sIconURL, mxFrame)); } } diff -Nru libreoffice-5.1.4/sfx2/source/sidebar/Sidebar.cxx libreoffice-5.1.5~rc2/sfx2/source/sidebar/Sidebar.cxx --- libreoffice-5.1.4/sfx2/source/sidebar/Sidebar.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/sidebar/Sidebar.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -31,9 +31,9 @@ { SidebarController* pController = SidebarController::GetSidebarControllerForFrame(rxFrame); - const PanelDescriptor* pPanelDescriptor = pController->GetResourceManager()->GetPanelDescriptor(rsPanelId); + std::shared_ptr xPanelDescriptor = pController->GetResourceManager()->GetPanelDescriptor(rsPanelId); - if (pController!=nullptr && pPanelDescriptor != nullptr) + if (pController && xPanelDescriptor) { // This should be a lot more sophisticated: // - Make the deck switching asynchronous @@ -41,10 +41,33 @@ // All that is not necessary for the current use cases so lets // keep it simple for the time being. - pController->OpenThenSwitchToDeck(pPanelDescriptor->msDeckId); + pController->OpenThenSwitchToDeck(xPanelDescriptor->msDeckId); } } +void Sidebar::TogglePanel ( + const ::rtl::OUString& rsPanelId, + const css::uno::Reference& rxFrame) +{ + SidebarController* pController = SidebarController::GetSidebarControllerForFrame(rxFrame); + + if (!pController) + return; + + std::shared_ptr xPanelDescriptor = pController->GetResourceManager()->GetPanelDescriptor(rsPanelId); + + if (!xPanelDescriptor) + return; + + // This should be a lot more sophisticated: + // - Make the deck switching asynchronous + // - Make sure to use a context that really shows the panel + + // All that is not necessary for the current use cases so lets + // keep it simple for the time being. + pController->OpenThenToggleDeck(xPanelDescriptor->msDeckId); +} + } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.1.4/sfx2/source/sidebar/TabBar.cxx libreoffice-5.1.5~rc2/sfx2/source/sidebar/TabBar.cxx --- libreoffice-5.1.4/sfx2/source/sidebar/TabBar.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/sidebar/TabBar.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -119,20 +119,20 @@ for (ResourceManager::DeckContextDescriptorContainer::const_iterator iDeck(rDecks.begin()); iDeck != rDecks.end(); ++iDeck) { - const DeckDescriptor* pDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iDeck->msId); - if (pDescriptor == nullptr) + std::shared_ptr xDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iDeck->msId); + if (xDescriptor == nullptr) { - OSL_ASSERT(pDescriptor!=nullptr); + OSL_ASSERT(xDescriptor!=nullptr); continue; } Item& rItem (maItems[nIndex++]); - rItem.msDeckId = pDescriptor->msId; + rItem.msDeckId = xDescriptor->msId; rItem.mpButton.disposeAndClear(); - rItem.mpButton = CreateTabItem(*pDescriptor); + rItem.mpButton = CreateTabItem(*xDescriptor); rItem.mpButton->SetClickHdl(LINK(&rItem, TabBar::Item, HandleClick)); rItem.maDeckActivationFunctor = maDeckActivationFunctor; - rItem.mbIsHidden = ! pDescriptor->mbIsEnabled; + rItem.mbIsHidden = ! xDescriptor->mbIsEnabled; rItem.mbIsHiddenByDefault = rItem.mbIsHidden; // the default is the state while creating rItem.mpButton->Enable(iDeck->mbIsEnabled); @@ -158,11 +158,11 @@ iItem!=iEnd; ++iItem) { - const DeckDescriptor* pDeckDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iItem->msDeckId); + std::shared_ptr xDeckDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iItem->msDeckId); - if (pDeckDescriptor != nullptr) + if (xDeckDescriptor) { - aImage = GetItemImage(*pDeckDescriptor); + aImage = GetItemImage(*xDeckDescriptor); if ( mpMenuButton->GetDPIScaleFactor() > 1 ) { BitmapEx b = aImage.GetBitmapEx(); @@ -335,18 +335,18 @@ { maItems[nIndex].mbIsHidden = ! maItems[nIndex].mbIsHidden; - DeckDescriptor* pDeckDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(maItems[nIndex].msDeckId); - if (pDeckDescriptor) + std::shared_ptr xDeckDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(maItems[nIndex].msDeckId); + if (xDeckDescriptor) { - pDeckDescriptor->mbIsEnabled = ! maItems[nIndex].mbIsHidden; + xDeckDescriptor->mbIsEnabled = ! maItems[nIndex].mbIsHidden; Context aContext; aContext.msApplication = pParentSidebarController->GetCurrentContext().msApplication; // leave aContext.msContext on default 'any' ... this func is used only for decks // and we don't have context-sensitive decks anyway - pDeckDescriptor->maContextList.ToggleVisibilityForContext( - aContext, pDeckDescriptor->mbIsEnabled ); + xDeckDescriptor->maContextList.ToggleVisibilityForContext( + aContext, xDeckDescriptor->mbIsEnabled ); } Layout(); @@ -363,9 +363,9 @@ iItem->mbIsHidden = iItem->mbIsHiddenByDefault; bNeedsLayout = true; - DeckDescriptor* pDeckDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iItem->msDeckId); - if (pDeckDescriptor) - pDeckDescriptor->mbIsEnabled = ! iItem->mbIsHidden; + std::shared_ptr xDeckDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iItem->msDeckId); + if (xDeckDescriptor) + xDeckDescriptor->mbIsEnabled = ! iItem->mbIsHidden; } } @@ -395,13 +395,13 @@ for (ItemContainer::const_iterator iItem(maItems.begin()); iItem != maItems.end(); ++iItem) { - const DeckDescriptor* pDeckDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iItem->msDeckId); + std::shared_ptr xDeckDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iItem->msDeckId); - if (pDeckDescriptor != nullptr) + if (xDeckDescriptor) { DeckMenuData aData; - aData.msDisplayName = pDeckDescriptor->msTitle; - aData.msDeckId = pDeckDescriptor->msId; + aData.msDisplayName = xDeckDescriptor->msTitle; + aData.msDeckId = xDeckDescriptor->msId; aData.mbIsCurrentDeck = iItem->mpButton->IsChecked(); aData.mbIsActive = !iItem->mbIsHidden; aData.mbIsEnabled = iItem->mpButton->IsEnabled(); diff -Nru libreoffice-5.1.4/sfx2/source/sidebar/UnoDeck.cxx libreoffice-5.1.5~rc2/sfx2/source/sidebar/UnoDeck.cxx --- libreoffice-5.1.4/sfx2/source/sidebar/UnoDeck.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/sidebar/UnoDeck.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -67,16 +67,16 @@ SidebarController* pSidebarController = getSidebarController(); pSidebarController->CreateDeck(mDeckId); - DeckDescriptor* pDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); + std::shared_ptr xDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); - if (pDeckDescriptor) + if (xDeckDescriptor) { - Deck* pDeck = pDeckDescriptor->mpDeck; + Deck* pDeck = xDeckDescriptor->mpDeck; DeckTitleBar* pTitleBar = pDeck->GetTitleBar(); pTitleBar->SetTitle(newTitle); - pDeckDescriptor->msTitle = newTitle; - pDeckDescriptor->msHelpText = newTitle; + xDeckDescriptor->msTitle = newTitle; + xDeckDescriptor->msHelpText = newTitle; pSidebarController->notifyDeckTitle(mDeckId); } @@ -133,11 +133,11 @@ SolarMutexGuard aGuard; SidebarController* pSidebarController = getSidebarController(); - DeckDescriptor* pDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); + std::shared_ptr xDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); - if (pDeckDescriptor) + if (xDeckDescriptor) { - pDeckDescriptor->mnOrderIndex = newOrderIndex; + xDeckDescriptor->mnOrderIndex = newOrderIndex; // update the sidebar pSidebarController->NotifyResize(); } @@ -157,10 +157,10 @@ if (curOrderIndex != minIndex) // is deck already in place ? { minIndex -= 1; - DeckDescriptor* pDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); - if (pDeckDescriptor) + std::shared_ptr xDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); + if (xDeckDescriptor) { - pDeckDescriptor->mnOrderIndex = minIndex; + xDeckDescriptor->mnOrderIndex = minIndex; // update the sidebar pSidebarController->NotifyResize(); } @@ -181,10 +181,10 @@ if (curOrderIndex != maxIndex) // is deck already in place ? { maxIndex += 1; - DeckDescriptor* pDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); - if (pDeckDescriptor) + std::shared_ptr xDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); + if (xDeckDescriptor) { - pDeckDescriptor->mnOrderIndex = maxIndex; + xDeckDescriptor->mnOrderIndex = maxIndex; // update the sidebar pSidebarController->NotifyResize(); } @@ -214,10 +214,10 @@ if (curOrderIndex != previousIndex) // is deck already in place ? { previousIndex -= 1; - DeckDescriptor* pDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); - if (pDeckDescriptor) + std::shared_ptr xDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); + if (xDeckDescriptor) { - pDeckDescriptor->mnOrderIndex = previousIndex; + xDeckDescriptor->mnOrderIndex = previousIndex; // update the sidebar pSidebarController->NotifyResize(); } @@ -248,17 +248,16 @@ if (curOrderIndex != nextIndex) // is deck already in place ? { nextIndex += 1; - DeckDescriptor* pDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); - if (pDeckDescriptor) + std::shared_ptr xDeckDescriptor = pSidebarController->GetResourceManager()->GetDeckDescriptor(mDeckId); + if (xDeckDescriptor) { - pDeckDescriptor->mnOrderIndex = nextIndex; + xDeckDescriptor->mnOrderIndex = nextIndex; // update the sidebar pSidebarController->NotifyResize(); } } } - sal_Int32 SfxUnoDeck::GetMinOrderIndex(ResourceManager::DeckContextDescriptorContainer aDecks) { SidebarController* pSidebarController = getSidebarController(); diff -Nru libreoffice-5.1.4/sfx2/source/sidebar/UnoPanel.cxx libreoffice-5.1.5~rc2/sfx2/source/sidebar/UnoPanel.cxx --- libreoffice-5.1.4/sfx2/source/sidebar/UnoPanel.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/sidebar/UnoPanel.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -64,11 +64,11 @@ SolarMutexGuard aGuard; SidebarController* pSidebarController = getSidebarController(); - PanelDescriptor* pPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); + std::shared_ptr xPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); - if (pPanelDescriptor) + if (xPanelDescriptor) { - pPanelDescriptor->msTitle = newTitle; + xPanelDescriptor->msTitle = newTitle; PanelTitleBar* pTitleBar = mpPanel->GetTitleBar(); if (pTitleBar) pTitleBar->SetTitle(newTitle); @@ -147,11 +147,11 @@ SolarMutexGuard aGuard; SidebarController* pSidebarController = getSidebarController(); - PanelDescriptor* pPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); + std::shared_ptr xPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); - if (pPanelDescriptor) + if (xPanelDescriptor) { - pPanelDescriptor->mnOrderIndex = newOrderIndex; + xPanelDescriptor->mnOrderIndex = newOrderIndex; // update the sidebar pSidebarController->NotifyResize(); } @@ -171,10 +171,10 @@ if (curOrderIndex != minIndex) // is current panel already in place ? { minIndex -= 1; - PanelDescriptor* pPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); - if (pPanelDescriptor) + std::shared_ptr xPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); + if (xPanelDescriptor) { - pPanelDescriptor->mnOrderIndex = minIndex; + xPanelDescriptor->mnOrderIndex = minIndex; // update the sidebar pSidebarController->NotifyResize(); } @@ -195,10 +195,10 @@ if (curOrderIndex != maxIndex) // is current panel already in place ? { maxIndex += 1; - PanelDescriptor* pPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); - if (pPanelDescriptor) + std::shared_ptr xPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); + if (xPanelDescriptor) { - pPanelDescriptor->mnOrderIndex = maxIndex; + xPanelDescriptor->mnOrderIndex = maxIndex; // update the sidebar pSidebarController->NotifyResize(); } @@ -228,10 +228,10 @@ if (curOrderIndex != previousIndex) // is current panel already in place ? { previousIndex -= 1; - PanelDescriptor* pPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); - if (pPanelDescriptor) + std::shared_ptr xPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); + if (xPanelDescriptor) { - pPanelDescriptor->mnOrderIndex = previousIndex; + xPanelDescriptor->mnOrderIndex = previousIndex; // update the sidebar pSidebarController->NotifyResize(); } @@ -261,10 +261,10 @@ if (curOrderIndex != nextIndex) // is current panel already in place ? { nextIndex += 1; - PanelDescriptor* pPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); - if (pPanelDescriptor) + std::shared_ptr xPanelDescriptor = pSidebarController->GetResourceManager()->GetPanelDescriptor(mPanelId); + if (xPanelDescriptor) { - pPanelDescriptor->mnOrderIndex = nextIndex; + xPanelDescriptor->mnOrderIndex = nextIndex; // update the sidebar pSidebarController->NotifyResize(); } diff -Nru libreoffice-5.1.4/sfx2/source/view/viewfrm.cxx libreoffice-5.1.5~rc2/sfx2/source/view/viewfrm.cxx --- libreoffice-5.1.4/sfx2/source/view/viewfrm.cxx 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/source/view/viewfrm.cxx 2016-07-26 21:17:25.000000000 +0000 @@ -3048,8 +3048,8 @@ // First make sure that the sidebar is visible ShowChildWindow(SID_SIDEBAR); - ::sfx2::sidebar::Sidebar::ShowPanel("StyleListPanel", - GetFrame().GetFrameInterface()); + ::sfx2::sidebar::Sidebar::TogglePanel("StyleListPanel", + GetFrame().GetFrameInterface()); rReq.Done(); return; } diff -Nru libreoffice-5.1.4/sfx2/uiconfig/ui/inputdialog.ui libreoffice-5.1.5~rc2/sfx2/uiconfig/ui/inputdialog.ui --- libreoffice-5.1.4/sfx2/uiconfig/ui/inputdialog.ui 2016-06-14 20:05:10.000000000 +0000 +++ libreoffice-5.1.5~rc2/sfx2/uiconfig/ui/inputdialog.ui 2016-07-26 21:17:25.000000000 +0000 @@ -1,5 +1,5 @@ - +

Сражение у мыса Тендра

Содержание