From 8d74795e6e777cef0b1df64a56ea886208c87bc0 Mon Sep 17 00:00:00 2001 From: "yogesh.bharate001" Date: Fri, 17 Apr 2015 17:37:00 +0530 Subject: tdf#90672: PPTX table cell border color is not exported. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem Description : XML Difference : Original : After Roundtrip : tag is missing Solution : Added support for table cell border color. Change-Id: I2baf969d7a8e46a0c5825d9f57bf135ec479c9eb Reviewed-on: https://gerrit.libreoffice.org/15364 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sd/qa/unit/data/pptx/n90190.pptx | Bin 32349 -> 33256 bytes sd/qa/unit/export-tests.cxx | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/qa/unit/data/pptx/n90190.pptx b/sd/qa/unit/data/pptx/n90190.pptx index ae83eb64f18f..caeabe71038e 100644 Binary files a/sd/qa/unit/data/pptx/n90190.pptx and b/sd/qa/unit/data/pptx/n90190.pptx differ diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 78fce6b322d1..bfb89135acc6 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -983,27 +983,32 @@ void SdExportTest::testTableCellBorder() sal_Int32 nLeftBorder = aBorderLine.LineWidth ; // While importing the table cell border line width, it converts EMU->Hmm then divided result by 2. // To get original value of LineWidth need to multiple by 2. - nLeftBorder = nLeftBorder * 2 ; + nLeftBorder = nLeftBorder * 2 ; nLeftBorder = oox::drawingml::convertHmmToEmu( nLeftBorder ); CPPUNIT_ASSERT(nLeftBorder); + CPPUNIT_ASSERT_EQUAL(util::Color(45296), aBorderLine.Color); xCellPropSet->getPropertyValue("RightBorder") >>= aBorderLine; sal_Int32 nRightBorder = aBorderLine.LineWidth ; nRightBorder = nRightBorder * 2 ; nRightBorder = oox::drawingml::convertHmmToEmu( nRightBorder ); CPPUNIT_ASSERT(nRightBorder); + CPPUNIT_ASSERT_EQUAL(util::Color(16777215), aBorderLine.Color); xCellPropSet->getPropertyValue("TopBorder") >>= aBorderLine; sal_Int32 nTopBorder = aBorderLine.LineWidth ; nTopBorder = nTopBorder * 2 ; nTopBorder = oox::drawingml::convertHmmToEmu( nTopBorder ); CPPUNIT_ASSERT(nTopBorder); + CPPUNIT_ASSERT_EQUAL(util::Color(45296), aBorderLine.Color); + xCellPropSet->getPropertyValue("BottomBorder") >>= aBorderLine; sal_Int32 nBottomBorder = aBorderLine.LineWidth ; nBottomBorder = nBottomBorder * 2 ; nBottomBorder = oox::drawingml::convertHmmToEmu( nBottomBorder ); CPPUNIT_ASSERT(nBottomBorder); + CPPUNIT_ASSERT_EQUAL(util::Color(45296), aBorderLine.Color); xDocShRef->DoClose(); } -- cgit