diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-09 15:00:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-09 15:01:28 +0100 |
| commit | 07544ac6c4f426db76bf70eb10e4fd4c6ae4a234 (patch) | |
| tree | 98fb8977c7ec587d2092005b54ab13cc07d9ce03 | |
| parent | 284c8ce11957f11693e6b5026adc1a564d35e7e9 (diff) | |
Resolves: tdf#101383 don't crash is merge has no targetview on mail setup
Change-Id: I7d5d97443a64e2fe99d575e0e59914777f1723c4
| -rw-r--r-- | sw/source/ui/dbui/mmresultdialogs.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 2b66f5d1ff0b..b18a7380b32e 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -909,16 +909,17 @@ IMPL_LINK_TYPED(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, //get the composed document SwView* pTargetView = xConfigItem->GetTargetView(); - assert(pTargetView); + SAL_WARN_IF(!pTargetView, "sw.ui", "No TargetView in SwMailMergeConfigItem"); if (xConfigItem->GetMailServer().isEmpty() || !SwMailMergeHelper::CheckMailAddress(xConfigItem->GetMailAddress()) ) { ScopedVclPtrInstance< QueryBox > aQuery(pButton, WB_YES_NO_CANCEL, m_sConfigureMail); sal_uInt16 nRet = aQuery->Execute(); - if(RET_YES == nRet ) + if (RET_YES == nRet ) { - SfxAllItemSet aSet(pTargetView->GetPool()); + SwView* pConfigView = pTargetView ? pTargetView : pView; + SfxAllItemSet aSet(pConfigView->GetPool()); ScopedVclPtrInstance< SwMailConfigDlg > pDlg(pButton, aSet); nRet = pDlg->Execute(); } |