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

[Julien Nabet]

 sc/source/ui/unoobj/condformatuno.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 202c5747d23df7fae477f097648135b0bd675c07
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu May 18 00:03:32 2017 +0200

    tdf#107920: Crash when using ScCompiler in condformat
    
    Just call SetGrammar from ScCompiler object with grammar of document
    See bt in https://bugs.documentfoundation.org/attachment.cgi?id=133382
    
    Change-Id: Iedf4b88f2821bbcf728e4b1c023041fd6f10e5f3
    Reviewed-on: https://gerrit.libreoffice.org/37739
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 63843a97262ccfa38d838a9cbbc3faadba8290a6)
    Reviewed-on: https://gerrit.libreoffice.org/37755
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index e97311a6cff1..549fb6710fd4 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -717,6 +717,7 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue(
             if ((aValue >>= aFormula) && !aFormula.isEmpty())
             {
                 ScCompiler aComp(&mpDocShell->GetDocument(), getCoreObject()->GetSrcPos());
+                aComp.SetGrammar(mpDocShell->GetDocument().GetGrammar());
                 std::unique_ptr<ScTokenArray> pArr(aComp.CompileString(aFormula));
                 getCoreObject()->SetFormula1(*pArr);
             }
@@ -728,6 +729,7 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue(
             if ((aValue >>= aFormula) && !aFormula.isEmpty())
             {
                 ScCompiler aComp(&mpDocShell->GetDocument(), getCoreObject()->GetSrcPos());
+                aComp.SetGrammar(mpDocShell->GetDocument().GetGrammar());
                 std::unique_ptr<ScTokenArray> pArr(aComp.CompileString(aFormula));
                 getCoreObject()->SetFormula2(*pArr);
             }