diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-03-18 21:40:15 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-03-19 09:07:15 +0100 |
commit | 00ac19068de5e120d1620a719aa64f1203c639ae (patch) | |
tree | a1ea31d1cf81442d8926cae9a3db185ee657dc7d /sw/source/core/layout/ssfrm.cxx | |
parent | 192baae9fee4ddaa7758f2396b79a1da8e2b7a89 (diff) |
tdf#120548 sw ApplyParagraphMarkFormatToNumbering: fix handling of font color
Regression from commit b2c1474c1dc93b69f0ede03fc5c9ab496c669955
(SwTxtNode::IsIgnoredCharFmtForNumbering: ignore RES_CHRATR_COLOR,
2014-11-20), where the problem was that unconditionally ignoring or not
ignoring the font color is not correct.
Re-examining the test document from the above commit, it has an explicit
font color set in the numbering, while this bugdoc doesn't have it.
So make applying the paragraph mark font color to the numbering
conditional if the numbering already has a color set, this makes both
cases work correctly.
Change-Id: I43a6dec7d3a77689e2acbdc9d3671e79a9c4cac8
Reviewed-on: https://gerrit.libreoffice.org/69400
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source/core/layout/ssfrm.cxx')
0 files changed, 0 insertions, 0 deletions