[Libreoffice-commits] core.git: accessibility/source include/vcl vcl/source

Steve Yin steve_y at apache.org
Tue Jan 28 03:48:18 PST 2014


 accessibility/source/standard/vclxaccessiblebox.cxx  |    1 +
 accessibility/source/standard/vclxaccessiblelist.cxx |    1 +
 include/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 05534b5523a264a18d5ee4b8014d6a0eb6470071
Author: Steve Yin <steve_y at apache.org>
Date:   Tue Jan 28 09:55:07 2014 +0000

    Resolves: #i124008# listbox entry's are selected automatically...
    
    on mouse over instead of mouse click
    
    (cherry picked from commit ae97dcb5b8d2dead81b007c5c71daf608f0c7bc3)
    
    Change-Id: Ib1ce0db60785ddc96473ef4ce88b578287956164

diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index dbb5dcd..b9f3a3e 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -110,6 +110,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 29a65b5..cc0e5f7 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -345,6 +345,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/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 92ffca9..a4f4e29 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -151,6 +151,7 @@ namespace com { namespace sun { namespace star {
 #define VCLEVENT_ITEM_EXPANDED              1174
 #define VCLEVENT_ITEM_COLLAPSED             1175
 #define VCLEVENT_DROPDOWN_PRE_OPEN          1176
+#define VCLEVENT_DROPDOWN_SELECT            1177
 #define VCLEVENT_LISTBOX_FOCUSITEMCHANGED   1180
 
 // VclMenuEvent
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 6fb9d47..aa34972 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -463,7 +463,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl)
 
 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 2af18e2..551382d 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -249,7 +249,7 @@ IMPL_LINK( ListBox, ImplFocusHdl, void *, nPos )
 
 IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG )
 {
-    ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
+    ImplCallEventListeners( VCLEVENT_DROPDOWN_SELECT );
     return 1;
 }
 


More information about the Libreoffice-commits mailing list