sw/source/core/unocore/unotbl.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 6ed87cc5a4f755f360951550cac836e8967fc6bf
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Sat Oct 12 09:47:37 2019 +0300
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Sat Nov 30 19:49:17 2019 +0100
related tdf#118947 sw tablestyle: no need to avoid numbered para
Removed the hack that avoided applying table properties to
paragraphs that had numbering/bullets applied.
Most of the hackery around that happens in finishParagraph(),
which runs before this, so any table properties already
see all of the directly applied numbering properties.
Since numbering heavily uses RES_LR_SPACE
(which has multiple MemberIds), the previous
inability to distinguish SET/DEFAULT per member probably
caused problems, but since that happens now, it should be
safe to also apply table-style properties.
Change-Id: Id59a6249af55ea60255e2cef4ed9efe3d8321246
Reviewed-on: https://gerrit.libreoffice.org/81414
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index 34c2b1bfb2ca..914717e83519 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1102,8 +1102,7 @@ void SwXCell::setPropertyValue(const OUString&
rPropertyName, const uno::Any& aV
}
bool bSet = false;
- // HACK: don't check styles if numbering/bullets are
turned on. Table-styles don't override numbering formatting
- SwFormat* pFormatColl = pNd->GetNumRule() ? nullptr :
pNd->GetFormatColl();
+ SwFormat* pFormatColl = pNd->GetFormatColl();
// Manually walk through the parent properties in order to
avoid the default properties.
// Table-styles don't override paragraph-style formatting.
// TODO: ?except for fontsize/justification if
compat:overrideTableStyleFontSizeAndJustification?
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
