svn commit: r1501747 - in /openoffice/trunk/main/cui/source: dialogs/cuifmsearch.cxx inc/cuifmsearch.hxx

[hdu]

Author: hdu
Date: Wed Jul 10 12:16:11 2013
New Revision: 1501747

URL: http://svn.apache.org/r1501747
Log:
#i122581# reestablish focus of the Record Search dialog to the search combobox

Patch by: Tsutomu Uchino <hanya.r...@gmail.com>

Modified:
    openoffice/trunk/main/cui/source/dialogs/cuifmsearch.cxx
    openoffice/trunk/main/cui/source/inc/cuifmsearch.hxx

Modified: openoffice/trunk/main/cui/source/dialogs/cuifmsearch.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/cuifmsearch.cxx?rev=1501747&r1=1501746&r2=1501747&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/dialogs/cuifmsearch.cxx (original)
+++ openoffice/trunk/main/cui/source/dialogs/cuifmsearch.cxx Wed Jul 10 
12:16:11 2013
@@ -252,6 +252,7 @@ void FmSearchDialog::Init(const UniStrin
 
        m_cmbSearchText.SetModifyHdl(LINK(this, FmSearchDialog, 
OnSearchTextModified));
        m_cmbSearchText.EnableAutocomplete(sal_False);
+       m_cmbSearchText.SetGetFocusHdl(LINK(this, FmSearchDialog, 
OnFocusGrabbed));
 
        m_cbUseFormat.SetToggleHdl(LINK(this, FmSearchDialog, 
OnCheckBoxToggled));
        m_cbBackwards.SetToggleHdl(LINK(this, FmSearchDialog, 
OnCheckBoxToggled));
@@ -443,6 +444,12 @@ IMPL_LINK(FmSearchDialog, OnSearchTextMo
 }
 
 //------------------------------------------------------------------------
+IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
+{
+    m_cmbSearchText.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
+}
+
+//------------------------------------------------------------------------
 IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox)
 {
     (void) pBox; // avoid warning

Modified: openoffice/trunk/main/cui/source/inc/cuifmsearch.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/inc/cuifmsearch.hxx?rev=1501747&r1=1501746&r2=1501747&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/inc/cuifmsearch.hxx (original)
+++ openoffice/trunk/main/cui/source/inc/cuifmsearch.hxx Wed Jul 10 12:16:11 
2013
@@ -196,6 +196,7 @@ private:
        DECL_LINK( OnPositionSelected, ListBox* );
        DECL_LINK( OnFieldSelected, ListBox* );
 
+       DECL_LINK( OnFocusGrabbed, ComboBox* );
        DECL_LINK( OnCheckBoxToggled, CheckBox* );
 
        DECL_LINK( OnContextSelection, ListBox* );