commit f4d6a3a7142f2f11e8c58b9fb32d05f66fa69685
author Caolán McNamara <caolanm@redhat.com> Thu Jul 01 21:12:26 2021 +0100
committer Caolán McNamara <caolanm@redhat.com> Fri Jul 02 10:15:22 2021 +0200
tree 8a31350b8fc7e3d5fe0a092436ba44684b96086c
parent a80e607b65662393f93e896ba7925f67150149da

tdf#143149 fix crash if app exits while print progress is running

dismiss the dialog if its parent goes away, but leave the print
job running

Change-Id: Ic29ee0300a7d9476ad27a2594a555312e30c74f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118253
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

include/vcl/print.hxx

diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index e787ce4..d96e6d7 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -387,7 +387,7 @@ class VCL_DLLPUBLIC PrinterController
    std::unique_ptr<ImplPrinterControllerData>
                                        mpImplData;
protected:
    PrinterController(const VclPtr<Printer>&, weld::Window*);
    PrinterController(const VclPtr<Printer>&, weld::Window* pDialogParent);
public:
    struct MultiPageSetup
    {
@@ -516,6 +516,8 @@ public:
    bool                                isShowDialogs() const;
    bool                                isDirectPrint() const;

    void                                dialogsParentClosing();

    // implementation details, not usable outside vcl
    // don't use outside vcl. Some of these are exported for
    // the benefit of vcl's plugins.

sfx2/source/view/viewprn.cxx

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 0007daf..1be88db 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -174,6 +174,7 @@ void SfxPrinterController::Notify( SfxBroadcaster& , const SfxHint& rHint )
    {
        EndListening(*mpViewShell);
        EndListening(*mpObjectShell);
        dialogsParentClosing();
        mpViewShell = nullptr;
        mpObjectShell = nullptr;
    }

vcl/source/gdi/print3.cxx

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index fbbde7b..d4518bb 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -779,6 +779,17 @@ weld::Window* PrinterController::getWindow() const
    return mpImplData->mpWindow;
}

void PrinterController::dialogsParentClosing()
{
    mpImplData->mpWindow = nullptr;
    if (mpImplData->mxProgress)
    {
        // close the dialog without doing anything, just get rid of it
        mpImplData->mxProgress->response(RET_OK);
        mpImplData->mxProgress.reset();
    }
}

void PrinterController::setPrinter( const VclPtr<Printer>& i_rPrinter )
{
    VclPtr<Printer> xPrinter = mpImplData->mxPrinter;