summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2020-12-15 10:01:03 +0300
committerJustin Luth <justin_luth@sil.org>2020-12-16 06:04:18 +0100
commitbfcd952dc7820c4cf8761c4222d29ede039391dc (patch)
treef58cfdecbf29ad46c8ad8af9be027e8319c5a94a /solenv
parent59301a1cadd87a63276650975252d14e8477e632 (diff)
tdf#138892 writerfilter: cancel style list if bNoNumbering
This fixes 6.1 regression e24e2d2fb02239753c1520a0458b44683ea4cc2e. Starting in 7.0 (tdf#131321), paragraph styles kept their numbering property. But even before that, non-paragraphs marked by bNoNumbering we having their direct numbering removed, and then finishParagraph applied para-style numbering since there was no direct numbering. So, we need to pass the bNoNumbering to finishParagraph so that it can cancel out a style-assigned numbering. Change-Id: I0c24af4e9bd0ea3712179a47ed3550f91c8f44b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107738 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/clang-format/excludelist1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index db388fdefd77..0b10ea4e335e 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -12413,6 +12413,7 @@ sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx