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

[Maxim Monastirsky]

 cui/source/inc/numpages.hxx      |    2 +-
 cui/source/tabpages/numpages.cxx |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit c780c6726dca5e2fe33297e44f25ae3e00703294
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Sep 1 00:27:29 2016 +0300

    Gallery submenu was missing from native menus
    
    ... for both OS X and gtk3. The reason is that it was
    filled in item highlight handler, which isn't implemented
    for native menus. For now use the menu activation handler,
    like for the similar button in SvxLineTabPage.
    
    Change-Id: I437fd6536dbd9e6ba51282eaacc8b43c3a2d6cbf

diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 42bcf296..6047683 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -318,7 +318,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
         DECL_LINK_TYPED( NumberTypeSelectHdl_Impl, ListBox&, void );
         DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void );
-        DECL_LINK_TYPED( PopupActivateHdl_Impl, Menu *, bool);
+        DECL_LINK_TYPED( PopupActivateHdl_Impl, MenuButton *, void );
         DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
         DECL_LINK_TYPED( BulletHdl_Impl, Button*, void);
         DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 42e26ef..59e5d89 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1153,6 +1153,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
     m_pBulletPB->SetClickHdl(LINK(this, SvxNumOptionsTabPage, BulletHdl_Impl));
     m_pFmtLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl));
     m_pBitmapMB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, GraphicHdl_Impl));
+    m_pBitmapMB->SetActivateHdl(LINK(this, SvxNumOptionsTabPage, PopupActivateHdl_Impl));
     m_pLevelLB->EnableMultiSelection(true);
     m_pLevelLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, LevelHdl_Impl));
     m_pCharFmtLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, CharFmtHdl_Impl));
@@ -1171,8 +1172,6 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
     aInvalidateTimer.SetTimeout(50);
 
     Menu *pBitmapMenu = m_pBitmapMB->GetPopupMenu();
-
-    pBitmapMenu->SetHighlightHdl(LINK(this, SvxNumOptionsTabPage, PopupActivateHdl_Impl));
     m_nGalleryId = pBitmapMenu->GetItemId("gallery");
     assert(m_nGalleryId != MENU_ITEM_NOTFOUND);
     VclPtrInstance<PopupMenu> pPopup;
@@ -2051,7 +2050,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, v
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, bool)
+IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void)
 {
     if(!bMenuButtonInitialized)
     {
@@ -2103,7 +2102,6 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, bool)
         }
         LeaveWait();
     }
-    return false;
 }
 
 IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void)