[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Katarina Behrens]

 sc/source/ui/condformat/condformatdlgentry.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f2a367ffa4bb20ceb2bab11d8895653bf0d1309d
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Sat Aug 29 17:12:42 2015 +0200

    tdf#93600: Avoid crash on entering '=' as a cell value
    
    To match formulas, 'formula is' condition should be used instead
    
    Change-Id: I37a9a2680c49bffcb8b25a11faedc1421cfa2d00
    Reviewed-on: https://gerrit.libreoffice.org/18126
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-on: https://gerrit.libreoffice.org/18159
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 018e7e8..79cf58f 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -313,7 +313,7 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit)
     boost::scoped_ptr<ScTokenArray> ta(aComp.CompileString(aFormula));
 
     // Error, warn the user
-    if( ta->GetCodeError() )
+    if( ta->GetCodeError() || ( ta->GetLen() == 0 ) )
     {
         pEdit->SetControlBackground(COL_LIGHTRED);
         maFtVal->SetText(ScGlobal::GetRscString(STR_VALID_DEFERROR));