[Libreoffice-commits] .: 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/cell.cxx              |    3 +++
 sc/source/ui/condformat/condformatdlg.cxx |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 082155566a88b470da1fa197c264fff6cacc32f5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 18 09:00:29 2012 +0200

    broadcaster cells are empty, fdo#54553
    
    Change-Id: Ie7c251b7eaee248c97f4f931175bc26539acb22a

diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 8f3a0a4..c4ddb68 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -264,6 +264,9 @@ void ScBaseCell::Delete()
 
 bool ScBaseCell::IsBlank() const
 {
+    if(eCellType == CELLTYPE_NOTE)
+        return true;
+
     return false;
 }
 
commit 61f6bfca7bd55dd8a9cfdd1f966e0da53a3101b3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 18 06:30:06 2012 +0200

    use light red as error color
    
    Change-Id: Ia16b683c47743a921e70ce1bb7f37724e4ad7c9d

diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 2ed6738..3be5bc2 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -836,7 +836,7 @@ IMPL_LINK_NOARG(ScCondFrmtEntry, TypeListHdl)
     SetHeight();
     return 0;
 }
-#include <iostream>
+
 IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit)
 {
     rtl::OUString aFormula = pEdit->GetText();
@@ -845,7 +845,7 @@ IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit)
     boost::scoped_ptr<ScTokenArray> mpCode(aComp.CompileString(aFormula));
     if(mpCode->GetCodeError())
     {
-        pEdit->SetControlBackground(COL_RED);
+        pEdit->SetControlBackground(COL_LIGHTRED);
     }
     else
     {