summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2022-07-17 15:43:17 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2022-07-17 22:36:53 +0200
commitf87c7018fa5641eeecd788907ea66892514255a6 (patch)
tree5ff236b2bc84f9f0f0fe7695c06133346b4018cf /include
parent7077e688408210b32596cbac2f2202610094ddf3 (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 'include')
-rw-r--r--include/framework/sfxhelperfunctions.hxx19
-rw-r--r--include/sfx2/tbxctrl.hxx1
2 files changed, 1 insertions, 19 deletions
diff --git a/include/framework/sfxhelperfunctions.hxx b/include/framework/sfxhelperfunctions.hxx
index 36de22f54e67..c0f4dc38ff62 100644
--- a/include/framework/sfxhelperfunctions.hxx
+++ b/include/framework/sfxhelperfunctions.hxx
@@ -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,
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index e3953c4e5b7a..d513c0807b21 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -31,7 +31,6 @@
namespace com::sun::star::frame { class XDispatchProvider; }
namespace com::sun::star::frame { class XFrame; }
namespace vcl { class Window; }
-namespace com::sun::star::frame { class XToolbarController; }
class InterimItemWindow;
class SfxToolBoxControl;