diff options
| author | Eike Rathke <erack@redhat.com> | 2015-07-13 19:07:02 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-08-07 12:52:08 +0000 |
| commit | 29be11a5d5d9e3e72816ebf6b204099ff8d86058 (patch) | |
| tree | 8aa0c5f58a283f6420349a997b26edad850a14cf | |
| parent | cf6869230c3676db068e774a4e2b0a0e43c85390 (diff) | |
Resolves: tdf#92709 conditional formats are applied to ranges, not expressions
Hence we need a separate string as header in the dialog. Unfortunately I
did not see this when applying 0cf38e7d0c5d2b67dca828aae1797bff58b6c5fe
Change-Id: Ib60cef29e663e71a25849df1d5a926f0e871bb8b
(cherry picked from commit ffebdead5445dffd60fb09382e69701d8a06cfc8)
Reviewed-on: https://gerrit.libreoffice.org/17239
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | sc/inc/globstr.hrc | 4 | ||||
| -rw-r--r-- | sc/source/ui/namedlg/namemgrtable.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/src/globstr.src | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 07896d451d3c..6ca1fd7ef480 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -700,7 +700,9 @@ #define STR_TABLE_COUNT 535 -#define SC_GLOBSTR_STR_COUNT 536 /**< the count of permanently resident strings */ +#define STR_HEADER_RANGE_OR_EXPR 536 + +#define SC_GLOBSTR_STR_COUNT 537 /**< the count of permanently resident strings */ #endif diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index e226e893e331..89749c62747c 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -45,7 +45,7 @@ ScRangeManagerTable::ScRangeManagerTable( SvSimpleTableContainer& rParent, boost SetTabs( &aStaticTabs[0], MAP_PIXEL ); OUString aNameStr(ScGlobal::GetRscString(STR_HEADER_NAME)); - OUString aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE)); + OUString aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE_OR_EXPR)); OUString aScopeStr(ScGlobal::GetRscString(STR_HEADER_SCOPE)); HeaderBar& rHeaderBar = GetTheHeaderBar(); diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index 0ce65a8a0860..8ebb2c6fd710 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -1772,7 +1772,7 @@ Resource RID_GLOBSTR { Text [en-US] = "Name"; }; - String STR_HEADER_RANGE + String STR_HEADER_RANGE_OR_EXPR { Text [en-US] = "Range or formula expression"; }; @@ -1804,6 +1804,10 @@ Resource RID_GLOBSTR { Text [ en-US ] = "This Document is referenced by another document and not yet saved. Closing it without saving will result in data loss."; }; + String STR_HEADER_RANGE + { + Text [en-US] = "Range"; + }; String STR_HEADER_COND { Text [ en-US ] = "First Condition"; |