[Libreoffice-commits] core.git: sw/source

[László Németh (via logerrit)]

 sw/source/core/unocore/unotbl.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 362437b58a1c64be5c6c7a4a6e7a0c16d2eb65a4
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Tue Feb 4 15:08:14 2020 +0100
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Wed Feb 12 12:53:42 2020 +0100

    Revert "related tdf#118947 sw tablestyle: no need to avoid numbered para"
    
    This reverts commit 6ed87cc5a4f755f360951550cac836e8967fc6bf.
    
    Change-Id: Idd56da3056b60a60228875c644d57099b3d2520f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88455
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>

diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 9a1ff2987786..2053b7502c02 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1091,7 +1091,8 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV
                     }
 
                     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.
                     // Table-styles don't override paragraph-style formatting.
                     //    TODO: ?except for fontsize/justification if compat:overrideTableStyleFontSizeAndJustification?