commit: backports to STABLE

I have done the following backports to STABLE.

Jordi,

* Backports fixes 6354 and Insert on listbox

retrieving revision 1.6
retrieving revision 1.7
Merging differences between 1.6 and 1.7 into ap_Win32Dialog_MailMerge.cpp

* fixes menuhighlight and 6731

(ups, no log)

* fixes 7454

RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Lists.cpp,v
retrieving revision 1.40
retrieving revision 1.41
Merging differences between 1.40 and 1.41 into ap_Win32Dialog_Lists.cpp

RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Lists.h,v
retrieving revision 1.14
retrieving revision 1.15
Merging differences between 1.14 and 1.15 into ap_Win32Dialog_Lists.h

-- 
Jordi Mas i Hernàndez (homepage http://www.softcatala.org/~jmas)
http://www.softcatala.org