oox/source/ppt/pptshape.cxx | 4 +---
sd/qa/unit/data/pptx/tdf132282.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 14 ++++++++++++++
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 7df4ebf9a658681d02842b14187722ae8161cd7e
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Apr 28 14:42:29 2020 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Fri May 1 17:57:07 2020 +0200
tdf#132282: Revert fix for tdf#131554
912217285b3058efa54c2336f91fda4efdad6ff0 fixed the
root cause of tdf#131554 and
69b83dc2d3014dd9b18402534e15c937dc082464 is no longer needed
The unittest still passes
Change-Id: I7c723b0c3cc2b56022978bbeb8bf6b3f6f93f1c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93063
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93073
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 440103acff12..af7324485c65 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -424,7 +424,6 @@ namespace
// 3. ph with nSecondSubType and the same oSubTypeIndex
// 4. ph with nSecondSubType
// 5. ph with the same oSubTypeIndex
-// It appears 3 and 1 has the same highest prority.
oox::drawingml::ShapePtr PPTShape::findPlaceholder( sal_Int32 nFirstSubType,
sal_Int32 nSecondSubType,
const OptValue< sal_Int32 >& oSubTypeIndex, std::vector<
oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly )
@@ -516,8 +515,7 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder(
sal_Int32 nFirstSubType, sal
}
}
- if (aPlaceholders.hasByPrio(0) ||
- aPlaceholders.hasByPrio(2))
+ if (aPlaceholders.hasByPrio(0))
{
break;
}
diff --git a/sd/qa/unit/data/pptx/tdf132282.pptx
b/sd/qa/unit/data/pptx/tdf132282.pptx
new file mode 100644
index 000000000000..cc1d7df4cd8f
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf132282.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index f12ad87e9abc..6bac3cca9584 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -184,6 +184,7 @@ public:
void testTdf98603();
void testTdf119087();
void testTdf131554();
+ void testTdf132282();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -286,6 +287,7 @@ public:
CPPUNIT_TEST(testTdf98603);
CPPUNIT_TEST(testTdf119087);
CPPUNIT_TEST(testTdf131554);
+ CPPUNIT_TEST(testTdf132282);
CPPUNIT_TEST_SUITE_END();
@@ -2653,6 +2655,18 @@ void SdOOXMLExportTest2::testTdf131554()
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(13251),
xShape->getPosition().Y);
}
+void SdOOXMLExportTest2::testTdf132282()
+{
+ ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf132282.pptx"),
PPTX);
+ xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ uno::Reference<drawing::XShape> xShape(getShapeFromPage(0, 0, xDocShRef),
uno::UNO_QUERY);
+ // Without the fix in place, the position would be 0,0, height = 1 and
width = 1
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1736),
xShape->getPosition().X);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(763), xShape->getPosition().Y);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(30523),
xShape->getSize().Width);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2604),
xShape->getSize().Height);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
CPPUNIT_PLUGIN_IMPLEMENT();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
