From aca832667b04186caee31ce551318bd833c5d950 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Sun, 4 Nov 2012 00:25:34 +0100
Subject: fix the remaining UI places that needed update for new cond formats

Change-Id: I9df9a2adadf2e4181e1f601259eadf6bbc6007ca
---
 sc/source/ui/condformat/condformatdlgentry.cxx | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'sc/source/ui/condformat')

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;
 }
-- 
cgit