diff options
| author | Justin Luth <justin_luth@sil.org> | 2021-01-25 08:28:35 +0300 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-01-25 13:49:15 +0100 |
| commit | f2b04cd11cda4d9828e5af1a4160c08bab45496e (patch) | |
| tree | e1391ee4467c041446c81636df74f5a852d1f96c /sw | |
| parent | 1f3d755b6f3e519c163df1e2496927ce5231e7c3 (diff) | |
Revert "sw: DOCX export: don't export numPr to style from outline numrule"
This reverts 7.1 commit 9e455724e50bf512683b1cddfeb7493e047c19ae.
to fix regression bugs tdf#138780 and tdf#139089
Change-Id: I2a5bbcd990a6648667342cc989160582e0367f09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109864
Tested-by: Justin Luth <justin_luth@sil.org>
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 32d11fb200d45cdacb973b625488d0b8bbee6d81)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109872
Tested-by: Jenkins
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index fd304e9f4fe9..f2cdc7e9cdf2 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -8610,7 +8610,7 @@ void DocxAttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone ) FSNS( XML_w, XML_val ), OString::boolean( !rHyphenZone.IsHyphen() ) ); } -void DocxAttributeOutput::ParaNumRule_Impl(const SwTextNode*, sal_Int32 nLvl, sal_Int32 nNumId) +void DocxAttributeOutput::ParaNumRule_Impl( const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) { if ( USHRT_MAX == nNumId ) return; @@ -8619,9 +8619,8 @@ void DocxAttributeOutput::ParaNumRule_Impl(const SwTextNode*, sal_Int32 nLvl, sa 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, - // neither as style properties - there's w:outlineLvl for that. - if (!bOutlineRule) + // Do not export outline rules (Chapter Numbering) as paragraph properties, only as style properties. + if ( !pTextNd || !bOutlineRule ) { m_pSerializer->startElementNS(XML_w, XML_numPr); m_pSerializer->singleElementNS(XML_w, XML_ilvl, |