drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 16 +++++++------ sc/source/ui/app/inputhdl.cxx | 1 sc/source/ui/view/viewfun3.cxx | 2 + 3 files changed, 12 insertions(+), 7 deletions(-)
New commits: commit 57727c53d69fc352c16674e175b89ef1f2667dd7 Author: Jaume Pujantell Traserra <[email protected]> AuthorDate: Fri Jun 16 09:01:27 2023 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Jun 28 13:10:58 2023 +0200 fix crash on LOKIT spelling dialog Update active view before trying to access it's selection. Change-Id: Ic83d335216304f7122005e447f5bd1c1484d0eb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153136 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> (cherry picked from commit 2ab23ac48d5ebbfb87177bcee4acceecd88ce69e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153285 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index cfcd72f37b13..96c4963fe073 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -4269,6 +4269,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh) { + UpdateActiveView(); EditView* pActiveView = pTopView ? pTopView : pTableView; ESelection aSel = pActiveView ? pActiveView->GetSelection() : ESelection(); commit adaae622b67f525e0fb58af848a7cece8ac65f45 Author: Luigi Iucci <[email protected]> AuthorDate: Wed Jun 21 10:16:16 2023 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Jun 28 13:10:52 2023 +0200 problem pasting to calc an image copied from firefox (windows) Calc tries to paste the image as html. In case both HTML_SIMPLE and BITMAP flavors are present in the clipboard, we paste as BITMAP Change-Id: I2527bedf11eb6986b58329acaf360a397af03101 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153614 Tested-by: Jenkins Reviewed-by: Henry Castro <[email protected]> (cherry picked from commit 46fa17b70db0d543518dde52908f46c85838ac12) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153668 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index a3d5c01e370f..8a9b489833fc 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -597,6 +597,8 @@ void ScViewFunc::PasteFromSystem() PasteFromSystem(SotClipboardFormatId::RICHTEXT); else if (aDataHelper.HasFormat(SotClipboardFormatId::HTML)) PasteFromSystem(SotClipboardFormatId::HTML); + else if (aDataHelper.HasFormat(SotClipboardFormatId::BITMAP)) + PasteFromSystem(SotClipboardFormatId::BITMAP); else if (aDataHelper.HasFormat(SotClipboardFormatId::HTML_SIMPLE)) PasteFromSystem(SotClipboardFormatId::HTML_SIMPLE); else if (aDataHelper.HasFormat(SotClipboardFormatId::SYLK)) commit 170a3cfa47e2e4ec83ec91d654601894e246b9d2 Author: Armin Le Grand (allotropia) <[email protected]> AuthorDate: Tue Jun 27 13:46:51 2023 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Jun 28 13:10:46 2023 +0200 MCGR: tdf#155479 always propagate SVG-flag for sub-content metafiles For SVG export it is necessary to always propagate the SVG-flag for metafiles in *any* case impDumpToMetaFile is used and a new metafile gets created (aContentMetafile here). This is due to the subContent again may have any combinations of gradients/transparenceGradients that are non-vcl-renderable and need special handling. Change-Id: I7edee8afa81c0b6f3fb0e183d144c50f29c5bb79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153645 Tested-by: Jenkins Reviewed-by: Armin Le Grand <[email protected]> (cherry picked from commit 3b06c1835e9fcbbcdcd6ce2b207301f4f8bb6388) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153666 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index feb30d33e1ed..e55055024159 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -2293,6 +2293,11 @@ void VclMetafileProcessor2D::processUnifiedTransparencePrimitive2D( // various content, create content-metafile GDIMetaFile aContentMetafile; + + // tdf#155479 always forward propagate SVG flag for sub-content, + // it may contain cannotBeHandledByVCL gradients or transparencyGradients + aContentMetafile.setSVG(mpOutputDevice->GetConnectMetaFile()->getSVG()); + const tools::Rectangle aPrimitiveRectangle( impDumpToMetaFile(rContent, aContentMetafile)); @@ -2389,8 +2394,7 @@ void VclMetafileProcessor2D::processTransparencePrimitive2D( // tdf#155479 Yepp, as already mentionmed above we need to add // some MCGR infos in case of SVG export, prepare that here - if (nullptr != mpOutputDevice->GetConnectMetaFile() - && mpOutputDevice->GetConnectMetaFile()->getSVG()) + if (mpOutputDevice->GetConnectMetaFile()->getSVG()) { // for SVG, do not use decompose & prep extra data bSVGTransparencyColorStops = true; @@ -2409,11 +2413,9 @@ void VclMetafileProcessor2D::processTransparencePrimitive2D( // vcl/metafile, so add it directly. various content, create content-metafile GDIMetaFile aContentMetafile; - // tdf#155479 do not forget to forward SVG flag for sub-content - if (bSVGTransparencyColorStops) - { - aContentMetafile.setSVG(true); - } + // tdf#155479 always forward propagate SVG flag for sub-content, + // it may contain cannotBeHandledByVCL gradients or transparencyGradients + aContentMetafile.setSVG(mpOutputDevice->GetConnectMetaFile()->getSVG()); const tools::Rectangle aPrimitiveRectangle(impDumpToMetaFile(rContent, aContentMetafile));
