summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/dispatch/closedispatcher.cxx2
-rw-r--r--framework/source/dispatch/windowcommanddispatch.cxx2
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx4
-rw-r--r--framework/source/inc/dispatch/windowcommanddispatch.hxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx6
-rw-r--r--framework/source/services/autorecovery.cxx8
-rw-r--r--framework/source/tabwin/tabwindow.cxx4
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx10
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx4
-rw-r--r--framework/source/uielement/generictoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/menubarmanager.cxx8
-rw-r--r--framework/source/uielement/newmenucontroller.cxx2
-rw-r--r--framework/source/uielement/notebookbarmenucontroller.cxx2
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx4
-rw-r--r--framework/source/uielement/statusbarmanager.cxx4
-rw-r--r--framework/source/uielement/togglebuttontoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx24
-rw-r--r--framework/source/uielement/toolbarmodemenucontroller.cxx2
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx2
19 files changed, 47 insertions, 47 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index b7cc20807c59..991c3e9f5734 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -249,7 +249,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
- decide then, if we must close this frame only, establish the backing mode
or shutdown the whole application.
*/
-IMPL_LINK_NOARG_TYPED(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void)
+IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void)
{
try
{
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 04728a1632d9..71ecaa0a5020 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -92,7 +92,7 @@ void WindowCommandDispatch::impl_stopListening()
}
}
-IMPL_LINK_TYPED(WindowCommandDispatch, impl_notifyCommand, VclWindowEvent&, rEvent, void)
+IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, VclWindowEvent&, rEvent, void)
{
if (rEvent.GetId() == VCLEVENT_OBJECT_DYING)
{
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 08db9b86ed03..a55292aaab6d 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -275,7 +275,7 @@ class AddonsOptions_Impl : public ConfigItem
Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const;
bool CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const;
- DECL_LINK_TYPED(NotifyEvent, void*, void);
+ DECL_LINK(NotifyEvent, void*, void);
virtual void ImplCommit() override;
@@ -1615,7 +1615,7 @@ Mutex& AddonsOptions::GetOwnStaticMutex()
return *pMutex;
}
-IMPL_LINK_NOARG_TYPED(AddonsOptions_Impl, NotifyEvent, void*, void)
+IMPL_LINK_NOARG(AddonsOptions_Impl, NotifyEvent, void*, void)
{
MutexGuard aGuard(AddonsOptions::GetOwnStaticMutex());
ReadConfigurationData();
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index f3f63928f208..d00c893f613b 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -102,7 +102,7 @@ class WindowCommandDispatch
/** @short callback from VCL to notify new commands
*/
- DECL_LINK_TYPED( impl_notifyCommand, VclWindowEvent&, void );
+ DECL_LINK( impl_notifyCommand, VclWindowEvent&, void );
/** @short dispatch right command URLs into our frame context.
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index ead5fc8241a8..e5e0e09518cf 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1416,7 +1416,7 @@ uno::Reference< ui::XUIElement > LayoutManager::implts_createDockingWindow( cons
return xUIElement;
}
-IMPL_LINK_TYPED( LayoutManager, WindowEventListener, VclWindowEvent&, rEvent, void )
+IMPL_LINK( LayoutManager, WindowEventListener, VclWindowEvent&, rEvent, void )
{
vcl::Window* pWindow = rEvent.GetWindow();
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
@@ -2610,7 +2610,7 @@ bool LayoutManager::implts_resetMenuBar()
return false;
}
-IMPL_LINK_NOARG_TYPED(LayoutManager, MenuBarClose, void*, void)
+IMPL_LINK_NOARG(LayoutManager, MenuBarClose, void*, void)
{
SolarMutexClearableGuard aReadLock;
uno::Reference< frame::XDispatchProvider > xProvider(m_xFrame, uno::UNO_QUERY);
@@ -2753,7 +2753,7 @@ void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) thr
}
}
-IMPL_LINK_NOARG_TYPED(LayoutManager, AsyncLayoutHdl, Timer *, void)
+IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl, Timer *, void)
{
SolarMutexClearableGuard aReadLock;
m_aAsyncLayoutTimer.Stop();
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 1d5b6d19b0cd..932995f6c0e5 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -618,11 +618,11 @@ private:
/** @short callback of our internal timer.
*/
- DECL_LINK_TYPED(implts_timerExpired, Timer*, void);
+ DECL_LINK(implts_timerExpired, Timer*, void);
/** @short makes our dispatch() method asynchronous!
*/
- DECL_LINK_TYPED(implts_asyncDispatch, LinkParamNone*, void);
+ DECL_LINK(implts_asyncDispatch, LinkParamNone*, void);
/** @short implements the dispatch real. */
void implts_dispatch(const DispatchParams& aParams);
@@ -2286,7 +2286,7 @@ void AutoRecovery::implts_stopTimer()
m_aTimer.Stop();
}
-IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_timerExpired, Timer *, void)
+IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired, Timer *, void)
{
try
{
@@ -2380,7 +2380,7 @@ IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_timerExpired, Timer *, void)
}
}
-IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_asyncDispatch, LinkParamNone*, void)
+IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch, LinkParamNone*, void)
{
DispatchParams aParams;
/* SAFE */ {
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 15153599fc48..edd628976ff4 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -226,7 +226,7 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID, con
// Links
-IMPL_LINK_TYPED( TabWindow, Activate, TabControl*, pTabControl, void )
+IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl, void )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
@@ -241,7 +241,7 @@ IMPL_LINK_TYPED( TabWindow, Activate, TabControl*, pTabControl, void )
implts_SendNotification( NOTIFY_ACTIVATED, nPageId );
}
-IMPL_LINK_TYPED( TabWindow, Deactivate, TabControl*, pTabControl, bool )
+IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl, bool )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 0a272443767a..930c62c62c6f 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -384,7 +384,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
AddFrameActionListener();
}
-IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Click, ToolBox *, void)
+IMPL_LINK_NOARG(AddonsToolBarManager, Click, ToolBox *, void)
{
if ( m_bDisposed )
return;
@@ -400,7 +400,7 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Click, ToolBox *, void)
}
}
-IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, DoubleClick, ToolBox *, void)
+IMPL_LINK_NOARG(AddonsToolBarManager, DoubleClick, ToolBox *, void)
{
if ( m_bDisposed )
return;
@@ -416,7 +416,7 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, DoubleClick, ToolBox *, void)
}
}
-IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void)
+IMPL_LINK_NOARG(AddonsToolBarManager, Select, ToolBox *, void)
{
if ( m_bDisposed )
return;
@@ -433,7 +433,7 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void)
}
}
-IMPL_LINK_TYPED( AddonsToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
+IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
{
if ( *pStateChangedType == StateChangedType::ControlBackground )
{
@@ -441,7 +441,7 @@ IMPL_LINK_TYPED( AddonsToolBarManager, StateChanged, StateChangedType const *, p
}
}
-IMPL_LINK_TYPED( AddonsToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEvent, void )
+IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEvent, void )
{
if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS ) ||
( pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY )) &&
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 38a341b0b0c9..0831d254237a 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -196,7 +196,7 @@ throw ( RuntimeException, std::exception )
}
}
-IMPL_STATIC_LINK_TYPED( ComplexToolbarController, ExecuteHdl_Impl, void*, p, void )
+IMPL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, void*, p, void )
{
ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
SolarMutexReleaser aReleaser;
@@ -214,7 +214,7 @@ IMPL_STATIC_LINK_TYPED( ComplexToolbarController, ExecuteHdl_Impl, void*, p, voi
delete pExecuteInfo;
}
-IMPL_STATIC_LINK_TYPED( ComplexToolbarController, Notify_Impl, void*, p, void )
+IMPL_STATIC_LINK( ComplexToolbarController, Notify_Impl, void*, p, void )
{
NotifyInfo* pNotifyInfo = static_cast<NotifyInfo*>(p);
SolarMutexReleaser aReleaser;
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index b4ec343fdc44..21da2b088b9a 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -263,7 +263,7 @@ throw ( RuntimeException, std::exception )
}
}
-IMPL_STATIC_LINK_TYPED( GenericToolbarController, ExecuteHdl_Impl, void*, p, void )
+IMPL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, void*, p, void )
{
ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
SolarMutexReleaser aReleaser;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index c387d2ad1212..feb5e71befcd 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -734,7 +734,7 @@ private:
}
-IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
+IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
{
if ( pMenu == m_pVCLMenu )
{
@@ -932,7 +932,7 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
return true;
}
-IMPL_LINK_TYPED( MenuBarManager, Deactivate, Menu *, pMenu, bool )
+IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu, bool )
{
if ( pMenu == m_pVCLMenu )
{
@@ -951,7 +951,7 @@ IMPL_LINK_TYPED( MenuBarManager, Deactivate, Menu *, pMenu, bool )
return true;
}
-IMPL_LINK_NOARG_TYPED( MenuBarManager, AsyncSettingsHdl, Timer*, void)
+IMPL_LINK_NOARG( MenuBarManager, AsyncSettingsHdl, Timer*, void)
{
SolarMutexGuard g;
Reference< XInterface > xSelfHold(
@@ -965,7 +965,7 @@ IMPL_LINK_NOARG_TYPED( MenuBarManager, AsyncSettingsHdl, Timer*, void)
}
}
-IMPL_LINK_TYPED( MenuBarManager, Select, Menu *, pMenu, bool )
+IMPL_LINK( MenuBarManager, Select, Menu *, pMenu, bool )
{
URL aTargetURL;
Sequence<PropertyValue> aArgs;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 5b997c1dcbc6..94b15fca3afb 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -548,7 +548,7 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
}
}
-IMPL_STATIC_LINK_TYPED( NewMenuController, ExecuteHdl_Impl, void*, p, void )
+IMPL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, void*, p, void )
{
NewDocument* pNewDocument = static_cast<NewDocument*>(p);
/* i62706: Don't catch all exceptions. We hide all problems here and are not able
diff --git a/framework/source/uielement/notebookbarmenucontroller.cxx b/framework/source/uielement/notebookbarmenucontroller.cxx
index 7173356fe92b..833fdafff983 100644
--- a/framework/source/uielement/notebookbarmenucontroller.cxx
+++ b/framework/source/uielement/notebookbarmenucontroller.cxx
@@ -301,7 +301,7 @@ void SAL_CALL NotebookbarMenuController::setPopupMenu( const Reference< css::awt
}
}
-IMPL_STATIC_LINK_TYPED( NotebookbarMenuController, ExecuteHdl_Impl, void*, p, void )
+IMPL_STATIC_LINK( NotebookbarMenuController, ExecuteHdl_Impl, void*, p, void )
{
ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
try
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 1495d5d79903..786ef69a44bd 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -99,7 +99,7 @@ public:
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override;
- DECL_STATIC_LINK_TYPED( RecentFilesMenuController, ExecuteHdl_Impl, void*, void );
+ DECL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, void*, void );
private:
virtual void impl_setPopupMenu() override;
@@ -438,7 +438,7 @@ throw( RuntimeException, std::exception )
}
}
-IMPL_STATIC_LINK_TYPED( RecentFilesMenuController, ExecuteHdl_Impl, void*, p, void )
+IMPL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, void*, p, void )
{
LoadRecentFile* pLoadRecentFile = static_cast<LoadRecentFile*>(p);
try
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 6fb88bf10a4b..fce91ae24c93 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -644,7 +644,7 @@ void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt )
MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonUp);
}
-IMPL_LINK_NOARG_TYPED(StatusBarManager, Click, StatusBar*, void)
+IMPL_LINK_NOARG(StatusBarManager, Click, StatusBar*, void)
{
SolarMutexGuard g;
@@ -665,7 +665,7 @@ IMPL_LINK_NOARG_TYPED(StatusBarManager, Click, StatusBar*, void)
}
}
-IMPL_LINK_NOARG_TYPED(StatusBarManager, DoubleClick, StatusBar*, void)
+IMPL_LINK_NOARG(StatusBarManager, DoubleClick, StatusBar*, void)
{
SolarMutexGuard g;
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 4e726c191312..c0a19ff4a33c 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -259,7 +259,7 @@ void ToggleButtonToolbarController::executeControlCommand( const css::frame::Con
}
}
-IMPL_LINK_TYPED( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu, bool )
+IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu, bool )
{
SolarMutexGuard aGuard;
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index eb85a82b853b..7942d9429ce7 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1282,12 +1282,12 @@ void ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )(
}
}
-IMPL_LINK_NOARG_TYPED(ToolBarManager, Click, ToolBox *, void)
+IMPL_LINK_NOARG(ToolBarManager, Click, ToolBox *, void)
{
HandleClick(&XToolbarController::click);
}
-IMPL_LINK_NOARG_TYPED(ToolBarManager, DropdownClick, ToolBox *, void)
+IMPL_LINK_NOARG(ToolBarManager, DropdownClick, ToolBox *, void)
{
SolarMutexGuard g;
@@ -1309,7 +1309,7 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, DropdownClick, ToolBox *, void)
}
}
-IMPL_LINK_NOARG_TYPED(ToolBarManager, DoubleClick, ToolBox *, void)
+IMPL_LINK_NOARG(ToolBarManager, DoubleClick, ToolBox *, void)
{
HandleClick(&XToolbarController::doubleClick);
}
@@ -1524,7 +1524,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
return pMenu;
}
-IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
+IMPL_LINK( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
{
SolarMutexGuard g;
@@ -1563,7 +1563,7 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
}
}
-IMPL_LINK_TYPED( ToolBarManager, MenuButton, ToolBox*, pToolBar, void )
+IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar, void )
{
SolarMutexGuard g;
@@ -1575,7 +1575,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuButton, ToolBox*, pToolBar, void )
ImplClearPopupMenu( pToolBar );
}
-IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
+IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
{
// We have to hold a reference to ourself as it is possible that we will be disposed and
// our refcount could be zero (destruction) otherwise.
@@ -1755,7 +1755,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
return true;
}
-IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void)
+IMPL_LINK_NOARG(ToolBarManager, Select, ToolBox *, void)
{
if ( m_bDisposed )
return;
@@ -1773,7 +1773,7 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void)
}
}
-IMPL_LINK_TYPED( ToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
+IMPL_LINK( ToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
{
if ( m_bDisposed )
return;
@@ -1795,7 +1795,7 @@ IMPL_LINK_TYPED( ToolBarManager, StateChanged, StateChangedType const *, pStateC
}
}
-IMPL_LINK_TYPED( ToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEvent, void )
+IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEvent, void )
{
if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS ) ||
( pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY )) &&
@@ -1825,12 +1825,12 @@ IMPL_LINK_TYPED( ToolBarManager, DataChanged, DataChangedEvent const *, pDataCha
}
}
-IMPL_LINK_NOARG_TYPED(ToolBarManager, MiscOptionsChanged, LinkParamNone*, void)
+IMPL_LINK_NOARG(ToolBarManager, MiscOptionsChanged, LinkParamNone*, void)
{
CheckAndUpdateImages();
}
-IMPL_LINK_NOARG_TYPED(ToolBarManager, AsyncUpdateControllersHdl, Timer *, void)
+IMPL_LINK_NOARG(ToolBarManager, AsyncUpdateControllersHdl, Timer *, void)
{
// The guard must be in its own context as the we can get destroyed when our
// own xInterface reference get destroyed!
@@ -1846,7 +1846,7 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, AsyncUpdateControllersHdl, Timer *, void)
UpdateControllers();
}
-IMPL_STATIC_LINK_TYPED( ToolBarManager, ExecuteHdl_Impl, void*, p, void )
+IMPL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, void*, p, void )
{
ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
try
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx
index b39fa3b7877b..ffd0440431e4 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -300,7 +300,7 @@ void SAL_CALL ToolbarModeMenuController::setPopupMenu( const Reference< css::awt
}
}
-IMPL_STATIC_LINK_TYPED( ToolbarModeMenuController, ExecuteHdl_Impl, void*, p, void )
+IMPL_STATIC_LINK( ToolbarModeMenuController, ExecuteHdl_Impl, void*, p, void )
{
ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
try
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 28fc45af1e98..1b649c8f6326 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -805,7 +805,7 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume
}
}
-IMPL_STATIC_LINK_TYPED( ToolbarsMenuController, ExecuteHdl_Impl, void*, p, void )
+IMPL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, void*, p, void )
{
ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
try
generated by cgit (git 2.34.1) at 2024-12-26 23:42:50 +0000