summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlhan Yesil <ilhanyesil@gmx.de>2018-08-28 18:39:57 +0200
committerAndras Timar <andras.timar@collabora.com>2018-09-03 10:12:50 +0200
commitd576955f513509a2740ab2e40b4523bf1a6b17ac (patch)
treed08ce414c41d97cc1b9efcc930ff8514d5fee67f
parent5ca8b9752c3afb8a688279aa2306c80ef34f1297 (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/59803 (cherry picked from commit 55498d196c31c098b02da5f4638fc0ca155b60b4)
-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 27dbf41be1ce..5952313aabd4 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -532,6 +532,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!