[Libreoffice-commits] core.git: sw/source

[Oliver Specht]

 sw/source/uibase/uiview/viewprt.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 75f890a7859148e6638b08eeb97a564bed606cad
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Fri Sep 4 14:40:18 2015 +0200

    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 at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 64c371e..032dec9 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;
                 }
             }