download.lst | 4 ++-- sc/source/ui/app/transobj.cxx | 13 +++++-------- sc/source/ui/inc/transobj.hxx | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-)
New commits: commit 12f068d1f8740ba67ad4c9f3de85198157214c15 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Aug 12 15:59:09 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Aug 25 20:05:13 2025 +0200 tdf#167075: init doc shell before pasting as png/bmp (take 2) Regression after commit d8ab8992bd35aedfc1d2b0debebab0d623aa8d09 Author: Xisco Fauli <[email protected]> Date: Mon May 26 11:06:06 2025 +0200 ScViewData: pass ScDocShell by ref and commit 52e3b2b040ac54c2a5661e3676b135170f028f50 Author: Xisco Fauli <[email protected]> Date: Mon May 26 16:06:12 2025 +0200 ScViewData: simplify constructors Change-Id: I6a709ab82f51c34a022c43d35b97f661e5c283e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189434 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 671564bce4541244ad3d67b5b98899321176231e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189443 Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 112282e65a56..bac4a53f8962 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -97,21 +97,17 @@ void ScTransferObj::GetAreaSize( const ScDocument& rDoc, SCTAB nTab1, SCTAB nTab nCol = nMaxCol; } -void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument& rDoc, double nPrintFactor, +void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocShell& rDocSh, double nPrintFactor, const ScRange& rBlock ) { - if (!rDoc.GetDocumentShell()) - return; - tools::Rectangle aBound( Point(), pDev->GetOutputSize() ); //! use size from clip area? - ScViewData aViewData(*rDoc.GetDocumentShell(), nullptr); + ScViewData aViewData(rDocSh, nullptr); - aViewData.SetTabNo( rBlock.aEnd.Tab() ); aViewData.SetScreen( rBlock.aStart.Col(), rBlock.aStart.Row(), rBlock.aEnd.Col(), rBlock.aEnd.Row() ); - ScPrintFunc::DrawToDev( rDoc, pDev, nPrintFactor, aBound, aViewData, false/*bMetaFile*/ ); + ScPrintFunc::DrawToDev( rDocSh.GetDocument(), pDev, nPrintFactor, aBound, aViewData, false/*bMetaFile*/ ); } ScTransferObj::ScTransferObj( const std::shared_ptr<ScDocument>& pClipDoc, TransferableObjectDescriptor aDesc ) : @@ -437,7 +433,8 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt pVirtDev->SetOutputSizePixel(aPixelSize); - PaintToDev( pVirtDev, *m_pDoc, 1.0, aReducedBlock ); + InitDocShell(true); + PaintToDev( pVirtDev, *m_aDocShellRef, 1.0, aReducedBlock ); pVirtDev->SetMapMode( MapMode( MapUnit::MapPixel, Point(), aScale, aScale ) ); BitmapEx aBmp = pVirtDev->GetBitmapEx( Point(), pVirtDev->GetOutputSize() ); diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 4ad4a93be7f7..d84f5cb3e0df 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -58,7 +58,7 @@ private: static void StripRefs( ScDocument& rDoc, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, ScDocument& rDestDoc ); - static void PaintToDev( OutputDevice* pDev, ScDocument& rDoc, double nPrintFactor, + static void PaintToDev( OutputDevice* pDev, ScDocShell& rDocSh, double nPrintFactor, const ScRange& rBlock ); static void GetAreaSize( const ScDocument& rDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol ); commit 12d7b6b42e30700c2ae877d62dbf102d3360d977 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Aug 22 11:30:09 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Aug 25 20:05:03 2025 +0200 nss: upgrade to 3.115.1 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_115_1_RTM/src/nss-3.115.1-with-nspr-4.37.tar.gz Change-Id: Ie887520c9177bfca2a7aff78787f14109bb3c4fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190053 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> diff --git a/download.lst b/download.lst index c7d65934f010..cb9a314502ed 100644 --- a/download.lst +++ b/download.lst @@ -518,8 +518,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 83503e5c77024ecc6349e9d7216a8e8aa2423495da4ff752a65ad128638abacf -NSS_TARBALL := nss-3.115-with-nspr-4.37.tar.gz +NSS_SHA256SUM := 5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320 +NSS_TARBALL := nss-3.115.1-with-nspr-4.37.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts
