tdf#135774, tdf#114799 Char highlight: apply to numbering

This is a partial revert of LO 7.0's
commit 315d56582f8a56d8f2d3ea6cda63ea4832249608

The character background is exported as either w:highlight
or w:shd, based on a user setting. w:shd does not affect
numbering in MS Word, only the 16 color w:highlight does.
(tools - options - Load/Save - Microsoft Office -
Character highlighting export as: Highlight or Shading)

I replaced tdf114799.docx with a version that uses w:highlight
instead of w:shd. The test was doing it backwards - MS Word
was NOT highlighting the numbering in the original unit test.

I added another test using the original unit test to ensure
that the numbering was not affected by the paragraph's
char shading.

There are many other "Char highlight:" patches in 7.2
that are not going to be backported.
See http://wiki.documentfoundation.org/Documentation/CharHighlight
for more details about this topic.

Change-Id: I38b6f700895e29f634f07430f6c7a13722ffa4f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111201
Tested-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index f83bab3cebba..cc071f28b70e 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -804,7 +804,7 @@ public:
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const override;
 
     /// In MS Word, the font underline setting of the paragraph end position won't affect the formatting of numbering, so we ignore it
-    static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich);
+    static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich, bool bIsCharStyle = false);
     void FormatDropNotify(const SwFormatDrop& rDrop) override
             { TriggerNodeUpdate(sw::LegacyModifyHint(&rDrop, &rDrop)); };
 };