summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-27 13:08:02 +0200
committerNoel Grandin <noel@peralex.com>2015-08-28 09:49:56 +0200
commitbd8b93fdff93ff7b2b7e493a7bcef6a59f299dae (patch)
treef05be9665737f0667faf95702d96fbf3f0a103c5 /framework/inc
parent1b9c3a17e8496aedfb80528c5275e6658154789d (diff)
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/services/layoutmanager.hxx2
-rw-r--r--framework/inc/uielement/complextoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/generictoolbarcontroller.hxx2
-rw-r--r--framework/inc/uielement/newmenucontroller.hxx2
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx2
-rw-r--r--framework/inc/uielement/toolbarsmenucontroller.hxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index d1e042d956bb..c8b4e7c37a91 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -168,7 +168,7 @@ namespace framework
virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- DECL_LINK(MenuBarClose, void *);
+ DECL_LINK_TYPED( MenuBarClose, void *, void);
DECL_LINK( WindowEventListener, VclSimpleEvent* );
// ILayoutNotifications
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index b24186f644bf..bf9b7cf81611 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -71,8 +71,8 @@ class ComplexToolbarController : public svt::ToolboxController
// XStatusListener
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- DECL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo* );
- DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo* );
+ DECL_STATIC_LINK_TYPED( ComplexToolbarController, ExecuteHdl_Impl, void*, void );
+ DECL_STATIC_LINK_TYPED( ComplexToolbarController, Notify_Impl, void*, void);
protected:
static sal_Int32 getFontSizePixel( const vcl::Window* pWindow );
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 26ebeb61ab46..cfef97d562fe 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -51,7 +51,7 @@ class GenericToolbarController : public svt::ToolboxController
// XStatusListener
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* );
+ DECL_STATIC_LINK_TYPED( GenericToolbarController, ExecuteHdl_Impl, void*, void );
protected:
VclPtr<ToolBox> m_pToolbar;
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index a86d5ad97e9f..3243278d0dda 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -77,7 +77,7 @@ namespace framework
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* );
+ DECL_STATIC_LINK_TYPED( NewMenuController, ExecuteHdl_Impl, void*, void );
private:
virtual void impl_setPopupMenu() SAL_OVERRIDE;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 9a43da9b143c..5cf00f7290fe 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -140,7 +140,7 @@ class ToolBarManager : public ToolbarManager_Base
DECL_LINK( MenuSelect, Menu * );
DECL_LINK_TYPED( MenuDeactivate, Menu *, bool );
DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void);
- DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo* );
+ DECL_STATIC_LINK_TYPED( ToolBarManager, ExecuteHdl_Impl, void*, void );
virtual bool MenuItemAllowed( sal_uInt16 ) const;
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 41eb059f376c..3cc2c26ca660 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -80,7 +80,7 @@ namespace framework
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
};
- DECL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInfo* );
+ DECL_STATIC_LINK_TYPED( ToolbarsMenuController, ExecuteHdl_Impl, void*, void );
private:
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );