[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/ui/formdlg/formula.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 72ac345ab4eea1654bb5eb01ce9901c90102300c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Nov 16 19:25:38 2015 +0100

    tdf#95824: Crash: when opening Function Wizard
    
    Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=ccde2360d5c29bb99008cfae5ab3675bee4ca46c
    Let's just initialize m_pDoc in ctor
    
    Change-Id: I4fe0f8eff5439b3150c90ac14343aaf8e0a4e43e
    Reviewed-on: https://gerrit.libreoffice.org/20004
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 7e8262e..e4d466e 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -88,8 +88,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
         }
     }
 
-    if (m_pDoc == nullptr)
-        m_pDoc = pViewData->GetDocument();
+    m_pDoc = pViewData->GetDocument();
     m_xParser.set(ScServiceProvider::MakeInstance(SC_SERVICE_FORMULAPARS, static_cast<ScDocShell*>(m_pDoc->GetDocumentShell())),uno::UNO_QUERY);
     uno::Reference< beans::XPropertySet> xSet(m_xParser,uno::UNO_QUERY);
     xSet->setPropertyValue(SC_UNO_COMPILEFAP, uno::makeAny(sal_True));