From 06db842d732bba0deacc27e54176536e4c45b2c9 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 17 Mar 2016 10:20:34 +0100 Subject: SwMailMergeWizardExecutor::EndDialogHdl: avoid accessing already deleted view Valgrind points out that SwView::GetMailMergeConfigItem() is called on a pointer that is already deleted. SwView gets deleted, because it is closed by SwMailMergeWizardExecutor::EndDialogHdl(). Since the new MM toolbar the source view is never closed (since the toolbar is part of the source view), so adapt code here to always show the source frame at the end of the wizard, instead of conditionally showing or closing it. With this, MM to a merged document or individual documents no longer crashes for me. Change-Id: If90302f0619f621420e832a1acc0a05865b8f87d --- sw/source/uibase/app/apphdl.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 3b6d4ae3e9b7..9ff99927771c 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -567,11 +567,7 @@ IMPL_LINK_NOARG_TYPED( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void ) SwView* pSourceView = pMMConfig->GetSourceView(); if(pSourceView) { - SwDocShell* pDocShell = pSourceView->GetDocShell(); - if(pDocShell->HasName() && !pDocShell->IsModified()) - pMMConfig->GetSourceView()->GetViewFrame()->DoClose(); - else - pMMConfig->GetSourceView()->GetViewFrame()->GetFrame().Appear(); + pMMConfig->GetSourceView()->GetViewFrame()->GetFrame().Appear(); } ExecutionFinished(); break; -- cgit