diff options
Diffstat (limited to 'cui/source/inc')
| -rw-r--r-- | cui/source/inc/SvxMenuConfigPage.hxx | 8 | ||||
| -rw-r--r-- | cui/source/inc/SvxToolbarConfigPage.hxx | 11 | ||||
| -rw-r--r-- | cui/source/inc/cfg.hxx | 27 |
3 files changed, 5 insertions, 41 deletions
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx index c604150afcaf..72796b8b2235 100644 --- a/cui/source/inc/SvxMenuConfigPage.hxx +++ b/cui/source/inc/SvxMenuConfigPage.hxx @@ -53,14 +53,6 @@ private: bool m_bIsMenuBar; DECL_LINK( SelectMenu, ListBox&, void ); DECL_LINK( SelectMenuEntry, SvTreeListBox *, void ); - DECL_LINK( NewMenuHdl, Button *, void ); - DECL_LINK( MenuSelectHdl, MenuButton *, void ); - DECL_LINK( EntrySelectHdl, MenuButton *, void ); - DECL_LINK( AddCommandsHdl, Button *, void ); - DECL_LINK( AddSeparatorHdl, Button *, void ); - DECL_LINK( AddSubmenuHdl, Button *, void ); - DECL_LINK( DeleteCommandHdl, Button *, void ); - DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog&, void ); void Init() override; void UpdateButtonStates() override; diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx index 099dd8e2175c..02a23979865e 100644 --- a/cui/source/inc/SvxToolbarConfigPage.hxx +++ b/cui/source/inc/SvxToolbarConfigPage.hxx @@ -53,14 +53,6 @@ private: DECL_LINK( SelectToolbar, ListBox&, void ); DECL_LINK( SelectToolbarEntry, SvTreeListBox*, void ); - DECL_LINK( ToolbarSelectHdl, MenuButton *, void ); - DECL_LINK( EntrySelectHdl, MenuButton *, void ); - DECL_LINK( StyleChangeHdl, Button *, void ); - DECL_LINK( NewToolbarHdl, Button *, void ); - DECL_LINK( AddCommandsHdl, Button *, void ); - DECL_LINK( AddSeparatorHdl, Button *, void ); - DECL_LINK( DeleteCommandHdl, Button *, void ); - DECL_LINK( ResetTopLevelHdl, Button *, void ); DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog&, void ); DECL_LINK( MoveHdl, Button *, void ); @@ -70,9 +62,6 @@ private: void DeleteSelectedContent() override; void DeleteSelectedTopLevel() override; - VclPtr<PopupMenu> m_pMenu; - VclPtr<PopupMenu> m_pEntry; - public: SvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxToolbarConfigPage() override; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index f75f4d6f90d2..626445602213 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -81,9 +81,9 @@ class SvxConfigDialog : public SfxTabDialog private: css::uno::Reference< css::frame::XFrame > m_xFrame; sal_uInt16 m_nMenusPageId; + sal_uInt16 m_nToolbarsPageId; sal_uInt16 m_nContextMenusPageId; sal_uInt16 m_nKeyboardPageId; - sal_uInt16 m_nToolbarsPageId; sal_uInt16 m_nEventsPageId; public: @@ -383,31 +383,18 @@ protected: // the top section of the tab page where top level menus and toolbars // are displayed in a listbox - VclPtr<VclFrame> m_pTopLevel; - VclPtr<FixedText> m_pTopLevelLabel; VclPtr<ListBox> m_pTopLevelListBox; - VclPtr<PushButton> m_pNewTopLevelButton; - VclPtr<MenuButton> m_pModifyTopLevelButton; - - VclPtr<FixedText> m_pToolbarStyleLabel; - VclPtr<RadioButton> m_pIconsOnlyRB; - VclPtr<RadioButton> m_pTextOnlyRB; - VclPtr<RadioButton> m_pIconsAndTextRB; // the contents section where the contents of the selected // menu or toolbar are displayed VclPtr<VclFrame> m_pContents; - VclPtr<FixedText> m_pContentsLabel; VclPtr<VclContainer> m_pEntries; VclPtr<SvTreeListBox> m_pContentsListBox; - VclPtr<PushButton> m_pAddCommandsButton; - VclPtr<PushButton> m_pAddSeparatorButton; - VclPtr<PushButton> m_pAddSubmenuButton; - VclPtr<MenuButton> m_pModifyCommandButton; - VclPtr<PushButton> m_pDeleteCommandButton; - // Resets the top level toolbar to default settings - VclPtr<PushButton> m_pResetTopLevelButton; + // the functions section where functions in the + // selected category will be displayed + VclPtr<VclContainer> m_pFunctions; + VclPtr<SvTreeListBox> m_pFunctionsListBox; VclPtr<PushButton> m_pMoveUpButton; VclPtr<PushButton> m_pMoveDownButton; @@ -525,10 +512,6 @@ public: SvxConfigEntry* GetSelectedEntry(); }; -//SvxToolbarEntriesListBox class was here - -//SvxToolbarConfigPage class was here - class ToolbarSaveInData : public SaveInData { private: |