commit bde00b3d8748cc4642300f2a961fa3f2add85c73
author Caolán McNamara <caolan.mcnamara@collabora.com> Tue Dec 05 11:55:01 2023 +0000
committer Xisco Fauli <xiscofauli@libreoffice.org> Wed Dec 06 19:12:53 2023 +0100
tree d8aacdbb26d3d36338c9d540942ee8d07cce4ea9
parent ea7c17960ddfe93249b17612662adc4694bd02b3

Resolves: tdf#158534 two help pages from print help button

its either use the default "help" response, or have an explicit
handler for the help button.

Its more consistent to just use the default "help" response for
the print dialog as done everywhere else.

Change-Id: I0bb173e67a3bea1c10cc315cfcf212376f2710c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160340
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit a639b7432e7d35b271fbfea9021f5df56d681006)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160357
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

vcl/inc/printdlg.hxx

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index fc4085a..bf058b0 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -131,7 +131,6 @@ namespace vcl

        std::unique_ptr<weld::Button>           mxOKButton;
        std::unique_ptr<weld::Button>           mxCancelButton;
        std::unique_ptr<weld::Button>           mxHelpButton;

        std::unique_ptr<weld::Button>           mxBackwardBtn;
        std::unique_ptr<weld::Button>           mxForwardBtn;

vcl/source/window/printdlg.cxx

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 9fcb055..b83d516 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -543,7 +543,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, std::shared_ptr<PrinterControl
    , mxReverseOrderBox(m_xBuilder->weld_check_button("reverseorder"))
    , mxOKButton(m_xBuilder->weld_button("ok"))
    , mxCancelButton(m_xBuilder->weld_button("cancel"))
    , mxHelpButton(m_xBuilder->weld_button("help"))
    , mxBackwardBtn(m_xBuilder->weld_button("backward"))
    , mxForwardBtn(m_xBuilder->weld_button("forward"))
    , mxFirstBtn(m_xBuilder->weld_button("btnFirst"))
@@ -676,7 +675,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, std::shared_ptr<PrinterControl
    // setup click hdl
    mxOKButton->connect_clicked(LINK(this, PrintDialog, ClickHdl));
    mxCancelButton->connect_clicked(LINK(this, PrintDialog, ClickHdl));
    mxHelpButton->connect_clicked(LINK(this, PrintDialog, ClickHdl));
    mxSetupButton->connect_clicked( LINK( this, PrintDialog, ClickHdl ) );
    mxBackwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
    mxForwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
@@ -1872,15 +1870,6 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void)
        storeToSettings();
        m_xDialog->response(&rButton == mxOKButton.get() ? RET_OK : RET_CANCEL);
    }
    else if( &rButton == mxHelpButton.get() )
    {
        // start help system
        Help* pHelp = Application::GetHelp();
        if( pHelp )
        {
            pHelp->Start("vcl/ui/printdialog/PrintDialog", mxOKButton.get());
        }
    }
    else if( &rButton == mxForwardBtn.get() )
    {
        previewForward();