[Libreoffice-commits] core.git: 5 commits - framework/inc framework/source include/vcl vcl/inc vcl/source

Stephan Bergmann sbergman at redhat.com
Wed May 6 03:54:47 PDT 2015


 framework/inc/uielement/addonstoolbarmanager.hxx    |    6 ++--
 framework/inc/uielement/toolbarmanager.hxx          |    8 ++---
 framework/source/uielement/addonstoolbarmanager.cxx |   18 ++----------
 framework/source/uielement/toolbarmanager.cxx       |   30 +++++++-------------
 include/vcl/toolbox.hxx                             |   20 ++++---------
 vcl/inc/toolbox.h                                   |    2 -
 vcl/source/window/toolbox.cxx                       |    4 +-
 vcl/source/window/toolbox2.cxx                      |    3 --
 8 files changed, 33 insertions(+), 58 deletions(-)

New commits:
commit 98b5f1164b11ee7b84bf7efc16256afc5c58fcb8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 6 11:07:59 2015 +0200

    Use typed ToolBox::SetMenuButtonHdl Link
    
    Change-Id: I00cd35374294ccdcc0ac3223ae81ba8129b9a5d7

diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index f8e8932..3acc8c6 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -138,7 +138,7 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void );
         DECL_LINK( MiscOptionsChanged, void* );
 
-        DECL_LINK( MenuButton, ToolBox * );
+        DECL_LINK_TYPED( MenuButton, ToolBox *, void );
         DECL_LINK( MenuSelect, Menu * );
         DECL_LINK( MenuDeactivate, Menu * );
         DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void);
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 52d3081..d175b6e 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1811,18 +1811,16 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
     }
 }
 
-IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar )
+IMPL_LINK_TYPED( ToolBarManager, MenuButton, ToolBox*, pToolBar, void )
 {
     SolarMutexGuard g;
 
     if ( m_bDisposed )
-        return 1;
+        return;
 
     pToolBar->UpdateCustomMenu();
     // remove all entries that do not come from the toolbar itself (fdo#38276)
     ImplClearPopupMenu( pToolBar );
-
-    return 0;
  }
 
 IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index ad3e7cc..bff42bf 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -520,7 +520,7 @@ public:
     bool                IsMenuEnabled() const;
     PopupMenu*          GetMenu() const;
     void                UpdateCustomMenu();
-    void                SetMenuButtonHdl( const Link<>& rLink );
+    void                SetMenuButtonHdl( const Link<ToolBox *, void>& rLink );
 
     // open custommenu
     void                ExecuteCustomMenu();
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 57e3081..e8c7a1f 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -141,7 +141,7 @@ struct ImplToolBoxPrivateData
     ImplSVEvent *   mnEventId;
 
     // called when menu button is clicked and before the popup menu is executed
-    Link<>      maMenuButtonHdl;
+    Link<ToolBox *, void> maMenuButtonHdl;
 
     // a dummy item representing the custom menu button
     ImplToolItem   maMenubuttonItem;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 0a65b83..cab1a37 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1773,7 +1773,7 @@ PopupMenu* ToolBox::GetMenu() const
     return mpData->mpMenu;
 }
 
-void ToolBox::SetMenuButtonHdl( const Link<>& rLink )
+void ToolBox::SetMenuButtonHdl( const Link<ToolBox *, void>& rLink )
 {
     mpData->maMenuButtonHdl = rLink;
 }
commit e1b8ae4b2e5b5d99a51011a5d18f23df0448e379
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 6 10:56:13 2015 +0200

    Use typed ToolBox::SetDataChangedHdl Link
    
    Change-Id: Ia4fe932e765651653e6c534e755a8fc32875ffc3

diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 0d31d82..f01093f 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -65,7 +65,7 @@ class AddonsToolBarManager : public ToolBarManager
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
         DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
-        DECL_LINK( DataChanged, DataChangedEvent* );
+        DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void );
 
         virtual bool MenuItemAllowed( sal_uInt16 ) const SAL_OVERRIDE;
 };
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 810076d..f8e8932 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -135,7 +135,7 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
         DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
-        DECL_LINK( DataChanged, DataChangedEvent* );
+        DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void );
         DECL_LINK( MiscOptionsChanged, void* );
 
         DECL_LINK( MenuButton, ToolBox * );
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 3b92f45..f895630 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -447,7 +447,7 @@ IMPL_LINK_TYPED( AddonsToolBarManager, StateChanged, StateChangedType const *, p
     }
 }
 
-IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
+IMPL_LINK_TYPED( AddonsToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEvent, void )
 {
     if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS )   ||
         (  pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY  ))  &&
@@ -466,8 +466,6 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
             pWindow->DataChanged( rDCEvt );
         }
     }
-
-    return 1;
 }
 
 }
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ccf886b..52d3081 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -283,7 +283,7 @@ void ToolBarManager::Destroy()
     m_pToolBar->SetDropdownClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDoubleClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetStateChangedHdl( Link<StateChangedType const *, void>() );
-    m_pToolBar->SetDataChangedHdl( Link<>() );
+    m_pToolBar->SetDataChangedHdl( Link<DataChangedEvent const *, void>() );
     m_pToolBar->SetCommandHdl( Link<CommandEvent const *, void>() );
 
     m_pToolBar.clear();
@@ -2051,7 +2051,7 @@ IMPL_LINK_TYPED( ToolBarManager, StateChanged, StateChangedType const *, pStateC
     }
 }
 
-IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
+IMPL_LINK_TYPED( ToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEvent, void )
 {
     if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS )   ||
         (  pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY  ))  &&
@@ -2079,8 +2079,6 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
         ::Size aSize( m_pToolBar->CalcWindowSizePixel() );
         m_pToolBar->SetOutputSizePixel( aSize );
     }
-
-    return 1;
 }
 
 IMPL_LINK_NOARG(ToolBarManager, MiscOptionsChanged)
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index bd72a7b..ad3e7cc 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -192,7 +192,7 @@ private:
     Link<ToolBox *, void> maSelectHdl;
     Link<CommandEvent const *, void> maCommandHandler;
     Link<StateChangedType const *, void> maStateChangedHandler;
-    Link<>              maDataChangedHandler;
+    Link<DataChangedEvent const *, void> maDataChangedHandler;
 
     public:
     using Window::ImplInit;
@@ -506,8 +506,7 @@ public:
     const Link<ToolBox *, void>& GetSelectHdl() const { return maSelectHdl; }
     void                SetCommandHdl( const Link<CommandEvent const *, void>& aLink ) { maCommandHandler = aLink; }
     void                SetStateChangedHdl( const Link<StateChangedType const *, void>& aLink ) { maStateChangedHandler = aLink; }
-    void                SetDataChangedHdl( const Link<>& aLink ) { maDataChangedHandler = aLink; }
-    const Link<>&       GetDataChangedHdl() { return maDataChangedHandler; }
+    void                SetDataChangedHdl( const Link<DataChangedEvent const *, void>& aLink ) { maDataChangedHandler = aLink; }
 
     // support for custom menu (eg for configuration)
     // note: this menu will also be used to display currently
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 3e7d7e8..067f494 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4471,7 +4471,7 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt )
     }
 
     if ( maDataChangedHandler.IsSet() )
-        maDataChangedHandler.Call( (void*)&rDCEvt );
+        maDataChangedHandler.Call( &rDCEvt );
 }
 
 bool ToolBox::PrepareToggleFloatingMode()
commit f9830183e1076fcbaa757f2220070b4bfe804231
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 6 10:31:54 2015 +0200

    Use typed ToolBox::SetStateChangedHdl Link
    
    Change-Id: I9b574f652e5d999086e32e9c7ede7c68fe5cc99a

diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 234df21..0d31d82 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -64,7 +64,7 @@ class AddonsToolBarManager : public ToolBarManager
         DECL_LINK_TYPED(Select, ToolBox *, void);
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
-        DECL_LINK( StateChanged, StateChangedType* );
+        DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
         DECL_LINK( DataChanged, DataChangedEvent* );
 
         virtual bool MenuItemAllowed( sal_uInt16 ) const SAL_OVERRIDE;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 0bc40ca..810076d 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -134,7 +134,7 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK_TYPED(Select, ToolBox *, void);
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
-        DECL_LINK( StateChanged, StateChangedType* );
+        DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
         DECL_LINK( DataChanged, DataChangedEvent* );
         DECL_LINK( MiscOptionsChanged, void* );
 
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index b8a9bf8..3b92f45 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -439,13 +439,12 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Activate, ToolBox *, void)
 IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Deactivate, ToolBox *, void)
 {}
 
-IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
+IMPL_LINK_TYPED( AddonsToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
 {
     if ( *pStateChangedType == StateChangedType::ControlBackground )
     {
         CheckAndUpdateImages();
     }
-    return 1;
 }
 
 IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index aa163b9..ccf886b 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -276,15 +276,14 @@ void ToolBarManager::Destroy()
         // #i93173# delete toolbar lazily as we can still be in one of its handlers
     m_pToolBar->doLazyDelete();
 
-    Link<> aEmpty;
     m_pToolBar->SetSelectHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetActivateHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDeactivateHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDropdownClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDoubleClickHdl( Link<ToolBox *, void>() );
-    m_pToolBar->SetStateChangedHdl( aEmpty );
-    m_pToolBar->SetDataChangedHdl( aEmpty );
+    m_pToolBar->SetStateChangedHdl( Link<StateChangedType const *, void>() );
+    m_pToolBar->SetDataChangedHdl( Link<>() );
     m_pToolBar->SetCommandHdl( Link<CommandEvent const *, void>() );
 
     m_pToolBar.clear();
@@ -2030,10 +2029,10 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, Activate, ToolBox *, void)
 IMPL_LINK_NOARG_TYPED(ToolBarManager, Deactivate, ToolBox *, void)
 {}
 
-IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
+IMPL_LINK_TYPED( ToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
 {
     if ( m_bDisposed )
-        return 1;
+        return;
 
     if ( *pStateChangedType == StateChangedType::ControlBackground )
     {
@@ -2050,7 +2049,6 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
     {
         m_aAsyncUpdateControllersTimer.Start();
     }
-    return 1;
 }
 
 IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index cbf6342..bd72a7b 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -191,7 +191,7 @@ private:
     Link<ToolBox *, void> maDeactivateHdl;
     Link<ToolBox *, void> maSelectHdl;
     Link<CommandEvent const *, void> maCommandHandler;
-    Link<>              maStateChangedHandler;
+    Link<StateChangedType const *, void> maStateChangedHandler;
     Link<>              maDataChangedHandler;
 
     public:
@@ -505,8 +505,7 @@ public:
     void                SetSelectHdl( const Link<ToolBox *, void>& rLink ) { maSelectHdl = rLink; }
     const Link<ToolBox *, void>& GetSelectHdl() const { return maSelectHdl; }
     void                SetCommandHdl( const Link<CommandEvent const *, void>& aLink ) { maCommandHandler = aLink; }
-    void                SetStateChangedHdl( const Link<>& aLink ) { maStateChangedHandler = aLink; }
-    const Link<>&       GetStateChangedHdl() const { return maStateChangedHandler; }
+    void                SetStateChangedHdl( const Link<StateChangedType const *, void>& aLink ) { maStateChangedHandler = aLink; }
     void                SetDataChangedHdl( const Link<>& aLink ) { maDataChangedHandler = aLink; }
     const Link<>&       GetDataChangedHdl() { return maDataChangedHandler; }
 
commit 1e64fe1364dc4aed8d46671e5b7160244b77db76
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 6 10:17:36 2015 +0200

    Use typed ToolBox::SetCommandHdl Link
    
    Change-Id: Ieee142ddebb288037647fb77bac6f11b9827c4a8

diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 542a366..234df21 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -60,7 +60,7 @@ class AddonsToolBarManager : public ToolBarManager
     protected:
         DECL_LINK_TYPED(Click, ToolBox *, void);
         DECL_LINK_TYPED(DoubleClick, ToolBox *, void);
-        DECL_LINK(Command, void *);
+        DECL_LINK_TYPED(Command, CommandEvent const *, void);
         DECL_LINK_TYPED(Select, ToolBox *, void);
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 7e1ae3b..0bc40ca 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -126,7 +126,7 @@ class ToolBarManager : public ToolbarManager_Base
         typedef std::vector< ControllerParams > ControllerParamsVector;
 
     protected:
-        DECL_LINK( Command, CommandEvent * );
+        DECL_LINK_TYPED( Command, CommandEvent const *, void );
         PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar);
         DECL_LINK_TYPED(Click, ToolBox *, void);
         DECL_LINK_TYPED(DropdownClick, ToolBox *, void);
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index ca56c44..b8a9bf8 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -413,15 +413,8 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, DoubleClick, ToolBox *, void)
     }
 }
 
