oox/source/ppt/slidepersist.cxx | 72 +++++++++++++-----
sd/qa/unit/data/pptx/tdf153036_resizedConnectorL.pptx |binary
sd/qa/unit/import-tests.cxx | 17 ++++
3 files changed, 69 insertions(+), 20 deletions(-)
New commits:
commit 379866dd23be2cd3eb9952fbc6b106daaec0cdea
Author: Attila Szűcs <attila.sz...@collabora.com>
AuthorDate: Mon Jan 16 04:13:07 2023 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Jan 19 13:29:10 2023 +0000
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>
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
diff --git a/sd/qa/unit/data/pptx/tdf153036_resizedConnectorL.pptx
b/sd/qa/unit/data/pptx/tdf153036_resizedConnectorL.pptx
new file mode 100644
index 000000000000..e9a3199b4ac5
Binary files /dev/null and
b/sd/qa/unit/data/pptx/tdf153036_resizedConnectorL.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index d2c9001b50e2..b17f051df1ba 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -86,6 +86,7 @@ public:
void testDocumentLayout();
void testTdf152434();
void testConnectors();
+ void testTdf153036_resizedConnectorL();
void testTdf149314();
void testTdf149124();
void testTdf148965();
@@ -159,6 +160,7 @@ public:
CPPUNIT_TEST(testDocumentLayout);
CPPUNIT_TEST(testTdf152434);
CPPUNIT_TEST(testConnectors);
+ CPPUNIT_TEST(testTdf153036_resizedConnectorL);
CPPUNIT_TEST(testTdf149314);
CPPUNIT_TEST(testTdf149124);
CPPUNIT_TEST(testTdf148965);
@@ -340,6 +342,21 @@ void SdImportTest::testConnectors()
xDocShRef->DoClose();
}
+void SdImportTest::testTdf153036_resizedConnectorL()
+{
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf153036_resizedConnectorL.pptx"),
PPTX);
+
+ // TODO: If you are working on improvement related to connectors import,
then
+ // expect this unit test to fail.
+ // This is a "L" shape, imported as a special "Z" shape that looks like a
"L" shape.
+ uno::Reference<beans::XPropertySet> xConnector(getShapeFromPage(1, 0,
xDocShRef));
+
CPPUNIT_ASSERT(xConnector->getPropertySetInfo()->hasPropertyByName("EdgeLine1Delta"));
+
+ sal_Int32 nEdgeLine =
xConnector->getPropertyValue("EdgeLine1Delta").get<sal_Int32>();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(-3243), nEdgeLine);
+}
+
void SdImportTest::testTdf149314()
{
sd::DrawDocShellRef xDocShRef
