ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

sw: DOCX export: don't export numPr to style from outline numrule

Browse Source 
8e9e705de2 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>
This commit is contained in:
Michael Stahl
2020-10-20 09:00:25 +02:00
committed by Michael Stahl
parent aa99b57cdc
commit 9e455724e5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/source/filter/ww8/docxattributeoutput.cxx
+4 -3
View File
@@ -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,