diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2015-09-04 14:40:18 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-09-04 14:32:18 +0000 |
| commit | 75f890a7859148e6638b08eeb97a564bed606cad (patch) | |
| tree | 2a81133ec5f6800578e9334aab9d43d5a46fca90 /sw | |
| parent | 457ccbe1d3fa5b86b28b18221969c7cb888ddc13 (diff) | |
tdf#86671: Cancel printing if query is cancelled
cancelling query for mail merge vs. normal printing
should cancel the request
Change-Id: I157778efc9e5db42646fb3ff238a5b6f4c8dccca
Reviewed-on: https://gerrit.libreoffice.org/18339
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/uiview/viewprt.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 64c371ec705b..032dec9274d4 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -204,12 +204,15 @@ void SwView::ExecutePrint(SfxRequest& rReq) ScopedVclPtrInstance<MessageDialog> aBox(&GetEditWin(), "PrintMergeDialog", "modules/swriter/ui/printmergedialog.ui"); short nRet = aBox->Execute(); - if(RET_YES == nRet) + if(RET_NO != nRet) { - SfxBoolItem aBool(FN_QRY_MERGE, true); - GetViewFrame()->GetDispatcher()->Execute( - FN_QRY_MERGE, SfxCallMode::ASYNCHRON, &aBool, 0L); - rReq.Ignore(); + if(RET_YES == nRet) + { + SfxBoolItem aBool(FN_QRY_MERGE, true); + GetViewFrame()->GetDispatcher()->Execute( + FN_QRY_MERGE, SfxCallMode::ASYNCHRON, &aBool, 0L); + rReq.Ignore(); + } return; } } |