mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bnc#910045 wrong cell fill color defined by table style

Browse Source 
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 <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
Zolnai Tamás 2014-12-05 19:23:01 +01:00 committed by Andras Timar
parent e27d7c38ba
commit debf3ffb87
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oox/source/drawingml/table/tablecell.cxx
View File

@ -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 );

BIN
sd/qa/unit/data/pptx/bnc910045.pptx Normal file
View File

Binary file not shown.

23
sd/qa/unit/import-tests.cxx
View File

@ -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<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(SdImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();