sw/source/uibase/dbui/dbmgr.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 743bbedb1a4d1ce9304f9cf864bfe3e2b6ea5efa Author: Miklos Vajna <[email protected]> Date: Wed Mar 16 17:15:48 2016 +0100 CppunitTest_sw_mailmerge: fix testMissingDefaultLineColor SwDBManager::MergeMailFiles() assumes that there is a config item in a merge description all the time, but SwXMailMerge::execute() doesn't set one for the nCurOutputType == MailMergeType::FILE case, so don't rely on that. Especially given that MergeMailFiles() later explicitly handles the pTargetView == nullptr case. Change-Id: Ia46539c650885834d54c499fb63188d9bf9ac9ba diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index a63ab1f..5895186 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -997,7 +997,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, bCancel = false; // in case of creating a single resulting file this has to be created here - SwView* pTargetView = rMergeDescriptor.pMailMergeConfigItem->GetTargetView(); + SwView* pTargetView = rMergeDescriptor.pMailMergeConfigItem ? rMergeDescriptor.pMailMergeConfigItem->GetTargetView() : nullptr; SwWrtShell* pTargetShell = nullptr; SwDoc* pTargetDoc = nullptr; SfxObjectShellRef xTargetDocShell = nullptr; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
