sw/source/uibase/app/apphdl.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit cb954f0486b78131876b92190d840ba1b1636eb4
Author: Ilhan Yesil <[email protected]>
AuthorDate: Tue Aug 28 18:39:57 2018 +0200
Commit: Michael Stahl <[email protected]>
CommitDate: Thu Aug 30 17:26:26 2018 +0200
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 <[email protected]>
(cherry picked from commit 9d847ff825c1c94286e8ab864a88fc5375d9341c)
Reviewed-on: https://gerrit.libreoffice.org/59802
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!
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
