summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-05-15 15:17:41 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-05-16 07:26:38 +0200
commit4eb19ec569579137de9d835fe584e47b871c4e8c (patch)
treef427ac5d6beea4d663ea6830beb51b73519824a3
parent1622b67e4b2bc8ecc5dd3ededc0a6e5adb936a6e (diff)
add missing OOXML icon sets, tdf#69095
Change-Id: Ia4f9e62bb2b2bd143785642fcfacbc58cfaf1926
-rw-r--r--sc/inc/colorscale.hxx5
-rw-r--r--sc/source/core/data/colorscale.cxx22
-rw-r--r--sc/source/ui/src/condformatdlg.src3
3 files changed, 28 insertions, 2 deletions
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index dd28d47f51e8..6a2115f06001 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -192,6 +192,8 @@ enum ScIconSetType
IconSet_3Symbols,
IconSet_3Symbols2,
IconSet_3Smilies,
+ IconSet_3Stars,
+ IconSet_3Triangles,
IconSet_3ColorSmilies,
IconSet_4Arrows,
IconSet_4ArrowsGray,
@@ -201,7 +203,8 @@ enum ScIconSetType
IconSet_5Arrows,
IconSet_5ArrowsGray,
IconSet_5Ratings,
- IconSet_5Quarters
+ IconSet_5Quarters,
+ IconSet_5Boxes
};
struct ScIconSetMap {
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index cefb5cc962c3..176b1c8e95b9 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1231,6 +1231,8 @@ ScIconSetMap aIconSetMap[] = {
{ "3Symbols2", IconSet_3Symbols2, 3 },
{ "3Smilies", IconSet_3Smilies, 3 },
{ "3ColorSmilies", IconSet_3ColorSmilies, 3 },
+ { "3Stars", IconSet_3Stars, 3 },
+ { "3Triangles", IconSet_3Triangles, 3 },
{ "4Arrows", IconSet_4Arrows, 4 },
{ "4ArrowsGray", IconSet_4ArrowsGray, 4 },
{ "4RedToBlack", IconSet_4RedToBlack, 4 },
@@ -1240,6 +1242,7 @@ ScIconSetMap aIconSetMap[] = {
{ "5ArrowsGray", IconSet_5ArrowsGray, 5 },
{ "5Rating", IconSet_5Ratings, 5 },
{ "5Quarters", IconSet_5Quarters, 5 },
+ { "5Boxes", IconSet_5Boxes, 5 },
{ NULL, IconSet_3Arrows, 0 }
};
@@ -1286,6 +1289,14 @@ 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 a3Stars[] = {
+ BMP_ICON_SET_STARS_EMPTY, BMP_ICON_SET_STARS_HALF, BMP_ICON_SET_STARS_FULL
+};
+
+const sal_Int32 a3Triangles[] = {
+ BMP_ICON_SET_TRIANGLES_DOWN, BMP_ICON_SET_TRIANGLES_SAME, BMP_ICON_SET_TRIANGLES_UP
+};
+
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
};
@@ -1314,6 +1325,12 @@ const sal_Int32 a5Quarters[] = {
BMP_ICON_SET_PIES_THREE_QUARTER, BMP_ICON_SET_PIES_FULL,
};
+const sal_Int32 a5Boxes[] = {
+ BMP_ICON_SET_SQUARES_EMPTY, BMP_ICON_SET_SQUARES_ONE_QUARTER,
+ BMP_ICON_SET_SQUARES_HALF, BMP_ICON_SET_SQUARES_THREE_QUARTER,
+ BMP_ICON_SET_SQUARES_FULL
+};
+
const sal_Int32 a3Symbols1[] = {
BMP_ICON_SET_SYMBOLS1_CROSS, BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK, BMP_ICON_SET_SYMBOLS1_CHECK
};
@@ -1353,6 +1370,8 @@ static const ScIconSetBitmapMap aBitmapMap[] = {
{ IconSet_3TrafficLights2, a3TrafficLights2 },
{ IconSet_3Smilies, a3Smilies },
{ IconSet_3ColorSmilies, a3ColorSmilies },
+ { IconSet_3Triangles, a3Triangles },
+ { IconSet_3Stars, a3Stars },
{ IconSet_4Arrows, a4Arrows },
{ IconSet_4ArrowsGray, a4ArrowsGray },
{ IconSet_4Rating, a4Ratings },
@@ -1361,7 +1380,8 @@ static const ScIconSetBitmapMap aBitmapMap[] = {
{ IconSet_5Arrows, a5Arrows },
{ IconSet_5ArrowsGray, a5ArrowsGray },
{ IconSet_5Quarters, a5Quarters },
- { IconSet_5Ratings, a5Ratings }
+ { IconSet_5Ratings, a5Ratings },
+ { IconSet_5Boxes, a5Boxes }
};
}
diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index d086dcaf3589..4d2ca4c717a0 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -286,6 +286,8 @@ Control RID_COND_ENTRY
"3 Symbols 1";
"3 Symbols 2";
"3 Smilies";
+ "3 Stars";
+ "3 Triangles";
"3 Colored Smilies";
"4 Arrows";
"4 Gray Arrows";
@@ -296,6 +298,7 @@ Control RID_COND_ENTRY
"5 Gray Arrows";
"5 Ratings";
"5 Quarters";
+ "5 Boxes";
};
};
};