commit 9476dfe7d1b86b367966e7dedf67e11936c8d9d7
author Serge Krot <Serge.Krot@cib.de> Fri Jan 10 14:44:25 2020 +0100
committer Thorsten Behrens <Thorsten.Behrens@CIB.de> Wed Jan 15 23:48:28 2020 +0100
tree 86e56dd37f5e164d6525dad7f4def3c3b00d2472
parent 62d084d50c0e6c90918f687251ffbb15264d7317

tdf#129924 docx import: set background color

Change-Id: If586a7a11e375c1592253630af87772bca40b52e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86542
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

sw/source/filter/ww8/ww8atr.cxx

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 9e8d815..813ace5 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -256,6 +256,22 @@

                AttrOutput().OutputItem( fontHeight );
             }
             else if (nWhich == RES_CHRATR_COLOR)
             {
                const SvxBrushItem& rBrushColor = static_cast<const SvxBrushItem&>(*pItem);
                const SfxPoolItem* pBackgroundItem = SearchPoolItems(rItems, RES_CHRATR_BACKGROUND);
                if (rBrushColor.GetColor() == COL_AUTO && pBackgroundItem)
                {
                    const SvxBrushItem& rBrushBackground = static_cast<const SvxBrushItem&>(*pBackgroundItem);
                    SvxBrushItem aForeground(rBrushBackground.GetColor().IsDark() ? COL_WHITE : COL_BLACK, RES_CHRATR_COLOR);
                    AttrOutput().OutputItem(aForeground);
                }
                else
                {
                    // default
                    AttrOutput().OutputItem( *pItem );
                }
             }
             else
             {
                AttrOutput().OutputItem( *pItem );