sw/source/filter/ww8/ww8par.cxx | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 26af8b14aad463ea7f1fd22ac221269f23145855
Author: Justin Luth <justin_l...@sil.org>
AuthorDate: Fri Jul 2 09:06:02 2021 +0200
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Sat Jul 3 11:43:10 2021 +0200
tdf104239 doc import: re-arrange aPreventUseAsChapterNumbering
It is better to do this more intensive check AFTER
the "continue" clause - since both those conditions
need to be true anyway in this section.
Change-Id: I6051832c207fbfd402c00cab4ed1a8ed662c1b12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118341
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e1cd8915be19..8034adfa68ba 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5962,13 +5962,6 @@ void SwWW8ImplReader::SetOutlineStyles()
if (bReRegister)
RegisterNumFormatOnStyle(nStyle);
- // When ANYTHING is wrong or strange, prohibit eligibility for
ChapterNumbering.
- if (rSI.IsWW8BuiltInHeadingStyle() && rSI.m_nListLevel !=
rSI.mnWW8OutlineLevel
- && rSI.IsOutlineNumbered())
- {
- aPreventUseAsChapterNumbering[rSI.m_pOutlineNumrule] = true;
- }
-
++nStyle; // increment before the first "continue";
if (!rSI.m_bColl || !rSI.IsWW8BuiltInHeadingStyle() ||
!rSI.HasWW8OutlineLevel())
@@ -5976,6 +5969,12 @@ void SwWW8ImplReader::SetOutlineStyles()
continue;
}
+ // When ANYTHING is wrong or strange, prohibit eligibility for
ChapterNumbering.
+ if (rSI.IsOutlineNumbered() && rSI.m_nListLevel !=
rSI.mnWW8OutlineLevel)
+ {
+ aPreventUseAsChapterNumbering[rSI.m_pOutlineNumrule] = true;
+ }
+
aWW8BuiltInHeadingStyles.push_back(&rSI);
const SwNumRule* pWW8ListStyle = rSI.GetOutlineNumrule();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
