[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/ui/dbui/mmresultdialogs.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 07544ac6c4f426db76bf70eb10e4fd4c6ae4a234
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 9 15:00:54 2016 +0100

    Resolves: tdf#101383 don't crash is merge has no targetview on mail setup
    
    Change-Id: I7d5d97443a64e2fe99d575e0e59914777f1723c4

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 2b66f5d..b18a738 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();
         }