summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-07-09 07:18:06 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-07-11 15:31:34 +0000
commitffda41f416012ed8bc84d71fdd205755a33ce2d6 (patch)
treeb2b898a4684f2f1bc6c32e35de69d6768f7bc450
parentdef0ae82be7f9c4c31b9690fe7e95d8f05cf2210 (diff)
tdf#100820: missing nullptr check in writer's apphdl.cxx
Change-Id: I32c22b1e2c6ee23ca712bde7b7f86dada654b802 Reviewed-on: https://gerrit.libreoffice.org/27067 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 81889ab4ce49e83ef4914dbff403b839c718a08a) Reviewed-on: https://gerrit.libreoffice.org/27068 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 95b3286e2a7f22ab75d63c83e83b874e8b85dd1c) Reviewed-on: https://gerrit.libreoffice.org/27073
-rw-r--r--sw/source/uibase/app/apphdl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 9bc5ec11cec6..3090ceb85268 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -239,7 +239,7 @@ void SwModule::StateOther(SfxItemSet &rSet)
case FN_MAILMERGE_EMAIL_DOCUMENTS:
{
SwView* pView = ::GetActiveView();
- SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+ SwMailMergeConfigItem* pConfigItem = pView ? pView->GetMailMergeConfigItem() : nullptr;
// #i51949# hide e-Mail option if e-Mail is not supported
// #i63267# printing might be disabled