From 92c2318db92c3f102243ef1f8a9a492796932ff6 Mon Sep 17 00:00:00 2001 From: Heiko Tietze Date: Fri, 3 Jul 2020 22:27:11 +0200 Subject: Revert "tdf#126733: inverted emoticons sets for the conditional formatting" This reverts commit a330d8eef09a3135bf6ae94b31b7ea944f256bdc. Reason for revert: Regression for existing documents Change-Id: I7bf70ddfa54c40732ca902f258530f34cac6cd98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97910 Tested-by: Jenkins Reviewed-by: Eike Rathke --- sc/source/core/data/colorscale.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sc') diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 3d1f3625cf60..3fe99a328cf1 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -1249,11 +1249,11 @@ const OUStringLiteral a3Flags[] = { }; const OUStringLiteral a3Smilies[] = { - BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_POSITIVE_YELLOW_SMILIE + BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE }; const OUStringLiteral a3ColorSmilies[] = { - BMP_ICON_SET_NEGATIVE_RED_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_POSITIVE_GREEN_SMILIE + BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_RED_SMILIE }; const OUStringLiteral a3Stars[] = { -- cgit