From 0c94072f401d32b6d631423ba98a6b84dc1cc7bd Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Fri, 19 Oct 2012 10:28:37 +0200
Subject: differentiate between formula and normal conditions in the dialog

Change-Id: Ie0545b028479fe3de6c642c5f64a1ce8cf7f523b
---
 sc/source/ui/condformat/condformatdlg.cxx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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