From debf3ffb87d607704ddea97f6710c3ceaa9a243d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= Date: Fri, 5 Dec 2014 19:23:01 +0100 Subject: [PATCH] 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. Change-Id: Ibde90df81ff253ba65618dde4038093d1caabfe8 Reviewed-on: https://gerrit.libreoffice.org/15089 Tested-by: Jenkins Reviewed-by: Andras Timar --- oox/source/drawingml/table/tablecell.cxx | 11 +++++++++++ sd/qa/unit/data/pptx/bnc910045.pptx | Bin 0 -> 37522 bytes sd/qa/unit/import-tests.cxx | 23 +++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 sd/qa/unit/data/pptx/bnc910045.pptx diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 2d8dfb8ad7b7..d753326aa4a5 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -116,6 +116,17 @@ void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase, ::oox::drawingml::FillPropertiesPtr& rPartFillPropertiesPtr( rTableStylePart.getFillProperties() ); if ( rPartFillPropertiesPtr.get() ) rFillProperties.assignUsed( *rPartFillPropertiesPtr ); + else + { + ::oox::drawingml::ShapeStyleRef& rFillStyleRef = rTableStylePart.getStyleRefs()[ XML_fillRef ]; + const Theme* pTheme = rFilterBase.getCurrentTheme(); + if (pTheme && rFillStyleRef.mnThemedIdx != 0 ) + { + rFillProperties.assignUsed( *pTheme->getFillStyle( rFillStyleRef.mnThemedIdx ) ); + sal_Int32 nPhClr = rFillStyleRef.maPhClr.getColor( rFilterBase.getGraphicHelper() ); + rFillProperties.maFillColor.setSrgbClr( nPhClr ); + } + } applyBorder( rFilterBase, rTableStylePart, XML_left, rLeftBorder ); applyBorder( rFilterBase, rTableStylePart, XML_right, rRightBorder ); diff --git a/sd/qa/unit/data/pptx/bnc910045.pptx b/sd/qa/unit/data/pptx/bnc910045.pptx new file mode 100644 index 0000000000000000000000000000000000000000..5788ea929c0e29f9674a1a3bece6099ea90e636d GIT binary patch literal 37522 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%0A2%vB=%j=b|P{~cGPW%<`s$c8&QsKh) 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 literal 0 HcmV?d00001 diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index fb8264ea6e5c..d9d92b965563 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -97,6 +97,7 @@ public: void testPDFImport(); void testPDFImportSkipImages(); void testBulletSuffix(); + void testBnc910045(); CPPUNIT_TEST_SUITE(SdImportTest); @@ -132,6 +133,7 @@ public: CPPUNIT_TEST(testPDFImport); CPPUNIT_TEST(testPDFImportSkipImages); CPPUNIT_TEST(testBulletSuffix); + CPPUNIT_TEST(testBnc910045); CPPUNIT_TEST_SUITE_END(); }; @@ -1139,6 +1141,27 @@ void SdImportTest::testBulletSuffix() xDocShRef->DoClose(); } +void SdImportTest::testBnc910045() +{ + // Problem with table style which defines cell color with fill style + ::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc("/sd/qa/unit/data/pptx/bnc910045.pptx"), 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(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(SdImportTest); CPPUNIT_PLUGIN_IMPLEMENT();