summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlhan Yesil <ilhanyesil@gmx.de>2018-08-28 18:39:57 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-08-30 17:26:26 +0200
commitcb954f0486b78131876b92190d840ba1b1636eb4 (patch)
tree7489619c7f756efaf921f2cd011f4f10a3b32972
parent48c677d55330ac6caf0065fa1776c985b876eead (diff)
tdf#117823 Save mail merge config item in new view
The config object is now saved in a newly created document. Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0. Change-Id: I2265de1dd69038d447e28dfda2e85c7cf89903c6 Reviewed-on: https://gerrit.libreoffice.org/59728 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 9d847ff825c1c94286e8ab864a88fc5375d9341c) Reviewed-on: https://gerrit.libreoffice.org/59802
-rw-r--r--sw/source/uibase/app/apphdl.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 90688e0648b9..804e358418ef 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -516,6 +516,7 @@ IMPL_LINK_NOARG( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void )
std::shared_ptr<SwMailMergeConfigItem> xMMConfig = m_pView->GetMailMergeConfigItem();
if (pNewView)
{
+ pNewView->SetMailMergeConfigItem(xMMConfig);
m_pView = pNewView;
xMMConfig->DocumentReloaded();
//new source view!