diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-13 01:05:59 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-14 17:03:55 +0200 |
| commit | 7bb20ab2e84cf4d84d24bfcd8103946e92f2ae06 (patch) | |
| tree | e86cc948a970fb0f68af2dc229527ac79992cb51 /sfx2 | |
| parent | c5301f215fec9016c3a75ff4a6a0c6c22f152718 (diff) | |
One toolbar generic controller is enough
The one from framework is more feature complete, so use that one.
Change-Id: I499f0ae1d20c588cfc04beebc643819559325882
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100726
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/ControllerFactory.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 2d887bd48536..692ee10628d4 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -26,9 +26,10 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <framework/sfxhelperfunctions.hxx> +#include <framework/generictoolbarcontroller.hxx> +#include <vcl/toolbox.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/weldutils.hxx> -#include <svtools/generictoolboxcontroller.hxx> #include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -69,7 +70,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( if ( ! xController.is()) { xController.set( - static_cast<XWeak*>(new svt::GenericToolboxController( + static_cast<XWeak*>(new framework::GenericToolbarController( ::comphelper::getProcessComponentContext(), rxFrame, pToolBox, @@ -155,7 +156,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( if (!xController.is()) { xController.set( - static_cast<XWeak*>(new svt::GenericToolboxController( + static_cast<XWeak*>(new framework::GenericToolbarController( ::comphelper::getProcessComponentContext(), rxFrame, rToolbar, |