extensions/source/update/feed/updatefeed.cxx | 8 +++----- forms/source/helper/controlfeatureinterception.cxx | 3 +-- package/inc/ThreadedDeflater.hxx | 9 +++++---- package/source/zipapi/ThreadedDeflater.cxx | 8 ++++---- sw/source/core/edit/edtab.cxx | 4 ++++ 5 files changed, 17 insertions(+), 15 deletions(-)
New commits: commit 6ef28599b227042e3b64075143207af2c674719d Author: Caolán McNamara <[email protected]> AuthorDate: Wed Dec 20 15:39:50 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Dec 20 20:59:04 2023 +0100 cid#1545612 COPY_INSTEAD_OF_MOVE and cid#1545605 COPY_INSTEAD_OF_MOVE cid#1545587 COPY_INSTEAD_OF_MOVE Change-Id: Iafb1d81dbacfefe70fbddd84b29e827dc137ef07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161077 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index b1bc6851edef..f9e6a5706c91 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -449,15 +449,13 @@ UpdateInformationProvider::load(const OUString& rURL) uno::Reference< ucb::XCommandProcessor > xCommandProcessor(m_xUniversalContentBroker->queryContent(xId), uno::UNO_QUERY_THROW); rtl::Reference< ActiveDataSink > aSink(new ActiveDataSink()); - // Disable KeepAlive in webdav - don't want millions of office - // instances phone home & clog up servers - uno::Sequence< beans::NamedValue > aProps { { "KeepAlive", uno::Any(false) } }; - ucb::OpenCommandArgument3 aOpenArgument; aOpenArgument.Mode = ucb::OpenMode::DOCUMENT; aOpenArgument.Priority = 32768; aOpenArgument.Sink = *aSink; - aOpenArgument.OpeningFlags = aProps; + // Disable KeepAlive in webdav - don't want millions of office + // instances phone home & clog up servers + aOpenArgument.OpeningFlags = { { "KeepAlive", uno::Any(false) } }; ucb::Command aCommand; aCommand.Name = "open"; diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index 091af550cc29..f95445a4f90a 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.cxx @@ -71,8 +71,7 @@ namespace frm if ( m_xFirstDispatchInterceptor == _rxInterceptor ) { // our chain will have a new first element - Reference< XDispatchProviderInterceptor > xSlave( m_xFirstDispatchInterceptor->getSlaveDispatchProvider(), UNO_QUERY ); - m_xFirstDispatchInterceptor = xSlave; + m_xFirstDispatchInterceptor.set(m_xFirstDispatchInterceptor->getSlaveDispatchProvider(), UNO_QUERY); } // do this before removing the interceptor from the chain as we won't know it's slave afterwards) diff --git a/package/inc/ThreadedDeflater.hxx b/package/inc/ThreadedDeflater.hxx index 361129d0f927..9b5867021cd6 100644 --- a/package/inc/ThreadedDeflater.hxx +++ b/package/inc/ThreadedDeflater.hxx @@ -52,10 +52,11 @@ public: // Unlike with Deflater class, bNoWrap is always true. ThreadedDeflater(sal_Int32 nSetLevel); ~ThreadedDeflater() COVERITY_NOEXCEPT_FALSE; - void deflateWrite( - const css::uno::Reference<css::io::XInputStream>& xInStream, - std::function<void(const css::uno::Sequence<sal_Int8>&, sal_Int32)> aProcessInputFunc, - std::function<void(const css::uno::Sequence<sal_Int8>&, sal_Int32)> aProcessOutputFunc); + void deflateWrite(const css::uno::Reference<css::io::XInputStream>& xInStream, + const std::function<void(const css::uno::Sequence<sal_Int8>&, sal_Int32)>& + rProcessInputFunc, + const std::function<void(const css::uno::Sequence<sal_Int8>&, sal_Int32)>& + rProcessOutputFunc); sal_Int64 getTotalIn() const { return totalIn; } sal_Int64 getTotalOut() const { return totalOut; } diff --git a/package/source/zipapi/ThreadedDeflater.cxx b/package/source/zipapi/ThreadedDeflater.cxx index f574105ad4ef..b76f3adfcd26 100644 --- a/package/source/zipapi/ThreadedDeflater.cxx +++ b/package/source/zipapi/ThreadedDeflater.cxx @@ -76,21 +76,21 @@ ThreadedDeflater::~ThreadedDeflater() COVERITY_NOEXCEPT_FALSE { clear(); } void ThreadedDeflater::deflateWrite( const css::uno::Reference<css::io::XInputStream>& xInStream, - std::function<void(const css::uno::Sequence<sal_Int8>&, sal_Int32)> aProcessInputFunc, - std::function<void(const css::uno::Sequence<sal_Int8>&, sal_Int32)> aProcessOutputFunc) + const std::function<void(const css::uno::Sequence<sal_Int8>&, sal_Int32)>& rProcessInputFunc, + const std::function<void(const css::uno::Sequence<sal_Int8>&, sal_Int32)>& rProcessOutputFunc) { sal_Int64 nThreadCount = comphelper::ThreadPool::getSharedOptimalPool().getWorkerCount(); sal_Int64 batchSize = MaxBlockSize * nThreadCount; inBuffer.realloc(batchSize); prevDataBlock.realloc(MaxBlockSize); outBuffers.resize(nThreadCount); - maProcessOutputFunc = aProcessOutputFunc; + maProcessOutputFunc = rProcessOutputFunc; bool firstTask = true; while (xInStream->available() > 0) { sal_Int64 inputBytes = xInStream->readBytes(inBuffer, batchSize); - aProcessInputFunc(inBuffer, inputBytes); + rProcessInputFunc(inBuffer, inputBytes); totalIn += inputBytes; int sequence = 0; bool lastBatch = xInStream->available() <= 0; commit 3a33a97d2358a7ad2e67c01edc1fca29d1b7041c Author: Mike Kaganski <[email protected]> AuthorDate: Wed Dec 20 18:52:17 2023 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Wed Dec 20 20:58:54 2023 +0100 tdf#158794: do not try to insert DDE table into footnotes / endnotes Until tdf#76007 is fixed, of course. Change-Id: Iad7fb0de679e024a8cebdd005ac5a66af3ace163 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161078 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx index b011a182b3ca..5e318ea74820 100644 --- a/sw/source/core/edit/edtab.cxx +++ b/sw/source/core/edit/edtab.cxx @@ -225,6 +225,10 @@ void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTableOpts, sal_uInt16 nRows, sal_uInt16 nCols ) { SwPosition* pPos = GetCursor()->GetPoint(); + // Do not try to insert table into Footnotes/Endnotes! tdf#76007 prevents that. + if (pPos->GetNode() < pPos->GetNodes().GetEndOfInserts() + && pPos->GetNode().GetIndex() >= pPos->GetNodes().GetEndOfInserts().StartOfSectionIndex()) + return; StartAllAction();
