diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2018-11-21 17:40:36 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2018-12-17 13:33:27 +0100 |
| commit | 1571c42e1fe64c6146161b08585737d3ba288629 (patch) | |
| tree | d0383fa3397dbeda68f2391c7b8a7c24df8e3197 /sd/qa | |
| parent | 8d6e14765145ab7c9cb0cbf6956eaf07db10139a (diff) | |
oox smartart, accent process: handle multiple runs from a data point
Multiple paragraphs indeed are impossible for those containers, but
multiple runs can happen.
Change-Id: I47a2f72cae4cbb822f31a5b7cd0169a663e2a6a8
Reviewed-on: https://gerrit.libreoffice.org/63732
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
(cherry picked from commit cfa76f538a44d4396574ece59e8a3953c22c6eb7)
Reviewed-on: https://gerrit.libreoffice.org/65249
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/data/pptx/smartart-accent-process.pptx | bin | 46472 -> 46326 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests-smartart.cxx | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sd/qa/unit/data/pptx/smartart-accent-process.pptx b/sd/qa/unit/data/pptx/smartart-accent-process.pptx Binary files differindex de556bdc6066..8710e7f170a9 100644 --- a/sd/qa/unit/data/pptx/smartart-accent-process.pptx +++ b/sd/qa/unit/data/pptx/smartart-accent-process.pptx diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index f431cdddfa03..7c46270015ee 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -494,7 +494,9 @@ void SdImportTestSmartArt::testAccentProcess() CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), xSecondPair->getCount()); uno::Reference<text::XText> xSecondParentText(xSecondPair->getByIndex(1), uno::UNO_QUERY); CPPUNIT_ASSERT(xFirstParentText.is()); - CPPUNIT_ASSERT_EQUAL(OUString("c"), xSecondParentText->getString()); + // Without the accompanying fix in place, this test would have failed with + // 'Expected: cc; Actual : c', i.e. non-first runs on data points were ignored. + CPPUNIT_ASSERT_EQUAL(OUString("cc"), xSecondParentText->getString()); uno::Reference<drawing::XShape> xSecondParent(xSecondParentText, uno::UNO_QUERY); CPPUNIT_ASSERT(xSecondParent.is()); int nSecondParentLeft = xSecondParent->getPosition().X; |