ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

No need for SfxWeldToolBoxControllerFactory

Browse Source 
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>
This commit is contained in:
Maxim Monastirsky
2022-07-17 22:36:53 +02:00
parent 7077e68840
commit f87c7018fa
6 changed files with 12 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/framework/sfxhelperfunctions.hxx
+1 -18
View File
@@ -24,17 +24,13 @@
#include <rtl/ref.hxx>
#include <vcl/toolboxid.hxx>
namespace com::sun::star::frame { class XFrame; class XToolbarController; }
namespace com::sun::star::frame { class XFrame; }
namespace com::sun::star::uno { template <typename > class Reference; }
namespace svt { class StatusbarController; }
namespace svt { class ToolboxController; }
class StatusBar;
class ToolBox;
namespace weld {
class Toolbar;
class Builder;
};
typedef rtl::Reference<svt::ToolboxController> ( *pfunc_setToolBoxControllerCreator)(
const css::uno::Reference< css::frame::XFrame >& rFrame,
@@ -42,12 +38,6 @@ typedef rtl::Reference<svt::ToolboxController> ( *pfunc_setToolBoxControllerCrea
ToolBoxItemId nID,
const OUString& aCommandURL );
typedef css::uno::Reference<css::frame::XToolbarController> ( *pfunc_setWeldToolBoxControllerCreator)(
const css::uno::Reference< css::frame::XFrame >& rFrame,
weld::Toolbar* pToolbar,
weld::Builder* pBuilder,
const OUString& aCommandURL );
typedef rtl::Reference<svt::StatusbarController> ( *pfunc_setStatusBarControllerCreator)(
const css::uno::Reference< css::frame::XFrame >& rFrame,
StatusBar* pStatusBar,
@@ -75,13 +65,6 @@ FWK_DLLPUBLIC rtl::Reference<svt::ToolboxController> CreateToolBoxController(
ToolBoxItemId nID,
const OUString& aCommandURL );
FWK_DLLPUBLIC pfunc_setWeldToolBoxControllerCreator SetWeldToolBoxControllerCreator( pfunc_setWeldToolBoxControllerCreator pSetToolBoxControllerCreator );
FWK_DLLPUBLIC css::uno::Reference<css::frame::XToolbarController> CreateWeldToolBoxController(
const css::uno::Reference< css::frame::XFrame >& rFrame,
weld::Toolbar* pToolbar,
weld::Builder* pBuilder,
const OUString& aCommandURL );
FWK_DLLPUBLIC pfunc_setStatusBarControllerCreator SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
FWK_DLLPUBLIC rtl::Reference<svt::StatusbarController> CreateStatusBarController(
const css::uno::Reference< css::frame::XFrame >& rFrame,