diff options
| -rw-r--r-- | cui/source/inc/cuitabline.hxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tpline.cxx | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 1122a2017f00..5cd3b0fdb044 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -172,7 +172,6 @@ private: // handler for gallery popup menu button + size DECL_LINK(GraphicHdl_Impl, const OUString&, void); DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void); - DECL_LINK(MenuCreateHdl_Impl, weld::Toggleable&, void); DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void); DECL_LINK(ClickInvisibleHdl_Impl, weld::ComboBox&, void); @@ -196,6 +195,7 @@ private: void FillXLSet_Impl(); void FillListboxes(); + void PopulateMenus(); public: void ShowSymbolControls(bool bOn); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index f07ca7a3497c..de9ee3b8c80a 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -181,7 +181,6 @@ SvxLineTabPage::SvxLineTabPage(weld::Container* pPage, weld::DialogController* p // Symbols on a line (eg star charts), MB-handler set m_xSymbolMB->connect_selected(LINK(this, SvxLineTabPage, GraphicHdl_Impl)); - m_xSymbolMB->connect_toggled(LINK(this, SvxLineTabPage, MenuCreateHdl_Impl)); m_xSymbolWidthMF->connect_value_changed(LINK(this, SvxLineTabPage, SizeHdl_Impl)); m_xSymbolHeightMF->connect_value_changed(LINK(this, SvxLineTabPage, SizeHdl_Impl)); m_xSymbolRatioCB->connect_toggled(LINK(this, SvxLineTabPage, RatioHdl_Impl)); @@ -215,6 +214,7 @@ SvxLineTabPage::~SvxLineTabPage() void SvxLineTabPage::Construct() { FillListboxes(); + PopulateMenus(); } void SvxLineTabPage::FillListboxes() @@ -1376,9 +1376,7 @@ void SvxLineTabPage::FillUserData() } // #58425# Symbols on a list (e.g. StarChart) -// Handler for the symbol selection's popup menu (NumMenueButton) -// The following link originates from SvxNumOptionsTabPage -IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl, weld::Toggleable&, void) +void SvxLineTabPage::PopulateMenus() { ScopedVclPtrInstance< VirtualDevice > pVD; @@ -1681,7 +1679,6 @@ void SvxLineTabPage::PageCreated(const SfxAllItemSet& aSet) SetPageType(static_cast<PageType>(pPageTypeItem->GetValue())); if (pDlgTypeItem) SetDlgType(pDlgTypeItem->GetValue()); - Construct(); if(pSdrObjListItem) //symbols { @@ -1692,6 +1689,8 @@ void SvxLineTabPage::PageCreated(const SfxAllItemSet& aSet) if(pGraphicItem) m_aAutoSymbolGraphic = pGraphicItem->GetGraphic(); } + + Construct(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |