diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-04-22 14:10:57 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-04-22 16:28:17 +0200 |
commit | 54f7c32beca5a9c99d7316dc38818edad55f7415 (patch) | |
tree | 7c0f532206739f856ca81fba8db7d5352eb03783 /oox | |
parent | 7d4506f89eba5c6b4edf1590c87e90d478fd179b (diff) |
tdf#132472: do not set text color when table style is 'Themed-Style-2'
and it has no Accent
Regression from 2c3f7d4ee0a0b2bf6efc41670645bd361f1b76ef
< tdf#107604 Handle predefined table styles. >
Change-Id: Id9ab5b20825e2eaf8cc138c108608fe446f33db4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114477
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/table/predefined-table-styles.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/drawingml/table/predefined-table-styles.cxx b/oox/source/drawingml/table/predefined-table-styles.cxx index 4a8aec4cef1a..ea68911112a0 100644 --- a/oox/source/drawingml/table/predefined-table-styles.cxx +++ b/oox/source/drawingml/table/predefined-table-styles.cxx @@ -516,11 +516,11 @@ std::unique_ptr<TableStyle> CreateTableStyle(const OUString& styleId) } else if (style_name == "Themed-Style-2") { - wholeTblTextColor.setSchemeClr(XML_lt1); - firstRowTextColor.setSchemeClr(XML_lt1); - if (!accent_name.isEmpty()) { + wholeTblTextColor.setSchemeClr(XML_lt1); + firstRowTextColor.setSchemeClr(XML_lt1); + accent_val = tokens[mStyleIdMap[styleId].second]; pTblBgFillProperties->maFillColor.setSchemeClr(accent_val); |