summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-10-19 19:41:36 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2020-10-20 09:02:58 +0200
commitb6b63c7ce92f7cc830593dbdd639cfde4951b971 (patch)
tree934eaf86bb009ec517d2fbc0cf60daad85c03079
parentc69681e4b4797c4976160c46efe06beb4df4af5d (diff)
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@cib.de> (cherry picked from commit 9e455724e50bf512683b1cddfeb7493e047c19ae)
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 270ab6fe964f..e9c09f206d01 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8073,7 +8073,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 )
{
@@ -8081,8 +8081,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,