diff options
| author | Matus Uzak <matus.uzak@gmail.com> | 2016-03-07 12:04:01 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-03-10 10:20:46 +0000 |
| commit | 6802f760a69f3b1f203d70399f0d73764f9159d5 (patch) | |
| tree | 17252a9645bedcf4bdbdecd4cc8ef43ae589ce2a /sd | |
| parent | a076feda8e6541ce611866e3f20f65648ec2b50b (diff) | |
tdf#89927: PPTX import: Incorrect inheritance of text run fill properties
Make use of FillProperties in TextCharacterProperties. DrawingML:
Fill related elements in Text Run Properties are in sync with Table
Cell Properties and all of Line Properties.
Change-Id: I7c513ecfc5f94cf49e98a657384b5c0f5dddc1c7
Reviewed-on: https://gerrit.libreoffice.org/22979
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/tdf89927.pptx | bin | 0 -> 417178 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 17 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/tdf89927.pptx b/sd/qa/unit/data/pptx/tdf89927.pptx Binary files differnew file mode 100644 index 000000000000..c71e5570259c --- /dev/null +++ b/sd/qa/unit/data/pptx/tdf89927.pptx diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 1e153b04b54e..b5e7431f374e 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -109,6 +109,7 @@ public: void testTdf93830(); void testTdf93097(); void testTdf62255(); + void testTdf89927(); CPPUNIT_TEST_SUITE(SdImportTest); @@ -152,6 +153,7 @@ public: CPPUNIT_TEST(testTdf93830); CPPUNIT_TEST(testTdf93097); CPPUNIT_TEST(testTdf62255); + CPPUNIT_TEST(testTdf89927); CPPUNIT_TEST_SUITE_END(); }; @@ -1192,6 +1194,21 @@ void SdImportTest::testTdf62255() } } +void SdImportTest::testTdf89927() +{ + sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/tdf89927.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(0xFFFFFF), nCharColor ); + + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); |