[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svx/source

[Caolán McNamara]

 svx/source/tbxctrls/tbcontrl.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b46fbedb4d41750b72b76b12350904d344100811
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jul 9 21:01:08 2016 +0100

    Resolves: tdf#100809 Paragraph styles drop-down list
    
    Change-Id: I9453c3c877dcd39268f7c910e8918947bdeb8fd4
    (cherry picked from commit 563dd59cdf84be980f4e0e2fb12566dd7e4a1633)
    Reviewed-on: https://gerrit.libreoffice.org/27075
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 17a4f3f..4a94e8a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -399,14 +399,16 @@ void SvxStyleBox_Impl::ReleaseFocus()
 IMPL_LINK_TYPED( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool)
 {
     OUString sEntry = GetSelectEntry();
+    sal_uInt16 nMenuId = pMenu->GetCurItemId();
     ReleaseFocus(); // It must be after getting entry pos!
+    if (IsInDropDown())
+        ToggleDropDown();
     Sequence< PropertyValue > aArgs( 2 );
     aArgs[0].Name   = "Param";
     aArgs[0].Value  = makeAny( sEntry );
     aArgs[1].Name   = "Family";
     aArgs[1].Value  = makeAny( sal_Int16( eStyleFamily ));
 
-    sal_uInt16 nMenuId = pMenu->GetCurItemId();
     switch(nMenuId) {
         case RID_SVX_UPDATE_STYLE:
         {