diff options
author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2021-12-16 14:00:05 +0100 |
---|---|---|
committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-12-21 09:33:41 +0100 |
commit | cd25005156939e0d87bf0b004b5d2d5bebfdbe4d (patch) | |
tree | a8998b7d4dd81cbc1f796f98d65878906a113091 | |
parent | tdf#137466: docx: support w:placeholder & w15:color in w:sdtPr (diff) | |
download | core-cd25005156939e0d87bf0b004b5d2d5bebfdbe4d.tar.gz core-cd25005156939e0d87bf0b004b5d2d5bebfdbe4d.zip |
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.mehrbrodt@allotropia.de>
(cherry picked from commit c84ec0b1debb9b72f05ffc1d669608afc454cec2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126947
Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
-rw-r--r-- | sw/qa/python/check_table.py | 6 | ||||
-rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py index 9cb3b829d4d3..9ddae06540f6 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 728a0a28e503..030f180db237 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -114,7 +114,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); |