diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-11-18 16:36:12 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-11-18 15:16:58 +0000 |
| commit | 5da50768716fbcb0ffc093ecd588527723109fed (patch) | |
| tree | b6343cad3ec9ee80c556bf76d5136fd5aa61cae6 /include/sfx2 | |
| parent | 99648095012187ef284d0a9399a8e12878b2a370 (diff) | |
Unify menu-based toolbar controllers
The new GenericPopupToolbarController takes by default
the popup menu controller that registered for the same
.uno:Something command, and sets ToolBoxItemBits to
ToolBoxItemBits::DROPDOWNONLY. If a different command
specified using the "Value" property - takes the popup
menu controller that registered for this command, and
sets bits to ToolBoxItemBits::DROPDOWN.
Change-Id: I75c5300bd27fcc9f618f2ee0df2aa6aefd088239
Reviewed-on: https://gerrit.libreoffice.org/20040
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/tbxctrl.hxx | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index f8969fbdb24b..5bf2bf7d54e1 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -263,43 +263,6 @@ public: }; - -/** Toolbox that implements recent files menu for the Open file toolbar button. - -To use that, the appropriate Sfx*Item (like Open, OpenFromCalc, or -OpenFromWriter) has to have SlotType = SfxStringItem, and the appropriate -module initialization has to call RegisterControl(). -*/ -class SfxRecentFilesToolBoxControl : public SfxToolBoxControl -{ -public: - // We don't use SFX_DECL_TOOLBOX_CONTROL() here as we need to have this - // RegisterControl() marked as SFX2_DLLPUBLIC - static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); - static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr); - - SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); - virtual ~SfxRecentFilesToolBoxControl(); - -protected: - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; -}; - -class SfxSaveAsToolBoxControl : public SfxToolBoxControl -{ -public: - // We don't use SFX_DECL_TOOLBOX_CONTROL() here as we need to have this - // RegisterControl() marked as SFX2_DLLPUBLIC - static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); - static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr); - - SfxSaveAsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); - virtual ~SfxSaveAsToolBoxControl(); - -protected: - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; -}; - class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl { protected: |