summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2015-11-16 19:25:38 +0100
committerMichael Stahl <mstahl@redhat.com>2015-11-16 19:34:51 +0000
commit72ac345ab4eea1654bb5eb01ce9901c90102300c (patch)
treefbb3cc86c282cf42e2a28d9718b81e921d31e137
parenta6c5cfa56d2bdebb899d05f702c29d79c39be299 (diff)
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@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sc/source/ui/formdlg/formula.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 7e8262e6c598..e4d466ef0be3 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));