sc/source/core/data/colorscale.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8192e7ad06538a3df44de14950b162b05ac26063
Author: Heiko Tietze <heiko.tie...@documentfoundation.org>
AuthorDate: Fri Jul 3 22:27:11 2020 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Sat Jul 4 01:28:57 2020 +0200
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 <er...@redhat.com>
(cherry picked from commit a54dd72bce539faa0de7f18affd4fe6e426fd2d4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97917
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 9d157eeb1a5a..693da4ae62f2 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[] = {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
