diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-05 18:36:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-06 22:14:17 +0200 |
| commit | 48595c805dd5b917e9bd01ad1c2deb4a047c5f7b (patch) | |
| tree | f1dd7b638b78694cd5ac635e0de6be3ca1d13042 /sfx2 | |
| parent | 4b28b77eddfe48e709180f1ab81ac0d996796471 (diff) | |
Related: tdf#127935 set default activate handler to toggle row expansion
Change-Id: I2bbfb1445b8d2e748f642cdf4723d41b7f072e2b
Reviewed-on: https://gerrit.libreoffice.org/80305
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/newstyle.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/versdlg.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/new.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/inc/versdlg.hxx | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 088dbe6ddbdb..ed7a20f70d63 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -49,9 +49,10 @@ IMPL_LINK_NOARG(SfxNewStyleDlg, OKClickHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(SfxNewStyleDlg, OKHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SfxNewStyleDlg, OKHdl, weld::TreeView&, bool) { OKClickHdl(*m_xOKBtn); + return true; } IMPL_LINK(SfxNewStyleDlg, ModifyHdl, weld::ComboBox&, rBox, void) diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 6dfc4329c769..2aece774b2cd 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -289,9 +289,10 @@ void SfxVersionDialog::Open_Impl() m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl, weld::TreeView&, bool) { Open_Impl(); + return true; } IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl, weld::TreeView&, void) diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 32abbf890f76..ecebd52c1ed7 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -206,11 +206,12 @@ IMPL_LINK_NOARG(SfxNewFileDialog, TemplateSelect, weld::TreeView&, void) m_aPrevIdle.Start(); } -IMPL_LINK_NOARG( SfxNewFileDialog, DoubleClick, weld::TreeView&, void ) +IMPL_LINK_NOARG( SfxNewFileDialog, DoubleClick, weld::TreeView&, bool ) { // Still loading if (!m_xDocShell.Is() || !m_xDocShell->GetProgress()) m_xDialog->response(RET_OK); + return true; } sal_uInt16 SfxNewFileDialog::GetSelectedTemplatePos() const diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 8f9377881e91..d486692e77a3 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -41,7 +41,7 @@ class SfxVersionDialog : public SfxDialogController std::unique_ptr<weld::Button> m_xCmisButton; std::unique_ptr<weld::TreeView> m_xVersionBox; - DECL_LINK(DClickHdl_Impl, weld::TreeView&, void); + DECL_LINK(DClickHdl_Impl, weld::TreeView&, bool); DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); DECL_LINK(ButtonHdl_Impl, weld::Button&, void ); void Init_Impl(); |