sw/source/uibase/app/apphdl.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit ffda41f416012ed8bc84d71fdd205755a33ce2d6 Author: Markus Mohrhard <[email protected]> Date: Sat Jul 9 07:18:06 2016 +0200 tdf#100820: missing nullptr check in writer's apphdl.cxx Change-Id: I32c22b1e2c6ee23ca712bde7b7f86dada654b802 Reviewed-on: https://gerrit.libreoffice.org/27067 Tested-by: Jenkins <[email protected]> Reviewed-by: Markus Mohrhard <[email protected]> (cherry picked from commit 81889ab4ce49e83ef4914dbff403b839c718a08a) Reviewed-on: https://gerrit.libreoffice.org/27068 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 95b3286e2a7f22ab75d63c83e83b874e8b85dd1c) Reviewed-on: https://gerrit.libreoffice.org/27073 diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 9bc5ec1..3090ceb 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
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
