diff options
| -rw-r--r-- | include/sfx2/sidebar/TabBar.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/TabBar.cxx | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index bc2b2a4e4d04..7591aeff7bf6 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -106,7 +106,6 @@ private: typedef ::std::vector<std::unique_ptr<Item>> ItemContainer; ItemContainer maItems; const ::std::function<void (const OUString& rsDeckId)> maDeckActivationFunctor; - PopupMenuSignalConnectFunction maPopupMenuSignalConnectFunction; void CreateTabItem(weld::Toolbar& rButton, const DeckDescriptor& rDeckDescriptor); css::uno::Reference<css::graphic::XGraphic> GetItemImage(const DeckDescriptor& rDeskDescriptor) const; diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index d9608e36d49f..af086c2610b5 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -57,7 +57,6 @@ TabBar::TabBar(vcl::Window* pParentWindow, , mxContents(mxAuxBuilder->weld_widget(u"TabBarContents"_ustr)) , mxMeasureBox(mxAuxBuilder->weld_widget(u"measure"_ustr)) , maDeckActivationFunctor(std::move(aDeckActivationFunctor)) - , maPopupMenuSignalConnectFunction(std::move(aPopupMenuSignalConnectFunction)) , mrParentSidebarController(rParentSidebarController) { set_id(u"TabBar"_ustr); // for uitest @@ -72,6 +71,7 @@ TabBar::TabBar(vcl::Window* pParentWindow, mxMenuButton = mxAuxBuilder->weld_menu_button(u"menubutton"_ustr); mxMainMenu = mxAuxBuilder->weld_menu(u"mainmenu"_ustr); mxSubMenu = mxAuxBuilder->weld_menu(u"submenu"_ustr); + aPopupMenuSignalConnectFunction(*mxMainMenu, *mxSubMenu); gDefaultWidth = m_xContainer->get_preferred_size().Width(); @@ -405,8 +405,6 @@ IMPL_LINK_NOARG(TabBar, OnToolboxClicked, weld::Toggleable&, void) // No Restore or Customize options for LoKit. mxMainMenu->set_visible(u"customization"_ustr, !comphelper::LibreOfficeKit::isActive()); - - maPopupMenuSignalConnectFunction(*mxMainMenu, *mxSubMenu); } void TabBar::EnableMenuButton(const bool bEnable) |