diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-29 23:32:21 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-30 01:03:56 +0100 |
| commit | 57bdc45e57cfa01330d21e3a37df133276239387 (patch) | |
| tree | 7cca418b53b56f0091292fd3f116bec987728c1f | |
| parent | ef4edac451093e0d281bcbc2dd43b262330ea43d (diff) | |
add icon sets to manage conditional formats dlg
Change-Id: I309ca58d708f0df87365a21fdcf9acb829f08a9e
| -rw-r--r-- | sc/inc/globstr.hrc | 16 | ||||
| -rw-r--r-- | sc/source/ui/condformat/condformathelper.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/inc/condformathelper.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/src/globstr.src | 4 |
4 files changed, 18 insertions, 8 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 42d8c1eb64ee..9887d8e6ac8a 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -594,15 +594,15 @@ #define STR_COND_CONDITION 469 #define STR_COND_COLORSCALE 470 #define STR_COND_DATABAR 471 -#define STR_COND_FORMULA 472 -#define STR_COND_BETWEEN 473 -#define STR_COND_NOTBETWEEN 474 -#define STR_COND_UNIQUE 475 -#define STR_COND_DUPLICATE 476 +#define STR_COND_ICONSET 472 +#define STR_COND_FORMULA 473 +#define STR_COND_BETWEEN 474 +#define STR_COND_NOTBETWEEN 475 +#define STR_COND_UNIQUE 476 +#define STR_COND_DUPLICATE 477 -#define STR_ERR_CONDFORMAT_PROTECTED 477 - -#define STR_COUNT 478 +#define STR_ERR_CONDFORMAT_PROTECTED 478 +#define STR_COUNT 479 #endif diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx index 1f658e326456..2180d5169bc1 100644 --- a/sc/source/ui/condformat/condformathelper.cxx +++ b/sc/source/ui/condformat/condformathelper.cxx @@ -25,6 +25,8 @@ rtl::OUString getTextForType(ScCondFormatEntryType eType) return ScGlobal::GetRscString(STR_COND_DATABAR); case FORMULA: return ScGlobal::GetRscString(STR_COND_FORMULA); + case ICONSET: + return ScGlobal::GetRscString(STR_COND_ICONSET); default: break; } @@ -105,6 +107,9 @@ rtl::OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rForm case condformat::COLORSCALE: aBuffer.append(getTextForType(COLORSCALE)); break; + case condformat::ICONSET: + aBuffer.append(getTextForType(ICONSET)); + break; } } return aBuffer.makeStringAndClear(); diff --git a/sc/source/ui/inc/condformathelper.hxx b/sc/source/ui/inc/condformathelper.hxx index 297d032d88ad..c674df4fcf64 100644 --- a/sc/source/ui/inc/condformathelper.hxx +++ b/sc/source/ui/inc/condformathelper.hxx @@ -18,6 +18,7 @@ enum ScCondFormatEntryType COLORSCALE, DATABAR, FORMULA, + ICONSET, COLLAPSED }; diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index a58f5b68d292..5091477a5351 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -1875,6 +1875,10 @@ Resource RID_GLOBSTR { Text [ en-US ] = "DataBar"; }; + String STR_COND_ICONSET + { + Text [ en-US ] = "IconSet"; + }; String STR_COND_BETWEEN { Text [ en-US ] = "between"; |