diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2016-03-21 20:14:37 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2016-03-21 20:06:44 +0000 |
commit | a79b1192c3241a350115e5a653935bb6986a9099 (patch) | |
tree | 78ca6f2f0ee77b809e09909f424aa171316cfc40 | |
parent | c4af2adea07fe87a0d785f413fd8cc4b1adc5e33 (diff) |
tdf#98787: Crash after showing mailmerge toolbar and showing preview
Change-Id: I38034875a7175acd16e451e733c0d4c103c36eef
Reviewed-on: https://gerrit.libreoffice.org/23411
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 9ff99927771c..e721abc8531a 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -208,7 +208,7 @@ void SwModule::StateOther(SfxItemSet &rSet) case FN_MAILMERGE_LAST_ENTRY: { SwView* pView = ::GetActiveView(); - SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem(); + SwMailMergeConfigItem* pConfigItem = pView?pView->GetMailMergeConfigItem():nullptr; if (!pConfigItem) rSet.DisableItem(nWhich); else |