diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2022-07-17 15:43:17 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2022-07-17 22:36:53 +0200 |
| commit | f87c7018fa5641eeecd788907ea66892514255a6 (patch) | |
| tree | 5ff236b2bc84f9f0f0fe7695c06133346b4018cf /sfx2/source/appl | |
| parent | 7077e688408210b32596cbac2f2202610094ddf3 (diff) | |
No need for SfxWeldToolBoxControllerFactory
sfx2::sidebar::ControllerFactory::CreateToolBoxController
only supports creating controllers using the uno factory,
or GenericToolbarController as a fallback. Given that we
already handle the uno factory case in
ToolBarManager::CreateControllers, all this complexity is
really just for creating GenericToolbarController with a
different ctor, which we can do locally as well.
Change-Id: I3a5a3cda95a6c5db97615286e93630214f76cbfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137149
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index cd4acc552132..760ab1ca9cb1 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -49,7 +49,6 @@ #include <sfx2/sfxdlg.hxx> #include <sfx2/stbitem.hxx> #include <sfx2/dockwin.hxx> -#include <sidebar/ControllerFactory.hxx> #include <officecfg/Office/Common.hxx> #include <rtl/strbuf.hxx> @@ -87,16 +86,6 @@ SfxModule* SfxApplication::GetModule(SfxToolsModule nSharedLib) return g_pSfxApplication->pImpl->aModules[nSharedLib].get(); } -namespace { - css::uno::Reference<css::frame::XToolbarController> SfxWeldToolBoxControllerFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, weld::Toolbar* pToolbar, weld::Builder* pBuilder, const OUString& aCommandURL ) - { - SolarMutexGuard aGuard; - - return sfx2::sidebar::ControllerFactory::CreateToolBoxController( - *pToolbar, *pBuilder, aCommandURL, rFrame, rFrame->getController(), false); - } -} - SfxApplication* SfxApplication::GetOrCreate() { static std::mutex theApplicationMutex; @@ -116,7 +105,6 @@ SfxApplication* SfxApplication::GetOrCreate() ::framework::SetRefreshToolbars( RefreshToolbars ); ::framework::SetToolBoxControllerCreator( SfxToolBoxControllerFactory ); - ::framework::SetWeldToolBoxControllerCreator( SfxWeldToolBoxControllerFactory ); ::framework::SetStatusBarControllerCreator( SfxStatusBarControllerFactory ); ::framework::SetDockingWindowCreator( SfxDockingWindowFactory ); ::framework::SetIsDockingWindowVisible( IsDockingWindowVisible ); |