add yellow smilies to icon sets

Change-Id: I32d3290d333c6bac34b2ef58d2a63c4470b2e462

5 files changed, 21 insertions, 3 deletions

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index b250aeeaf481..9dcce78d9b56 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -178,7 +178,8 @@ enum ScIconSetType
     IconSet_3Signs,
     IconSet_3Symbols,
     IconSet_3Symbols2,
-    IconSet_ColorSmilies,
+    IconSet_3Smilies,
+    IconSet_3ColorSmilies,
     IconSet_4Arrows,
     IconSet_4ArrowsGray,
     IconSet_4RedToBlack,
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 65cda1c221fc..8a1d0df5145a 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1165,7 +1165,8 @@ ScIconSetMap* ScIconSetFormat::getIconSetMap()
         { "3Signs", IconSet_3Signs, 3 },
         { "3Symbols", IconSet_3Symbols, 3 },
         { "3Symbols2", IconSet_3Symbols2, 3 },
-        { "ColorSmilies", IconSet_ColorSmilies, 3 },
+        { "3Smilies", IconSet_3Smilies, 3 },
+        { "3ColorSmilies", IconSet_3ColorSmilies, 3 },
         { "4Arrows", IconSet_4Arrows, 4 },
         { "4ArrowsGray", IconSet_4ArrowsGray, 4 },
         { "4RedToBlack", IconSet_4RedToBlack, 4 },
@@ -1203,6 +1204,10 @@ const sal_Int32 a3Flags[] = {
     BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
 };
 
+const sal_Int32 a3Smilies[] {
+    BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
+};
+
 const sal_Int32 a3ColorSmilies[] {
     BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_RED_SMILIE
 };
@@ -1272,7 +1277,8 @@ static const ScIconSetBitmapMap aBitmapMap[] = {
     { IconSet_3Symbols2, a3Symbols1 },
     { IconSet_3TrafficLights1, a3TrafficLights1 },
     { IconSet_3TrafficLights2, a3TrafficLights2 },
-    { IconSet_ColorSmilies, a3ColorSmilies },
+    { IconSet_3Smilies, a3Smilies },
+    { IconSet_3ColorSmilies, 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 80a2fd6a38e6..07ae417018ff 100644
--- a/sc/source/ui/inc/iconsets.hrc
+++ b/sc/source/ui/inc/iconsets.hrc
@@ -61,5 +61,7 @@
 #define BMP_ICON_SET_POSITIVE_GREEN_SMILIE 948
 #define BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE 947
 #define BMP_ICON_SET_NEGATIVE_RED_SMILIE 946
+#define BMP_ICON_SET_POSITIVE_YELLOW_SMILIE 945
+#define BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE 944
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index cf06d1821e6b..0594c5b22c59 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 Smilies";
             "3 Colored Smilies";
             "4 Arrows";
             "4 Gray Arrows";
diff --git a/sc/source/ui/src/iconsets.src b/sc/source/ui/src/iconsets.src
index f464ce4e3ac9..4fb56fde9ad4 100644
--- a/sc/source/ui/src/iconsets.src
+++ b/sc/source/ui/src/iconsets.src
@@ -225,5 +225,13 @@ Bitmap BMP_ICON_SET_NEGATIVE_RED_SMILIE
 {
     File = "icon-set-negative-red-smilie.png";
 };
+Bitmap BMP_ICON_SET_POSITIVE_YELLOW_SMILIE
+{
+    File = "icon-set-positive-yellow-smilie.png";
+};
+Bitmap BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
+{
+    File = "icon-set-negative-yellow-smilie.png";
+};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */