diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/condformat/condformatdlgentry.cxx | 21 | ||||
| -rw-r--r-- | sc/source/ui/src/condformatdlg.src | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 1f4a1f0365a6..180b1fcf2bd3 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -219,6 +219,14 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c maEdVal1.Hide(); maLbCondType.SelectEntryPos(15); break; + case SC_COND_ERROR: + maEdVal1.Hide(); + maLbCondType.SelectEntryPos(16); + break; + case SC_COND_NOERROR: + maEdVal1.Hide(); + maLbCondType.SelectEntryPos(17); + break; case SC_COND_NONE: break; } @@ -317,6 +325,12 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const case 15: eMode = SC_COND_BELOW_AVERAGE; break; + case 16: + eMode = SC_COND_ERROR; + break; + case 17: + eMode = SC_COND_NOERROR; + break; default: assert(false); // this cannot happen return NULL; @@ -963,11 +977,16 @@ IMPL_LINK_NOARG( ScConditionFrmtEntry, ConditionTypeSelectHdl ) maEdVal2.Hide(); maEdVal1.Hide(); } - else + else if(nSelectPos < 6 || (nSelectPos >= 10 && nSelectPos <= 13)) { maEdVal1.Show(); maEdVal2.Hide(); } + else + { + maEdVal1.Hide(); + maEdVal2.Hide(); + } return 0; } diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src index 51c791ad68d8..e0e0306a834d 100644 --- a/sc/source/ui/src/condformatdlg.src +++ b/sc/source/ui/src/condformatdlg.src @@ -147,6 +147,8 @@ Control RID_COND_ENTRY "bottom 10 percent"; "above average"; "below average"; + "Error"; + "No Error"; }; }; Edit ED_VAL1 |