add colored smilies to the icon sets, fdo#60107

Change-Id: I5a1de90912ea74be9c60f95e2aa3588fd8113a07
Reviewed-on: https://gerrit.libreoffice.org/5914
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

8 files changed, 23 insertions, 0 deletions

diff --git a/icon-themes/galaxy/sc/res/icon-set-negative-red-smilie.png b/icon-themes/galaxy/sc/res/icon-set-negative-red-smilie.png
new file mode 100644
index 000000000000..464fd10a8f58
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-negative-red-smilie.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-neutral-yellow-smilie.png b/icon-themes/galaxy/sc/res/icon-set-neutral-yellow-smilie.png
new file mode 100644
index 000000000000..6578efcfc3f2
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-neutral-yellow-smilie.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-positive-green-smilie.png b/icon-themes/galaxy/sc/res/icon-set-positive-green-smilie.png
new file mode 100644
index 000000000000..e4ecd165d1b8
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-positive-green-smilie.png
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 1264f2771399..b250aeeaf481 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -178,6 +178,7 @@ enum ScIconSetType
     IconSet_3Signs,
     IconSet_3Symbols,
     IconSet_3Symbols2,
+    IconSet_ColorSmilies,
     IconSet_4Arrows,
     IconSet_4ArrowsGray,
     IconSet_4RedToBlack,
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 91f096e4e37f..65cda1c221fc 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1165,6 +1165,7 @@ ScIconSetMap* ScIconSetFormat::getIconSetMap()
         { "3Signs", IconSet_3Signs, 3 },
         { "3Symbols", IconSet_3Symbols, 3 },
         { "3Symbols2", IconSet_3Symbols2, 3 },
+        { "ColorSmilies", IconSet_ColorSmilies, 3 },
         { "4Arrows", IconSet_4Arrows, 4 },
         { "4ArrowsGray", IconSet_4ArrowsGray, 4 },
         { "4RedToBlack", IconSet_4RedToBlack, 4 },
@@ -1202,6 +1203,10 @@ const sal_Int32 a3Flags[] = {
     BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
 };
 
+const sal_Int32 a3ColorSmilies[] {
+    BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_RED_SMILIE
+};
+
 const sal_Int32 a4Arrows[] = {
     BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, BMP_ICON_SET_COLORARROWS_UP
 };
@@ -1267,6 +1272,7 @@ static const ScIconSetBitmapMap aBitmapMap[] = {
     { IconSet_3Symbols2, a3Symbols1 },
     { IconSet_3TrafficLights1, a3TrafficLights1 },
     { IconSet_3TrafficLights2, a3TrafficLights2 },
+    { IconSet_ColorSmilies, a3ColorSmilies },
     { IconSet_4Arrows, a4Arrows },
     { IconSet_4ArrowsGray, a4ArrowsGray },
     { IconSet_4Rating, a4Ratings },
diff --git a/sc/source/ui/inc/iconsets.hrc b/sc/source/ui/inc/iconsets.hrc
index f4761c09afdc..80a2fd6a38e6 100644
--- a/sc/source/ui/inc/iconsets.hrc
+++ b/sc/source/ui/inc/iconsets.hrc
@@ -58,5 +58,8 @@
 #define BMP_ICON_SET_TRIANGLES_DOWN 951
 #define BMP_ICON_SET_TRIANGLES_SAME 950
 #define BMP_ICON_SET_TRIANGLES_UP 949
+#define BMP_ICON_SET_POSITIVE_GREEN_SMILIE 948
+#define BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE 947
+#define BMP_ICON_SET_NEGATIVE_RED_SMILIE 946
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index e0f13a1e7442..cf06d1821e6b 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -343,6 +343,7 @@ Control RID_COND_ENTRY
             "3 Signs";
             "3 Symbols 1";
             "3 Symbols 2";
+            "3 Colored Smilies";
             "4 Arrows";
             "4 Gray Arrows";
             "4 Circles Red to Black";
diff --git a/sc/source/ui/src/iconsets.src b/sc/source/ui/src/iconsets.src
index da3c3509eca0..f464ce4e3ac9 100644
--- a/sc/source/ui/src/iconsets.src
+++ b/sc/source/ui/src/iconsets.src
@@ -213,5 +213,17 @@ Bitmap BMP_ICON_SET_TRIANGLES_UP
 {
     File = "icon-set-triangles-up.png";
 };
+Bitmap BMP_ICON_SET_POSITIVE_GREEN_SMILIE
+{
+    File = "icon-set-positive-green-smilie.png";
+};
+Bitmap BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE
+{
+    File = "icon-set-neutral-yellow-smilie.png";
+};
+Bitmap BMP_ICON_SET_NEGATIVE_RED_SMILIE
+{
+    File = "icon-set-negative-red-smilie.png";
+};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */