From cb598029835477326b190bc99abd31a487cc5a91 Mon Sep 17 00:00:00 2001 From: Tamás Zolnai Date: Thu, 8 Dec 2016 19:22:56 +0100 Subject: tdf#104445: PPTX import: Extra bullets are added to placeholder text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I25ce98ed391f70292bed6238645b121b9cf50d5e Reviewed-on: https://gerrit.libreoffice.org/31771 Reviewed-by: Tamás Zolnai Tested-by: Tamás Zolnai --- oox/source/drawingml/textbody.cxx | 4 ++- oox/source/ppt/pptshape.cxx | 2 +- sd/qa/unit/data/pptx/tdf104445.pptx | Bin 0 -> 14291 bytes sd/qa/unit/import-tests.cxx | 53 ++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 2 deletions(-) create mode 100755 sd/qa/unit/data/pptx/tdf104445.pptx diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx index 662a52fd0113..8efb70d1cdd0 100644 --- a/oox/source/drawingml/textbody.cxx +++ b/oox/source/drawingml/textbody.cxx @@ -23,6 +23,7 @@ #include #include "drawingml/textparagraph.hxx" #include "oox/helper/propertyset.hxx" +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -110,10 +111,11 @@ void TextBody::ApplyStyleEmpty( { Reference< XPropertySet > xProps(xText, UNO_QUERY); PropertyMap aioBulletList; + aioBulletList.setProperty< sal_Int32 >(PROP_LeftMargin, 0); // Init bullets left margin to 0 (no bullets). float nCharHeight = xProps->getPropertyValue("CharHeight").get(); TextParagraphProperties aParaProp; aParaProp.apply(*pTextParagraphStyle); - aParaProp.pushToPropSet(&rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), false, nCharHeight, true); + aParaProp.pushToPropSet(&rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), true, nCharHeight, true); } } diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 08e2df86150c..80a056e1a899 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -352,7 +352,7 @@ void PPTShape::addShape( } // Apply text properties on placeholder text inside this placeholder shape - if (mpPlaceholder.get() != nullptr && getTextBody() && getTextBody()->isEmpty()) + if (meShapeLocation == Slide && mpPlaceholder.get() != nullptr && getTextBody() && getTextBody()->isEmpty()) { Reference < XText > xText(mxShape, UNO_QUERY); if (xText.is()) diff --git a/sd/qa/unit/data/pptx/tdf104445.pptx b/sd/qa/unit/data/pptx/tdf104445.pptx new file mode 100755 index 000000000000..bee32dc0022f Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf104445.pptx differ diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 110baa9433b1..f4faf00dfd65 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -132,6 +133,7 @@ public: void testTdf104015(); void testTdf104201(); void testTdf103477(); + void testTdf104445(); CPPUNIT_TEST_SUITE(SdImportTest); @@ -189,6 +191,7 @@ public: CPPUNIT_TEST(testTdf104015); CPPUNIT_TEST(testTdf104201); CPPUNIT_TEST(testTdf103477); + CPPUNIT_TEST(testTdf104445); CPPUNIT_TEST_SUITE_END(); }; @@ -1638,6 +1641,56 @@ void SdImportTest::testTdf103477() xDocShRef->DoClose(); } +void SdImportTest::testTdf104445() +{ + // Extra bullets were added to the first shape + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104445.pptx"), PPTX); + + // First shape should not have bullet + { + uno::Reference< beans::XPropertySet > xShape(getShapeFromPage(0, 0, xDocShRef)); + uno::Reference< text::XText > xText = uno::Reference< text::XTextRange>(xShape, uno::UNO_QUERY)->getText(); + CPPUNIT_ASSERT_MESSAGE("Not a text shape", xText.is()); + uno::Reference< beans::XPropertySet > xPropSet(xText, uno::UNO_QUERY_THROW); + + uno::Reference< container::XIndexAccess > xNumRule; + xPropSet->getPropertyValue("NumberingRules") >>= xNumRule; + uno::Sequence aBulletProps; + xNumRule->getByIndex(0) >>= aBulletProps; + + for (int i = 0; i < aBulletProps.getLength(); ++i) + { + const beans::PropertyValue& rProp = aBulletProps[i]; + if(rProp.Name == "NumberingType") + CPPUNIT_ASSERT_EQUAL(sal_Int16(style::NumberingType::NUMBER_NONE), rProp.Value.get()); + if(rProp.Name == "LeftMargin") + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rProp.Value.get()); + } + } + // Second shape should have bullet set + { + uno::Reference< beans::XPropertySet > xShape(getShapeFromPage(1, 0, xDocShRef)); + uno::Reference< text::XText > xText = uno::Reference< text::XTextRange>(xShape, uno::UNO_QUERY)->getText(); + CPPUNIT_ASSERT_MESSAGE("Not a text shape", xText.is()); + uno::Reference< beans::XPropertySet > xPropSet(xText, uno::UNO_QUERY_THROW); + + uno::Reference< container::XIndexAccess > xNumRule; + xPropSet->getPropertyValue("NumberingRules") >>= xNumRule; + uno::Sequence aBulletProps; + xNumRule->getByIndex(0) >>= aBulletProps; + + for(int i = 0; i < aBulletProps.getLength(); ++i) + { + const beans::PropertyValue& rProp = aBulletProps[i]; + if(rProp.Name == "NumberingType") + CPPUNIT_ASSERT_EQUAL(sal_Int16(style::NumberingType::CHAR_SPECIAL), rProp.Value.get()); + if(rProp.Name == "LeftMargin") + CPPUNIT_ASSERT_EQUAL(sal_Int32(635), rProp.Value.get()); + } + } + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); -- cgit