summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/dispatch/closedispatcher.hxx2
-rw-r--r--framework/inc/services/layoutmanager.hxx6
-rw-r--r--framework/inc/tabwin/tabwindow.hxx4
-rw-r--r--framework/inc/uielement/addonstoolbarmanager.hxx10
-rw-r--r--framework/inc/uielement/complextoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/generictoolbarcontroller.hxx2
-rw-r--r--framework/inc/uielement/menubarmanager.hxx8
-rw-r--r--framework/inc/uielement/newmenucontroller.hxx2
-rw-r--r--framework/inc/uielement/notebookbarmenucontroller.hxx2
-rw-r--r--framework/inc/uielement/statusbarmanager.hxx4
-rw-r--r--framework/inc/uielement/togglebuttontoolbarcontroller.hxx2
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx26
-rw-r--r--framework/inc/uielement/toolbarmodemenucontroller.hxx2
-rw-r--r--framework/inc/uielement/toolbarsmenucontroller.hxx2
14 files changed, 38 insertions, 38 deletions
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index a20db060d711..9d2f33932612 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -160,7 +160,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper<
asynchronous. Otherwise our callis kill its own environment
during they call us...
*/
- DECL_LINK_TYPED( impl_asyncCallback, LinkParamNone*, void );
+ DECL_LINK( impl_asyncCallback, LinkParamNone*, void );
/** @short prepare m_xCloseFrame so it should be closeable without problems.
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 5a1ec877fe9d..c6699b30a4cf 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -166,8 +166,8 @@ namespace framework
virtual void SAL_CALL addLayoutManagerEventListener( const css::uno::Reference< css::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeLayoutManagerEventListener( const css::uno::Reference< css::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (css::uno::RuntimeException, std::exception) override;
- DECL_LINK_TYPED( MenuBarClose, void *, void);
- DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
+ DECL_LINK( MenuBarClose, void *, void);
+ DECL_LINK( WindowEventListener, VclWindowEvent&, void );
// called from ToolbarLayoutManager
void requestLayout();
@@ -179,7 +179,7 @@ namespace framework
const css::uno::Reference< css::uno::XComponentContext > &rComponentContext );
protected:
- DECL_LINK_TYPED(AsyncLayoutHdl, Timer *, void);
+ DECL_LINK(AsyncLayoutHdl, Timer *, void);
private:
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 7d30485243b4..260ec0ee07bc 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -108,8 +108,8 @@ class TabWindow : public css::lang::XTypeProvider ,
virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
protected:
- DECL_LINK_TYPED( Activate, TabControl*, void );
- DECL_LINK_TYPED( Deactivate, TabControl*, bool );
+ DECL_LINK( Activate, TabControl*, void );
+ DECL_LINK( Deactivate, TabControl*, bool );
private:
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 526ff5e206d0..e86ae0fcb4ad 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -57,11 +57,11 @@ class AddonsToolBarManager : public ToolBarManager
void FillToolbar( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rAddonToolbar );
protected:
- DECL_LINK_TYPED(Click, ToolBox *, void);
- DECL_LINK_TYPED(DoubleClick, ToolBox *, void);
- DECL_LINK_TYPED(Select, ToolBox *, void);
- DECL_LINK_TYPED(StateChanged, StateChangedType const *, void );
- DECL_LINK_TYPED(DataChanged, DataChangedEvent const *, void );
+ DECL_LINK(Click, ToolBox *, void);
+ DECL_LINK(DoubleClick, ToolBox *, void);
+ DECL_LINK(Select, ToolBox *, void);
+ DECL_LINK(StateChanged, StateChangedType const *, void );
+ DECL_LINK(DataChanged, DataChangedEvent const *, void );
virtual bool MenuItemAllowed( sal_uInt16 ) const override;
};
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index d82ba10d02df..e9d90d7d0d04 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -56,8 +56,8 @@ class ComplexToolbarController : public svt::ToolboxController
// XStatusListener
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
- DECL_STATIC_LINK_TYPED( ComplexToolbarController, ExecuteHdl_Impl, void*, void );
- DECL_STATIC_LINK_TYPED( ComplexToolbarController, Notify_Impl, void*, void);
+ DECL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, void*, void );
+ DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, void*, void);
struct ExecuteInfo
{
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index c171d7bb287f..96a8f9eadac6 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -50,7 +50,7 @@ class GenericToolbarController : public svt::ToolboxController
// XStatusListener
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
- DECL_STATIC_LINK_TYPED( GenericToolbarController, ExecuteHdl_Impl, void*, void );
+ DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, void*, void );
struct ExecuteInfo
{
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index cd70a562278b..a709f0ad0ac6 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -127,7 +127,7 @@ class MenuBarManager : public css::frame::XStatusListener ,
// XSystemDependentMenuPeer
virtual css::uno::Any SAL_CALL getMenuHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw (css::uno::RuntimeException, std::exception) override;
- DECL_LINK_TYPED( Select, Menu *, bool );
+ DECL_LINK( Select, Menu *, bool );
Menu* GetMenuBar() const { return m_pVCLMenu; }
@@ -152,9 +152,9 @@ class MenuBarManager : public css::frame::XStatusListener ,
void GetPopupController( PopupControllerCache& rPopupController );
protected:
- DECL_LINK_TYPED( Activate, Menu *, bool );
- DECL_LINK_TYPED( Deactivate, Menu *, bool );
- DECL_LINK_TYPED( AsyncSettingsHdl, Timer *, void );
+ DECL_LINK( Activate, Menu *, bool );
+ DECL_LINK( Deactivate, Menu *, bool );
+ DECL_LINK( AsyncSettingsHdl, Timer *, void );
void RemoveListener();
void RequestImages();
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 17c9791a1b91..869650ea7a94 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 css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override;
- DECL_STATIC_LINK_TYPED( NewMenuController, ExecuteHdl_Impl, void*, void );
+ DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, void*, void );
private:
virtual void impl_setPopupMenu() override;
diff --git a/framework/inc/uielement/notebookbarmenucontroller.hxx b/framework/inc/uielement/notebookbarmenucontroller.hxx
index 1407c155b37b..287ba31b9ac1 100644
--- a/framework/inc/uielement/notebookbarmenucontroller.hxx
+++ b/framework/inc/uielement/notebookbarmenucontroller.hxx
@@ -72,7 +72,7 @@ namespace framework
css::uno::Sequence< css::beans::PropertyValue > aArgs;
};
- DECL_STATIC_LINK_TYPED( NotebookbarMenuController, ExecuteHdl_Impl, void*, void );
+ DECL_STATIC_LINK( NotebookbarMenuController, ExecuteHdl_Impl, void*, void );
private:
void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index 50c92944823c..117ddcf48eb9 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -84,8 +84,8 @@ class StatusBarManager : public ::cppu::WeakImplHelper<
void MouseMove( const MouseEvent& rMEvt );
void MouseButtonDown( const MouseEvent& rMEvt );
void MouseButtonUp( const MouseEvent& rMEvt );
- DECL_LINK_TYPED(Click, StatusBar*, void);
- DECL_LINK_TYPED(DoubleClick, StatusBar*, void);
+ DECL_LINK(Click, StatusBar*, void);
+ DECL_LINK(DoubleClick, StatusBar*, void);
void RemoveControllers();
void CreateControllers();
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 51744d08ad46..efddcf8d93bf 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -63,7 +63,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController
virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override;
private:
- DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool);
+ DECL_LINK( MenuSelectHdl, Menu *, bool);
Style m_eStyle;
OUString m_aCurrentSelection;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 306f9f3a4811..4a60aff7559b 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -114,21 +114,21 @@ class ToolBarManager : public ToolbarManager_Base
};
protected:
- DECL_LINK_TYPED( Command, CommandEvent const *, void );
+ DECL_LINK( Command, CommandEvent const *, void );
PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar);
- DECL_LINK_TYPED(Click, ToolBox *, void);
- DECL_LINK_TYPED(DropdownClick, ToolBox *, void);
- DECL_LINK_TYPED(DoubleClick, ToolBox *, void);
- DECL_LINK_TYPED(Select, ToolBox *, void);
- DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
- DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void );
- DECL_LINK_TYPED( MiscOptionsChanged, LinkParamNone*, void );
-
- DECL_LINK_TYPED( MenuButton, ToolBox *, void );
- DECL_LINK_TYPED( MenuSelect, Menu *, bool );
+ DECL_LINK(Click, ToolBox *, void);
+ DECL_LINK(DropdownClick, ToolBox *, void);
+ DECL_LINK(DoubleClick, ToolBox *, void);
+ DECL_LINK(Select, ToolBox *, void);
+ DECL_LINK( StateChanged, StateChangedType const *, void );
+ DECL_LINK( DataChanged, DataChangedEvent const *, void );
+ DECL_LINK( MiscOptionsChanged, LinkParamNone*, void );
+
+ DECL_LINK( MenuButton, ToolBox *, void );
+ DECL_LINK( MenuSelect, Menu *, bool );
void MenuDeactivated();
- DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void);
- DECL_STATIC_LINK_TYPED( ToolBarManager, ExecuteHdl_Impl, void*, void );
+ DECL_LINK(AsyncUpdateControllersHdl, Timer *, void);
+ DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, void*, void );
virtual bool MenuItemAllowed( sal_uInt16 ) const;
diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx
index 7bbf2fd2df0a..3496b2cbe675 100644
--- a/framework/inc/uielement/toolbarmodemenucontroller.hxx
+++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx
@@ -72,7 +72,7 @@ namespace framework
css::uno::Sequence< css::beans::PropertyValue > aArgs;
};
- DECL_STATIC_LINK_TYPED( ToolbarModeMenuController, ExecuteHdl_Impl, void*, void );
+ DECL_STATIC_LINK( ToolbarModeMenuController, ExecuteHdl_Impl, void*, void );
private:
void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 69f06f236be3..55733037cb70 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -80,7 +80,7 @@ namespace framework
css::uno::Sequence< css::beans::PropertyValue > aArgs;
};
- DECL_STATIC_LINK_TYPED( ToolbarsMenuController, ExecuteHdl_Impl, void*, void );
+ DECL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, void*, void );
private:
void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
generated by cgit (git 2.34.1) at 2024-12-26 23:35:13 +0000