sw/qa/python/check_table.py | 6 +++--- sw/source/core/docnode/ndtbl.cxx | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit 9237cce9ac9d339f179585f722a8ef0e88be64e3 Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de> AuthorDate: Thu Dec 16 14:00:05 2021 +0100 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Fri Dec 17 12:32:43 2021 +0100 tdf#99027 Set default table border width to 0.5pt Change-Id: Ib6c8a6e63271f400d69702c3c090678d6c016af3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126922 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de> (cherry picked from commit c84ec0b1debb9b72f05ffc1d669608afc454cec2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126972 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py index b06f3caa4d7d..f845be5649ef 100644 --- a/sw/qa/python/check_table.py +++ b/sw/qa/python/check_table.py @@ -35,7 +35,7 @@ class CheckTable(unittest.TestCase): def setUpClass(cls): cls._uno = UnoInProcess() cls._uno.setUp() - cls.OOLineHairline = 2 + cls.OOLineVeryThin = 18 @classmethod def tearDownClass(cls): @@ -44,13 +44,13 @@ class CheckTable(unittest.TestCase): def __test_borderAsserts(self, xBorderLine, line_valid): self.assertTrue(line_valid) self.assertEqual(0, xBorderLine.InnerLineWidth) - self.assertEqual(self.OOLineHairline, xBorderLine.OuterLineWidth) + self.assertEqual(self.OOLineVeryThin, xBorderLine.OuterLineWidth) self.assertEqual(0, xBorderLine.LineDistance) self.assertEqual(0, xBorderLine.Color) def __test_borderAssertsWithLineStyle(self, xBorderLine, line_valid): self.__test_borderAsserts(xBorderLine, line_valid) - self.assertEqual(self.OOLineHairline, xBorderLine.LineWidth) + self.assertEqual(self.OOLineVeryThin, xBorderLine.LineWidth) self.assertEqual(SOLID, xBorderLine.LineStyle) def __test_borderDistance(self, border): diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index ca153b598dde..1b0e09f9b0f2 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -117,7 +117,8 @@ static void lcl_SetDfltBoxAttr( SwFrameFormat& rFormat, sal_uInt8 nId ) const bool bHTML = rFormat.getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE); Color aCol( bHTML ? COL_GRAY : COL_BLACK ); - SvxBorderLine aLine( &aCol, SvxBorderLineWidth::Hairline ); + // Default border in Writer: 0.5pt (matching Word) + SvxBorderLine aLine( &aCol, SvxBorderLineWidth::VeryThin ); if ( bHTML ) { aLine.SetBorderLineStyle(SvxBorderLineStyle::DOUBLE);