sc/source/ui/unoobj/condformatuno.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit 5756d3d5bd2175335ac302aaa806fd5f2277f564 Author: Julien Nabet <serval2...@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 <c...@libreoffice.org> Reviewed-by: Eike Rathke <er...@redhat.com> (cherry picked from commit 63843a97262ccfa38d838a9cbbc3faadba8290a6) Reviewed-on: https://gerrit.libreoffice.org/37756 Tested-by: Eike Rathke <er...@redhat.com> diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index d64b71d9bedd..bfc003e94a05 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -745,6 +745,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); } @@ -756,6 +757,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); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits