From 98bc216781d52af7242b671595ec88a9468d6704 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Thu, 13 Feb 2020 14:41:10 +0200 Subject: Restore simple undo and redo buttons for the basctl module Changed in commit c34edadf5bd3d1d9f3c9c056af28b8964d8f1ca0 ("rework SvxUndoRedoControl to be a PopupWindowController"), but the dropdowns do not work in that module. These buttons used to be managed by SvxSimpleUndoRedoController, but that's no longer the case. The reason is that ToolBarManager::CreateControllers checks first for controllers registered in Controller.xcu, and only if none found it checks for sfx2 controllers. So SvxSimpleUndoRedoController by using a sfx2-style registration, has no chance to be ever selected for .uno:Undo or .uno:Redo. This commit removes the unused controller, and restores the previous behavior with the other controller. Change-Id: Ia774195511e41ab11562856fe1cf2ec7f170710a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88606 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky --- include/svx/tbcontrl.hxx | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'include') diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 4e4f477469ee..50efa73c62e2 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -245,20 +245,6 @@ public: void EnsurePaletteManager(); }; -class SVXCORE_DLLPUBLIC SvxSimpleUndoRedoController final : public SfxToolBoxControl -{ -private: - OUString aDefaultText; - -public: - SFX_DECL_TOOLBOX_CONTROL(); - SvxSimpleUndoRedoController(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox); - virtual ~SvxSimpleUndoRedoController() override; - - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; -}; - class SVXCORE_DLLPUBLIC SvxCurrencyToolBoxControl final : public svt::PopupWindowController { private: -- cgit