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

[Michael Stahl (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9e455724e50bf512683b1cddfeb7493e047c19ae
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Mon Oct 19 19:41:36 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Oct 20 09:00:25 2020 +0200

    sw: DOCX export: don't export numPr to style from outline numrule
    
    8e9e705de29a1a3d9b964c9350aa2a3a17cce6f9 disabled this for paragraphs
    but it appears to be unnecessary for styles as well, since w:outlineLvl
    will be produced, and Word displays bullets active in the UI if numPr
    exists.
    
    Change-Id: I60f7cf6359b27a4d69450752fbc4de6595d98761
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104539
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 76c40c207e36..78e6bba0bde2 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8554,7 +8554,7 @@ void DocxAttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone )
             FSNS( XML_w, XML_val ), OString::boolean( !rHyphenZone.IsHyphen() ) );
 }
 
-void DocxAttributeOutput::ParaNumRule_Impl( const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId )
+void DocxAttributeOutput::ParaNumRule_Impl(const SwTextNode*, sal_Int32 nLvl, sal_Int32 nNumId)
 {
     if ( USHRT_MAX == nNumId )
         return;
@@ -8563,8 +8563,9 @@ void DocxAttributeOutput::ParaNumRule_Impl( const SwTextNode* pTextNd, sal_Int32
     const SwNumRule* pRule = nNumId > 0 && nNumId <= nTableSize ? (*m_rExport.m_pUsedNumTable)[nNumId-1] : nullptr;
     const bool bOutlineRule = pRule && pRule->IsOutlineRule();
 
-    // Do not export outline rules (Chapter Numbering) as paragraph properties, only as style properties.
-    if ( !pTextNd || !bOutlineRule )
+    // Do not export outline rules (Chapter Numbering) as paragraph properties,
+    // neither as style properties - there's w:outlineLvl for that.
+    if (!bOutlineRule)
     {
         m_pSerializer->startElementNS(XML_w, XML_numPr);
         m_pSerializer->singleElementNS(XML_w, XML_ilvl,