diff options
| author | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-06-05 07:10:26 +0530 |
|---|---|---|
| committer | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-06-06 09:36:43 +0000 |
| commit | 55d75f4c28509234f70b860eeb47ca4294072695 (patch) | |
| tree | e6e4d940289e1e761e7a99e213b7cae72a5a4431 | |
| parent | cf81f59455ec0aa73f8d3e71ba7f39725ca77139 (diff) | |
Hitting return in search field should not open a template
Change-Id: I85d8096489debdbda1b3883f9335dd1218e567ec
Reviewed-on: https://gerrit.libreoffice.org/25915
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 1efbab1eb4e01ae3116301df861067a2e488c717)
Reviewed-on: https://gerrit.libreoffice.org/25958
Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com>
Tested-by: Akshay Deep <akshaydeepiitr@gmail.com>
| -rw-r--r-- | include/sfx2/templatedlg.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 97fd3e59307e..6fbcf65077e6 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -88,6 +88,7 @@ private: DECL_LINK_TYPED(DefaultTemplateHdl, ThumbnailViewItem*, void); DECL_LINK_TYPED(SearchUpdateHdl, Edit&, void); + DECL_LINK_TYPED(GetFocusHdl, Control&, void); void OnTemplateImportCategory(const OUString& sCategory); static void OnTemplateLink (); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index cf017880038e..9f71a4d151d8 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -261,6 +261,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent) mpSearchFilter->SetUpdateDataHdl(LINK(this, SfxTemplateManagerDlg, SearchUpdateHdl)); mpSearchFilter->EnableUpdateData(); + mpSearchFilter->SetGetFocusHdl(LINK( this, SfxTemplateManagerDlg, GetFocusHdl )); SvtMiscOptions aMiscOptions; if ( !aMiscOptions.IsExperimentalMode() ) @@ -910,6 +911,12 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SearchUpdateHdl, Edit&, void) } } +IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, GetFocusHdl, Control&, void) +{ + mpCurView->deselectItems(); + maSelTemplates.clear(); +} + void SfxTemplateManagerDlg::OnTemplateState (const ThumbnailViewItem *pItem) { bool bInSelection = maSelTemplates.find(pItem) != maSelTemplates.end(); |