diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-05 11:55:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-05 14:43:10 +0100 |
| commit | a639b7432e7d35b271fbfea9021f5df56d681006 (patch) | |
| tree | adbe0f7b6db5f117129c1fb36191fba4e3f0c6b8 /vcl | |
| parent | 6aba19406767a54bb61eaffb2903c1b2902da9a8 (diff) | |
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>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/printdlg.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index fc4085a99b4a..bf058b079717 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; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index da0c481655dd..3c1f5d0d36e5 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(); |