sw/source/ui/dbui/mmresultdialogs.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
New commits: commit 75840df232ec960afa20d40e85eb1f0ebd2d5312 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jan 18 11:23:49 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 18 22:12:48 2025 +0100 cid#1640468 Dereference after null check Change-Id: I5ade1b36b43aca5a33703333dc5d4ff30c383af1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180437 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 2a960e6a8f01..fea693fe7ffa 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -933,7 +933,11 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi //get the composed document SwView* pTargetView = xConfigItem->GetTargetView(); - SAL_WARN_IF(!pTargetView, "sw.ui", "No TargetView in SwMailMergeConfigItem"); + if (!pTargetView) + { + SAL_WARN("sw.ui", "No TargetView in SwMailMergeConfigItem"); + return; + } if (xConfigItem->GetMailServer().isEmpty() || !SwMailMergeHelper::CheckMailAddress(xConfigItem->GetMailAddress()) ) @@ -945,8 +949,7 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi sal_uInt16 nRet = xQueryBox->run(); if (RET_YES == nRet ) { - SwView* pConfigView = pTargetView ? pTargetView : pView; - SfxAllItemSet aSet(pConfigView->GetPool()); + SfxAllItemSet aSet(pTargetView->GetPool()); SwMailConfigDlg aDlg(m_xDialog.get(), aSet); nRet = aDlg.run(); }