-IMPL_LINK_NOARG(AddonsToolBarManager, Command)
-{
-    SolarMutexGuard g;
-
-    if ( m_bDisposed )
-        return 1;
-
-    return 0;
-}
+IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Command, CommandEvent const *, void)
+{}
 
 IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void)
 {
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ca2c943..aa163b9 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -285,7 +285,7 @@ void ToolBarManager::Destroy()
     m_pToolBar->SetDoubleClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetStateChangedHdl( aEmpty );
     m_pToolBar->SetDataChangedHdl( aEmpty );
-    m_pToolBar->SetCommandHdl( aEmpty );
+    m_pToolBar->SetCommandHdl( Link<CommandEvent const *, void>() );
 
     m_pToolBar.clear();
 
@@ -1772,14 +1772,14 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
     return pMenu;
 }
 
-IMPL_LINK( ToolBarManager, Command, CommandEvent*, pCmdEvt )
+IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
 {
     SolarMutexGuard g;
 
     if ( m_bDisposed )
-        return 1;
+        return;
     if ( pCmdEvt->GetCommand() != COMMAND_CONTEXTMENU )
-        return 0;
+        return;
 
     ::PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar);
     if (pMenu)
@@ -1810,8 +1810,6 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*, pCmdEvt )
             pManagerMenu->SetDeactivateHdl( Link<>() );
         }
     }
-
-    return 0;
 }
 
 IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar )
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index d2a09ce..cbf6342 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -190,7 +190,7 @@ private:
     Link<ToolBox *, void> maActivateHdl;
     Link<ToolBox *, void> maDeactivateHdl;
     Link<ToolBox *, void> maSelectHdl;
-    Link<>              maCommandHandler;
+    Link<CommandEvent const *, void> maCommandHandler;
     Link<>              maStateChangedHandler;
     Link<>              maDataChangedHandler;
 
@@ -504,8 +504,7 @@ public:
     void                SetDeactivateHdl( const Link<ToolBox *, void>& rLink ) { maDeactivateHdl = rLink; }
     void                SetSelectHdl( const Link<ToolBox *, void>& rLink ) { maSelectHdl = rLink; }
     const Link<ToolBox *, void>& GetSelectHdl() const { return maSelectHdl; }
-    void                SetCommandHdl( const Link<>& aLink ) { maCommandHandler = aLink; }
-    const Link<>&       GetCommandHdl() const { return maCommandHandler; }
+    void                SetCommandHdl( const Link<CommandEvent const *, void>& aLink ) { maCommandHandler = aLink; }
     void                SetStateChangedHdl( const Link<>& aLink ) { maStateChangedHandler = aLink; }
     const Link<>&       GetStateChangedHdl() const { return maStateChangedHandler; }
     void                SetDataChangedHdl( const Link<>& aLink ) { maDataChangedHandler = aLink; }
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index adc41ec..3e7d7e8 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4357,7 +4357,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt )
 void ToolBox::Command( const CommandEvent& rCEvt )
 {
     if ( maCommandHandler.IsSet() )
-        maCommandHandler.Call( (void *)( &rCEvt ));
+        maCommandHandler.Call( &rCEvt );
 
     // depict StartDrag on MouseButton/Left/Alt
     if ( (rCEvt.GetCommand() == COMMAND_STARTDRAG) && rCEvt.IsMouseEvent() &&
commit 1a5f1e82a96b5c8c9d523fd58c330498936cd2fe
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 6 09:56:15 2015 +0200

    Remove unused ToolBox::Get/SetHighlightHdl
    
    Change-Id: Ieea90173e84dc4d1d0202a3804033d1c42370261

diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 9c94f80..d2a09ce 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -189,7 +189,6 @@ private:
     Link<ToolBox *, void> maDoubleClickHdl;
     Link<ToolBox *, void> maActivateHdl;
     Link<ToolBox *, void> maDeactivateHdl;
-    Link<>              maHighlightHdl;
     Link<ToolBox *, void> maSelectHdl;
     Link<>              maCommandHandler;
     Link<>              maStateChangedHandler;
@@ -503,8 +502,6 @@ public:
     void                SetDropdownClickHdl( const Link<ToolBox *, void>& rLink );
     void                SetActivateHdl( const Link<ToolBox *, void>& rLink ) { maActivateHdl = rLink; }
     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; }
     const Link<ToolBox *, void>& GetSelectHdl() const { return maSelectHdl; }
     void                SetCommandHdl( const Link<>& aLink ) { maCommandHandler = aLink; }
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 211afd3..0a65b83 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -434,7 +434,6 @@ void ToolBox::Deactivate()
 void ToolBox::Highlight()
 {
     CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
-    maHighlightHdl.Call( this );
 }
 
 void ToolBox::Select()


More information about the Libreoffice-commits mailing list