summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-11-03 22:48:03 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-11-04 00:27:22 +0100
commit951910adf41d88bf12f916f5c5afcb48cc6be4f9 (patch)
tree199809e0c6b5cdf3239046920d99561d53767f47
parent97b6b6f4d0e6293759a02db089c9210b8c7287c1 (diff)
add strings for (no) error cond formats
Change-Id: I0479fe508b02590da80a7fda5e4f4374da2e0294
-rw-r--r--sc/inc/globstr.hrc6
-rw-r--r--sc/source/ui/condformat/condformathelper.cxx4
-rw-r--r--sc/source/ui/src/globstr.src8
3 files changed, 16 insertions, 2 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 2f2fb63c2089..5e27e71928bf 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -606,9 +606,11 @@
#define STR_COND_BOTTOM_PERCENT 481
#define STR_COND_ABOVE_AVERAGE 482
#define STR_COND_BELOW_AVERAGE 483
+#define STR_COND_ERROR 484
+#define STR_COND_NOERROR 485
-#define STR_ERR_CONDFORMAT_PROTECTED 484
+#define STR_ERR_CONDFORMAT_PROTECTED 486
-#define STR_COUNT 485
+#define STR_COUNT 487
#endif
diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx
index c6b3ecdbdb6b..3d8b5eeb2135 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -72,6 +72,10 @@ rtl::OUString getExpression(sal_Int32 nIndex)
return ScGlobal::GetRscString(STR_COND_ABOVE_AVERAGE);
case 16:
return ScGlobal::GetRscString(STR_COND_BELOW_AVERAGE);
+ case 17:
+ return ScGlobal::GetRscString(STR_COND_ERROR);
+ case 18:
+ return ScGlobal::GetRscString(STR_COND_NOERROR);
}
return rtl::OUString();
}
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index bbb89a9cb398..2212b42f0bb6 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1923,6 +1923,14 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = "Below Average";
};
+ String STR_COND_ERROR
+ {
+ Text [ en-US ] = "an Error code";
+ };
+ String STR_COND_NOERROR
+ {
+ Text [ en-US ] = "not an Error code";
+ };
String STR_ERR_CONDFORMAT_PROTECTED
{
Text [ en-US ] = "Conditional Formats can not be created, deleted or changed in protected sheets!";