diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2019-10-10 21:29:50 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-10-12 12:24:25 +0200 |
| commit | 57cfbc6830c3d8dc64107aed4a5555613415f069 (patch) | |
| tree | 16c556be5b715aa9e2b370e25d34a77f9fbf314e /sd/qa | |
| parent | f62590b6bace50f61cf3a43823a57180ba8a6ce4 (diff) | |
tdf#127129: pptx: map highlight to CharBackColor
Change-Id: I033c15db6848e96ba6b6bd7a2852c9e4d1524a8e
Reviewed-on: https://gerrit.libreoffice.org/80630
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/data/pptx/tdf127129.pptx | bin | 0 -> 30143 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 22 |
2 files changed, 22 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/tdf127129.pptx b/sd/qa/unit/data/pptx/tdf127129.pptx Binary files differnew file mode 100644 index 000000000000..680fcf631be4 --- /dev/null +++ b/sd/qa/unit/data/pptx/tdf127129.pptx diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 1fd0d5ef5e8c..f46da0b2aa89 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -154,6 +154,7 @@ public: void testBnc910045(); void testRowHeight(); void testTdf93830(); + void testTdf127129(); void testTdf93097(); void testTdf62255(); void testTdf93124(); @@ -251,6 +252,7 @@ public: CPPUNIT_TEST(testBnc910045); CPPUNIT_TEST(testRowHeight); CPPUNIT_TEST(testTdf93830); + CPPUNIT_TEST(testTdf127129); CPPUNIT_TEST(testTdf93097); CPPUNIT_TEST(testTdf62255); CPPUNIT_TEST(testTdf93124); @@ -1346,6 +1348,7 @@ void SdImportTest::testRowHeight() xDocShRef->DoClose(); } + void SdImportTest::testTdf93830() { // Text shape offset was ignored @@ -1364,6 +1367,25 @@ void SdImportTest::testTdf93830() xDocShRef->DoClose(); } +void SdImportTest::testTdf127129() +{ + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf127129.pptx"), PPTX); + uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); + uno::Reference< text::XTextRange > xParagraph( getParagraphFromShape( 0, xShape ) ); + uno::Reference< text::XTextRange > xRun( getRunFromParagraph( 0, xParagraph ) ); + uno::Reference< beans::XPropertySet > xPropSet( xRun, uno::UNO_QUERY_THROW ); + + sal_Int32 nCharColor; + xPropSet->getPropertyValue( "CharColor" ) >>= nCharColor; + CPPUNIT_ASSERT_EQUAL( sal_Int32(0x000000), nCharColor ); + + // Without the accompanying fix in place, the highlight would be -1 + sal_Int32 nCharBackColor; + xPropSet->getPropertyValue( "CharBackColor" ) >>= nCharBackColor; + CPPUNIT_ASSERT_EQUAL( sal_Int32(0xFF00), nCharBackColor ); + + xDocShRef->DoClose(); +} void SdImportTest::testTdf93097() { // Throwing metadata import aborted the filter, check that metadata is now imported. |