diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-05-25 13:40:09 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-27 08:44:56 +0200 |
| commit | c4617fe203ace1239f7aed866c74fa957b71b0df (patch) | |
| tree | 2021d71b199039e7e82321350f2dd5306cab68f3 /solenv | |
| parent | 652db25e342cbe710c3b5ae671dce2ec4b3ee09e (diff) | |
Revert "tdf#104017 DOC export: be less aggressive with merging page styles"
This reverts LO 6.3.4 commit 5d1709a7c4184eb31cfc4c2d3acadff3a4a68189,
which tdf#133334 shows is wrong. How this made it past QA
is a mystery to me. There should be lots of examples.
Change-Id: I17be6e4bab44057f4535d4728825e12d068b65d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94782
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 42a37f8ce27ad8fca222f50b712a8fed52dbda95)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94683
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 6f092e83d27b..92dbb233e9d4 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -14840,6 +14840,7 @@ sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 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/ooxmlexport2.cxx sw/qa/extras/ooxmlexport/ooxmlexport3.cxx sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |