File bnc1088262.patch of Package libreoffice.8149

Overview Repositories Revisions Requests Users Attributes Meta

File bnc1088262.patch of Package libreoffice.8149

From 05021abd97316fe3d188cd9f15c44db2170927d7 Mon Sep 17 00:00:00 2001
From: Justin Luth <justin.luth@collabora.com>
Date: Sat, 2 Jun 2018 14:57:47 +0300
Subject: tdf#104199 sd: nofill borders shouldn't be visible.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

regression from export bugfix tdf#90190.
rLineProperties.maLineFill was set, but that value was
never used, leaving aBorderLine with the default value.

Setting borderline to COL_AUTO lets it merge in with background
colors while still taking up the space defined by the border width.

The existing unit test says "it is likely you will break
this if fixing background issues, so feel free to adjust the
test values." Indeed, this patch removes an unwanted black border,
so utilizing that test as a proof.

Change-Id: I0725a3d5874a509a4464c586d60c77cde2b49fcb
Reviewed-on: https://gerrit.libreoffice.org/55205
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 76505bbd862b17b9b02a2d6e68bac308890dec70)
Reviewed-on: https://gerrit.libreoffice.org/55777
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 552b3fa548e19436af24f4b413e34b2f15100718)
Reviewed-on: https://gerrit.libreoffice.org/55883
---
 oox/source/drawingml/table/tablecell.cxx | 3 +--
 sd/qa/unit/import-tests.cxx              | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 3675193..0630d2f 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -85,8 +85,7 @@ void applyLineAttributes( const ::oox::core::XmlFilterBase& rFilterBase,
     }
     else if ( rLineProperties.moLineWidth.get(0)!=0 )
     {
-        // Default color of Line is black.
-        rLineProperties.maLineFill.maFillColor.setSrgbClr( 0 );
+        aBorderLine.Color = sal_Int32( COL_AUTO );
         aBorderLine.OuterLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
         aBorderLine.InnerLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
         aBorderLine.LineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 2 );
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 5504e04..887bbda 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -892,7 +892,7 @@ void SdImportTest::testBnc480256()
 
     xCell.set(xTable->getCellByPosition(1, 0), uno::UNO_QUERY_THROW);
     xCell->getPropertyValue("BottomBorder") >>= aBorderLine;
-    CPPUNIT_ASSERT_EQUAL(util::Color(0), aBorderLine.Color);
+    CPPUNIT_ASSERT_EQUAL(util::Color(COL_AUTO), aBorderLine.Color);
 
     xDocShRef->DoClose();
 }
-- 
cgit v1.1

Places

File bnc1088262.patch of Package libreoffice.8149

Places