basctl/source/basicide/baside2b.cxx | 6 +++++-
vcl/inc/printdlg.hxx | 1 -
vcl/source/window/printdlg.cxx | 11 -----------
3 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit a639b7432e7d35b271fbfea9021f5df56d681006
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Dec 5 11:55:01 2023 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Dec 5 14:43:10 2023 +0100
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.mcnam...@collabora.com>
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();
commit 6aba19406767a54bb61eaffb2903c1b2902da9a8
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Dec 5 10:58:57 2023 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Dec 5 14:43:04 2023 +0100
Resolves: tdf#158441 we don't want to return early for all handled keys
a problem since:
commit c39bd1f6690ade936d62a66265b9b277061024d8
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Feb 19 10:13:15 2020 +0000
weld CodeCompleteWindow
Change-Id: I520a591bad89515c973098f4200f01ae0ddbdc34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160337
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index e62ba50683fb..d410a5e325d6 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -562,7 +562,11 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
if (pCodeCompleteWnd->IsVisible() &&
CodeCompleteOptions::IsCodeCompleteOn())
{
- if (pCodeCompleteWnd->HandleKeyInput(rKEvt))
+ pCodeCompleteWnd->HandleKeyInput(rKEvt);
+ if( rKEvt.GetKeyCode().GetCode() == KEY_UP
+ || rKEvt.GetKeyCode().GetCode() == KEY_DOWN
+ || rKEvt.GetKeyCode().GetCode() == KEY_TAB
+ || rKEvt.GetKeyCode().GetCode() == KEY_POINT)
return;
}
