summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2021-03-13 09:45:27 +0200
committerJustin Luth <justin_luth@sil.org>2021-03-13 12:00:31 +0100
commitcb7839169ac58bc24d986f4cf5532d1d6219574d (patch)
tree36bf6cd63e829149a307b42f9a97625717b41bf0 /connectivity
parenta9bdb74c0309fca470abdaabbddea84798cbaa83 (diff)
tdf#135774 Char highlight: partial revert tdf#114799
...DOCX import: fix missing numbering highlight from 7.0 commit 315d56582f8a56d8f2d3ea6cda63ea4832249608. If the numbering had a specified w:highlight in numbering.xml, then that character background should apply to the bullet point. However, SetDiffFnt automatically clears the highlight, the same as it does with mxBackColor (fixed in earlier commit). So a special step is needed to check if the font has a highlight, and since that direct formatting has priority, re-apply it after SetDiffFnt has finished. This is slightly different from mxBackColor - which is an optional attribute. Highlight is reset to COL_TRANSPARENT. If a RES_CHRATR_HIGHLIGHT exists explicitly setting a COL_TRANSPARENT, then any overrides should have been removed from pCleanedSet, and so it never needs to SetHighlightColor(AUTO). Change-Id: Id9d88054254563706b9aee90a1d257b467139334 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112410 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'connectivity')
0 files changed, 0 insertions, 0 deletions