[Libreoffice-commits] core.git: Branch 'aoo/trunk' - accessibility/source vcl/inc vcl/source

[Steve Yin]

 accessibility/source/standard/vclxaccessiblebox.cxx  |    1 +
 accessibility/source/standard/vclxaccessiblelist.cxx |    1 +
 vcl/inc/vcl/vclevent.hxx                             |    1 +
 vcl/source/control/combobox.cxx                      |    2 +-
 vcl/source/control/lstbox.cxx                        |    2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ae97dcb5b8d2dead81b007c5c71daf608f0c7bc3
Author: Steve Yin <steve_y at apache.org>
Date:   Tue Jan 28 09:55:07 2014 +0000

    Bug 124008 - listbox entry's are selected automatically on mouse over instead of mouse click

diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 2ae5be1..e4645a0 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -116,6 +116,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
 {
     switch ( rVclWindowEvent.GetId() )
     {
+        case VCLEVENT_DROPDOWN_SELECT:
         case VCLEVENT_LISTBOX_SELECT:
         case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
 
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 9b55ed5..091611a 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -363,6 +363,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
 {
     switch ( rVclWindowEvent.GetId() )
       {
+        case VCLEVENT_DROPDOWN_SELECT:
         case VCLEVENT_LISTBOX_SELECT:
             if ( !m_bDisableProcessEvent )
                 UpdateSelection_Impl_Acc(b_IsDropDownList);
diff --git a/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx
index 89c651b..7ba0aa6 100644
--- a/vcl/inc/vcl/vclevent.hxx
+++ b/vcl/inc/vcl/vclevent.hxx
@@ -154,6 +154,7 @@ namespace com { namespace sun { namespace star {
 #define VCLEVENT_ITEM_COLLAPSED             1175
 // <--
 #define VCLEVENT_DROPDOWN_PRE_OPEN          1176
+#define VCLEVENT_DROPDOWN_SELECT            1177
 #define VCLEVENT_LISTBOX_FOCUSITEMCHANGED   1180
 // #define VCLEVENT_EDIT_CARETCHANGED       xxxx    // IA2 CWS. MT: VCL only has selection API - difference for selection_changed vs. caret_changed is handled in accessibility wrapper since OOo 3.2
 
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 38d1098..4f9a2da 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -475,7 +475,7 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYARG )
 }
 IMPL_LINK( ComboBox, ImplListItemSelectHdl,  void*, EMPTYARG )
 {
-    ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
+    ImplCallEventListeners( VCLEVENT_DROPDOWN_SELECT );
     return 1;
 }
 // -----------------------------------------------------------------------
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 511c2aa..375bb7e 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -258,7 +258,7 @@ IMPL_LINK( ListBox, ImplFocusHdl, void *, nPos )
 }
 IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG )
 {
-    ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
+    ImplCallEventListeners( VCLEVENT_DROPDOWN_SELECT );
     return 1;
 }