Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2023-01-27 10:15:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Fri Jan 27 10:15:31 2023 rev:266 rq:1061179 version:7.4.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2023-01-20 17:37:03.935985396 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.32243/libreoffice.changes 2023-01-27 10:15:59.951541258 +0100 @@ -1,0 +2,6 @@ +Thu Jan 19 13:51:27 UTC 2023 - Andras Timar <andras.ti...@collabora.com> + +- Fix bsc#1205866 - LO-L3: Connector lines from PPTX "break"/bend too often + * bsc1205866.patch + +------------------------------------------------------------------- New: ---- bsc1205866.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.RYohNX/_old 2023-01-27 10:16:04.631567164 +0100 +++ /var/tmp/diff_new_pack.RYohNX/_new 2023-01-27 10:16:04.635567186 +0100 @@ -115,6 +115,8 @@ Patch14: use-fixmath-shared-library.patch # LO-L3: PPTX: text box shows that does not show in PowerPoint Patch15: bsc1204825.patch +# LO-L3: Connector lines from PPTX "break"/bend too often +Patch16: bsc1205866.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -1040,6 +1042,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %patch990 -p1 %patch991 -p1 ++++++ bsc1205866.patch ++++++ >From 379866dd23be2cd3eb9952fbc6b106daaec0cdea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Sz=C5=B1cs?= <attila.sz...@collabora.com> Date: Mon, 16 Jan 2023 04:13:07 +0100 Subject: tdf#153036 PPTX import resized connector broken Fixed the EdgeLine1Delta calculation in case of bentConnector2. (when L shape imported as a special Z shape) Co-authored-by: Tibor Nagy (NISZ) Change-Id: I08c92e63adc744322061e4e433bfdc512745eda1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145548 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.ti...@collabora.com> (cherry picked from commit 17c68fad2aef917adfdd3d4d651da786e620699c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145766 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> --- oox/source/ppt/slidepersist.cxx | 72 +++++++++++++++------ .../data/pptx/tdf153036_resizedConnectorL.pptx | Bin 0 -> 33042 bytes sd/qa/unit/import-tests.cxx | 17 +++++ 3 files changed, 69 insertions(+), 20 deletions(-) create mode 100644 sd/qa/unit/data/pptx/tdf153036_resizedConnectorL.pptx diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index 657703fff239..dc068b0b699e 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -342,6 +342,36 @@ void SlidePersist::hideShapesAsMasterShapes() } } +// This angle determines in the direction of the line +static sal_Int32 lcl_GetAngle(uno::Reference<drawing::XShape>& rXShape, awt::Point& rPt) +{ + SdrObject* pObj = SdrObject::getSdrObjectFromXShape(rXShape); + tools::Rectangle aR(pObj->GetSnapRect()); + sal_Int32 nLeftX = rPt.X - aR.Left(); + sal_Int32 nTopY = rPt.Y - aR.Top(); + sal_Int32 nRightX = aR.Right() - rPt.X; + sal_Int32 nBottomY = aR.Bottom() - rPt.Y; + sal_Int32 nX = std::min(nLeftX, nRightX); + sal_Int32 nY = std::min(nTopY, nBottomY); + + sal_Int32 nAngle; + if (nX < nY) + { + if (nLeftX < nRightX) + nAngle = 180; // Left + else + nAngle = 0; // Right + } + else + { + if (nTopY < nBottomY) + nAngle = 270; // Top + else + nAngle = 90; // Bottom + } + return nAngle; +} + Reference<XAnimationNode> SlidePersist::getAnimationNode(const OUString& sId) const { const auto& pIter = maAnimNodesMap.find(sId); @@ -373,6 +403,8 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector, SdrObject* pEndObj = xEndSp.is() ? SdrObject::getSdrObjectFromXShape(xEndSp) : nullptr; sal_Int32 nStartSpLineW = 0; + sal_Int32 nStartA = -1; + sal_Int32 nEndA = -1; if (pStartObj) { aStartRect = pStartObj->GetSnapRect(); @@ -380,6 +412,7 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector, xPropxStartSp->getPropertyValue("LineWidth") >>= nStartSpLineW; if (nStartSpLineW) nStartSpLineW = nStartSpLineW / 2; + nStartA = lcl_GetAngle(xStartSp, aStartPt); } sal_Int32 nEndSpLineW = 0; if (pEndObj) @@ -389,6 +422,7 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector, xPropxEndSp->getPropertyValue("LineWidth") >>= nEndSpLineW; if (nEndSpLineW) nEndSpLineW = nEndSpLineW / 2; + nEndA = lcl_GetAngle(xEndSp, aEndPt); } const OUString sConnectorName = rShapePtr->getConnectorName(); @@ -397,27 +431,25 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector, awt::Size aConnSize = rXConnector->getSize(); if (xStartSp.is() || xEndSp.is()) { - if (aConnSize.Height < aConnSize.Width) + if (nStartA >= 0) { - if (xStartSp.is()) - nEdge = (aStartPt.Y > aEndPt.Y) - ? (nStartSpLineW - (aStartRect.Top() - aEndPt.Y)) - : ((aEndPt.Y - aStartRect.Bottom()) - nStartSpLineW); - else - nEdge = (aStartPt.Y > aEndPt.Y) - ? ((aStartPt.Y - aEndRect.Bottom()) - nEndSpLineW) - : (nEndSpLineW - (aEndRect.Top() - aStartPt.Y)); - } - else - { - if (xStartSp.is()) - nEdge = (aStartPt.X > aEndPt.X) - ? (nStartSpLineW - (aStartRect.Left() - aEndPt.X)) - : ((aEndPt.X - aStartRect.Right()) - nStartSpLineW); - else - nEdge = (aStartPt.X > aEndPt.X) - ? ((aStartPt.X - aEndRect.Right()) - nEndSpLineW) - : (nEndSpLineW - (aEndRect.Left() - aStartPt.X)); + switch (nStartA) + { + case 0: nEdge = aEndPt.X - aStartRect.Right(); break; + case 180: nEdge = aEndPt.X - aStartRect.Left(); break; + case 90: nEdge = aEndPt.Y - aStartRect.Bottom(); break; + case 270: nEdge = aEndPt.Y - aStartRect.Top(); break; + } + nEdge += nStartSpLineW * (nStartA >= 180 ? +1 : -1); + } else { + switch (nEndA) + { + case 0: nEdge = aStartPt.X - aEndRect.Right(); break; + case 180: nEdge = aStartPt.X - aEndRect.Left(); break; + case 90: nEdge = aStartPt.Y - aEndRect.Bottom(); break; + case 270: nEdge = aStartPt.Y - aEndRect.Top(); break; + } + nEdge += nEndSpLineW * (nEndA >= 180 ? +1 : -1); } } else
