summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2018-06-02 14:57:47 +0300
committerJustin Luth <justin_luth@sil.org>2018-06-15 17:39:52 +0200
commit552b3fa548e19436af24f4b413e34b2f15100718 (patch)
tree6b15735df74d069bef8b66440604d7bf3f07cb5b /oox
parent6cc88407acd148982ba05a9a52e390225449c031 (diff)
tdf#104199 sd: nofill borders shouldn't be visible.
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>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/table/tablecell.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 3dc40ceafab9..7639743842b2 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 );