[Libreoffice-commits] core.git: framework/source

[Maxim Monastirsky]

 framework/source/uielement/popuptoolbarcontroller.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e413549dc8b5669a806eeabc30c7d6f92723a882
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Dec 28 22:51:23 2015 +0200

    PopupMenuToolbarController: Update the menu before opening
    
    Just like we do for the menubar, we must tell the popup menu
    controller to update itself.
    
    Change-Id: Ib914b22b909f9e5c1c4ebc8af58496d73e867416

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 43b6882..c076652 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -220,7 +220,11 @@ void PopupMenuToolbarController::createPopupMenuController()
     if( !m_bHasController )
         return;
 
-    if ( !m_xPopupMenuController.is() )
+    if ( m_xPopupMenuController.is() )
+    {
+        m_xPopupMenuController->updatePopupMenu();
+    }
+    else
     {
         css::uno::Sequence< css::uno::Any > aArgs( 3 );
         aArgs[0] <<= comphelper::makePropertyValue( "Frame", m_xFrame );