diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-12-05 19:23:01 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-04-04 10:49:28 +0200 |
| commit | de80d8de59645a8473b07280199f7f69c7c92fc6 (patch) | |
| tree | d099cd03c5c622310a0c63b0bbda281c754eb7f7 /sd | |
| parent | 93eedfb73f239d8f360a8bcd89a6a706ceddd036 (diff) | |
bnc#910045 wrong cell fill color defined by table style
Problems were with those table styles which used
color themes to define cell fill color.
Reviewed-on: https://gerrit.libreoffice.org/15089
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit debf3ffb87d607704ddea97f6710c3ceaa9a243d)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ibde90df81ff253ba65618dde4038093d1caabfe8
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/bnc910045.pptx | bin | 0 -> 37522 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 23 |
2 files changed, 23 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/bnc910045.pptx b/sd/qa/unit/data/pptx/bnc910045.pptx Binary files differnew file mode 100644 index 000000000000..5788ea929c0e --- /dev/null +++ b/sd/qa/unit/data/pptx/bnc910045.pptx diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index c5fc418d09cf..13b23b706b9d 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -100,6 +100,7 @@ public: void testShapeLineStyle(); void testBnc862510_6(); void testBnc862510_7(); + void testBnc910045(); #if !defined WNT void testBnc822341(); #endif @@ -144,6 +145,7 @@ public: CPPUNIT_TEST(testBnc822341); #endif + CPPUNIT_TEST(testBnc910045); CPPUNIT_TEST_SUITE_END(); }; @@ -1366,6 +1368,27 @@ void SdFiltersTest::testBnc822341() #endif +void SdFiltersTest::testBnc910045() +{ + // Problem with table style which defines cell color with fill style + ::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc("/sd/qa/unit/data/pptx/bnc910045.pptx") ); + + SdDrawDocument *pDoc = xDocShRef->GetDoc(); + CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL ); + const SdrPage *pPage = pDoc->GetPage(1); + CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL ); + + sdr::table::SdrTableObj *pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0)); + CPPUNIT_ASSERT( pTableObj ); + uno::Reference< table::XCellRange > xTable(pTableObj->getTable(), uno::UNO_QUERY_THROW); + uno::Reference< beans::XPropertySet > xCell; + sal_Int32 nColor; + + xCell.set(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW); + xCell->getPropertyValue("FillColor") >>= nColor; + CPPUNIT_ASSERT_EQUAL(sal_Int32(5210557), nColor); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTest); CPPUNIT_PLUGIN_IMPLEMENT(); |