[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

Ivan Timofeev ivantimofeev at kemper.freedesktop.org
Mon Feb 13 10:37:16 PST 2012


 sc/source/core/data/cell.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 202019a7671ff9f4f1431513cd606a6bf1bcddef
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Mon Feb 13 12:26:50 2012 -0500

    fdo#45916: Ensure formula cell's pCode isn't NULL even when compilation fails.
    
    Signed-off-by: Ivan Timofeev <timofeev.i.s at gmail.com>

diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 155f4bd..8ddc540 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -782,6 +782,9 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos,
     aPos( rPos )
 {
     Compile( rFormula, true, eGrammar );    // bNoListening, Insert does that
+    if (!pCode)
+        // We need to have a non-NULL token array instance at all times.
+        pCode = new ScTokenArray;
 }
 
 // Wird von den Importfiltern verwendet


More information about the Libreoffice-commits mailing list