summaryrefslogtreecommitdiff
path: root/cpputools
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2021-01-27 22:56:04 +0300
committerMichael Stahl <michael.stahl@allotropia.de>2021-02-26 13:19:49 +0100
commit2f40c8f59cb23106e36071082d2570e2dbca4d22 (patch)
tree4539354efa9d1c512b11be63f06ccd87e9090cfd /cpputools
parent5ff60569f998d9afe9273ec4223d91f6d549e51a (diff)
tdf#134619 docxexport: don't skip font properties in NumberingLevel
This partially reverts LO 6.4.5 commit 598ca431de96d8bfcf18fa2945e9e30f98387474 The output set can contain more than just the font name. Things like colour and fontsize were being lost when the "else" clause was added. Since it looks like the main intent of the else clause was to avoid specifying a font name twice, erase that from the property set before writing out the rest of the font properties. There is a unit test that enforces that. (I was not able to reproduce the original problem that this was trying to fix. The entire commit is hard to revert, and I will assume that the rest of the commit is useful/accurate, so just fix up a careless portion of the commit.) Change-Id: I772e40e8bd75c0589f3308d4d7470229855aed8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110034 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110169 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 5031a2932e9146db8b163ecfcaaf29e59cc4cc9d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110558 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'cpputools')
0 files changed, 0 insertions, 0 deletions