[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Serge Krot (via logerrit)]

 sw/source/filter/ww8/ww8atr.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c212cf92c59946e1431e38396ac0e78fef3f23d8
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Fri Jan 17 09:34:01 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Jan 17 16:24:02 2020 +0100

    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 at redhat.com>
    (cherry picked from commit c5747c64d3134ec6d8b6ab6fdc938639157fca09)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86978
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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