sw/source/filter/ww8/ww8atr.cxx | 16 ---------------- 1 file changed, 16 deletions(-)
New commits: commit 92307cad6a66f4fc891f566b9a40832971b198f4 Author: Justin Luth <[email protected]> AuthorDate: Thu Oct 16 12:25:01 2025 -0400 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Mon Oct 20 19:19:36 2025 +0200 tdf#162461 Revert "tdf#129924 docx import: set background color" This reverts 6.4.1 commit 9476dfe7d1b86b367966e7dedf67e11936c8d9d7 Automatic font-color needs to be exported as automatic, not some hard-coded value based on some background whatever. There were lots of fixes related to "highlight" verses "shade" backgrounds in 7.x, so this hackery would be obsolete anyway. Change-Id: Ic62fe56c74cffd8c8475befe745e9fb1c227ec1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192518 Reviewed-by: Justin Luth <[email protected]> Tested-by: Jenkins (cherry picked from commit 74063178d58d30706c68003ee8ad8e6053f8df50) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192695 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 8f9b00c5998d..36c3f08655a1 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -267,22 +267,6 @@ void MSWordExportBase::ExportPoolItemsToCHP( ww8::PoolItems &rItems, sal_uInt16 AttrOutput().OutputItem( fontHeight ); } - else if (nWhich == RES_CHRATR_COLOR) - { - const SvxColorItem& rColor = pItem->StaticWhichCast(RES_CHRATR_COLOR); - const SfxPoolItem* pBackgroundItem = SearchPoolItems(rItems, RES_CHRATR_BACKGROUND); - if (rColor.GetValue() == COL_AUTO && pBackgroundItem) - { - const SvxBrushItem& rBrushBackground = pBackgroundItem->StaticWhichCast(RES_CHRATR_BACKGROUND); - SvxColorItem aForeground(rBrushBackground.GetColor().IsDark() ? COL_WHITE : COL_BLACK, RES_CHRATR_COLOR); - AttrOutput().OutputItem(aForeground); - } - else - { - // default - AttrOutput().OutputItem( *pItem ); - } - } else if (nWhich == RES_CHRATR_HIGHLIGHT) { const SvxBrushItem& rBrush = pItem->StaticWhichCast(RES_CHRATR_HIGHLIGHT);
