diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-19 10:28:37 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-19 10:37:24 +0200 |
| commit | 0c94072f401d32b6d631423ba98a6b84dc1cc7bd (patch) | |
| tree | 36a8d6e361fcd82a7302072c84ebbf833f3e4ba5 | |
| parent | 1c0f4d8ca7c127c3d6b31ec772de5b9b680c9db5 (diff) | |
differentiate between formula and normal conditions in the dialog
Change-Id: Ie0545b028479fe3de6c642c5f64a1ce8cf7f523b
| -rw-r--r-- | sc/source/ui/condformat/condformatdlg.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index bf4f8b20b762..fcf7dfc3a192 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -74,7 +74,14 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum switch(pEntry->GetType()) { case condformat::CONDITION: - maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc, maPos, static_cast<const ScCondFormatEntry*>( pEntry ) ) ); + { + const ScCondFormatEntry* pConditionEntry = static_cast<const ScCondFormatEntry*>( pEntry ); + if(pConditionEntry->GetOperation() != SC_COND_DIRECT) + maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc, maPos, pConditionEntry ) ); + else + maEntries.push_back(new ScFormulaFrmtEntry( this, mpDoc, maPos, pConditionEntry ) ); + + } break; case condformat::COLORSCALE: maEntries.push_back(new ScColorScale3FrmtEntry( this, mpDoc, maPos, static_cast<const ScColorScaleFormat*>( pEntry ) ) ); @@ -102,6 +109,7 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum break; } } + RecalcAll(); if (!maEntries.empty()) maEntries.begin()->SetActive(); |