summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2020-02-13 14:41:10 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2020-02-13 21:21:27 +0100
commit98bc216781d52af7242b671595ec88a9468d6704 (patch)
treedf3344734517846bb3671615115965fa1f4b946d /basctl
parent3b8c42a94b5448364d47daa103b3452f54990524 (diff)
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 <momonasmon@gmail.com>
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/basidesh.cxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index aa8ae7e364a0..75f0fe35bf90 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -62,7 +62,6 @@
#include <svx/pszctrl.hxx>
#include <svx/insctrl.hxx>
#include <svx/srchdlg.hxx>
-#include <svx/tbcontrl.hxx>
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <svx/xmlsecctrl.hxx>
@@ -177,8 +176,6 @@ void Shell::Init()
SvxPosSizeStatusBarControl::RegisterControl();
SvxInsertStatusBarControl::RegisterControl();
XmlSecStatusBarControl::RegisterControl( SID_SIGNATURE );
- SvxSimpleUndoRedoController::RegisterControl( SID_UNDO );
- SvxSimpleUndoRedoController::RegisterControl( SID_REDO );
SvxSearchDialogWrapper::RegisterChildWindow();