mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "related tdf#118947 sw tablestyle: no need to avoid numbered para"

Browse Source 
This reverts commit 6ed87cc5a4.

Change-Id: Idd56da3056b60a60228875c644d57099b3d2520f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88455
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
This commit is contained in:
László Németh
2020-02-04 15:08:14 +01:00
parent c90b6a208d
commit 362437b58a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sw/source/core/unocore/unotbl.cxx
View File

@@ -1091,7 +1091,8 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV
} }
bool bSet = false; bool bSet = false;
SwFormat* pFormatColl = pNd->GetFormatColl(); // 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();
// Manually walk through the parent properties in order to avoid the default properties. // Manually walk through the parent properties in order to avoid the default properties.
// Table-styles don't override paragraph-style formatting. // Table-styles don't override paragraph-style formatting.
// TODO: ?except for fontsize/justification if compat:overrideTableStyleFontSizeAndJustification? // TODO: ?except for fontsize/justification if compat:overrideTableStyleFontSizeAndJustification?