summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--framework/inc/uielement/addonstoolbarmanager.hxx2
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx2
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx6
-rw-r--r--framework/source/uielement/toolbarmanager.cxx8
-rw-r--r--include/sfx2/sidebar/SidebarToolBox.hxx2
-rw-r--r--include/vcl/toolbox.hxx5
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx8
7 files changed, 13 insertions, 20 deletions
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 1dc3f14a9edb..542a366f48dc 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -63,7 +63,7 @@ class AddonsToolBarManager : public ToolBarManager
DECL_LINK(Command, void *);
DECL_LINK_TYPED(Select, ToolBox *, void);
DECL_LINK_TYPED(Activate, ToolBox *, void);
- DECL_LINK(Deactivate, void *);
+ DECL_LINK_TYPED(Deactivate, ToolBox *, void);
DECL_LINK( StateChanged, StateChangedType* );
DECL_LINK( DataChanged, DataChangedEvent* );
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 6e8ea309fd31..7e1ae3b7c8aa 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -133,7 +133,7 @@ class ToolBarManager : public ToolbarManager_Base
DECL_LINK_TYPED(DoubleClick, ToolBox *, void);
DECL_LINK_TYPED(Select, ToolBox *, void);
DECL_LINK_TYPED(Activate, ToolBox *, void);
- DECL_LINK(Deactivate, void *);
+ DECL_LINK_TYPED(Deactivate, ToolBox *, void);
DECL_LINK( StateChanged, StateChangedType* );
DECL_LINK( DataChanged, DataChangedEvent* );
DECL_LINK( MiscOptionsChanged, void* );
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 506ddd680b10..ca56c441624a 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -443,10 +443,8 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void)
IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Activate, ToolBox *, void)
{}
-IMPL_LINK_NOARG(AddonsToolBarManager, Deactivate)
-{
- return 1;
-}
+IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Deactivate, ToolBox *, void)
+{}
IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
{
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 30869c14df39..ca2c94356642 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -279,7 +279,7 @@ void ToolBarManager::Destroy()
Link<> aEmpty;
m_pToolBar->SetSelectHdl( Link<ToolBox *, void>() );
m_pToolBar->SetActivateHdl( Link<ToolBox *, void>() );
- m_pToolBar->SetDeactivateHdl( aEmpty );
+ m_pToolBar->SetDeactivateHdl( Link<ToolBox *, void>() );
m_pToolBar->SetClickHdl( Link<ToolBox *, void>() );
m_pToolBar->SetDropdownClickHdl( Link<ToolBox *, void>() );
m_pToolBar->SetDoubleClickHdl( Link<ToolBox *, void>() );
@@ -2029,10 +2029,8 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void)
IMPL_LINK_NOARG_TYPED(ToolBarManager, Activate, ToolBox *, void)
{}
-IMPL_LINK_NOARG(ToolBarManager, Deactivate)
-{
- return 1;
-}
+IMPL_LINK_NOARG_TYPED(ToolBarManager, Deactivate, ToolBox *, void)
+{}
IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
{
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index 4e27f0d4a677..32db84e06a4c 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -83,7 +83,7 @@ private:
DECL_LINK_TYPED(DoubleClickHandler, ToolBox*, void);
DECL_LINK_TYPED(SelectHandler, ToolBox*, void);
DECL_LINK_TYPED(ActivateToolBox, ToolBox*, void);
- DECL_LINK(DeactivateToolBox, ToolBox*);
+ DECL_LINK_TYPED(DeactivateToolBox, ToolBox*, void);
void CreateController (
const sal_uInt16 nItemId,
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index dec93ff15ecd..f6a4f14cd199 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -188,7 +188,7 @@ private:
Link<ToolBox *, void> maClickHdl;
Link<ToolBox *, void> maDoubleClickHdl;
Link<ToolBox *, void> maActivateHdl;
- Link<> maDeactivateHdl;
+ Link<ToolBox *, void> maDeactivateHdl;
Link<> maHighlightHdl;
Link<ToolBox *, void> maSelectHdl;
Link<> maCommandHandler;
@@ -499,8 +499,7 @@ public:
void SetDoubleClickHdl( const Link<ToolBox *, void>& rLink ) { maDoubleClickHdl = rLink; }
void SetDropdownClickHdl( const Link<ToolBox *, void>& rLink );
void SetActivateHdl( const Link<ToolBox *, void>& rLink ) { maActivateHdl = rLink; }
- void SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; }
- const Link<>& GetDeactivateHdl() const { return maDeactivateHdl; }
+ void SetDeactivateHdl( const Link<ToolBox *, void>& rLink ) { maDeactivateHdl = rLink; }
void SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; }
const Link<>& GetHighlightHdl() const { return maHighlightHdl; }
void SetSelectHdl( const Link<ToolBox *, void>& rLink ) { maSelectHdl = rLink; }
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index a39031e3478b..ce0c7bdeb15d 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -80,7 +80,7 @@ void SidebarToolBox::dispose()
SetDoubleClickHdl(Link<ToolBox *, void>());
SetSelectHdl(Link<ToolBox *, void>());
SetActivateHdl(Link<ToolBox *, void>());
- SetDeactivateHdl(Link<>());
+ SetDeactivateHdl(Link<ToolBox *, void>());
mbAreHandlersRegistered = false;
}
@@ -276,10 +276,8 @@ IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void)
IMPL_LINK_NOARG_TYPED(SidebarToolBox, ActivateToolBox, ToolBox*, void)
{}
-IMPL_LINK(SidebarToolBox, DeactivateToolBox, ToolBox*, EMPTYARG)
-{
- return 1;
-}
+IMPL_LINK_NOARG_TYPED(SidebarToolBox, DeactivateToolBox, ToolBox*, void)
+{}
} } // end of namespace sfx2::sidebar
generated by cgit (git 2.34.1) at 2025-01-15 02:55:00 +0000