diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-12-15 10:01:03 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-12-16 15:57:54 +0100 |
| commit | 88aa8f5343705008b86ef41512993a00d331a668 (patch) | |
| tree | aee6b5829c81a498523615a891c8d623404ffee7 /solenv | |
| parent | b4e9f8093daecec90e8294287029070262a634ac (diff) | |
tdf#138892 writerfilter: cancel style list if bNoNumbering
This fixes 6.1 regression from tdf#95377's
commit e24e2d2fb02239753c1520a0458b44683ea4cc2e.
Starting in 7.0 (tdf#131321), paragraph styles kept their
numbering property. But even before that, non-paragraphs
marked by bNoNumbering were 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>
(cherry picked from commit bfcd952dc7820c4cf8761c4222d29ede039391dc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107795
(cherry picked from commit e901ffcb93d217f2cc09021a3b2fecb36f9884f6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107796
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/clang-format/blacklist | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 5a1512485d53..b01ce8d1f15a 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -14200,6 +14200,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 |