summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorSerge Krot <Serge.Krot@cib.de>2020-01-17 09:34:01 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-01-17 16:24:02 +0100
commitc212cf92c59946e1431e38396ac0e78fef3f23d8 (patch)
tree786197cb8dfc0530ab65fd34b7056356f4577eae /sw
parentc726c7ca57a1484aaeb4bdcc1baa29d91fa9cff9 (diff)
tdf#129924 critical fix: use SvxColorItem instead of SvxBrushItem
Change-Id: I09b1e9fe53315974864c8d6947c7cb861f069a68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86953 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit c5747c64d3134ec6d8b6ab6fdc938639157fca09) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86978 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 204c915b2a5c..4be2d36e177b 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -263,12 +263,12 @@ void MSWordExportBase::ExportPoolItemsToCHP( ww8::PoolItems &rItems, sal_uInt16
}
else if (nWhich == RES_CHRATR_COLOR)
{
- const SvxBrushItem& rBrushColor = static_cast<const SvxBrushItem&>(*pItem);
+ const SvxColorItem& rColor = static_cast<const SvxColorItem&>(*pItem);
const SfxPoolItem* pBackgroundItem = SearchPoolItems(rItems, RES_CHRATR_BACKGROUND);
- if (rBrushColor.GetColor() == COL_AUTO && pBackgroundItem)
+ if (rColor.GetValue() == COL_AUTO && pBackgroundItem)
{
const SvxBrushItem& rBrushBackground = static_cast<const SvxBrushItem&>(*pBackgroundItem);
- SvxBrushItem aForeground(rBrushBackground.GetColor().IsDark() ? COL_WHITE : COL_BLACK, RES_CHRATR_COLOR);
+ SvxColorItem aForeground(rBrushBackground.GetColor().IsDark() ? COL_WHITE : COL_BLACK, RES_CHRATR_COLOR);
AttrOutput().OutputItem(aForeground);
}
else