wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

Resolves: tdf#92709 conditional formats are applied to ranges, not expressions

Browse Source 
Hence we need a separate string as header in the dialog. Unfortunately I
did not see this when applying 0cf38e7d0c5d2b67dca828aae1797bff58b6c5fe

Change-Id: Ib60cef29e663e71a25849df1d5a926f0e871bb8b
This commit is contained in:
Eike Rathke
2015-07-13 19:07:02 +02:00
parent 107a4740f6
commit ffebdead54
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sc/inc/globstr.hrc
View File

@ -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

2
sc/source/ui/namedlg/namemgrtable.cxx
View File

@ -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();

6
sc/source/ui/src/globstr.src
View File

@ -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";