diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2023-07-27 08:43:59 +0200 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2023-07-31 18:32:27 +0200 |
| commit | 1eed2e57b1848e8f129e98d1bbdb5f8851740d6b (patch) | |
| tree | dd7a2a2749e693c360d0b7e85d977091eef7f098 /sd | |
| parent | bc7db71d2293d43e6e74ba9feb4a4f73afccece8 (diff) | |
pptx: import shape text from master page
If shape has custom text defined in master page
but no text itself - don't prefer placeholder text
but text from master page.
Change-Id: Id4f7aeca0e74ecd8565905cd656a182c1195fa30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154980
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/shape-master-text.pptx | bin | 0 -> 32645 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests2.cxx | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/shape-master-text.pptx b/sd/qa/unit/data/pptx/shape-master-text.pptx Binary files differnew file mode 100644 index 000000000000..ca056b852d3a --- /dev/null +++ b/sd/qa/unit/data/pptx/shape-master-text.pptx diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx index e3fe25a955ac..1168fdabeb55 100644 --- a/sd/qa/unit/import-tests2.cxx +++ b/sd/qa/unit/import-tests2.cxx @@ -147,6 +147,7 @@ public: void testTdf149961AutofitIndentation(); void testTdf149588TransparentSolidFill(); void testOverflowBehaviorClip(); + void testShapeMasterText(); CPPUNIT_TEST_SUITE(SdImportTest2); @@ -227,6 +228,7 @@ public: CPPUNIT_TEST(testTdf149961AutofitIndentation); CPPUNIT_TEST(testTdf149588TransparentSolidFill); CPPUNIT_TEST(testOverflowBehaviorClip); + CPPUNIT_TEST(testShapeMasterText); CPPUNIT_TEST_SUITE_END(); }; @@ -2051,6 +2053,17 @@ void SdImportTest2::testOverflowBehaviorClip() } } +void SdImportTest2::testShapeMasterText() +{ + createSdImpressDoc("pptx/shape-master-text.pptx"); + uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0)); + + uno::Reference<text::XTextRange> const xParagraph(getParagraphFromShape(0, xShape)); + + uno::Reference<text::XTextRange> xRun(getRunFromParagraph(0, xParagraph)); + CPPUNIT_ASSERT_EQUAL(OUString("Custom"), xRun->getString()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest2); CPPUNIT_PLUGIN_IMPLEMENT(); |