diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-09-05 17:24:05 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-09-12 14:58:10 +0200 |
| commit | cba9bce6936c31aa836763a4dd147ac3db2013bc (patch) | |
| tree | 8287905d8e805ee62e4bdf259b25bd77008da40e /sw/source/uibase/app | |
| parent | e3312f41fb70f91e31878e2bb9ccbfbf7e917eea (diff) | |
tdf#108572 revoke connection if mail-merge is cancelled
Change-Id: Idca4969af8043f7dbc54f4a63b99e92155ef1585
Reviewed-on: https://gerrit.libreoffice.org/41949
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit ba368643e6a0c5ac7a7b7ea8d72899d60b2a8331)
Reviewed-on: https://gerrit.libreoffice.org/42044
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sw/source/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 5abd1de7c9fa..0b029e6e5a04 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -489,6 +489,8 @@ void SwMailMergeWizardExecutor::ExecutionFinished() if (xMMConfig) xMMConfig->Commit(); + SwDBManager::CommitLastRegistrations(); + // release/destroy asynchronously Application::PostUserEvent( LINK( this, SwMailMergeWizardExecutor, DestroyDialogHdl ) ); } @@ -661,6 +663,12 @@ IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CancelHdl, void*, void) xMMConfig->Commit(); } + // Revoke created connections + SwDoc* pDoc = m_pView->GetDocShell()->GetDoc(); + SwDBManager* pDbManager = pDoc->GetDBManager(); + if (pDbManager) + pDbManager->RevokeLastRegistrations(); + m_pWizard.disposeAndClear(); release(); } |