diff options
Diffstat (limited to 'sd/qa/unit')
| -rw-r--r-- | sd/qa/unit/data/odp/tdf161023.fodp | 35 | ||||
| -rw-r--r-- | sd/qa/unit/import-tests2.cxx | 52 |
2 files changed, 0 insertions, 87 deletions
diff --git a/sd/qa/unit/data/odp/tdf161023.fodp b/sd/qa/unit/data/odp/tdf161023.fodp deleted file mode 100644 index bf3a894cec4b..000000000000 --- a/sd/qa/unit/data/odp/tdf161023.fodp +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.presentation"> - <office:font-face-decls> - <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable"/> - </office:font-face-decls> - <office:styles> - <style:style style:name="standard" style:family="graphic"> - <style:text-properties style:font-name="Liberation Sans" fo:font-size="18pt"/> - </style:style> - </office:styles> - <office:automatic-styles> - <style:style style:name="T1" style:family="text"> - <style:text-properties fo:font-size="10pt"/> - </style:style> - </office:automatic-styles> - <office:master-styles> - <draw:layer-set> - <draw:layer draw:name="layout"/> - </draw:layer-set> - </office:master-styles> - <office:body> - <office:presentation> - <draw:page draw:name="page1"> - <draw:frame draw:layer="layout" svg:width="4cm" svg:x="4cm" svg:y="4cm"> - <draw:text-box> - <text:p><text:span text:style-name="T1">a</text:span></text:p> - <text:p><text:span text:style-name="T1"/></text:p> - <text:p><text:span text:style-name="T1">c</text:span></text:p> - </draw:text-box> - </draw:frame> - </draw:page> - </office:presentation> - </office:body> -</office:document>
\ No newline at end of file diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx index a69a30ef991a..ac730a24d6bf 100644 --- a/sd/qa/unit/import-tests2.cxx +++ b/sd/qa/unit/import-tests2.cxx @@ -1982,58 +1982,6 @@ CPPUNIT_TEST_FIXTURE(SdImportTest2, testMasterSlides) CPPUNIT_ASSERT_EQUAL(sal_Int32(7), xMasterPages->getCount()); } -CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf161023) -{ - // Given a shape with three paragraphs (18pt), all directly assigned a smaller font (10pt) - createSdImpressDoc("odp/tdf161023.fodp"); - auto shape = getShapeFromPage(0, 0); - - // 1st paragraph, not empty - { - auto paragraph(getParagraphFromShape(0, shape)); - CPPUNIT_ASSERT_EQUAL(u"a"_ustr, paragraph->getString()); - auto run(getRunFromParagraph(0, paragraph)); - CPPUNIT_ASSERT_EQUAL(u"a"_ustr, run->getString()); - uno::Reference<beans::XPropertySet> xPropSet(run, uno::UNO_QUERY_THROW); - double fCharHeight = 0; - xPropSet->getPropertyValue("CharHeight") >>= fCharHeight; - CPPUNIT_ASSERT_EQUAL(10.0, fCharHeight); - // No more runs - CPPUNIT_ASSERT_THROW(getRunFromParagraph(1, paragraph), container::NoSuchElementException); - } - - // Empty 2nd paragraph, consisting of a single span: this span was treated as "paragraph mark" - { - auto paragraph(getParagraphFromShape(1, shape)); - CPPUNIT_ASSERT_EQUAL(u""_ustr, paragraph->getString()); - auto run(getRunFromParagraph(0, paragraph)); - CPPUNIT_ASSERT_EQUAL(u""_ustr, run->getString()); - uno::Reference<beans::XPropertySet> xPropSet(run, uno::UNO_QUERY_THROW); - double fCharHeight = 0; - xPropSet->getPropertyValue("CharHeight") >>= fCharHeight; - // Without the fix, this would fail with - // - Expected: 10 - // - Actual : 18 - CPPUNIT_ASSERT_EQUAL(10.0, fCharHeight); - // No more runs - CPPUNIT_ASSERT_THROW(getRunFromParagraph(1, paragraph), container::NoSuchElementException); - } - - // 3rd paragraph, not empty - { - auto paragraph(getParagraphFromShape(2, shape)); - CPPUNIT_ASSERT_EQUAL(u"c"_ustr, paragraph->getString()); - auto run(getRunFromParagraph(0, paragraph)); - CPPUNIT_ASSERT_EQUAL(u"c"_ustr, run->getString()); - uno::Reference<beans::XPropertySet> xPropSet(run, uno::UNO_QUERY_THROW); - double fCharHeight = 0; - xPropSet->getPropertyValue("CharHeight") >>= fCharHeight; - CPPUNIT_ASSERT_EQUAL(10.0, fCharHeight); - // No more runs - CPPUNIT_ASSERT_THROW(getRunFromParagraph(1, paragraph), container::NoSuchElementException); - } -} - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |