diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 | |
| parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) | |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
1865 files changed, 7147 insertions, 7147 deletions
diff --git a/accessibility/inc/extended/accessibletabbarbase.hxx b/accessibility/inc/extended/accessibletabbarbase.hxx index d0d9b6de0d5f..78162bf8f43e 100644 --- a/accessibility/inc/extended/accessibletabbarbase.hxx +++ b/accessibility/inc/extended/accessibletabbarbase.hxx @@ -40,7 +40,7 @@ public: virtual ~AccessibleTabBarBase() override; protected: - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx index 6f27b4efdc9e..5a41660d518f 100644 --- a/accessibility/inc/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/extended/accessibletablistboxtable.hxx @@ -41,7 +41,7 @@ private: css::uno::Reference< css::accessibility::XAccessible > m_xCurChild; void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); // helpers ---------------------------------------------------------------- diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx index ef673d93f4fe..7c84e19f8ec7 100644 --- a/accessibility/inc/extended/listboxaccessible.hxx +++ b/accessibility/inc/extended/listboxaccessible.hxx @@ -68,7 +68,7 @@ namespace accessibility void disposing(); private: - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); private: ListBoxAccessibleBase( const ListBoxAccessibleBase& ) = delete; diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index fbb7f9b810a2..6cb2d6a30243 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -579,7 +579,7 @@ private: // Assuming that this will only be called with the external (Solar) mutex // locked. // init will already have been called. - DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); + DECL_LINK(WindowEventHandler, VclWindowEvent&, void); // Must be called with both the external (Solar) and internal mutex // locked. diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index ace8ad33717f..417e7a6bcf12 100644 --- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -110,7 +110,7 @@ protected: virtual void Click(); virtual bool IsPopupMenuOpen(); - DECL_LINK_TYPED( MenuEventListener, VclMenuEvent&, void ); + DECL_LINK( MenuEventListener, VclMenuEvent&, void ); void ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent ); diff --git a/accessibility/inc/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/standard/vclxaccessiblemenubar.hxx index 530640103507..a4ecc4097335 100644 --- a/accessibility/inc/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenubar.hxx @@ -38,7 +38,7 @@ protected: virtual bool IsFocused() override; - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx index 11a26f8aa637..f75d4572a789 100644 --- a/accessibility/source/extended/accessibletabbarbase.cxx +++ b/accessibility/source/extended/accessibletabbarbase.cxx @@ -43,7 +43,7 @@ AccessibleTabBarBase::~AccessibleTabBarBase() DELETEZ( m_pExternalLock ); } -IMPL_LINK_TYPED( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent, void ) { vcl::Window* pEventWindow = rEvent.GetWindow(); OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" ); diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index f13ad1619032..1e25ee8837ea 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -251,7 +251,7 @@ namespace accessibility } } - IMPL_LINK_TYPED( AccessibleTabListBoxTable, WindowEventListener, VclWindowEvent&, rEvent, void ) + IMPL_LINK( AccessibleTabListBoxTable, WindowEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow() && m_pTabListBox, "no event window" ); ProcessWindowEvent( rEvent ); diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx index 533b3e208e66..db388f3a5732 100644 --- a/accessibility/source/extended/listboxaccessible.cxx +++ b/accessibility/source/extended/listboxaccessible.cxx @@ -41,7 +41,7 @@ namespace accessibility } } - IMPL_LINK_TYPED( ListBoxAccessibleBase, WindowEventListener, VclWindowEvent&, rEvent, void ) + IMPL_LINK( ListBoxAccessibleBase, WindowEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow() , "ListBoxAccessibleBase::WindowEventListener: no event window!" ); OSL_ENSURE( rEvent.GetWindow() == m_pWindow, "ListBoxAccessibleBase::WindowEventListener: where did this come from?" ); diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index f2aae5084506..5fd378821197 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1625,7 +1625,7 @@ void Document::Notify(::SfxBroadcaster &, ::SfxHint const & rHint) } } -IMPL_LINK_TYPED(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) +IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 4c4ecc7d624a..957e82490558 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -529,7 +529,7 @@ bool OAccessibleMenuBaseComponent::IsPopupMenuOpen() } -IMPL_LINK_TYPED( OAccessibleMenuBaseComponent, MenuEventListener, VclMenuEvent&, rEvent, void ) +IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclMenuEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetMenu(), "OAccessibleMenuBaseComponent - Menu?" ); ProcessMenuEvent( rEvent ); diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index ae0c21cbd4b3..ca917152d313 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -69,7 +69,7 @@ bool VCLXAccessibleMenuBar::IsFocused() } -IMPL_LINK_TYPED( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "VCLXAccessibleMenuBar::WindowEventListener: no window!" ); if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) ) diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index de0cde0c32b4..9feb1c15a486 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -64,12 +64,12 @@ protected: private: - DECL_LINK_TYPED( implTimeHdl, Slider*, void ); - DECL_LINK_TYPED( implTimeEndHdl, Slider*, void ); - DECL_LINK_TYPED( implVolumeHdl, Slider*, void ); - DECL_LINK_TYPED( implSelectHdl, ToolBox*, void ); - DECL_LINK_TYPED( implZoomSelectHdl, ListBox&, void ); - DECL_LINK_TYPED(implTimeoutHdl, Idle *, void); + DECL_LINK( implTimeHdl, Slider*, void ); + DECL_LINK( implTimeEndHdl, Slider*, void ); + DECL_LINK( implVolumeHdl, Slider*, void ); + DECL_LINK( implSelectHdl, ToolBox*, void ); + DECL_LINK( implZoomSelectHdl, ListBox&, void ); + DECL_LINK(implTimeoutHdl, Idle *, void); Idle maIdle; MediaItem maItem; diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index b2c12c0a2dda..872abab92f1f 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -255,7 +255,7 @@ void MediaControl::setState( const MediaItem& rItem ) } } -IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void ) +IMPL_LINK( MediaControl, implTimeHdl, Slider*, p, void ) { mbLocked = true; maIdle.Stop(); @@ -263,7 +263,7 @@ IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void ) } -IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void ) +IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p, void ) { MediaItem aExecItem; @@ -275,7 +275,7 @@ IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void ) } -IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void ) +IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p, void ) { MediaItem aExecItem; @@ -285,7 +285,7 @@ IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void ) } -IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) +IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p, void ) { if( p ) { @@ -321,7 +321,7 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) } -IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void ) +IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox&, p, void ) { MediaItem aExecItem; css::media::ZoomLevel eLevel; @@ -343,7 +343,7 @@ IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void ) } -IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void) +IMPL_LINK_NOARG(MediaControl, implTimeoutHdl, Idle *, void) { update(); } diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 785f6ced9964..753fddca4b52 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -298,7 +298,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property @return 0 every time... it doesn't matter for us. @threadsafe yes *//*-*************************************************************************************************************/ -IMPL_LINK_NOARG_TYPED(SoundHandler, implts_PlayerNotify, Idle *, void) +IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Idle *, void) { // SAFE { ::osl::ClearableMutexGuard aLock( m_aLock ); diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index b9f041445c22..de718d5b9897 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -110,7 +110,7 @@ class SoundHandler : // interfaces // private methods private: - DECL_LINK_TYPED( implts_PlayerNotify, Idle*, void ); + DECL_LINK( implts_PlayerNotify, Idle*, void ); // variables // (should be private everyway!) diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index a849a585f1da..37b76626315b 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -102,7 +102,7 @@ public: private: void processQueue(); - DECL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void*, void); + DECL_STATIC_LINK(MissingPluginInstaller, launchUi, void*, void); osl::Mutex mutex_; std::set<OString> reported_; @@ -235,7 +235,7 @@ void MissingPluginInstaller::processQueue() { } -IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void) +IMPL_STATIC_LINK(MissingPluginInstaller, launchUi, void *, p, void) { MissingPluginInstallerThread* thread = static_cast<MissingPluginInstallerThread*>(p); rtl::Reference<MissingPluginInstallerThread> ref(thread, SAL_NO_ACQUIRE); diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 4077e3b014d0..50fdf4c2a1be 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -358,7 +358,7 @@ uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames() return { "com.sun.star.media.Player_OpenGL" }; } -IMPL_LINK_TYPED(OGLPlayer,TimerHandler,Timer*,pTimer,void) +IMPL_LINK(OGLPlayer,TimerHandler,Timer*,pTimer,void) { if (pTimer == &m_aTimer) { diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx index 8a43fc7e28c3..05716ad33b5f 100644 --- a/avmedia/source/opengl/oglplayer.hxx +++ b/avmedia/source/opengl/oglplayer.hxx @@ -61,7 +61,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; private: - DECL_LINK_TYPED( TimerHandler, Timer*, void ); + DECL_LINK( TimerHandler, Timer*, void ); OUString m_sURL; diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx index 5c08d74df4d2..15ec0f7a52db 100644 --- a/avmedia/source/opengl/oglwindow.cxx +++ b/avmedia/source/opengl/oglwindow.cxx @@ -199,7 +199,7 @@ void SAL_CALL OGLWindow::removePaintListener( const uno::Reference< awt::XPaintL { } -IMPL_LINK_TYPED(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void) +IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void) { if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE ) { @@ -225,7 +225,7 @@ IMPL_LINK_TYPED(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void) } } -IMPL_LINK_TYPED(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void) { if( rEvent.GetId() == VCLEVENT_WINDOW_KEYINPUT ) { diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx index c6bd9cd857b1..d89f2735fccb 100644 --- a/avmedia/source/opengl/oglwindow.hxx +++ b/avmedia/source/opengl/oglwindow.hxx @@ -62,8 +62,8 @@ public: virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; private: - DECL_LINK_TYPED( FocusGrabber, VclWindowEvent&, void ); - DECL_LINK_TYPED( CameraHandler, VclWindowEvent&, void ); + DECL_LINK( FocusGrabber, VclWindowEvent&, void ); + DECL_LINK( CameraHandler, VclWindowEvent&, void ); libgltf::glTFHandle& m_rHandle; rtl::Reference<OpenGLContext> m_xContext; diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 6092d460fae2..830d885373b7 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -328,7 +328,7 @@ void AccessibleDialogWindow::SortChildren() } -IMPL_LINK_TYPED( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, rEvent, void ) { DBG_ASSERT(rEvent.GetWindow(), "AccessibleDialogWindow::WindowEventListener: no window!"); if (!rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || rEvent.GetId() == VCLEVENT_OBJECT_DYING) diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 4ad9d08bae2f..23976945e3f8 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -88,7 +88,7 @@ private: SyntaxHighlighter aHighlighter; Idle aSyntaxIdle; std::set<sal_uInt16> aSyntaxLineTable; - DECL_LINK_TYPED(SyntaxTimerHdl, Idle *, void); + DECL_LINK(SyntaxTimerHdl, Idle *, void); // progress bar class ProgressInfo; @@ -233,10 +233,10 @@ protected: virtual void Resize() override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; - DECL_LINK_TYPED( ButtonHdl, Button *, void ); - DECL_LINK_TYPED(TreeListHdl, SvTreeListBox*, void); - DECL_LINK_TYPED( implEndDragHdl, HeaderBar *, void ); - DECL_LINK_TYPED( EditAccHdl, Accelerator&, void ); + DECL_LINK( ButtonHdl, Button *, void ); + DECL_LINK(TreeListHdl, SvTreeListBox*, void); + DECL_LINK( implEndDragHdl, HeaderBar *, void ); + DECL_LINK( EditAccHdl, Accelerator&, void ); public: @@ -281,7 +281,7 @@ private: protected: virtual void Resize() override; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); public: explicit ComplexEditorWindow( ModulWindow* pParent ); @@ -494,8 +494,8 @@ public: virtual void dispose() override; void InsertSelectedEntry(); //insert the selected entry - DECL_LINK_TYPED(ImplDoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(ImplSelectHdl, ListBox&, void); + DECL_LINK(ImplDoubleClickHdl, ListBox&, void); + DECL_LINK(ImplSelectHdl, ListBox&, void); protected: virtual void KeyInput( const KeyEvent& rKeyEvt ) override; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 1c31380cb296..9b8eb6fc53e6 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1272,7 +1272,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara ) } } -IMPL_LINK_NOARG_TYPED(EditorWindow, SyntaxTimerHdl, Idle *, void) +IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl, Idle *, void) { DBG_ASSERT( pEditView, "Noch keine View, aber Syntax-Highlight ?!" ); @@ -1762,21 +1762,21 @@ void WatchWindow::RemoveSelectedWatch() } -IMPL_LINK_TYPED( WatchWindow, ButtonHdl, Button *, pButton, void ) +IMPL_LINK( WatchWindow, ButtonHdl, Button *, pButton, void ) { if (pButton == aRemoveWatchButton.get()) if (SfxDispatcher* pDispatcher = GetDispatcher()) pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH); } -IMPL_LINK_NOARG_TYPED(WatchWindow, TreeListHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(WatchWindow, TreeListHdl, SvTreeListBox*, void) { SvTreeListEntry* pCurEntry = aTreeListBox->GetCurEntry(); if ( pCurEntry && pCurEntry->GetUserData() ) aXEdit->SetText( static_cast<WatchItem*>(pCurEntry->GetUserData())->maName ); } -IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void ) +IMPL_LINK_NOARG( WatchWindow, implEndDragHdl, HeaderBar *, void ) { const sal_Int32 TAB_WIDTH_MIN = 10; sal_Int32 nMaxWidth = @@ -1806,7 +1806,7 @@ IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void ) } } -IMPL_LINK_TYPED( WatchWindow, EditAccHdl, Accelerator&, rAcc, void ) +IMPL_LINK( WatchWindow, EditAccHdl, Accelerator&, rAcc, void ) { switch ( rAcc.GetCurKeyCode().GetCode() ) { @@ -2028,7 +2028,7 @@ void ComplexEditorWindow::Resize() aEWVScrollBar->SetPosSizePixel( Point( aOutSz.Width() - DWBORDER - nSBWidth, DWBORDER ), Size( nSBWidth, aSz.Height() ) ); } -IMPL_LINK_TYPED(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void ) +IMPL_LINK(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void ) { if (aEdtWindow->GetEditView()) { @@ -2616,12 +2616,12 @@ void CodeCompleteListBox::dispose() ListBox::dispose(); } -IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplDoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(CodeCompleteListBox, ImplDoubleClickHdl, ListBox&, void) { InsertSelectedEntry(); } -IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectHdl, ListBox&, void) {//give back the focus to the parent pCodeCompleteWindow->pParent->GrabFocus(); } diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index c318fc67ba51..a7ef0e09f2e5 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -217,7 +217,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt ) } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, pUndoAction, void ) { // #i120515# pUndoAction needs to be deleted, this hand over is an ownership diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index e919ebe43ab2..2cea9d1d8b0b 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -437,7 +437,7 @@ void Shell::OuterResizePixel( const Point &rPos, const Size &rSize ) } -IMPL_LINK_TYPED( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void ) +IMPL_LINK( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void ) { sal_uInt16 nCurId = pCurTabBar->GetCurPageId(); BaseWindow* pWin = aWindowTable[ nCurId ]; diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 82a7ea2543dc..0f383e436b23 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -209,10 +209,10 @@ namespace class MacroExecution { public: - DECL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, void ); + DECL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, void*, void ); }; - IMPL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, p, void ) + IMPL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, void*, p, void ) { MacroExecutionData* i_pData = static_cast<MacroExecutionData*>(p); ENSURE_OR_RETURN_VOID( i_pData, "wrong MacroExecutionData" ); diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx index 5f946ca5a2c3..5c8892502489 100644 --- a/basctl/source/basicide/bastype3.hxx +++ b/basctl/source/basicide/bastype3.hxx @@ -34,9 +34,9 @@ private: Link<ExtendedEdit*,void> aLoseFocusHdl; protected: - DECL_LINK_TYPED( EditAccHdl, Accelerator&, void ); - DECL_LINK_TYPED( ImplGetFocusHdl, Control&, void ); - DECL_LINK_TYPED( ImplLoseFocusHdl, Control&, void ); + DECL_LINK( EditAccHdl, Accelerator&, void ); + DECL_LINK( ImplGetFocusHdl, Control&, void ); + DECL_LINK( ImplLoseFocusHdl, Control&, void ); public: ExtendedEdit( vcl::Window* pParent, IDEResId nRes ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index fb57bc791ece..9bff85d0dd3b 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -90,7 +90,7 @@ void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ) } -IMPL_LINK_TYPED( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void ) +IMPL_LINK( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void ) { DoScroll( pCurScrollBar ); } @@ -426,20 +426,20 @@ ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) : Control::SetLoseFocusHdl( LINK( this, ExtendedEdit, ImplLoseFocusHdl ) ); } -IMPL_LINK_NOARG_TYPED(ExtendedEdit, ImplGetFocusHdl, Control&, void) +IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl, Control&, void) { Application::InsertAccel( &aAcc ); aLoseFocusHdl.Call( this ); } -IMPL_LINK_NOARG_TYPED(ExtendedEdit, ImplLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl, Control&, void) { Application::RemoveAccel( &aAcc ); } -IMPL_LINK_TYPED( ExtendedEdit, EditAccHdl, Accelerator&, rAcc, void ) +IMPL_LINK( ExtendedEdit, EditAccHdl, Accelerator&, rAcc, void ) { aAccHdl.Call( rAcc ); } diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 37c863b79823..5695a584b5d8 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -149,7 +149,7 @@ void BreakPointDialog::CheckButtons() } } -IMPL_LINK_TYPED( BreakPointDialog, CheckBoxHdl, Button *, pButton, void ) +IMPL_LINK( BreakPointDialog, CheckBoxHdl, Button *, pButton, void ) { ::CheckBox * pChkBx = static_cast<::CheckBox*>(pButton); BreakPoint* pBrk = GetSelectedBreakPoint(); @@ -157,7 +157,7 @@ IMPL_LINK_TYPED( BreakPointDialog, CheckBoxHdl, Button *, pButton, void ) pBrk->bEnabled = pChkBx->IsChecked(); } -IMPL_LINK_TYPED( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void ) +IMPL_LINK( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void ) { m_pNewButton->Disable(); m_pOKButton->Enable(); @@ -170,7 +170,7 @@ IMPL_LINK_TYPED( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void ) } -IMPL_LINK_TYPED( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void ) { if (&rEdit == m_pComboBox) CheckButtons(); @@ -183,7 +183,7 @@ IMPL_LINK_TYPED( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void ) } -IMPL_LINK_TYPED( BreakPointDialog, ButtonHdl, Button *, pButton, void ) +IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton, void ) { if (pButton == m_pOKButton) { diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index a3b0715f5f72..2a93ef2131e7 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -43,10 +43,10 @@ private: protected: void CheckButtons(); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( ComboBoxHighlightHdl, ComboBox&, void ); - DECL_LINK_TYPED( EditModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ButtonHdl, Button*, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( ComboBoxHighlightHdl, ComboBox&, void ); + DECL_LINK( EditModifyHdl, Edit&, void ); + DECL_LINK( ButtonHdl, Button*, void ); void UpdateFields( BreakPoint* pBrk ); BreakPoint* GetSelectedBreakPoint(); diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 2ea8a295d113..eb0e6ddce679 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -170,7 +170,7 @@ void ExtraData::SetSearchItem (const SvxSearchItem& rItem) pSearchItem.reset(static_cast<SvxSearchItem*>(rItem.Clone())); } -IMPL_STATIC_LINK_TYPED(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic, sal_uInt16) +IMPL_STATIC_LINK(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic, sal_uInt16) { sal_uInt16 nRet = 0; if (Shell* pShell = GetShell()) diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx index 896a870030c1..1409dc4cd958 100644 --- a/basctl/source/basicide/iderdll2.hxx +++ b/basctl/source/basicide/iderdll2.hxx @@ -48,7 +48,7 @@ private: bool bShellInCriticalSection; protected: - DECL_STATIC_LINK_TYPED( ExtraData, GlobalBasicBreakHdl, StarBASIC *, sal_uInt16 ); + DECL_STATIC_LINK( ExtraData, GlobalBasicBreakHdl, StarBASIC *, sal_uInt16 ); public: ExtraData(); diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 50ba83481aa1..cf9430592734 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -362,7 +362,7 @@ void Layout::SplittedSide::ArrangeIn (Rectangle const& rRect) } } -IMPL_LINK_TYPED(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter, void) +IMPL_LINK(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter, void) { // checking margins CheckMarginsFor(pSplitter); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index aed300eef587..a14f9847ac0a 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -456,7 +456,7 @@ void MacroChooser::CheckButtons() } -IMPL_LINK_NOARG_TYPED(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool) { StoreMacroDescription(); if (nMode == Recording) @@ -470,7 +470,7 @@ IMPL_LINK_NOARG_TYPED(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool) return false; } -IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void ) { // Is also called if deselected! // Two function calls in every SelectHdl because @@ -483,7 +483,7 @@ IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void ) } } -IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void ) { // Is also called if deselected! // Two function calls in every SelectHdl because @@ -533,7 +533,7 @@ IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void ) } -IMPL_LINK_NOARG_TYPED( MacroChooser, EditModifyHdl, Edit&, void ) +IMPL_LINK_NOARG( MacroChooser, EditModifyHdl, Edit&, void ) { // select the module in which the macro is put at Neu (new), // if BasicManager or Lib is selecting @@ -590,7 +590,7 @@ IMPL_LINK_NOARG_TYPED( MacroChooser, EditModifyHdl, Edit&, void ) } -IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void ) +IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton, void ) { // apart from New/Record the Description is done by LoseFocus if (pButton == m_pRunButton) diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index 28c3f9cb2028..052aa52edcaa 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -67,11 +67,11 @@ private: Mode nMode; - DECL_LINK_TYPED( MacroSelectHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( MacroDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( BasicSelectHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( EditModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ButtonHdl, Button *, void ); + DECL_LINK( MacroSelectHdl, SvTreeListBox *, void ); + DECL_LINK( MacroDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( BasicSelectHdl, SvTreeListBox *, void ); + DECL_LINK( EditModifyHdl, Edit&, void ); + DECL_LINK( ButtonHdl, Button *, void ); void CheckButtons(); void SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index a513944fed83..b4933cdb1c56 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -353,7 +353,7 @@ bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName ) } // NewObjectDialog -IMPL_LINK_NOARG_TYPED(NewObjectDialog, OkButtonHandler, Button*, void) +IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler, Button*, void) { if (IsValidSbxName(m_pEdit->GetText())) EndDialog(1); @@ -435,7 +435,7 @@ sal_Int32 GotoLineDialog::GetLineNumber() const return m_pEdit->GetText().toInt32(); } -IMPL_LINK_NOARG_TYPED(GotoLineDialog, OkButtonHandler, Button*, void) +IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler, Button*, void) { if ( GetLineNumber() ) EndDialog(1); @@ -444,7 +444,7 @@ IMPL_LINK_NOARG_TYPED(GotoLineDialog, OkButtonHandler, Button*, void) } // ExportDialog -IMPL_LINK_NOARG_TYPED(ExportDialog, OkButtonHandler, Button*, void) +IMPL_LINK_NOARG(ExportDialog, OkButtonHandler, Button*, void) { mbExportAsPackage = m_pExportAsPackageButton->IsChecked(); EndDialog(1); @@ -607,19 +607,19 @@ void LibPage::DeactivatePage() { } -IMPL_LINK_TYPED( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void ) { if ( pBox->IsSelected( pBox->GetHdlEntry() ) ) CheckButtons(); } -IMPL_LINK_NOARG_TYPED( LibPage, BasicSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( LibPage, BasicSelectHdl, ListBox&, void ) { SetCurLib(); CheckButtons(); } -IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void ) +IMPL_LINK( LibPage, ButtonHdl, Button *, pButton, void ) { if (pButton == m_pEditButton) { @@ -707,7 +707,7 @@ IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void ) CheckButtons(); } -IMPL_LINK_TYPED( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg, bool ) +IMPL_LINK( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg, bool ) { bool bRet = false; diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 02daa5d69ebb..5a7ce994f70c 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -506,7 +506,7 @@ short OrganizeDialog::Execute() return TabDialog::Execute(); } -IMPL_LINK_TYPED( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) +IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) { sal_uInt16 nId = pTabCtrl->GetCurPageId(); @@ -679,7 +679,7 @@ void ObjectPage::CheckButtons() m_pDelButton->Disable(); } -IMPL_LINK_TYPED( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void ) +IMPL_LINK( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void ) { if ( !pBox->IsSelected( pBox->GetHdlEntry() ) ) return; @@ -687,7 +687,7 @@ IMPL_LINK_TYPED( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void ) CheckButtons(); } -IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton, void ) +IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton, void ) { if (pButton == m_pEditButton) { diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 074871fc503d..20a53ba782f1 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -51,7 +51,7 @@ private: VclPtr<Edit> m_pEdit; VclPtr<OKButton> m_pOKButton; - DECL_LINK_TYPED(OkButtonHandler, Button*, void); + DECL_LINK(OkButtonHandler, Button*, void); public: NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false); virtual ~NewObjectDialog() override; @@ -68,7 +68,7 @@ class GotoLineDialog : public ModalDialog { VclPtr<Edit> m_pEdit; VclPtr<OKButton> m_pOKButton; - DECL_LINK_TYPED(OkButtonHandler, Button*, void); + DECL_LINK(OkButtonHandler, Button*, void); public: explicit GotoLineDialog(vcl::Window * pParent); virtual ~GotoLineDialog() override; @@ -84,7 +84,7 @@ private: bool mbExportAsPackage; - DECL_LINK_TYPED(OkButtonHandler, Button*, void); + DECL_LINK(OkButtonHandler, Button*, void); public: explicit ExportDialog( vcl::Window * pParent ); @@ -178,7 +178,7 @@ public: virtual short Execute() override; - DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void ); + DECL_LINK( ActivatePageHdl, TabControl*, void ); }; class ObjectPage: public TabPage @@ -190,8 +190,8 @@ protected: VclPtr<PushButton> m_pNewDlgButton; VclPtr<PushButton> m_pDelButton; - DECL_LINK_TYPED( BasicBoxHighlightHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ButtonHdl, Button *, void ); + DECL_LINK( BasicBoxHighlightHdl, SvTreeListBox*, void ); + DECL_LINK( ButtonHdl, Button *, void ); void CheckButtons(); bool GetSelection( ScriptDocument& rDocument, OUString& rLibName ); void DeleteCurrent(); @@ -229,10 +229,10 @@ protected: ScriptDocument m_aCurDocument; LibraryLocation m_eCurLocation; - DECL_LINK_TYPED( TreeListHighlightHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( BasicSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ButtonHdl, Button *, void ); - DECL_LINK_TYPED( CheckPasswordHdl, SvxPasswordDialog *, bool ); + DECL_LINK( TreeListHighlightHdl, SvTreeListBox *, void ); + DECL_LINK( BasicSelectHdl, ListBox&, void ); + DECL_LINK( ButtonHdl, Button *, void ); + DECL_LINK( CheckPasswordHdl, SvxPasswordDialog *, bool ); void CheckButtons(); void DeleteCurrent(); void NewLib(); diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 157a2eb8ed0f..363f043465b9 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -575,7 +575,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect } -IMPL_LINK_NOARG_TYPED(DlgEditor, MarkTimeout, Idle *, void) +IMPL_LINK_NOARG(DlgEditor, MarkTimeout, Idle *, void) { rLayout.UpdatePropertyBrowser(); } diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index d1df0c1f13bb..cb2fbc68660d 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -43,7 +43,7 @@ DlgEdFactory::~DlgEdFactory() } -IMPL_LINK_TYPED( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) +IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { static bool bNeedsInit = true; static uno::Reference< lang::XMultiServiceFactory > xDialogSFact; diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 491e3c523466..30a95a8541f4 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -27,7 +27,7 @@ namespace basctl { -IMPL_LINK_TYPED( DlgEdFunc, ScrollTimeout, Timer *, pTimer, void ) +IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, pTimer, void ) { (void)pTimer; vcl::Window& rWindow = rParent.GetWindow(); diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 0716056fb000..ab6bb4818bc2 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -144,7 +144,7 @@ void ManageLanguageDialog::ClearLanguageBox() m_pLanguageLB->Clear(); } -IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, AddHdl, Button*, void) +IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl, Button*, void) { ScopedVclPtrInstance< SetDefaultLanguageDialog > aDlg( this, m_xLocalizationMgr ); if ( RET_OK == aDlg->Execute() ) @@ -168,7 +168,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, AddHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void) { ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelangdialog.ui"); if ( aQBox->Execute() == RET_OK ) @@ -197,7 +197,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void) +IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl, Button*, void) { const sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos(); LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos )); @@ -214,7 +214,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, ListBox&, void) { const sal_Int32 nCount = m_pLanguageLB->GetEntryCount(); bool bEmpty = ( !nCount || diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 714b96fbd277..1da0a2f905f0 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -95,7 +95,7 @@ protected: void UpdateChildren(); void SortChildren(); - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 5c9fea0defac..35c4161c5a89 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -73,7 +73,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ) override; virtual void LoseFocus() override; - DECL_STATIC_LINK_TYPED( DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, void ); + DECL_STATIC_LINK( DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, void ); virtual void DoInit() override; virtual void DoScroll( ScrollBar* pCurScrollBar ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index e756caa9f4f8..d6acd5c5578c 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -101,7 +101,7 @@ private: void ImplStartListening( StarBASIC* pBasic ); - DECL_LINK_TYPED( TabBarHdl, ::TabBar*, void ); + DECL_LINK( TabBarHdl, ::TabBar*, void ); static unsigned nShellCount; diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 8c668c344532..20f9f8f1471f 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -153,7 +153,7 @@ private: VclPtr<ScrollBar> pShellHScrollBar; VclPtr<ScrollBar> pShellVScrollBar; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); int nStatus; ScriptDocument m_aDocument; diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 191d92910018..d4af255a843c 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -102,7 +102,7 @@ public: }; private: - DECL_LINK_TYPED(MarkTimeout, Idle *, void); + DECL_LINK(MarkTimeout, Idle *, void); static void Print( Printer* pPrinter, const OUString& rTitle ); diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx index a824921388f8..60bc4418ff8c 100644 --- a/basctl/source/inc/dlgedfac.hxx +++ b/basctl/source/inc/dlgedfac.hxx @@ -38,7 +38,7 @@ public: DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel ); ~DlgEdFactory(); - DECL_LINK_TYPED( MakeObject, SdrObjCreatorParams, SdrObject* ); + DECL_LINK( MakeObject, SdrObjCreatorParams, SdrObject* ); }; } // namespace basctl diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx index 7f198457ca7e..f4c64518bc03 100644 --- a/basctl/source/inc/dlgedfunc.hxx +++ b/basctl/source/inc/dlgedfunc.hxx @@ -35,7 +35,7 @@ protected: DlgEditor& rParent; Timer aScrollTimer; - DECL_LINK_TYPED( ScrollTimeout, Timer *, void ); + DECL_LINK( ScrollTimeout, Timer *, void ); void ForceScroll( const Point& rPos ); public: diff --git a/basctl/source/inc/layout.hxx b/basctl/source/inc/layout.hxx index 71e642d32b39..434b6b160856 100644 --- a/basctl/source/inc/layout.hxx +++ b/basctl/source/inc/layout.hxx @@ -121,7 +121,7 @@ private: Point MakePoint (long, long) const; Size MakeSize (long, long) const; static bool IsDocking (DockingWindow const&); - DECL_LINK_TYPED(SplitHdl, Splitter*, void); + DECL_LINK(SplitHdl, Splitter*, void); void CheckMarginsFor (Splitter*); void InitSplitter (Splitter&); } aLeftSide, aBottomSide; diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 3ccc75742fb2..a965416254a1 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -63,10 +63,10 @@ private: void FillLanguageBox(); void ClearLanguageBox(); - DECL_LINK_TYPED(AddHdl, Button*, void); - DECL_LINK_TYPED(DeleteHdl, Button*, void); - DECL_LINK_TYPED(MakeDefHdl, Button*, void); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); + DECL_LINK(AddHdl, Button*, void); + DECL_LINK(DeleteHdl, Button*, void); + DECL_LINK(MakeDefHdl, Button*, void); + DECL_LINK(SelectHdl, ListBox&, void); public: ManageLanguageDialog( vcl::Window* pParent, std::shared_ptr<LocalizationMgr> const & _pLMgr ); diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx index 0ff361966758..7b5aa22a1927 100644 --- a/basic/qa/cppunit/basictest.cxx +++ b/basic/qa/cppunit/basictest.cxx @@ -112,7 +112,7 @@ bool MacroSnippet::Compile() bool MacroSnippet::HasError() { return mbError; } -IMPL_LINK_TYPED( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool) +IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool) { fprintf(stderr,"(%d:%d)\n", StarBASIC::GetLine(), StarBASIC::GetCol1()); diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx index b287e56f18a1..d435489846fb 100644 --- a/basic/qa/cppunit/basictest.hxx +++ b/basic/qa/cppunit/basictest.hxx @@ -43,7 +43,7 @@ public: bool Compile(); - DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool ); + DECL_LINK( BasicErrorHdl, StarBASIC *, bool ); bool HasError(); }; diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index d4b7e3750b5b..6388ef712ed9 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -456,10 +456,10 @@ public: uno::Reference< frame::XDesktop2 > xDeskTop = frame::Desktop::create( comphelper::getProcessComponentContext() ); xDeskTop->terminate(); } - DECL_STATIC_LINK_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void ); + DECL_STATIC_LINK( AsyncQuitHandler, OnAsyncQuit, void*, void ); }; -IMPL_STATIC_LINK_NOARG_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void ) +IMPL_STATIC_LINK_NOARG( AsyncQuitHandler, OnAsyncQuit, void*, void ) { QuitApplication(); } @@ -1732,11 +1732,11 @@ public: // restore error handler StarBASIC::SetGlobalErrorHdl(mErrHandler); } - DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool ); + DECL_LINK( BasicErrorHdl, StarBASIC *, bool ); bool HasError() { return mbError; } }; -IMPL_LINK_TYPED( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool) +IMPL_LINK( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool) { mbError = true; return false; diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index fb84c1af06ed..945e610dc1ed 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -67,7 +67,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv ) return nDdeErrMap[ 2 * (nErr - DDE_FIRSTERR) + 1 ]; } -IMPL_LINK_TYPED( SbiDdeControl, Data, const DdeData*, pData, void ) +IMPL_LINK( SbiDdeControl, Data, const DdeData*, pData, void ) { aData = OUString::createFromAscii( static_cast<const char*>(static_cast<const void*>(*pData)) ); } diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx index 0eaac2123b51..a961b19b405f 100644 --- a/basic/source/runtime/ddectrl.hxx +++ b/basic/source/runtime/ddectrl.hxx @@ -29,7 +29,7 @@ class DdeData; class SbiDdeControl { private: - DECL_LINK_TYPED( Data, const DdeData*, void ); + DECL_LINK( Data, const DdeData*, void ); static SbError GetLastErr( DdeConnection* ); size_t GetFreeChannel(); std::vector<DdeConnection*> aConvList; diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index b0a4655e8a0e..4b89c6c4cf08 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -40,8 +40,8 @@ class SvRTLInputBox : public ModalDialog void InitButtons( const Size& rDlgSize ); void PositionEdit( const Size& rDlgSize ); void PositionPrompt( const OUString& rPrompt, const Size& rDlgSize ); - DECL_LINK_TYPED( OkHdl, Button *, void ); - DECL_LINK_TYPED( CancelHdl, Button *, void ); + DECL_LINK( OkHdl, Button *, void ); + DECL_LINK( CancelHdl, Button *, void ); public: SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle, @@ -129,13 +129,13 @@ void SvRTLInputBox::PositionPrompt(const OUString& rPrompt,const Size& rDlgSize) } -IMPL_LINK_NOARG_TYPED( SvRTLInputBox, OkHdl, Button *, void ) +IMPL_LINK_NOARG( SvRTLInputBox, OkHdl, Button *, void ) { aText = aEdit->GetText(); EndDialog( 1 ); } -IMPL_LINK_NOARG_TYPED( SvRTLInputBox, CancelHdl, Button *, void ) +IMPL_LINK_NOARG( SvRTLInputBox, CancelHdl, Button *, void ) { aText.clear(); EndDialog(); diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 05020f6082ce..a56d6e33373d 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -66,8 +66,8 @@ class SbiInputDialog : public ModalDialog { VclPtr<OKButton> aOk; VclPtr<CancelButton> aCancel; OUString aText; - DECL_LINK_TYPED( Ok, Button *, void ); - DECL_LINK_TYPED( Cancel, Button *, void ); + DECL_LINK( Ok, Button *, void ); + DECL_LINK( Cancel, Button *, void ); public: SbiInputDialog( vcl::Window*, const OUString& ); virtual ~SbiInputDialog() override { disposeOnce(); } @@ -111,13 +111,13 @@ void SbiInputDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( SbiInputDialog, Ok, Button *, void ) +IMPL_LINK_NOARG( SbiInputDialog, Ok, Button *, void ) { aText = aInput->GetText(); EndDialog( 1 ); } -IMPL_LINK_NOARG_TYPED( SbiInputDialog, Cancel, Button *, void ) +IMPL_LINK_NOARG( SbiInputDialog, Cancel, Button *, void ) { EndDialog(); } diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index f4170353d83e..c26122f6ca02 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -229,7 +229,7 @@ private: //methods css::awt::Rectangle impl_createDiagramAndContent( const CreateShapeParam2D& rParam, const css::awt::Size& rPageSize ); - DECL_LINK_TYPED( UpdateTimeBased, Timer*, void ); + DECL_LINK( UpdateTimeBased, Timer*, void ); private: //member ::osl::Mutex m_aMutex; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 972e52db5eb7..0956589ee991 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -1205,7 +1205,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref } } -IMPL_LINK_NOARG_TYPED(CombiColumnLineChartDialogController, ChangeLineCountHdl, Edit&, void) +IMPL_LINK_NOARG(CombiColumnLineChartDialogController, ChangeLineCountHdl, Edit&, void) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 81e2115d49e0..ec36f07ddff0 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -280,7 +280,7 @@ public: virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException) override; private: - DECL_LINK_TYPED( ChangeLineCountHdl, Edit&, void ); + DECL_LINK( ChangeLineCountHdl, Edit&, void ); private: VclPtr<FixedText> m_pFT_NumberOfLines; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index bee501889089..79b214efd9a7 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -181,8 +181,8 @@ private: Link<SeriesHeaderEdit*,void> m_aChangeLink; void notifyChanges(); - DECL_LINK_TYPED( SeriesNameChanged, Edit&, void ); - DECL_LINK_TYPED( SeriesNameEdited, Edit&, void ); + DECL_LINK( SeriesNameChanged, Edit&, void ); + DECL_LINK( SeriesNameEdited, Edit&, void ); static Image GetChartTypeImage( const Reference< chart2::XChartType > & xChartType, @@ -321,12 +321,12 @@ void SeriesHeader::SetEditChangedHdl( const Link<SeriesHeaderEdit*,void> & rLink m_aChangeLink = rLink; } -IMPL_LINK_NOARG_TYPED(SeriesHeader, SeriesNameChanged, Edit&, void) +IMPL_LINK_NOARG(SeriesHeader, SeriesNameChanged, Edit&, void) { notifyChanges(); } -IMPL_LINK_NOARG_TYPED(SeriesHeader, SeriesNameEdited, Edit&, void) +IMPL_LINK_NOARG(SeriesHeader, SeriesNameEdited, Edit&, void) { m_bSeriesNameChangePending = true; } @@ -1285,7 +1285,7 @@ void DataBrowser::ImplAdjustHeaderControls() } } -IMPL_LINK_TYPED( DataBrowser, SeriesHeaderGotFocus, Control&, rControl, void ) +IMPL_LINK( DataBrowser, SeriesHeaderGotFocus, Control&, rControl, void ) { impl::SeriesHeaderEdit* pEdit = static_cast<impl::SeriesHeaderEdit*>(&rControl); pEdit->SetShowWarningBox( !m_bDataValid ); @@ -1300,7 +1300,7 @@ IMPL_LINK_TYPED( DataBrowser, SeriesHeaderGotFocus, Control&, rControl, void ) } } -IMPL_LINK_TYPED( DataBrowser, SeriesHeaderChanged, impl::SeriesHeaderEdit*, pEdit, void ) +IMPL_LINK( DataBrowser, SeriesHeaderChanged, impl::SeriesHeaderEdit*, pEdit, void ) { if( pEdit ) { diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 4724ac8d7076..cc67b5b07dfd 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -175,8 +175,8 @@ private: OUString GetColString( sal_Int32 nColumnId ) const; static OUString GetRowString( sal_Int32 nRow ); - DECL_LINK_TYPED( SeriesHeaderGotFocus, Control&, void ); - DECL_LINK_TYPED( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void ); + DECL_LINK( SeriesHeaderGotFocus, Control&, void ); + DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void ); DataBrowser( const DataBrowser & ) = delete; }; diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index 565c0e74718c..66293238f55f 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -45,7 +45,7 @@ void TimerTriggeredControllerLock::startTimer() m_apControllerLockGuard.reset( new ControllerLockGuardUNO(m_xModel) ); m_aTimer.Start(); } -IMPL_LINK_NOARG_TYPED(TimerTriggeredControllerLock, TimerTimeout, Timer *, void) +IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout, Timer *, void) { m_apControllerLockGuard.reset(); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 21b9a2d6a9c9..16696b0b7c34 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -208,7 +208,7 @@ void CreationWizardUnoDlg::createDialogOnDemand() } } } -IMPL_LINK_TYPED( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void ) { if(rEvent.GetId() == VCLEVENT_OBJECT_DYING) m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index a12497c38ed1..36af3ffcb78d 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -111,7 +111,7 @@ void DataEditor::dispose() } // react on click (or keypress) on toolbar icon -IMPL_LINK_NOARG_TYPED(DataEditor, ToolboxHdl, ToolBox *, void) +IMPL_LINK_NOARG(DataEditor, ToolboxHdl, ToolBox *, void) { sal_uInt16 nId = m_pTbxData->GetCurItemId(); @@ -132,7 +132,7 @@ IMPL_LINK_NOARG_TYPED(DataEditor, ToolboxHdl, ToolBox *, void) } // refresh toolbar icons according to currently selected cell in browse box -IMPL_LINK_NOARG_TYPED(DataEditor, BrowserCursorMovedHdl, DataBrowser*, void) +IMPL_LINK_NOARG(DataEditor, BrowserCursorMovedHdl, DataBrowser*, void) { if( m_bReadOnly ) return; @@ -167,7 +167,7 @@ void DataEditor::SetReadOnly( bool bReadOnly ) m_xBrwData->SetReadOnly( m_bReadOnly ); } -IMPL_LINK_NOARG_TYPED(DataEditor, MiscHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(DataEditor, MiscHdl, LinkParamNone*, void) { SvtMiscOptions aMiscOptions; sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() ); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index c3e5547e2ab0..d5ead3a404a5 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -639,7 +639,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) } } -IMPL_LINK_TYPED(SchAttribTabDlg, OKPressed, Button*, pButton, void) +IMPL_LINK(SchAttribTabDlg, OKPressed, Button*, pButton, void) { m_bOKPressed = true; m_aOriginalOKClickHdl.Call( pButton ); diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 8d4a31cc315b..fc3cf0449cb9 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -182,7 +182,7 @@ void DataLabelResources::SetNumberFormatter( SvNumberFormatter* pFormatter ) m_pNumberFormatter = pFormatter; } -IMPL_LINK_TYPED( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, void ) +IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, void ) { if( !m_pPool || !m_pNumberFormatter ) { @@ -230,7 +230,7 @@ IMPL_LINK_TYPED( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, v } } -IMPL_LINK_TYPED( DataLabelResources, CheckHdl, Button*, pBox, void ) +IMPL_LINK( DataLabelResources, CheckHdl, Button*, pBox, void ) { if( pBox ) static_cast<CheckBox*>(pBox)->EnableTriState( false ); diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index 2f715e5a44f5..01366656179d 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -83,8 +83,8 @@ private: VclPtr<vcl::Window> m_pWindow; SfxItemPool* m_pPool; - DECL_LINK_TYPED(NumberFormatDialogHdl, Button *, void ); - DECL_LINK_TYPED(CheckHdl, Button*, void ); + DECL_LINK(NumberFormatDialogHdl, Button *, void ); + DECL_LINK(CheckHdl, Button*, void ); void EnableControls(); }; diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 0294813bd294..4296b9502b86 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -340,12 +340,12 @@ void ErrorBarResources::UpdateControlStates() } } -IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen2, ListBox&, void ) +IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen2, ListBox&, void ) { CategoryChosen(nullptr); } -IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void ) +IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, Button*, void ) { m_bErrorKindUnique = true; SvxChartKindError eOldError = m_eErrorKind; @@ -403,13 +403,13 @@ IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void ) UpdateControlStates(); } -IMPL_LINK_NOARG_TYPED(ErrorBarResources, SynchronizePosAndNeg, CheckBox&, void) +IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg, CheckBox&, void) { UpdateControlStates(); PosValueChanged( *m_pMfPositive ); } -IMPL_LINK_NOARG_TYPED(ErrorBarResources, PosValueChanged, Edit&, void) +IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged, Edit&, void) { if( m_pCbSyncPosNeg->IsChecked()) { @@ -423,7 +423,7 @@ IMPL_LINK_NOARG_TYPED(ErrorBarResources, PosValueChanged, Edit&, void) } } -IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void) +IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, Button*, void) { m_bIndicatorUnique = true; if( m_pRbBoth->IsChecked()) @@ -438,7 +438,7 @@ IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void) UpdateControlStates(); } -IMPL_LINK_TYPED( ErrorBarResources, ChooseRange, Button*, pButton, void ) +IMPL_LINK( ErrorBarResources, ChooseRange, Button*, pButton, void ) { OSL_ASSERT( m_apRangeSelectionHelper.get()); if( ! m_apRangeSelectionHelper.get()) @@ -470,7 +470,7 @@ IMPL_LINK_TYPED( ErrorBarResources, ChooseRange, Button*, pButton, void ) m_pCurrentRangeChoosingField = nullptr; } -IMPL_LINK_TYPED( ErrorBarResources, RangeChanged, Edit&, rEdit, void ) +IMPL_LINK( ErrorBarResources, RangeChanged, Edit&, rEdit, void ) { if( &rEdit == m_pEdRangePositive ) { diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index b4ed6789103e..6b268f90685a 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -165,7 +165,7 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM } } -IMPL_LINK_NOARG_TYPED(LegendPositionResources, PositionEnableHdl, CheckBox&, void) +IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl, CheckBox&, void) { bool bEnable = m_pCbxShow == nullptr || m_pCbxShow->IsChecked(); @@ -225,7 +225,7 @@ void LegendPositionResources::writeToItemSet( SfxItemSet& rOutAttrs ) const rOutAttrs.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, m_pCbxShow == nullptr || m_pCbxShow->IsChecked()) ); } -IMPL_LINK_TYPED( LegendPositionResources, PositionChangeHdl, RadioButton&, rRadio, void ) +IMPL_LINK( LegendPositionResources, PositionChangeHdl, RadioButton&, rRadio, void ) { //for each radio click there are coming two change events //first uncheck of previous button -> ignore that call diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 034a63b756f5..bec6a44257eb 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -93,7 +93,7 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet& TrendlineResources::~TrendlineResources() {} -IMPL_LINK_TYPED( TrendlineResources, SelectTrendLine, Button *, pRadioButton, void ) +IMPL_LINK( TrendlineResources, SelectTrendLine, Button *, pRadioButton, void ) { if( pRadioButton == m_pRB_Linear ) m_eTrendLineType = SvxChartRegress::Linear; @@ -348,7 +348,7 @@ void TrendlineResources::UpdateControlStates() m_pEE_YName->Enable( !bMovingAverage && m_pCB_ShowEquation->IsChecked() ); } -IMPL_LINK_TYPED( TrendlineResources, ChangeValue, Edit&, rNumericField, void) +IMPL_LINK( TrendlineResources, ChangeValue, Edit&, rNumericField, void) { if( &rNumericField == m_pNF_Degree ) { @@ -388,7 +388,7 @@ void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints ) UpdateControlStates(); } -IMPL_LINK_TYPED( TrendlineResources, ShowEquation, CheckBox&, rCheckBox, void) +IMPL_LINK( TrendlineResources, ShowEquation, CheckBox&, rCheckBox, void) { if( &rCheckBox == m_pCB_ShowEquation ) { diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 69ca98e2e4ab..1dccbd3a4f0c 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -80,9 +80,9 @@ private: sal_Int32 m_nNbPoints; void UpdateControlStates(); - DECL_LINK_TYPED( SelectTrendLine, Button*, void ); - DECL_LINK_TYPED( ChangeValue, Edit&, void); - DECL_LINK_TYPED( ShowEquation, CheckBox&, void); + DECL_LINK( SelectTrendLine, Button*, void ); + DECL_LINK( ChangeValue, Edit&, void); + DECL_LINK( ShowEquation, CheckBox&, void); }; } // namespace chart diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index ed3a1f3c2ac6..602afffbaecf 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -291,7 +291,7 @@ void ThreeD_SceneAppearance_TabPage::updateScheme() } } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void) +IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void) { if( !m_bUpdateOtherControls ) return; @@ -316,7 +316,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, initControlsFromModel(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, void) +IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, void) { if( !m_bUpdateOtherControls ) return; @@ -325,7 +325,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, applyShadeModeToModel(); updateScheme(); } -IMPL_LINK_TYPED( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, CheckBox&, rCheckBox, void ) +IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, CheckBox&, rCheckBox, void ) { if( !m_bUpdateOtherControls ) return; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index a7b339697844..9ea3935feedb 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -44,9 +44,9 @@ public: virtual void ActivatePage() override; private: - DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectShading, CheckBox&, void ); - DECL_LINK_TYPED( SelectRoundedEdgeOrObjectLines, CheckBox&, void ); + DECL_LINK( SelectSchemeHdl, ListBox&, void ); + DECL_LINK( SelectShading, CheckBox&, void ); + DECL_LINK( SelectRoundedEdgeOrObjectLines, CheckBox&, void ); void initControlsFromModel(); void applyShadeModeToModel(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index ae6bfa5fdf2b..af8174f617db 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -195,7 +195,7 @@ void ThreeD_SceneGeometry_TabPage::applyAnglesToModel() m_bAngleChangePending = false; } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void) { m_nXRotation = m_pMFXRotation->GetValue(); m_nYRotation = m_pMFYRotation->GetValue(); @@ -203,7 +203,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void) m_bAngleChangePending = true; } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleChanged, Edit&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleChanged, Edit&, void) { applyAnglesToModel(); } @@ -229,23 +229,23 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel() m_bPerspectiveChangePending = false; } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveEdited, Edit&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveEdited, Edit&, void) { m_bPerspectiveChangePending = true; } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveChanged, Edit&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveChanged, Edit&, void) { applyPerspectiveToModel(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, CheckBox&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, CheckBox&, void) { m_pMFPerspective->Enable( m_pCbxPerspective->IsChecked() ); applyPerspectiveToModel(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, CheckBox&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, CheckBox&, void) { ControllerLockHelperGuard aGuard( m_rControllerLockHelper ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index 6da428d43f42..8d1ab9a83901 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -45,16 +45,16 @@ public: void commitPendingChanges(); // is called by timer to apply changes to model - DECL_LINK_TYPED( AngleChanged, Edit&, void ); + DECL_LINK( AngleChanged, Edit&, void ); // is called immediately when a field changes - DECL_LINK_TYPED( AngleEdited, Edit&, void ); + DECL_LINK( AngleEdited, Edit&, void ); // is called by timer to apply changes to model - DECL_LINK_TYPED( PerspectiveChanged, Edit&, void ); + DECL_LINK( PerspectiveChanged, Edit&, void ); // is called immediately when a field changes - DECL_LINK_TYPED( PerspectiveEdited, Edit&, void ); - DECL_LINK_TYPED( PerspectiveToggled, CheckBox&, void ); - DECL_LINK_TYPED( RightAngledAxesToggled, CheckBox&, void ); + DECL_LINK( PerspectiveEdited, Edit&, void ); + DECL_LINK( PerspectiveToggled, CheckBox&, void ); + DECL_LINK( RightAngledAxesToggled, CheckBox&, void ); private: void applyAnglesToModel(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 07509aedc228..bdd53ff10d21 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -308,7 +308,7 @@ void ThreeD_SceneIllumination_TabPage::dispose() TabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void*, void) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void*, void) { if( m_bInCommitToModel )//don't read own changes return; @@ -342,7 +342,7 @@ void ThreeD_SceneIllumination_TabPage::applyLightSourcesToModel() m_aTimerTriggeredControllerLock.startTimer(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLightCtl3D*, void) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLightCtl3D*, void) { m_aTimerTriggeredControllerLock.startTimer(); @@ -392,7 +392,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLig applyLightSourcesToModel(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLightCtl3D*, void) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLightCtl3D*, void) { sal_uInt32 nLightNumber = m_pCtl_Preview->GetSvx3DLightControl().GetSelectedLight(); if(nLightNumber<8) @@ -405,7 +405,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLig } } -IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton, void ) +IMPL_LINK( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton, void ) { bool bIsAmbientLight = (pButton==m_pBtn_AmbientLight_Color); ColorLB* pListBox = ( bIsAmbientLight ? m_pLB_AmbientLight : m_pLB_LightSource); @@ -441,7 +441,7 @@ IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pBut } } -IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBox, void ) +IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBox, void ) { ColorLB* pListBox = static_cast<ColorLB*>(&rBox); if(pListBox==m_pLB_AmbientLight) @@ -471,7 +471,7 @@ IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBo this->updatePreview(); } -IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void ) +IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void ) { LightButton* pButton = static_cast<LightButton*>(pBtn); if( !pButton ) diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 735d7659ddd8..515ace16b8e4 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -58,16 +58,16 @@ public: virtual void dispose() override; private: - DECL_LINK_TYPED( ClickLightSourceButtonHdl, Button*, void ); - DECL_LINK_TYPED( SelectColorHdl, ListBox&, void ); - DECL_LINK_TYPED( ColorDialogHdl, Button*, void ); - DECL_LINK_TYPED( PreviewChangeHdl, SvxLightCtl3D*, void ); - DECL_LINK_TYPED( PreviewSelectHdl, SvxLightCtl3D*, void ); + DECL_LINK( ClickLightSourceButtonHdl, Button*, void ); + DECL_LINK( SelectColorHdl, ListBox&, void ); + DECL_LINK( ColorDialogHdl, Button*, void ); + DECL_LINK( PreviewChangeHdl, SvxLightCtl3D*, void ); + DECL_LINK( PreviewSelectHdl, SvxLightCtl3D*, void ); void updatePreview(); private: - DECL_LINK_TYPED(fillControlsFromModel, void *, void); + DECL_LINK(fillControlsFromModel, void *, void); void applyLightSourceToModel( sal_uInt32 nLightNumber ); void applyLightSourcesToModel(); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 8746615917b3..7b4c914ed99d 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -298,7 +298,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories ) // event handling routines -IMPL_LINK_NOARG_TYPED(SchAxisLabelTabPage, ToggleShowLabel, Button*, void) +IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel, Button*, void) { bool bEnable = ( m_pCbShowDescription->GetState() != TRISTATE_FALSE ); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index b847e4d69ffe..aefe92dc6962 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -65,7 +65,7 @@ private: bool m_bHasInitialStacking; /// false = checkbox in tristate bool m_bComplexCategories; - DECL_LINK_TYPED ( ToggleShowLabel, Button*, void ); + DECL_LINK ( ToggleShowLabel, Button*, void ); public: SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 908fd49b9d27..6cee0064cb18 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -313,7 +313,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning m_bSupportAxisPositioning = bSupportAxisPositioning; } -IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void) { sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos(); m_pED_CrossesAt->Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis ); @@ -327,7 +327,7 @@ IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void) PlaceLabelsSelectHdl( *m_pLB_PlaceLabels ); } -IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void) { sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos(); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 25fe19017da6..e5bacafbc00e 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -50,8 +50,8 @@ public: void SupportAxisPositioning( bool bSupportAxisPositioning ); private: //methods: - DECL_LINK_TYPED( CrossesAtSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( PlaceLabelsSelectHdl, ListBox&, void ); + DECL_LINK( CrossesAtSelectHdl, ListBox&, void ); + DECL_LINK( PlaceLabelsSelectHdl, ListBox&, void ); private: //member: VclPtr<VclFrame> m_pFL_AxisLine; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index ee86f8ed9f06..777297cb45c0 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -55,8 +55,8 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( Dim3DLookCheckHdl, CheckBox&, void ); - DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void ); + DECL_LINK( Dim3DLookCheckHdl, CheckBox&, void ); + DECL_LINK( SelectSchemeHdl, ListBox&, void ); private: VclPtr<CheckBox> m_pCB_3DLook; @@ -104,13 +104,13 @@ void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter ) rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown; } -IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox&, void) +IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox&, void) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); } -IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, SelectSchemeHdl, ListBox&, void) +IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl, ListBox&, void) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -127,7 +127,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( SortByXValuesCheckHdl, CheckBox&, void ); + DECL_LINK( SortByXValuesCheckHdl, CheckBox&, void ); private: VclPtr<CheckBox> m_pCB_XValueSorting; @@ -155,7 +155,7 @@ void SortByXValuesResourceGroup::fillParameter( ChartTypeParameter& rParameter ) rParameter.bSortByXValues = m_pCB_XValueSorting->IsChecked(); } -IMPL_LINK_NOARG_TYPED(SortByXValuesResourceGroup, SortByXValuesCheckHdl, CheckBox&, void) +IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl, CheckBox&, void) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -172,8 +172,8 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( StackingChangeHdl, RadioButton&, void ); - DECL_LINK_TYPED( StackingEnableHdl, CheckBox&, void ); + DECL_LINK( StackingChangeHdl, RadioButton&, void ); + DECL_LINK( StackingEnableHdl, CheckBox&, void ); private: VclPtr<CheckBox> m_pCB_Stacked; @@ -250,7 +250,7 @@ void StackingResourceGroup::fillParameter( ChartTypeParameter& rParameter ) else if(m_pRB_Stack_Z->IsChecked()) rParameter.eStackMode = GlobalStackMode_STACK_Z; } -IMPL_LINK_TYPED( StackingResourceGroup, StackingChangeHdl, RadioButton&, rRadio, void ) +IMPL_LINK( StackingResourceGroup, StackingChangeHdl, RadioButton&, rRadio, void ) { //for each radio click there are coming two change events //first uncheck of previous button -> ignore that call @@ -258,7 +258,7 @@ IMPL_LINK_TYPED( StackingResourceGroup, StackingChangeHdl, RadioButton&, rRadio, if( m_pChangeListener && rRadio.IsChecked() ) m_pChangeListener->stateChanged(this); } -IMPL_LINK_NOARG_TYPED(StackingResourceGroup, StackingEnableHdl, CheckBox&, void) +IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, CheckBox&, void) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -274,7 +274,7 @@ public: void fillParameter( ChartTypeParameter& rParam ); private: - DECL_LINK_TYPED( SettingChangedHdl, CheckBox&, void ); + DECL_LINK( SettingChangedHdl, CheckBox&, void ); private: VclPtr<CheckBox> m_pCB_RoundedEdge; }; @@ -300,7 +300,7 @@ void GL3DResourceGroup::fillParameter( ChartTypeParameter& rParam ) rParam.mbRoundedEdge = m_pCB_RoundedEdge->IsChecked(); } -IMPL_LINK_NOARG_TYPED( GL3DResourceGroup, SettingChangedHdl, CheckBox&, void ) +IMPL_LINK_NOARG( GL3DResourceGroup, SettingChangedHdl, CheckBox&, void ) { if (m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -319,7 +319,7 @@ public: virtual void StateChanged( StateChangedType nType ) override; private: - DECL_LINK_TYPED( SplineTypeListBoxHdl, ListBox&, void ); + DECL_LINK( SplineTypeListBoxHdl, ListBox&, void ); private: VclPtr<ListBox> m_pLB_Spline_Type; @@ -392,7 +392,7 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool rParameter.nCurveResolution = static_cast< sal_Int32 >( m_pMF_SplineResolution->GetValue()); rParameter.nSplineOrder = static_cast< sal_Int32 >( m_pMF_SplineOrder->GetValue()); } -IMPL_LINK_NOARG_TYPED(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void) { m_pFT_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos()); m_pMF_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos()); @@ -491,9 +491,9 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( LineTypeChangeHdl, ListBox&, void ); - DECL_LINK_TYPED( SplineDetailsDialogHdl, Button*, void ); - DECL_LINK_TYPED( SteppedDetailsDialogHdl, Button*, void ); + DECL_LINK( LineTypeChangeHdl, ListBox&, void ); + DECL_LINK( SplineDetailsDialogHdl, Button*, void ); + DECL_LINK( SteppedDetailsDialogHdl, Button*, void ); SplinePropertiesDialog& getSplinePropertiesDialog(); SteppedPropertiesDialog& getSteppedPropertiesDialog(); @@ -584,12 +584,12 @@ void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter ) break; } } -IMPL_LINK_NOARG_TYPED(SplineResourceGroup, LineTypeChangeHdl, ListBox&, void) +IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl, ListBox&, void) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); } -IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void) +IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void) { ChartTypeParameter aOldParameter; @@ -609,7 +609,7 @@ IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void getSplinePropertiesDialog().fillControls( aOldParameter ); } } -IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void) +IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void) { ChartTypeParameter aOldParameter; @@ -641,7 +641,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( GeometryChangeHdl, ListBox&, void ); + DECL_LINK( GeometryChangeHdl, ListBox&, void ); private: BarGeometryResources m_aGeometryResources; @@ -673,7 +673,7 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter ) rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos(); } -IMPL_LINK_NOARG_TYPED(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void) +IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -872,7 +872,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType() pTypeController = m_aChartTypeDialogControllerList[nM]; return pTypeController; } -IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) +IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) { if( m_pCurrentMainType ) { @@ -884,7 +884,7 @@ IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) } } -IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void) { selectMainType(); } diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index ea756379cf41..e885898fbdc9 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -70,8 +70,8 @@ protected: void commitToModel( const ChartTypeParameter& rParameter ); void selectMainType(); - DECL_LINK_TYPED( SelectMainTypeHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectSubTypeHdl, ValueSet*, void ); + DECL_LINK( SelectMainTypeHdl, ListBox&, void ); + DECL_LINK( SelectSubTypeHdl, ValueSet*, void ); protected: VclPtr<FixedText> m_pFT_ChooseType; diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 9c8fe5f0074b..df92cc0e680d 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -529,7 +529,7 @@ void DataSourceTabPage::updateControlState() isValid(); } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBox*, void) { m_rDialogModel.startControllerLockTimer(); if( m_pLB_SERIES->FirstSelected()) @@ -540,7 +540,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBo updateControlState(); } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*, void) { m_rDialogModel.startControllerLockTimer(); SvTreeListEntry * pEntry = m_pLB_ROLE->FirstSelected(); @@ -564,7 +564,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox* } } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void) { OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); m_pCurrentRangeChoosingField = m_pEDT_RANGE; @@ -605,7 +605,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, voi m_pCurrentRangeChoosingField = nullptr; } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void) { OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); m_pCurrentRangeChoosingField = m_pEDT_CATEGORIES; @@ -619,7 +619,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button m_rDialogModel.getCategoriesRange(), aStr, *this ); } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, AddButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -657,7 +657,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, AddButtonClickedHdl, Button*, void) SeriesSelectionChangedHdl( nullptr ); } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -699,7 +699,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, UpButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -714,7 +714,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, UpButtonClickedHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, DownButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -729,7 +729,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, DownButtonClickedHdl, Button*, void) } } -IMPL_LINK_TYPED( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void ) +IMPL_LINK( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void ) { // note: isValid sets the color of the edit field if( isRangeFieldContentValid( rEdit )) @@ -747,7 +747,7 @@ IMPL_LINK_TYPED( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void ) isValid(); } -IMPL_LINK_TYPED( DataSourceTabPage, RangeUpdateDataHdl, Edit&, rEdit, void ) +IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit&, rEdit, void ) { // note: isValid sets the color of the edit field if( isRangeFieldContentValid( rEdit )) diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 3b0c0b554c47..1cfd2802a64e 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -73,16 +73,16 @@ protected: virtual void initializePage() override; - DECL_LINK_TYPED( SeriesSelectionChangedHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( RoleSelectionChangedHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( MainRangeButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( CategoriesRangeButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( AddButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( RemoveButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( RangeModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( RangeUpdateDataHdl, Edit&, void ); - DECL_LINK_TYPED( UpButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( DownButtonClickedHdl, Button*, void ); + DECL_LINK( SeriesSelectionChangedHdl, SvTreeListBox*, void ); + DECL_LINK( RoleSelectionChangedHdl, SvTreeListBox*, void ); + DECL_LINK( MainRangeButtonClickedHdl, Button*, void ); + DECL_LINK( CategoriesRangeButtonClickedHdl, Button*, void ); + DECL_LINK( AddButtonClickedHdl, Button*, void ); + DECL_LINK( RemoveButtonClickedHdl, Button*, void ); + DECL_LINK( RangeModifiedHdl, Edit&, void ); + DECL_LINK( RangeUpdateDataHdl, Edit&, void ); + DECL_LINK( UpButtonClickedHdl, Button*, void ); + DECL_LINK( DownButtonClickedHdl, Button*, void ); // ____ RangeSelectionListenerParent ____ virtual void listeningFinished( const OUString & rNewRange ) override; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index f990f54ed0ca..62ce33ac5f1b 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -349,30 +349,30 @@ bool RangeChooserTabPage::isValid() return bIsValid; } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlEditedHdl, Edit&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl, Edit&, void) { setDirty(); isValid(); } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedRadioHdl, RadioButton&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedRadioHdl, RadioButton&, void) { ControlChangedHdl(*m_pED_Range); } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedCheckBoxHdl, CheckBox&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, CheckBox&, void) { ControlChangedHdl(*m_pED_Range); } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedHdl, Edit&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl, Edit&, void) { setDirty(); if( isValid()) changeDialogModelAccordingToControls(); } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ChooseRangeHdl, Button*, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl, Button*, void) { OUString aRange = m_pED_Range->GetText(); OUString aTitle = m_pFTTitle->GetText(); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index fb62d98835b9..1e74fd7f98df 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -69,11 +69,11 @@ protected: //methods bool isValid(); void setDirty(); - DECL_LINK_TYPED( ChooseRangeHdl, Button*, void ); - DECL_LINK_TYPED( ControlChangedHdl, Edit&, void ); - DECL_LINK_TYPED( ControlChangedCheckBoxHdl, CheckBox&, void ); - DECL_LINK_TYPED( ControlChangedRadioHdl, RadioButton&, void ); - DECL_LINK_TYPED( ControlEditedHdl, Edit&, void ); + DECL_LINK( ChooseRangeHdl, Button*, void ); + DECL_LINK( ControlChangedHdl, Edit&, void ); + DECL_LINK( ControlChangedCheckBoxHdl, CheckBox&, void ); + DECL_LINK( ControlChangedRadioHdl, RadioButton&, void ); + DECL_LINK( ControlEditedHdl, Edit&, void ); protected: //member diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index cdf8c6484c77..3edb725029ac 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -157,7 +157,7 @@ void ScaleTabPage::dispose() SfxTabPage::dispose(); } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, Edit&, rEdit, void ) { FormattedField& rFmtField = static_cast<FormattedField&>(rEdit); @@ -217,7 +217,7 @@ void ScaleTabPage::EnableControls() EnableValueHdl(m_pCbx_AutoTimeResolution); } -IMPL_LINK_TYPED( ScaleTabPage, EnableValueHdl, Button *, pButton, void ) +IMPL_LINK( ScaleTabPage, EnableValueHdl, Button *, pButton, void ) { CheckBox * pCbx = static_cast<CheckBox*>(pButton); bool bEnable = pCbx && !pCbx->IsChecked() && pCbx->IsEnabled(); @@ -257,7 +257,7 @@ enum AxisTypeListBoxEntry TYPE_DATE=2 }; -IMPL_LINK_NOARG_TYPED(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void) { const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos(); if( nPos==TYPE_DATE ) diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 5fdd60994f54..2eb856017aa7 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -99,9 +99,9 @@ private: void EnableControls(); - DECL_LINK_TYPED( SelectAxisTypeHdl, ListBox&, void ); - DECL_LINK_TYPED( EnableValueHdl, Button*, void ); - DECL_STATIC_LINK_TYPED( ScaleTabPage, FmtFieldModifiedHdl, Edit&, void); + DECL_LINK( SelectAxisTypeHdl, ListBox&, void ); + DECL_LINK( EnableValueHdl, Button*, void ); + DECL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, Edit&, void); /** shows a warning window due to an invalid input. diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index b8c6a7a90d6f..bc7122cdb9d0 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -87,7 +87,7 @@ void SchOptionTabPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SchOptionTabPage, EnableHdl, Button*, void) +IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, Button*, void) { if( m_nAllSeriesAxisIndex == 0 ) m_pCBAxisSideBySide->Enable( m_pRbtAxis2->IsChecked()); diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index 56b587d077b5..5051d7c2f7da 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -62,7 +62,7 @@ private: //member VclPtr<CheckBox> m_pCBIncludeHiddenCells; - DECL_LINK_TYPED(EnableHdl, Button*, void ); + DECL_LINK(EnableHdl, Button*, void ); sal_Int32 m_nAllSeriesAxisIndex; diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index e28bb0571504..be85cacf6647 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -146,15 +146,15 @@ void TitlesAndObjectsTabPage::commitToModel() } -IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, CheckBox&, void) +IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, CheckBox&, void) { ChangeHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeEditHdl, Edit&, void) +IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeEditHdl, Edit&, void) { ChangeHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeHdl, LinkParamNone*, void) { if( m_bCommitToModel ) commitToModel(); diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index 0820ffa1250a..2b5eabbfcb03 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -51,9 +51,9 @@ public: protected: void commitToModel(); - DECL_LINK_TYPED( ChangeHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( ChangeEditHdl, Edit&, void ); - DECL_LINK_TYPED( ChangeCheckBoxHdl, CheckBox&, void ); + DECL_LINK( ChangeHdl, LinkParamNone*, void ); + DECL_LINK( ChangeEditHdl, Edit&, void ); + DECL_LINK( ChangeCheckBoxHdl, CheckBox&, void ); protected: std::unique_ptr< TitleResources > m_xTitleResources; diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 336d86ae968e..a128a03d2a05 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -376,7 +376,7 @@ public: ViewElementListProvider getViewElementListProvider(); DrawModelWrapper* GetDrawModelWrapper(); - DECL_LINK_TYPED( NotifyUndoActionHdl, SdrUndoAction*, void ); + DECL_LINK( NotifyUndoActionHdl, SdrUndoAction*, void ); css::uno::Reference<css::uno::XInterface> const & getChartView(); @@ -552,7 +552,7 @@ private: void impl_ShapeControllerDispatch( const css::util::URL& rURL, const css::uno::Sequence< css::beans::PropertyValue >& rArgs ); - DECL_LINK_TYPED( DoubleClickWaitingHdl, Timer*, void ); + DECL_LINK( DoubleClickWaitingHdl, Timer*, void ); void execute_DoubleClick( const Point* pMousePixel ); void startDoubleClickWaiting(); void stopDoubleClickWaiting(); diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index 429365917b5b..dd2c3dc2031e 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -41,7 +41,7 @@ private: std::unique_ptr< ControllerLockGuardUNO > m_apControllerLockGuard; AutoTimer m_aTimer; - DECL_LINK_TYPED( TimerTimeout, Timer*, void ); + DECL_LINK( TimerTimeout, Timer*, void ); }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 7122daf207b2..3868211faf0e 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -95,7 +95,7 @@ public: virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - DECL_LINK_TYPED( DialogEventHdl, VclWindowEvent&, void ); + DECL_LINK( DialogEventHdl, VclWindowEvent&, void ); protected: // ____ OComponentHelper ____ diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index b90c0adb8fef..b2e9009d208f 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -70,11 +70,11 @@ private: m_xContext; /// handles actions of the toolbox - DECL_LINK_TYPED( ToolboxHdl, ToolBox*, void ); + DECL_LINK( ToolboxHdl, ToolBox*, void ); /// is called, if the cursor of the table has moved - DECL_LINK_TYPED( BrowserCursorMovedHdl, DataBrowser*, void); + DECL_LINK( BrowserCursorMovedHdl, DataBrowser*, void); /// this is called if MiscOptions change, esp. High-Contrast mode - DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); + DECL_LINK( MiscHdl, LinkParamNone*, void ); void UpdateData(); /// moved and resizes the series name control etc. to fit the dimensions of the edit browsebox diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 40ad209598c3..4c82d01bdc0f 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -122,7 +122,7 @@ private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override; Link<Button*,void> m_aOriginalOKClickHdl; - DECL_LINK_TYPED( OKPressed, Button*, void ); + DECL_LINK( OKPressed, Button*, void ); public: SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index d87b4bc655db..a22e613d63cd 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -121,13 +121,13 @@ private: bool m_bHasInternalDataProvider; bool m_bEnableDataTableDialog; - DECL_LINK_TYPED( CategoryChosen, Button*, void ); - DECL_LINK_TYPED( CategoryChosen2, ListBox&, void ); - DECL_LINK_TYPED( SynchronizePosAndNeg, CheckBox&, void ); - DECL_LINK_TYPED( PosValueChanged, Edit&, void ); - DECL_LINK_TYPED( IndicatorChanged, Button *, void ); - DECL_LINK_TYPED( ChooseRange, Button *, void ); - DECL_LINK_TYPED( RangeChanged, Edit&, void ); + DECL_LINK( CategoryChosen, Button*, void ); + DECL_LINK( CategoryChosen2, ListBox&, void ); + DECL_LINK( SynchronizePosAndNeg, CheckBox&, void ); + DECL_LINK( PosValueChanged, Edit&, void ); + DECL_LINK( IndicatorChanged, Button *, void ); + DECL_LINK( ChooseRange, Button *, void ); + DECL_LINK( RangeChanged, Edit&, void ); void UpdateControlStates(); void isRangeFieldContentValid( Edit & rEdit ); diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx index c282718b34c8..cf6442008160 100644 --- a/chart2/source/controller/inc/res_LegendPosition.hxx +++ b/chart2/source/controller/inc/res_LegendPosition.hxx @@ -48,8 +48,8 @@ public: void SetChangeHdl( const Link<LinkParamNone*,void>& rLink ); - DECL_LINK_TYPED( PositionEnableHdl, CheckBox&, void ); - DECL_LINK_TYPED( PositionChangeHdl, RadioButton&, void ); + DECL_LINK( PositionEnableHdl, CheckBox&, void ); + DECL_LINK( PositionChangeHdl, RadioButton&, void ); private: void impl_setRadioButtonToggleHdl(); diff --git a/chart2/source/controller/inc/uiobject.hxx b/chart2/source/controller/inc/uiobject.hxx index f5a2ede42ded..e1d54747e52d 100644 --- a/chart2/source/controller/inc/uiobject.hxx +++ b/chart2/source/controller/inc/uiobject.hxx @@ -38,7 +38,7 @@ private: VclPtr<chart::ChartWindow> mxChartWindow; std::vector<std::unique_ptr<OUString>> maCommands; - DECL_LINK_TYPED(PostCommand, void*, void); + DECL_LINK(PostCommand, void*, void); }; class ChartWindowUIObject : public WindowUIObject diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index f537b6bc28b0..0f9dd7c4ae9b 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1454,7 +1454,7 @@ void SAL_CALL ChartController::modified( //todo? update menu states ? } -IMPL_LINK_TYPED( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction, void ) +IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction, void ) { ENSURE_OR_RETURN_VOID( pUndoAction, "invalid Undo action" ); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index b0e5ffca73df..e55196f86521 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -529,7 +529,7 @@ void ChartController::stopDoubleClickWaiting() m_bWaitingForDoubleClick = false; } -IMPL_LINK_NOARG_TYPED(ChartController, DoubleClickWaitingHdl, Timer *, void) +IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl, Timer *, void) { m_bWaitingForDoubleClick = false; diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 5c65270da837..de1d92bddbe7 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -224,7 +224,7 @@ void ShapeController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:ParagraphDialog", COMMAND_ID_PARAGRAPH_DIALOG, CommandGroup::EDIT ); } -IMPL_LINK_TYPED( ShapeController, CheckNameHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) +IMPL_LINK( ShapeController, CheckNameHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) { OUString aName; rDialog.GetName( aName ); diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index c5ff2983afa1..34885a725283 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -58,7 +58,7 @@ protected: virtual void describeSupportedFeatures() override; private: - DECL_LINK_TYPED( CheckNameHdl, AbstractSvxObjectNameDialog&, bool); + DECL_LINK( CheckNameHdl, AbstractSvxObjectNameDialog&, bool); void executeDispatch_FormatLine(); void executeDispatch_FormatArea(); diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index ac0d6f4ae731..27cb58b82d71 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -358,7 +358,7 @@ void ChartAxisPanel::SelectionInvalid() { } -IMPL_LINK_TYPED(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void) +IMPL_LINK(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void) { CheckBox* pCheckbox = static_cast<CheckBox*>(pButton); OUString aCID = getCID(mxModel); @@ -373,7 +373,7 @@ IMPL_LINK_TYPED(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void) setReverse(mxModel, aCID, bChecked); } -IMPL_LINK_NOARG_TYPED(ChartAxisPanel, ListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartAxisPanel, ListBoxHdl, ListBox&, void) { OUString aCID = getCID(mxModel); sal_Int32 nPos = mpLBLabelPos->GetSelectEntryPos(); @@ -381,7 +381,7 @@ IMPL_LINK_NOARG_TYPED(ChartAxisPanel, ListBoxHdl, ListBox&, void) setLabelPosition(mxModel, aCID, nPos); } -IMPL_LINK_TYPED(ChartAxisPanel, TextRotationHdl, Edit&, rMetricField, void) +IMPL_LINK(ChartAxisPanel, TextRotationHdl, Edit&, rMetricField, void) { OUString aCID = getCID(mxModel); double nVal = static_cast<NumericField&>(rMetricField).GetValue(); diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx index 2f2fc98d898f..51da3511563c 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx @@ -92,9 +92,9 @@ private: void Initialize(); - DECL_LINK_TYPED(CheckBoxHdl, Button*, void); - DECL_LINK_TYPED(ListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(TextRotationHdl, Edit&, void); + DECL_LINK(CheckBoxHdl, Button*, void); + DECL_LINK(ListBoxHdl, ListBox&, void); + DECL_LINK(TextRotationHdl, Edit&, void); }; } } // end of namespace ::chart::sidebar diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index b18171313702..9829a63ea07c 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -534,7 +534,7 @@ void ChartElementsPanel::updateModel( xBroadcasterNew->addModifyListener(mxListener); } -IMPL_LINK_TYPED(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void) +IMPL_LINK(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void) { CheckBox* pCheckBox = static_cast<CheckBox*>(pButton); bool bChecked = pCheckBox->IsChecked(); @@ -577,7 +577,7 @@ IMPL_LINK_TYPED(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void) setGridVisible(mxModel, GridType::HOR_MINOR, bChecked); } -IMPL_LINK_NOARG_TYPED(ChartElementsPanel, LegendPosHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartElementsPanel, LegendPosHdl, ListBox&, void) { sal_Int32 nPos = mpLBLegendPosition->GetSelectEntryPos(); setLegendPos(mxModel, nPos); diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index 5e04943b145a..e1fbe5767ff2 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -112,8 +112,8 @@ private: void setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible); - DECL_LINK_TYPED(CheckBoxHdl, Button*, void); - DECL_LINK_TYPED(LegendPosHdl, ListBox&, void); + DECL_LINK(CheckBoxHdl, Button*, void); + DECL_LINK(LegendPosHdl, ListBox&, void); }; } } // end of namespace ::chart::sidebar diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 248b9e74876f..13e3d611eb7d 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -408,7 +408,7 @@ void ChartErrorBarPanel::updateModel( xBroadcasterNew->addModifyListener(mxListener); } -IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void) +IMPL_LINK_NOARG(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void) { OUString aCID = getCID(mxModel); bool bPos = mpRBPosAndNeg->IsChecked() || mpRBPos->IsChecked(); @@ -418,7 +418,7 @@ IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void) setShowNegativeError(mxModel, aCID, bNeg); } -IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, ListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartErrorBarPanel, ListBoxHdl, ListBox&, void) { OUString aCID = getCID(mxModel); sal_Int32 nPos = mpLBType->GetSelectEntryPos(); @@ -426,7 +426,7 @@ IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, ListBoxHdl, ListBox&, void) setTypePos(mxModel, aCID, nPos); } -IMPL_LINK_TYPED(ChartErrorBarPanel, NumericFieldHdl, Edit&, rMetricField, void) +IMPL_LINK(ChartErrorBarPanel, NumericFieldHdl, Edit&, rMetricField, void) { OUString aCID = getCID(mxModel); double nVal = static_cast<NumericField&>(rMetricField).GetValue(); diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx index ea7e14b79548..b68d33cd9e85 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx @@ -87,9 +87,9 @@ private: void Initialize(); - DECL_LINK_TYPED(RadioBtnHdl, RadioButton&, void); - DECL_LINK_TYPED(ListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(NumericFieldHdl, Edit&, void); + DECL_LINK(RadioBtnHdl, RadioButton&, void); + DECL_LINK(ListBoxHdl, ListBox&, void); + DECL_LINK(NumericFieldHdl, Edit&, void); }; } } // end of namespace ::chart::sidebar diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 43b36ddbe01e..b23733eaf97f 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -456,7 +456,7 @@ void ChartSeriesPanel::SelectionInvalid() { } -IMPL_LINK_TYPED(ChartSeriesPanel, CheckBoxHdl, Button*, pButton, void) +IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, Button*, pButton, void) { CheckBox* pCheckBox = static_cast<CheckBox*>(pButton); bool bChecked = pCheckBox->IsChecked(); @@ -471,7 +471,7 @@ IMPL_LINK_TYPED(ChartSeriesPanel, CheckBoxHdl, Button*, pButton, void) setErrorBarVisible(mxModel, aCID, true, bChecked); } -IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, RadioBtnHdl, RadioButton&, void) +IMPL_LINK_NOARG(ChartSeriesPanel, RadioBtnHdl, RadioButton&, void) { OUString aCID = getCID(mxModel); bool bChecked = mpRBPrimaryAxis->IsChecked(); @@ -479,7 +479,7 @@ IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, RadioBtnHdl, RadioButton&, void) setAttachedAxisType(mxModel, aCID, bChecked); } -IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, ListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartSeriesPanel, ListBoxHdl, ListBox&, void) { OUString aCID = getCID(mxModel); diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx index 5710810f86d7..d38eb797dbfc 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx @@ -106,9 +106,9 @@ private: void Initialize(); - DECL_LINK_TYPED(CheckBoxHdl, Button*, void); - DECL_LINK_TYPED(RadioBtnHdl, RadioButton&, void); - DECL_LINK_TYPED(ListBoxHdl, ListBox&, void); + DECL_LINK(CheckBoxHdl, Button*, void); + DECL_LINK(RadioBtnHdl, RadioButton&, void); + DECL_LINK(ListBoxHdl, ListBox&, void); }; } } // end of namespace ::chart::sidebar diff --git a/chart2/source/controller/uitest/uiobject.cxx b/chart2/source/controller/uitest/uiobject.cxx index d100466e659f..70d5e142f53e 100644 --- a/chart2/source/controller/uitest/uiobject.cxx +++ b/chart2/source/controller/uitest/uiobject.cxx @@ -65,7 +65,7 @@ void ChartUIObject::execute(const OUString& rAction, } } -IMPL_LINK_TYPED(ChartUIObject, PostCommand, void*, pCommand, void) +IMPL_LINK(ChartUIObject, PostCommand, void*, pCommand, void) { css::util::URL aURL; aURL.Path = *static_cast<OUString*>(pCommand); diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 0715c22ccd56..a4193da2e1ac 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -1470,7 +1470,7 @@ void GL3DBarChart::processAutoFly(sal_uInt32 nId, sal_uInt32 nColor) } } -IMPL_LINK_NOARG_TYPED(GL3DBarChart, UpdateTimerHdl, Idle *, void) +IMPL_LINK_NOARG(GL3DBarChart, UpdateTimerHdl, Idle *, void) { updateScreenText(); maIdle.Start(); diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index 55df3d154925..f69b2f8567eb 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -100,7 +100,7 @@ private: void updateScreenText(); void updateRenderFPS(); void updateDataUpdateFPS(); - DECL_LINK_TYPED(UpdateTimerHdl, Idle*, void); + DECL_LINK(UpdateTimerHdl, Idle*, void); static int calcTimeInterval(TimeValue &startTime, TimeValue &endTime); float addScreenTextShape(OUString &nStr, const glm::vec2& rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag, const glm::vec4& rColor, diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 787440cd747c..3c27e6d1bb34 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -3145,7 +3145,7 @@ void ChartView::setViewDirty() m_bViewDirty = true; } -IMPL_LINK_NOARG_TYPED(ChartView, UpdateTimeBased, Timer *, void) +IMPL_LINK_NOARG(ChartView, UpdateTimeBased, Timer *, void) { setViewDirty(); update(); diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 95ad22de82d3..65281aadce3d 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1059,18 +1059,18 @@ void SfxAcceleratorConfigPage::ResetConfig() m_pEntriesBox->Clear(); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Load, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load, Button*, void) { // ask for filename, where we should load the new config data from StartFileDialog( 0, aLoadAccelConfigStr ); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Save, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Save, Button*, void) { StartFileDialog( WB_SAVEAS, aSaveAccelConfigStr ); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Default, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default, Button*, void) { uno::Reference<form::XReset> xReset(m_xAct, uno::UNO_QUERY); if (xReset.is()) @@ -1084,7 +1084,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Default, Button*, void) m_pEntriesBox->Select(m_pEntriesBox->GetEntry(nullptr, 0)); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, ChangeHdl, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl, Button*, void) { sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() ); TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(nullptr, nPos)->GetUserData()); @@ -1100,7 +1100,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, ChangeHdl, Button*, void) m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox ); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) { // get selected entry sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() ); @@ -1114,7 +1114,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox ); } -IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox, void ) +IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox, void ) { // disable help Help::ShowBalloon( this, Point(), Rectangle(), OUString() ); @@ -1200,7 +1200,7 @@ IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox, } } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl, Button*, void) { uno::Reference<ui::XAcceleratorConfiguration> xOld = m_xAct; @@ -1233,7 +1233,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, void) { assert(m_pFileDlg); @@ -1317,7 +1317,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper* } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void) { assert(m_pFileDlg); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 715c29f9a3cc..bfda9e3f3551 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2108,7 +2108,7 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* ) return result; } -IMPL_LINK_NOARG_TYPED( SvxConfigPage, SelectSaveInLocation, ListBox&, void ) +IMPL_LINK_NOARG( SvxConfigPage, SelectSaveInLocation, ListBox&, void ) { pCurrentSaveInData = static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( m_pSaveInListBox->GetSelectEntryPos())); @@ -2344,7 +2344,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI( return pNewEntry; } -IMPL_LINK_NOARG_TYPED( SvxConfigPage, AsyncInfoMsg, void*, void ) +IMPL_LINK_NOARG( SvxConfigPage, AsyncInfoMsg, void*, void ) { // Asynchronous msg because of D&D ScopedVclPtrInstance<MessageDialog>(this, @@ -2352,7 +2352,7 @@ IMPL_LINK_NOARG_TYPED( SvxConfigPage, AsyncInfoMsg, void*, void ) VclMessageType::Info)->Execute(); } -IMPL_LINK_TYPED( SvxConfigPage, MoveHdl, Button *, pButton, void ) +IMPL_LINK( SvxConfigPage, MoveHdl, Button *, pButton, void ) { MoveEntry(pButton == m_pMoveUpButton); } @@ -2516,7 +2516,7 @@ void SvxMenuConfigPage::dispose() SvxConfigPage::dispose(); } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenuEntry, SvTreeListBox *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, SelectMenuEntry, SvTreeListBox *, void ) { UpdateButtonStates(); } @@ -2633,7 +2633,7 @@ short SvxMenuConfigPage::QueryReset() return qbox->Execute(); } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu, ListBox&, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, SelectMenu, ListBox&, void ) { m_pContentsListBox->Clear(); @@ -2663,7 +2663,7 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu, ListBox&, void ) UpdateButtonStates(); } -IMPL_LINK_TYPED( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void ) +IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void ) { OString sIdent = pButton->GetCurItemIdent(); @@ -2710,7 +2710,7 @@ IMPL_LINK_TYPED( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void ) } } -IMPL_LINK_TYPED( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) +IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) { OString sIdent = pButton->GetCurItemIdent(); if (sIdent == "addsubmenu") @@ -2769,12 +2769,12 @@ IMPL_LINK_TYPED( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void } } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void ) { AddFunction(); } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, NewMenuHdl, Button *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, NewMenuHdl, Button *, void ) { VclPtrInstance<SvxMainMenuOrganizerDialog> pDialog( nullptr, GetSaveInData()->GetEntries(), nullptr, true ); @@ -2787,7 +2787,7 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, NewMenuHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddCommandsHdl, Button *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, AddCommandsHdl, Button *, void ) { if ( m_pSelectorDlg == nullptr ) { @@ -2809,7 +2809,7 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddCommandsHdl, Button *, void ) m_pSelectorDlg->Execute(); } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddSeparatorHdl, Button *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, AddSeparatorHdl, Button *, void ) { SvxConfigEntry* pNewEntryData = new SvxConfigEntry; pNewEntryData->SetUserDefined(); @@ -2821,7 +2821,7 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddSeparatorHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, DeleteCommandHdl, Button *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, DeleteCommandHdl, Button *, void ) { DeleteSelectedContent(); if ( GetSaveInData()->IsModified() ) @@ -2938,7 +2938,7 @@ void SvxMainMenuOrganizerDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxMainMenuOrganizerDialog, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxMainMenuOrganizerDialog, ModifyHdl, Edit&, void) { // if the Edit control is empty do not change the name if (m_pMenuNameEdit->GetText().isEmpty()) @@ -2954,7 +2954,7 @@ IMPL_LINK_NOARG_TYPED(SvxMainMenuOrganizerDialog, ModifyHdl, Edit&, void) m_pMenuListBox->SetEntryText( pNewMenuEntry, pNewEntryData->GetName() ); } -IMPL_LINK_NOARG_TYPED( SvxMainMenuOrganizerDialog, SelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( SvxMainMenuOrganizerDialog, SelectHdl, SvTreeListBox*, void ) { UpdateButtonStates(); } @@ -2970,7 +2970,7 @@ void SvxMainMenuOrganizerDialog::UpdateButtonStates() m_pMoveDownButton->Enable( selection != last ); } -IMPL_LINK_TYPED( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton, void ) +IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton, void ) { SvTreeListEntry *pSourceEntry = m_pMenuListBox->FirstSelected(); SvTreeListEntry *pTargetEntry = nullptr; @@ -3305,7 +3305,7 @@ void SvxToolbarConfigPage::DeleteSelectedContent() } } -IMPL_LINK_TYPED( SvxToolbarConfigPage, MoveHdl, Button *, pButton, void ) +IMPL_LINK( SvxToolbarConfigPage, MoveHdl, Button *, pButton, void ) { MoveEntry(pButton == m_pMoveUpButton); } @@ -3325,7 +3325,7 @@ void SvxToolbarConfigPage::MoveEntry( bool bMoveUp ) } } -IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void ) +IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void ) { sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); @@ -3370,7 +3370,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, } } -IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) +IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) { bool bNeedsApply = false; @@ -4453,7 +4453,7 @@ void ToolbarSaveInData::LoadToolbar( } } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbarEntry, SvTreeListBox *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, SelectToolbarEntry, SvTreeListBox *, void ) { UpdateButtonStates(); } @@ -4514,7 +4514,7 @@ short SvxToolbarConfigPage::QueryReset() return qbox->Execute(); } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) { m_pContentsListBox->Clear(); @@ -4594,7 +4594,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) UpdateButtonStates(); } -IMPL_LINK_TYPED( SvxToolbarConfigPage, StyleChangeHdl, Button*, pButton, void ) +IMPL_LINK( SvxToolbarConfigPage, StyleChangeHdl, Button*, pButton, void ) { sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); @@ -4626,7 +4626,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, StyleChangeHdl, Button*, pButton, void ) } } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) { OUString prefix = CUI_RES( RID_SVXSTR_NEW_TOOLBAR ); @@ -4684,7 +4684,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddCommandsHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, AddCommandsHdl, Button *, void ) { if ( m_pSelectorDlg == nullptr ) { @@ -4704,7 +4704,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddCommandsHdl, Button *, void ) m_pSelectorDlg->Execute(); } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddSeparatorHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, AddSeparatorHdl, Button *, void ) { // get currently selected toolbar SvxConfigEntry* pToolbar = GetTopLevelSelection(); @@ -4722,12 +4722,12 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddSeparatorHdl, Button *, void ) UpdateButtonStates(); } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, DeleteCommandHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, DeleteCommandHdl, Button *, void ) { DeleteSelectedContent(); } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, ResetTopLevelHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, ResetTopLevelHdl, Button *, void ) { sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); @@ -4748,7 +4748,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, ResetTopLevelHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void ) { AddFunction(); } @@ -5231,7 +5231,7 @@ uno::Reference< graphic::XGraphic> SvxIconSelectorDialog::GetSelectedIcon() return result; } -IMPL_LINK_TYPED( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox, void ) +IMPL_LINK( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox, void ) { (void)pToolBox; @@ -5261,7 +5261,7 @@ IMPL_LINK_TYPED( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox, void ) } } -IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, ImportHdl, Button *, void) +IMPL_LINK_NOARG( SvxIconSelectorDialog, ImportHdl, Button *, void) { sfx2::FileDialogHelper aImportDialog( css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW, @@ -5287,7 +5287,7 @@ IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, ImportHdl, Button *, void) } } -IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, DeleteHdl, Button *, void ) +IMPL_LINK_NOARG( SvxIconSelectorDialog, DeleteHdl, Button *, void ) { OUString message = CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ); if (ScopedVclPtrInstance<WarningBox>(this, WinBits(WB_OK_CANCEL), message)->Execute() == RET_OK) diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 8ba080dba886..082194fdc66d 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -167,7 +167,7 @@ void SvxEventConfigPage::ImplInitDocument() } } -IMPL_LINK_NOARG_TYPED( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void ) { bool* bApp = static_cast<bool*>(m_pSaveInListBox->GetEntryData( m_pSaveInListBox->GetSelectEntryPos())); diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 749bf11b8175..764972a0c8a0 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -37,7 +37,7 @@ class SvxEventConfigPage : public SvxMacroTabPage_ bool bAppConfig; - DECL_LINK_TYPED( SelectHdl_Impl, ListBox&, void ); + DECL_LINK( SelectHdl_Impl, ListBox&, void ); SvxEventConfigPage (const SvxEventConfigPage &) = delete; SvxEventConfigPage & operator= (const SvxEventConfigPage &) = delete; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 718d59e9be81..3826bf53713f 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -83,7 +83,7 @@ static long nTabs[] = #define LB_MACROS_ITEMPOS 2 -IMPL_LINK_TYPED( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { DBG_ASSERT( pBar == maHeaderBar.get(), "*MacroEventListBox::HeaderEndDrag_Impl: something is wrong here..." ); (void)pBar; @@ -567,7 +567,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents) } // select event handler on the listbox -IMPL_LINK_NOARG_TYPED( SvxMacroTabPage_, SelectEvent_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG( SvxMacroTabPage_, SelectEvent_Impl, SvTreeListBox*, void) { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); @@ -583,12 +583,12 @@ IMPL_LINK_NOARG_TYPED( SvxMacroTabPage_, SelectEvent_Impl, SvTreeListBox*, void) EnableButtons(); } -IMPL_LINK_TYPED( SvxMacroTabPage_, AssignDeleteHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SvxMacroTabPage_, AssignDeleteHdl_Impl, Button*, pBtn, void ) { GenericHandler_Impl( this, static_cast<PushButton*>(pBtn) ); } -IMPL_LINK_NOARG_TYPED( SvxMacroTabPage_, DoubleClickHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG( SvxMacroTabPage_, DoubleClickHdl_Impl, SvTreeListBox*, bool) { return GenericHandler_Impl( this, nullptr ); } @@ -850,7 +850,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( vcl::Window* pParent, const Reference< fra } -IMPL_LINK_NOARG_TYPED(AssignComponentDialog, ButtonHandler, Button*, void) +IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler, Button*, void) { OUString aMethodName = mpMethodEdit->GetText(); maURL.clear(); @@ -890,7 +890,7 @@ void AssignComponentDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, void ) +IMPL_LINK_NOARG( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, void ) { GetTabPage()->FillItemSet( nullptr ); EndDialog( RET_OK ); diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index f460ca216ca1..b3d9d3842bf0 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -45,7 +45,7 @@ private: OUString maURL; - DECL_LINK_TYPED(ButtonHandler, Button*, void); + DECL_LINK(ButtonHandler, Button*, void); public: AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 06894bac5c5f..d595d2e1f5ff 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -138,7 +138,7 @@ void SvxConfigFunctionListBox::MouseMove( const MouseEvent& rMEvt ) } -IMPL_LINK_NOARG_TYPED(SvxConfigFunctionListBox, TimerHdl, Timer *, void) +IMPL_LINK_NOARG(SvxConfigFunctionListBox, TimerHdl, Timer *, void) { aTimer.Stop(); Point aMousePos = GetPointerPosPixel(); @@ -967,7 +967,7 @@ void SvxScriptSelectorDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void ) +IMPL_LINK( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void ) { if (pCtrl == m_pCategories) { @@ -980,7 +980,7 @@ IMPL_LINK_TYPED( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void UpdateUI(); } -IMPL_LINK_NOARG_TYPED( SvxScriptSelectorDialog, FunctionDoubleClickHdl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( SvxScriptSelectorDialog, FunctionDoubleClickHdl, SvTreeListBox*, bool ) { if (m_pOKButton->IsEnabled()) ClickHdl(m_pOKButton); @@ -1008,7 +1008,7 @@ SvxScriptSelectorDialog::UpdateUI() } } -IMPL_LINK_TYPED( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void ) +IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void ) { if (pButton == m_pCancelButton) { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index af15bb5878ba..56bbd308123f 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -438,7 +438,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent /* Initialize, asynchronous to prevent virtual calls from a constructor */ -IMPL_LINK_NOARG_TYPED( SpellDialog, InitHdl, void*, void) +IMPL_LINK_NOARG( SpellDialog, InitHdl, void*, void) { m_pToolbar->Disable(); SetUpdateMode( false ); @@ -469,7 +469,7 @@ IMPL_LINK_NOARG_TYPED( SpellDialog, InitHdl, void*, void) }; -IMPL_LINK_TYPED( SpellDialog, ExtClickHdl, Button *, pBtn, void ) +IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn, void ) { if (m_pOptionsPB == pBtn) StartSpellOptDlg_Impl(); @@ -501,7 +501,7 @@ IMPL_LINK_TYPED( SpellDialog, ExtClickHdl, Button *, pBtn, void ) } } -IMPL_LINK_TYPED( SpellDialog, CheckGrammarHdl, Button*, pBox, void ) +IMPL_LINK( SpellDialog, CheckGrammarHdl, Button*, pBox, void ) { rParent.SetGrammarChecking( static_cast<CheckBox*>(pBox)->IsChecked() ); Impl_Restore(true); @@ -565,12 +565,12 @@ OUString SpellDialog::getReplacementString() const } -IMPL_LINK_NOARG_TYPED(SpellDialog, DoubleClickChangeHdl, ListBox&, void) +IMPL_LINK_NOARG(SpellDialog, DoubleClickChangeHdl, ListBox&, void) { ChangeHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, ChangeHdl, Button*, void) { if(m_pSentenceED->IsUndoEditMode()) { @@ -590,7 +590,7 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeAllHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl, Button*, void) { m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP ); OUString aString = getReplacementString(); @@ -620,7 +620,7 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeAllHdl, Button*, void) } -IMPL_LINK_TYPED( SpellDialog, IgnoreAllHdl, Button *, pButton, void ) +IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton, void ) { m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP ); // add word to IgnoreAll list @@ -667,7 +667,7 @@ IMPL_LINK_TYPED( SpellDialog, IgnoreAllHdl, Button *, pButton, void ) } -IMPL_LINK_NOARG_TYPED(SpellDialog, UndoHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, UndoHdl, Button*, void) { m_pSentenceED->Undo(); if(!m_pSentenceED->GetUndoActionCount()) @@ -675,7 +675,7 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, UndoHdl, Button*, void) } -IMPL_LINK_TYPED( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl&, rAction, void ) +IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl&, rAction, void ) { switch(rAction.GetId()) { @@ -732,7 +732,7 @@ void SpellDialog::Impl_Restore(bool bUseSavedSentence) m_pIgnorePB->SetText(m_sIgnoreOnceST); } -IMPL_LINK_NOARG_TYPED(SpellDialog, IgnoreHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, IgnoreHdl, Button*, void) { if (m_sResumeST.equals(m_pIgnorePB->GetText())) { @@ -776,7 +776,7 @@ LanguageType SpellDialog::GetSelectedLang_Impl() const } -IMPL_LINK_TYPED(SpellDialog, LanguageSelectHdl, ListBox&, rBox, void) +IMPL_LINK(SpellDialog, LanguageSelectHdl, ListBox&, rBox, void) { //If selected language changes, then add->list should be regenerated to //match @@ -886,13 +886,13 @@ int SpellDialog::InitUserDicts() } -IMPL_LINK_NOARG_TYPED(SpellDialog, AddToDictClickHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, AddToDictClickHdl, Button*, void) { AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu()); } -IMPL_LINK_TYPED(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton, void ) +IMPL_LINK(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton, void ) { AddToDictionaryExecute(pButton->GetCurItemId(), pButton->GetPopupMenu()); } @@ -946,7 +946,7 @@ void SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu ) } -IMPL_LINK_TYPED(SpellDialog, ModifyHdl, Edit&, rEd, void) +IMPL_LINK(SpellDialog, ModifyHdl, Edit&, rEd, void) { if (m_pSentenceED == &rEd) { @@ -971,7 +971,7 @@ IMPL_LINK_TYPED(SpellDialog, ModifyHdl, Edit&, rEd, void) }; -IMPL_LINK_NOARG_TYPED(SpellDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, CancelHdl, Button*, void) { //apply changes and ignored text parts first - if there are any rParent.ApplyChangedSentence(m_pSentenceED->CreateSpellPortions(), false); @@ -1550,7 +1550,7 @@ void SentenceEditWindow_Impl::Init(VclPtr<ToolBox> &rToolbar) m_xToolbar->SetSelectHdl(LINK(this,SentenceEditWindow_Impl,ToolbarHdl)); } -IMPL_LINK_NOARG_TYPED(SentenceEditWindow_Impl, ToolbarHdl, ToolBox *, void) +IMPL_LINK_NOARG(SentenceEditWindow_Impl, ToolbarHdl, ToolBox *, void) { const sal_uInt16 nCurItemId = m_xToolbar->GetCurItemId(); if (nCurItemId == m_xToolbar->GetItemId("paste")) @@ -2053,7 +2053,7 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) pSpellDialog->m_pChangePB->Enable(); } -IMPL_LINK_TYPED( SpellDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void ) +IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void ) { OUString sURL=rHyperlink.GetURL(); OUString sTitle=GetText(); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 6826c515eafe..336951b3a7f3 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -109,7 +109,7 @@ void AboutDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED( AboutDialog, HandleClick, Button*, pButton, void ) +IMPL_LINK( AboutDialog, HandleClick, Button*, pButton, void ) { OUString sURL = ""; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 05111e1d240f..c1c7ac64e61b 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -882,10 +882,10 @@ public: void update_color(UpdateFlags n = UpdateFlags::All); - DECL_LINK_TYPED(ColorFieldControlModifydl, ColorFieldControl&, void); - DECL_LINK_TYPED(ColorSliderControlModifyHdl, ColorSliderControl&, void); - DECL_LINK_TYPED(ColorModifyEditHdl, Edit&, void); - DECL_LINK_TYPED(ModeModifyHdl, RadioButton&, void); + DECL_LINK(ColorFieldControlModifydl, ColorFieldControl&, void); + DECL_LINK(ColorSliderControlModifyHdl, ColorSliderControl&, void); + DECL_LINK(ColorModifyEditHdl, Edit&, void); + DECL_LINK(ModeModifyHdl, RadioButton&, void); sal_Int32 GetColor() const; @@ -1173,7 +1173,7 @@ void ColorPickerDialog::update_color( UpdateFlags n ) mpColorPreview->SetColor(aColor); } -IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ColorFieldControlModifydl, ColorFieldControl&, void) +IMPL_LINK_NOARG(ColorPickerDialog, ColorFieldControlModifydl, ColorFieldControl&, void) { double x = mpColorField->GetX(); double y = mpColorField->GetY(); @@ -1209,7 +1209,7 @@ IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ColorFieldControlModifydl, ColorFieldCo update_color(UpdateFlags::All & ~(UpdateFlags::ColorChooser)); } -IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ColorSliderControlModifyHdl, ColorSliderControl&, void) +IMPL_LINK_NOARG(ColorPickerDialog, ColorSliderControlModifyHdl, ColorSliderControl&, void) { double dValue = mpColorSlider->GetValue(); switch (meMode) @@ -1237,7 +1237,7 @@ IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ColorSliderControlModifyHdl, ColorSlide update_color(UpdateFlags::All & ~(UpdateFlags::ColorSlider)); } -IMPL_LINK_TYPED(ColorPickerDialog, ColorModifyEditHdl, Edit&, rEdit, void) +IMPL_LINK(ColorPickerDialog, ColorModifyEditHdl, Edit&, rEdit, void) { UpdateFlags n = UpdateFlags::NONE; @@ -1316,7 +1316,7 @@ IMPL_LINK_TYPED(ColorPickerDialog, ColorModifyEditHdl, Edit&, rEdit, void) update_color(n); } -IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ModeModifyHdl, RadioButton&, void) +IMPL_LINK_NOARG(ColorPickerDialog, ModeModifyHdl, RadioButton&, void) { ColorMode eMode = HUE; diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 7d59ee9f4570..5ac0bf270535 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -392,7 +392,7 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, OKHdl, Button*, void) +IMPL_LINK_NOARG(SvxCharacterMap, OKHdl, Button*, void) { OUString aStr = m_pShowText->GetText(); @@ -419,7 +419,7 @@ void SvxCharacterMap::fillAllSubsets(ListBox &rListBox) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos(); const sal_uInt16 nFont = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFontLB->GetEntryData( nPos )); @@ -471,7 +471,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos(); const Subset* pSubset = static_cast<const Subset*> (m_pSubsetLB->GetEntryData(nPos)); @@ -484,7 +484,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void) +IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void) { if (bOne) { @@ -495,7 +495,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) +IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) { if ( !bOne ) { @@ -526,7 +526,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void) +IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void) { OUString aText; OUString aHexText; @@ -593,17 +593,17 @@ void SvxCharacterMap::selectCharByCode(Radix radix) SetChar(cChar); } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, DecimalCodeChangeHdl, Edit&, void) +IMPL_LINK_NOARG(SvxCharacterMap, DecimalCodeChangeHdl, Edit&, void) { selectCharByCode(Radix::decimal); } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, HexCodeChangeHdl, Edit&, void) +IMPL_LINK_NOARG(SvxCharacterMap, HexCodeChangeHdl, Edit&, void) { selectCharByCode(Radix::hexadecimal); } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharPreSelectHdl, SvxShowCharSet*, void) +IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl, SvxShowCharSet*, void) { // adjust subset selection if( pSubsetMap ) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 5d77b83efd1e..a31aed0e8976 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -289,7 +289,7 @@ bool FmSearchDialog::Close() return ModalDialog::Close(); } -IMPL_LINK_TYPED(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void) +IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void) { if ((pButton == m_prbSearchForText) || (pButton == m_prbSearchForNull) || (pButton == m_prbSearchForNotNull)) { @@ -309,7 +309,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void) } } -IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnClickedSearchAgain, Button*, void) +IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain, Button*, void) { if (m_pbClose->IsEnabled()) { // the button has the function 'search' @@ -352,7 +352,7 @@ IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnClickedSearchAgain, Button*, void) } } -IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void ) +IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void ) { if (m_ppbApproxSettings == pButton) { @@ -394,7 +394,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void } } -IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnSearchTextModified, Edit&, void) +IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified, Edit&, void) { if ((!m_pcmbSearchText->GetText().isEmpty()) || !m_prbSearchForText->IsChecked()) m_pbSearchAgain->Enable(); @@ -404,19 +404,19 @@ IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnSearchTextModified, Edit&, void) m_pSearchEngine->InvalidatePreviousLoc(); } -IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnFocusGrabbed, Control&, void) +IMPL_LINK_NOARG(FmSearchDialog, OnFocusGrabbed, Control&, void) { m_pcmbSearchText->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); } -IMPL_LINK_TYPED(FmSearchDialog, OnPositionSelected, ListBox&, rBox, void) +IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox&, rBox, void) { DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unerwartet : nicht genau ein Eintrag selektiert !"); m_pSearchEngine->SetPosition(m_plbPosition->GetSelectEntryPos()); } -IMPL_LINK_TYPED(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void) +IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void) { DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unerwartet : nicht genau ein Eintrag selektiert !"); @@ -428,7 +428,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void) m_arrContextFields[nCurrentContext] = m_plbField->GetSelectEntry(); } -IMPL_LINK_TYPED(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void) +IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void) { bool bChecked = rBox.IsChecked(); @@ -553,7 +553,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) m_pftRecord->SetText(OUString::number(fmscContext.xCursor->getRow())); } -IMPL_LINK_TYPED( FmSearchDialog, OnContextSelection, ListBox&, rBox, void) +IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox&, rBox, void) { InitContext(rBox.GetSelectEntryPos()); } @@ -670,7 +670,7 @@ void FmSearchDialog::EnableControlPaint(bool bEnable) } } -IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnDelayedPaint, Timer *, void) +IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint, Timer *, void) { EnableControlPaint(true); } @@ -693,7 +693,7 @@ void FmSearchDialog::OnFound(const css::uno::Any& aCursorPos, sal_Int16 nFieldPo m_pcmbSearchText->GrabFocus(); } -IMPL_LINK_TYPED(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, void) +IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, void) { SolarMutexGuard aGuard; // make this single method thread-safe (it's an overkill to block the whole application for this, diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index f12d42b7c456..2484a03dddd8 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -225,13 +225,13 @@ void SearchProgress::Terminate() } -IMPL_LINK_NOARG_TYPED(SearchProgress, ClickCancelBtn, Button*, void) +IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn, Button*, void) { Terminate(); } -IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void) +IMPL_LINK_NOARG(SearchProgress, CleanUpHdl, void*, void) { if (maSearchThread.is()) maSearchThread->join(); @@ -354,13 +354,13 @@ void TakeProgress::Terminate() } -IMPL_LINK_NOARG_TYPED(TakeProgress, ClickCancelBtn, Button*, void) +IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn, Button*, void) { Terminate(); } -IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void) +IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void) { if (maTakeThread.is()) maTakeThread->join(); @@ -472,14 +472,14 @@ short ActualizeProgress::Execute() } -IMPL_LINK_NOARG_TYPED(ActualizeProgress, ClickCancelBtn, Button*, void) +IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn, Button*, void) { pTheme->AbortActualize(); EndDialog( RET_OK ); } -IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void) +IMPL_LINK( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void) { if ( _pTimer ) { @@ -492,7 +492,7 @@ IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void) } -IMPL_LINK_TYPED( ActualizeProgress, ActualizeHdl, const INetURLObject&, rURL, void ) +IMPL_LINK( ActualizeProgress, ActualizeHdl, const INetURLObject&, rURL, void ) { for( long i = 0; i < 128; i++ ) Application::Reschedule(); @@ -558,7 +558,7 @@ void GalleryIdDialog::dispose() } -IMPL_LINK_NOARG_TYPED(GalleryIdDialog, ClickOkHdl, Button*, void) +IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl, Button*, void) { Gallery* pGal = pThm->GetParent(); const sal_uLong nId = GetId(); @@ -972,7 +972,7 @@ void TPGalleryThemeProperties::FillFilterList() } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, void) { OUString aText( m_pCbbFileType->GetText() ); @@ -1001,7 +1001,7 @@ void TPGalleryThemeProperties::SearchFiles() } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickSearchHdl, Button*, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl, Button*, void) { if( bInputAllowed ) { @@ -1053,7 +1053,7 @@ void TPGalleryThemeProperties::TakeFiles() } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void) { if ( bInputAllowed ) { @@ -1100,7 +1100,7 @@ void TPGalleryThemeProperties::DoPreview() } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl, Button*, void) { if( bInputAllowed ) { @@ -1124,7 +1124,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void) { if( bInputAllowed ) { @@ -1135,7 +1135,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void) { if( bInputAllowed ) { @@ -1165,7 +1165,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void) { if( bInputAllowed ) { @@ -1177,14 +1177,14 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void) { aPreviewTimer.Stop(); DoPreview(); } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void) { if( !aFoundList.empty() ) { @@ -1203,7 +1203,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, v } -IMPL_LINK_TYPED( TPGalleryThemeProperties, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvt, void ) +IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvt, void ) { DBG_ASSERT( xFolderPicker.is(), "TPGalleryThemeProperties::DialogClosedHdl(): no folder picker" ); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 76f4698ce5c6..dc680de5bd48 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -170,7 +170,7 @@ void GraphicFilterDialog::dispose() } -IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void) { maTimer.Stop(); mpPreview->SetPreview(GetFilteredGraphic(mpPreview->GetScaledOriginal(), @@ -178,7 +178,7 @@ IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void) } -IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void) { if (bIsBitmap) { @@ -212,13 +212,13 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r } -IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, void) +IMPL_LINK_NOARG(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, void) { GetModifyHdl().Call(nullptr); } -IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterMosaic, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } @@ -288,7 +288,7 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r } -IMPL_LINK_NOARG_TYPED(GraphicFilterSmooth, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterSmooth, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } @@ -351,13 +351,13 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi } -IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, void) +IMPL_LINK_NOARG(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, void) { GetModifyHdl().Call(nullptr); } -IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterSolarize, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } @@ -421,7 +421,7 @@ GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGr mpMtrSepia->SetModifyHdl( LINK(this, GraphicFilterSepia, EditModifyHdl) ); } -IMPL_LINK_NOARG_TYPED(GraphicFilterSepia, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterSepia, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } @@ -476,7 +476,7 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG } -IMPL_LINK_NOARG_TYPED(GraphicFilterPoster, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterPoster, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 262cde9cc42d..ad18fcbcdd00 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -263,7 +263,7 @@ void SvxHpLinkDlg::Move() } /// Click on OK button -IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickOkHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl, Button*, void) { Apply(); Close(); @@ -275,7 +275,7 @@ IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickOkHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickApplyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl, Button*, void) { Apply(); } @@ -286,7 +286,7 @@ IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickApplyHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickCloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl, Button*, void) { Close(); } diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 6772f445f3ea..88b768ad974e 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -58,7 +58,7 @@ void SvxNameDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxNameDialog, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl, Edit&, void) { if(aCheckNameHdl.IsSet()) pBtnOK->Enable(aCheckNameHdl.Call(*this)); @@ -98,7 +98,7 @@ void SvxObjectNameDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SvxObjectNameDialog, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl, Edit&, void) { if(aCheckNameHdl.IsSet()) { @@ -188,14 +188,14 @@ void SvxMessDialog::dispose() /*************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxMessDialog, Button1Hdl, Button*, void) +IMPL_LINK_NOARG(SvxMessDialog, Button1Hdl, Button*, void) { EndDialog( RET_BTN_1 ); } /*************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxMessDialog, Button2Hdl, Button*, void) +IMPL_LINK_NOARG(SvxMessDialog, Button2Hdl, Button*, void) { EndDialog( RET_BTN_2 ); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 8a1d65859002..2f6c5279eb7d 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -473,11 +473,11 @@ namespace svx } } - IMPL_LINK_TYPED( SuggestionDisplay, SelectSuggestionValueSetHdl, ValueSet*, pControl, void ) + IMPL_LINK( SuggestionDisplay, SelectSuggestionValueSetHdl, ValueSet*, pControl, void ) { SelectSuggestionHdl(pControl); } - IMPL_LINK_TYPED( SuggestionDisplay, SelectSuggestionListBoxHdl, ListBox&, rControl, void ) + IMPL_LINK( SuggestionDisplay, SelectSuggestionListBoxHdl, ListBox&, rControl, void ) { SelectSuggestionHdl(&rControl); } @@ -709,14 +709,14 @@ namespace svx } - IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void ) + IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void ) { m_pWordInput->SetText( m_pSuggestions->GetSelectEntry() ); OnSuggestionModified( *m_pWordInput ); } - IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnSuggestionModified, Edit&, void ) + IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionModified, Edit&, void ) { m_pFind->Enable( m_pWordInput->IsValueChangedFromSaved() ); @@ -726,7 +726,7 @@ namespace svx } - IMPL_LINK_TYPED( HangulHanjaConversionDialog, ClickByCharacterHdl, Button*, pBox, void ) + IMPL_LINK( HangulHanjaConversionDialog, ClickByCharacterHdl, Button*, pBox, void ) { m_aClickByCharacterLink.Call( static_cast<CheckBox*>(pBox) ); @@ -735,7 +735,7 @@ namespace svx } - IMPL_LINK_TYPED( HangulHanjaConversionDialog, OnConversionDirectionClicked, Button *, pBox, void ) + IMPL_LINK( HangulHanjaConversionDialog, OnConversionDirectionClicked, Button *, pBox, void ) { CheckBox *pOtherBox = nullptr; if ( pBox == m_pHangulOnly ) @@ -751,7 +751,7 @@ namespace svx } } - IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnOption, Button*, void ) + IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnOption, Button*, void ) { ScopedVclPtrInstance< HangulHanjaOptionsDialog > aOptDlg(this); aOptDlg->Execute(); @@ -960,7 +960,7 @@ namespace svx } } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, OkHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, OkHdl, Button*, void) { sal_uInt32 nCnt = m_aDictList.size(); sal_uInt32 n = 0; @@ -1013,7 +1013,7 @@ namespace svx EndDialog( RET_OK ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DictsLB_SelectHdl, SvTreeListBox*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl, SvTreeListBox*, void) { bool bSel = m_pDictsLB->FirstSelected() != nullptr; @@ -1021,7 +1021,7 @@ namespace svx m_pDeletePB->Enable(bSel); } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, NewDictHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, NewDictHdl, Button*, void) { OUString aName; ScopedVclPtrInstance< HangulHanjaNewDictDialog > aNewDlg(this); @@ -1052,7 +1052,7 @@ namespace svx } } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, EditDictHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, EditDictHdl, Button*, void) { SvTreeListEntry* pEntry = m_pDictsLB->FirstSelected(); DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" ); @@ -1063,7 +1063,7 @@ namespace svx } } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DeleteDictHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl, Button*, void) { sal_uLong nSelPos = m_pDictsLB->GetSelectEntryPos(); if( nSelPos != TREELIST_ENTRY_NOTFOUND ) @@ -1178,7 +1178,7 @@ namespace svx pEntry->SetUserData( new OUString( _rName ) ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaNewDictDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl, Button*, void) { OUString aName(comphelper::string::stripEnd(m_pDictNameED->GetText(), ' ')); @@ -1189,7 +1189,7 @@ namespace svx EndDialog( RET_OK ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaNewDictDialog, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl, Edit&, void) { OUString aName(comphelper::string::stripEnd(m_pDictNameED->GetText(), ' ')); @@ -1485,12 +1485,12 @@ namespace svx } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, ScrollHdl, ScrollBar*, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, ScrollHdl, ScrollBar*, void ) { UpdateScrollbar(); } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, OriginalModifyHdl, Edit&, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, OriginalModifyHdl, Edit&, void ) { m_bModifiedOriginal = true; m_aOriginal = comphelper::string::stripEnd( m_aOriginalLB->GetText(), ' ' ); @@ -1499,32 +1499,32 @@ namespace svx UpdateButtonStates(); } - IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl1, Edit&, rEdit, void ) + IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl1, Edit&, rEdit, void ) { EditModify( &rEdit, 0 ); } - IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl2, Edit&, rEdit, void ) + IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl2, Edit&, rEdit, void ) { EditModify( &rEdit, 1 ); } - IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl3, Edit&, rEdit, void ) + IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl3, Edit&, rEdit, void ) { EditModify( &rEdit, 2 ); } - IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl4, Edit&, rEdit, void ) + IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl4, Edit&, rEdit, void ) { EditModify( &rEdit, 3 ); } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void ) { InitEditDictDialog( m_aBookLB->GetSelectEntryPos() ); } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void ) { DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." ); Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; @@ -1592,7 +1592,7 @@ namespace svx return bRemovedSomething; } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, DeletePBPushHdl, Button*, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, DeletePBPushHdl, Button*, void ) { if( DeleteEntryFromDictionary( m_aOriginal, m_rDictList[ m_nCurrentDict ] ) ) { diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index d7d56760d304..c5133396258f 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -400,7 +400,7 @@ void SvxHyperlinkNewDocTp::DoApply () |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void) { uno::Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 680d1dc29697..304408d8d88b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -193,7 +193,7 @@ void SvxHyperlinkDocTp::SetInitFocus() |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void) { // Open Fileopen-Dialog sfx2::FileDialogHelper aDlg( @@ -232,7 +232,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void) { if ( GetPathType ( maStrURL ) == Type_ExistsFile || maStrURL.isEmpty() || @@ -262,7 +262,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, Edit&, void) { maStrURL = GetCurrentURL(); @@ -278,7 +278,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, Edit&, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) { if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile || maStrURL.isEmpty() || @@ -301,7 +301,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, Edit&, void) { maStrURL = GetCurrentURL(); @@ -317,7 +317,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, Edit&, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, LostFocusPathHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl, Control&, void) { maStrURL = GetCurrentURL(); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 2508f123c812..71cc15c57c38 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -216,7 +216,7 @@ void SvxHyperlinkInternetTp::SetInitFocus() |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, Edit&, void) { OUString aScheme = GetSchemeFromURL( m_pCbbTarget->GetText() ); if( !aScheme.isEmpty() ) @@ -233,7 +233,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, Edit&, voi |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void) { RefreshMarkWindow(); } @@ -244,7 +244,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, Edit&, void) { OUString aStrLogin ( m_pEdLogin->GetText() ); if ( aStrLogin.equalsIgnoreAsciiCase( sAnonymous ) ) @@ -331,7 +331,7 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, Button*, void) { OUString aScheme = GetSchemeFromButtons(); SetScheme(aScheme); @@ -343,7 +343,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, Button*, |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, void) { // disable login-editfields if checked if ( m_pCbAnonymous->IsChecked() ) @@ -371,7 +371,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, v |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, Control&, void) { RefreshMarkWindow(); } diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 1d8387ba855e..73dd0b7e8719 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -228,7 +228,7 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const OUString& aProperScheme) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, Edit&, void) { OUString aScheme = GetSchemeFromURL( m_pCbbReceiver->GetText() ); if(!aScheme.isEmpty()) @@ -241,7 +241,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, Edit&, void) |* |************************************************************************/ -IMPL_STATIC_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void) +IMPL_STATIC_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void) { SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if( pViewFrame ) diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 96e2a04c52a0..986e608a6598 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -561,13 +561,13 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(const OUString& aStrMark) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, SvTreeListBox*, bool) { ClickApplyHdl_Impl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = mpLbTree->GetCurEntry(); @@ -588,7 +588,7 @@ IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = mpLbTree->GetCurEntry(); if ( pEntry ) diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 7e117bb43743..226e7a6a6c62 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -317,7 +317,7 @@ SfxDispatcher* SvxHyperlinkTabPageBase::GetDispatcher() const } // Click on imagebutton : Script -IMPL_LINK_NOARG_TYPED(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void) { SvxHyperlinkItem *pHyperlinkItem = const_cast<SvxHyperlinkItem*>(static_cast<const SvxHyperlinkItem *>( GetItemSet().GetItem (SID_HYPERLINK_GETLINK))); diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 8dd3aface50f..a31c070ab83d 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -339,7 +339,7 @@ void SvxHyphenWordDialog::SelRight() } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CutHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -350,7 +350,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CutHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void ) +IMPL_LINK_NOARG( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void ) { if( !m_bBusy ) { @@ -375,7 +375,7 @@ IMPL_LINK_NOARG_TYPED( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, DeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -386,7 +386,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, DeleteHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, ContinueHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -397,7 +397,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, ContinueHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -408,7 +408,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Left_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl, Button*, void) { if( !m_bBusy ) { @@ -419,7 +419,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Left_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Right_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl, Button*, void) { if( !m_bBusy ) { @@ -430,7 +430,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Right_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, GetFocusHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, GetFocusHdl_Impl, Control&, void) { m_pWordEdit->SetSelection( Selection( m_nOldPos, m_nOldPos + 1 ) ); } diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index d104557001f4..4026fdc3a869 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -334,7 +334,7 @@ void IconChoiceDialog::ShowPage(sal_uInt16 nId) | select a page | \**********************************************************************/ -IMPL_LINK_NOARG_TYPED(IconChoiceDialog , ChosePageHdl_Impl, SvtIconChoiceCtrl*, void) +IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl, SvtIconChoiceCtrl*, void) { SvxIconChoiceCtrlEntry *pEntry = m_pIconCtrl->GetSelectedEntry(); if ( !pEntry ) @@ -354,7 +354,7 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog , ChosePageHdl_Impl, SvtIconChoiceCtrl*, | \**********************************************************************/ -IMPL_LINK_NOARG_TYPED(IconChoiceDialog, OkHdl, Button*, void) +IMPL_LINK_NOARG(IconChoiceDialog, OkHdl, Button*, void) { bInOK = true; @@ -366,7 +366,7 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog, OkHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ApplyHdl, Button*, void) +IMPL_LINK_NOARG(IconChoiceDialog, ApplyHdl, Button*, void) { bInOK = true; @@ -377,7 +377,7 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ApplyHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ResetHdl, Button*, void) +IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl, Button*, void) { ResetPageImpl (); @@ -388,7 +388,7 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ResetHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(IconChoiceDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(IconChoiceDialog, CancelHdl, Button*, void) { Close(); } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 9c0b5a596274..2d72164caa68 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -99,12 +99,12 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OU } -IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl, ListBox&, void) { EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void) +IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, Button*, void) { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -132,7 +132,7 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, RadioHdl, Button*, void) +IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl, Button*, void) { if ( m_pRbNewObject->IsChecked() ) { @@ -600,7 +600,7 @@ short SfxInsertFloatingFrameDialog::Execute() } -IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void ) +IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void ) { CheckBox* pCB = static_cast<CheckBox*>(pButton); if ( pCB == m_pCBMarginWidthDefault ) @@ -621,7 +621,7 @@ IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void } -IMPL_LINK_NOARG_TYPED( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void) +IMPL_LINK_NOARG( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void) { // create the file dialog sfx2::FileDialogHelper aFileDlg( diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 48e09601fdf1..4ee16b38bf1c 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -165,7 +165,7 @@ void SvBaseLinksDlg::dispose() /************************************************************************* |* SvBaseLinksDlg::Handler() *************************************************************************/ -IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, void ) +IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, void ) { const sal_uLong nSelectionCount = pSvTabListBox ? pSvTabListBox->GetSelectionCount() : 0; @@ -250,13 +250,13 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, } } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, LinksDoubleClickHdl, SvTreeListBox *, bool ) +IMPL_LINK_NOARG( SvBaseLinksDlg, LinksDoubleClickHdl, SvTreeListBox *, bool ) { ChangeSourceClickHdl( nullptr ); return false; } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, AutomaticClickHdl, Button*, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, AutomaticClickHdl, Button*, void ) { sal_uLong nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); @@ -265,7 +265,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, AutomaticClickHdl, Button*, void ) SetType( *pLink, nPos, SfxLinkUpdateMode::ALWAYS ); } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ManualClickHdl, Button*, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, ManualClickHdl, Button*, void ) { sal_uLong nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); @@ -274,7 +274,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ManualClickHdl, Button*, void ) SetType( *pLink, nPos, SfxLinkUpdateMode::ONCALL ); } -IMPL_LINK_NOARG_TYPED(SvBaseLinksDlg, UpdateNowClickHdl, Button*, void) +IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl, Button*, void) { SvTabListBox& rListBox = *m_pTbLinks; @@ -345,7 +345,7 @@ IMPL_LINK_NOARG_TYPED(SvBaseLinksDlg, UpdateNowClickHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void ) { sal_uLong nSelectionCount = m_pTbLinks->GetSelectionCount(); if(nSelectionCount > 1) @@ -414,7 +414,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void ) { bool bModified = false; if(m_pTbLinks->GetSelectionCount() <= 1) @@ -501,7 +501,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void ) } } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void ) { m_pTbLinks->SetUpdateMode(false); for( sal_uLong nPos = m_pTbLinks->GetEntryCount(); nPos; ) @@ -519,7 +519,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void ) m_pTbLinks->SetUpdateMode(true); } -IMPL_LINK_TYPED( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink&, _rLink, void ) +IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink&, _rLink, void ) { sal_uLong nPos; GetSelEntry( &nPos ); diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index f3e799fc1166..afe5584e8b15 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; -IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void) { sal_uLong nCount = m_pRadioLB->GetEntryCount(); bool bIsSelected = m_pRadioLB->FirstSelected() != nullptr; @@ -48,7 +48,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void) m_pDelBtn->Enable(bEnable && bIsSelected); } -IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void) { sal_uLong nCount = m_pPathLB->GetEntryCount(); bool bIsSelected = m_pPathLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; @@ -56,7 +56,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void) m_pDelBtn->Enable(bEnable && bIsSelected); } -IMPL_LINK_TYPED( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void ) +IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void ) { SvTreeListEntry* pEntry = pBox @@ -66,7 +66,7 @@ IMPL_LINK_TYPED( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void ) m_pRadioLB->HandleEntryChecked( pEntry ); } -IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); @@ -99,7 +99,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); @@ -128,7 +128,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, DelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = m_pRadioLB->FirstSelected(); delete static_cast<OUString*>(pEntry->GetUserData()); @@ -154,7 +154,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, DelHdl_Impl, Button*, void) SelectHdl_Impl( nullptr ); } -IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, DelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl, Button*, void) { sal_Int32 nPos = m_pPathLB->GetSelectEntryPos(); m_pPathLB->RemoveEntry( nPos ); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index f869cd3f2fe6..21b88d5e4c78 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -49,7 +49,7 @@ struct PasswordToOpenModifyDialog_Impl bool m_bIsPasswordToModify; - DECL_LINK_TYPED( OkBtnClickHdl, Button*, void ); + DECL_LINK( OkBtnClickHdl, Button*, void ); PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); @@ -94,7 +94,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_pOptionsExpander->Hide(); } -IMPL_LINK_NOARG_TYPED( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void ) +IMPL_LINK_NOARG( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void ) { bool bInvalidState = !m_pOpenReadonlyCB->IsChecked() && m_pPasswdToOpenED->GetText().isEmpty() && diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 9b91856de302..d6750ca7fad0 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -73,13 +73,13 @@ void SvPasteObjectDialog::SelectObject() } } -IMPL_LINK_NOARG_TYPED( SvPasteObjectDialog, SelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( SvPasteObjectDialog, SelectHdl, ListBox&, void ) { if ( !m_pOKButton->IsEnabled() ) m_pOKButton->Enable(); } -IMPL_LINK_NOARG_TYPED( SvPasteObjectDialog, DoubleClickHdl, ListBox&, void ) +IMPL_LINK_NOARG( SvPasteObjectDialog, DoubleClickHdl, ListBox&, void ) { EndDialog( RET_OK ); } diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 35c3500a96fd..612e38221c68 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -166,17 +166,17 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) } -IMPL_LINK_NOARG_TYPED(SvxPostItDialog, PrevHdl, Button*, void) +IMPL_LINK_NOARG(SvxPostItDialog, PrevHdl, Button*, void) { aPrevHdlLink.Call( *this ); } -IMPL_LINK_NOARG_TYPED(SvxPostItDialog, NextHdl, Button*, void) +IMPL_LINK_NOARG(SvxPostItDialog, NextHdl, Button*, void) { aNextHdlLink.Call( *this ); } -IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void) +IMPL_LINK_NOARG(SvxPostItDialog, Stamp, Button*, void) { Date aDate( Date::SYSTEM ); tools::Time aTime( tools::Time::SYSTEM ); @@ -199,7 +199,7 @@ IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxPostItDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SvxPostItDialog, OKHdl, Button*, void) { const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); pOutSet = new SfxItemSet( rSet ); diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index f8f693e7a70f..357e9b1da7a4 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -70,10 +70,10 @@ public: private: // Handler for click on save - DECL_LINK_TYPED(saveButtonHandler, Button*, void); + DECL_LINK(saveButtonHandler, Button*, void); // Handler for clicks on picture frame - DECL_LINK_TYPED(pictureFrameListener, VclWindowEvent&, void); + DECL_LINK(pictureFrameListener, VclWindowEvent&, void); // helper methods void CollectChildren( @@ -241,7 +241,7 @@ ScreenshotAnnotationDlg_Impl::~ScreenshotAnnotationDlg_Impl() mpVirtualBufferDevice.disposeAndClear(); } -IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, saveButtonHandler, Button*, pButton, void) +IMPL_LINK(ScreenshotAnnotationDlg_Impl, saveButtonHandler, Button*, pButton, void) { (void)pButton; @@ -482,7 +482,7 @@ void ScreenshotAnnotationDlg_Impl::RepaintPictureElement() } } -IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, rEvent, void) { // event in picture frame bool bRepaint(false); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 554a9dc0103c..8f7b433521d6 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -613,7 +613,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) } } -IMPL_LINK_TYPED( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, void ) { if ( !pBox->IsSelected( pBox->GetHdlEntry() ) ) { @@ -637,7 +637,7 @@ IMPL_LINK_TYPED( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, voi } } -IMPL_LINK_TYPED( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void ) +IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void ) { if ( pButton == m_pCloseButton ) { @@ -1456,7 +1456,7 @@ short SvxScriptErrorDialog::Execute() return 0; } -IMPL_STATIC_LINK_TYPED( SvxScriptErrorDialog, ShowDialog, void*, p, void ) +IMPL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, p, void ) { OUString* pMessage = static_cast<OUString*>(p); OUString message; diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 8f320ade4bc2..0f2917fab7f5 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -51,7 +51,7 @@ void FmShowColsDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(FmShowColsDialog, OnClickedOk, Button*, void) +IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk, Button*, void) { DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should call SetColumns before executing the dialog !"); if (m_xColumns.is()) diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 7335f21a04de..3fdf3e578327 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -73,7 +73,7 @@ SvxSplitTableDlg::~SvxSplitTableDlg() m_pDialog.disposeAndClear(); } -IMPL_LINK_TYPED( SvxSplitTableDlg, ClickHdl, Button *, pButton, void ) +IMPL_LINK( SvxSplitTableDlg, ClickHdl, Button *, pButton, void ) { const bool bIsVert = pButton == m_pVertBox ; long nMax = bIsVert ? mnMaxVertical : mnMaxHorizontal; diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 5a12ed5e89e7..d6e0578ad0cc 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -193,7 +193,7 @@ void SvxSearchAttributeDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SvxSearchAttributeDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl, Button*, void) { SearchAttrItem aInvalidItem; aInvalidItem.pItem = reinterpret_cast<SfxPoolItem*>(-1); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 511ff0c70dc4..cd71d22f9b29 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -92,7 +92,7 @@ void LookUpComboBox::Modify() m_aModifyIdle.Start(); } -IMPL_LINK_NOARG_TYPED( LookUpComboBox, ModifyTimer_Hdl, Idle *, void ) +IMPL_LINK_NOARG( LookUpComboBox, ModifyTimer_Hdl, Idle *, void ) { m_pDialog->LookUp( GetText() ); m_aModifyIdle.Stop(); @@ -336,7 +336,7 @@ void SvxThesaurusDialog::LookUp( const OUString &rText ) LookUp_Impl(); } -IMPL_LINK_TYPED( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void ) { if (pBtn && aLookUpHistory.size() >= 2) { @@ -347,7 +347,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void ) } } -IMPL_LINK_TYPED( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void ) +IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void ) { OUString aLangText( rLB.GetSelectEntry() ); LanguageType nLang = SvtLanguageTable::GetLanguageType( aLangText ); @@ -377,7 +377,7 @@ void SvxThesaurusDialog::LookUp_Impl() m_pLeftBtn->Enable( aLookUpHistory.size() > 1 ); } -IMPL_LINK_TYPED( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void ) +IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void ) { if (!m_pWordCB->IsTravelSelect()) // act only upon return key and not when traveling with cursor keys { @@ -389,7 +389,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void ) } } -IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void ) { SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : nullptr; if (pEntry) @@ -405,7 +405,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox * } } -IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeListBox*, pBox, bool ) +IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeListBox*, pBox, bool ) { SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : nullptr; if (pEntry) @@ -429,7 +429,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeList return false; } -IMPL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void *, p, void ) +IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, void *, p, void ) { SvxCheckListBox* pBox = static_cast<SvxCheckListBox*>(p); if (pBox && pBox->GetEntryCount() >= 2) @@ -534,7 +534,7 @@ void SvxThesaurusDialog::dispose() SvxStandardDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, void ) +IMPL_LINK_NOARG( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, void ) { EndDialog(RET_OK); } diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index d79ed31a73b0..a93d18ff01f8 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -308,7 +308,7 @@ void SvxZoomDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SvxZoomDialog, UserHdl, Button *, pButton, void) +IMPL_LINK(SvxZoomDialog, UserHdl, Button *, pButton, void) { mbModified = true; @@ -323,7 +323,7 @@ IMPL_LINK_TYPED(SvxZoomDialog, UserHdl, Button *, pButton, void) } } -IMPL_LINK_NOARG_TYPED(SvxZoomDialog, SpinHdl, Edit&, void) +IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl, Edit&, void) { if (!m_pUserBtn->IsChecked()) return; @@ -331,7 +331,7 @@ IMPL_LINK_NOARG_TYPED(SvxZoomDialog, SpinHdl, Edit&, void) mbModified = true; } -IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void) +IMPL_LINK(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void) { mbModified = true; @@ -358,7 +358,7 @@ IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void) } } -IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutSpinHdl, Edit&, rEdit, void) +IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, Edit&, rEdit, void) { if (&rEdit == m_pColumnsEdit && !m_pColumnsBtn->IsChecked()) return; @@ -376,7 +376,7 @@ IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutSpinHdl, Edit&, rEdit, void) mbModified = true; } -IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void) +IMPL_LINK(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void) { if (pCheckBox == m_pBookModeChk && !m_pColumnsBtn->IsChecked()) return; @@ -384,7 +384,7 @@ IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void) mbModified = true; } -IMPL_LINK_TYPED(SvxZoomDialog, OKHdl, Button*, pButton, void) +IMPL_LINK(SvxZoomDialog, OKHdl, Button*, pButton, void) { if (mbModified || m_pOKBtn != pButton) { diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index f748ab491e69..47f4f4c7e59c 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -160,7 +160,7 @@ long VclAbstractDialog2_Impl::GetResult() return m_pDlg->GetResult(); } -IMPL_LINK_TYPED( VclAbstractDialog2_Impl, EndDialogHdl, Dialog&, rDlg, void ) +IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog&, rDlg, void ) { if ( &rDlg != m_pDlg ) { @@ -590,7 +590,7 @@ void AbstractSvxNameDialog_Impl::SetText( const OUString& rStr ) { pDlg->SetText( rStr ); } -IMPL_LINK_NOARG_TYPED(AbstractSvxNameDialog_Impl, CheckNameHdl, SvxNameDialog&, bool) +IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameHdl, SvxNameDialog&, bool) { return aCheckNameHdl.Call(*this); } @@ -614,7 +614,7 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link<AbstractSvxObj } } -IMPL_LINK_NOARG_TYPED(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, SvxObjectNameDialog&, bool) +IMPL_LINK_NOARG(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, SvxObjectNameDialog&, bool) { return aCheckNameHdl.Call(*this); } @@ -771,11 +771,11 @@ void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<AbstractSvxPostItDialo else pDlg->SetPrevHdl( Link<SvxPostItDialog&,void>() ); } -IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, NextHdl, SvxPostItDialog&, void) +IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, NextHdl, SvxPostItDialog&, void) { aNextHdl.Call(*this); } -IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, PrevHdl, SvxPostItDialog&, void) +IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, PrevHdl, SvxPostItDialog&, void) { aPrevHdl.Call(*this); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index a753130753a0..510d18e49836 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -85,7 +85,7 @@ public: virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; virtual long GetResult() override; private: - DECL_LINK_TYPED( EndDialogHdl, Dialog&, void ); + DECL_LINK( EndDialogHdl, Dialog&, void ); }; class CuiVclAbstractDialog_Impl : public VclAbstractDialog @@ -309,7 +309,7 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog virtual void SetText( const OUString& rStr ) override ; private: Link<AbstractSvxNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(CheckNameHdl, SvxNameDialog&, bool); + DECL_LINK(CheckNameHdl, SvxNameDialog&, bool); }; class SvxObjectNameDialog; @@ -323,7 +323,7 @@ class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog private: Link<AbstractSvxObjectNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(CheckNameHdl, SvxObjectNameDialog&, bool); + DECL_LINK(CheckNameHdl, SvxObjectNameDialog&, bool); }; class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog @@ -430,8 +430,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog private: Link<AbstractSvxPostItDialog&,void> aNextHdl; Link<AbstractSvxPostItDialog&,void> aPrevHdl; - DECL_LINK_TYPED(NextHdl, SvxPostItDialog&, void); - DECL_LINK_TYPED(PrevHdl, SvxPostItDialog&, void); + DECL_LINK(NextHdl, SvxPostItDialog&, void); + DECL_LINK(PrevHdl, SvxPostItDialog&, void); }; class PasswordToOpenModifyDialog; diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 60b81dbbe899..affdf32f1c85 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -74,7 +74,7 @@ private: inline SpellDialog* GetSpellDialog() const; - DECL_LINK_TYPED(ToolbarHdl, ToolBox*, void); + DECL_LINK(ToolbarHdl, ToolBox*, void); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; @@ -179,23 +179,23 @@ private: css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpell; - DECL_LINK_TYPED(ChangeHdl, Button*, void); - DECL_LINK_TYPED(DoubleClickChangeHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeAllHdl, Button*, void); - DECL_LINK_TYPED( IgnoreAllHdl, Button*, void ); - DECL_LINK_TYPED(IgnoreHdl, Button*, void); - DECL_LINK_TYPED( CheckGrammarHdl, Button*, void ); - DECL_LINK_TYPED( ExtClickHdl, Button*, void ); - DECL_LINK_TYPED(CancelHdl, Button*, void); - DECL_LINK_TYPED( ModifyHdl, Edit&, void); - DECL_LINK_TYPED(UndoHdl, Button*, void); - DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void ); - DECL_LINK_TYPED( AddToDictClickHdl, Button*, void ); - DECL_LINK_TYPED( LanguageSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DialogUndoHdl, SpellUndoAction_Impl&, void ); - DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void ); - - DECL_LINK_TYPED( InitHdl, void*, void ); + DECL_LINK(ChangeHdl, Button*, void); + DECL_LINK(DoubleClickChangeHdl, ListBox&, void); + DECL_LINK(ChangeAllHdl, Button*, void); + DECL_LINK( IgnoreAllHdl, Button*, void ); + DECL_LINK(IgnoreHdl, Button*, void); + DECL_LINK( CheckGrammarHdl, Button*, void ); + DECL_LINK( ExtClickHdl, Button*, void ); + DECL_LINK(CancelHdl, Button*, void); + DECL_LINK( ModifyHdl, Edit&, void); + DECL_LINK(UndoHdl, Button*, void); + DECL_LINK( AddToDictSelectHdl, MenuButton*, void ); + DECL_LINK( AddToDictClickHdl, Button*, void ); + DECL_LINK( LanguageSelectHdl, ListBox&, void ); + DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl&, void ); + DECL_LINK( HandleHyperlink, FixedHyperlink&, void ); + + DECL_LINK( InitHdl, void*, void ); void AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu *pMenu ); void StartSpellOptDlg_Impl(); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index d9597bd474f9..80fda68b6552 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -69,7 +69,7 @@ public: virtual ~AboutDialog() override; virtual void dispose() override; - DECL_LINK_TYPED( HandleClick, Button*, void ); + DECL_LINK( HandleClick, Button*, void ); }; #endif // INCLUDED_CUI_SOURCE_INC_ABOUT_HXX diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index e7f0298c27cd..24b92c90c15a 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -147,16 +147,16 @@ private: OUString m_sModuleShortName; OUString m_sModuleUIName; - DECL_LINK_TYPED(ChangeHdl, Button *, void); - DECL_LINK_TYPED(RemoveHdl, Button *, void); - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED(Save, Button *, void); - DECL_LINK_TYPED(Load, Button *, void); - DECL_LINK_TYPED(Default, Button *, void); - DECL_LINK_TYPED(RadioHdl, Button *, void); - - DECL_LINK_TYPED(LoadHdl, sfx2::FileDialogHelper *, void); - DECL_LINK_TYPED(SaveHdl, sfx2::FileDialogHelper *, void); + DECL_LINK(ChangeHdl, Button *, void); + DECL_LINK(RemoveHdl, Button *, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void ); + DECL_LINK(Save, Button *, void); + DECL_LINK(Load, Button *, void); + DECL_LINK(Default, Button *, void); + DECL_LINK(RadioHdl, Button *, void); + + DECL_LINK(LoadHdl, sfx2::FileDialogHelper *, void); + DECL_LINK(SaveHdl, sfx2::FileDialogHelper *, void); OUString GetLabel4Command(const OUString& rCommand); void InitAccCfg(); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 3695dadf6526..c70e95cf544d 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -76,8 +76,8 @@ private: bool HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const; - DECL_LINK_TYPED( UpdateEnableHdl, ListBox&, void ); - DECL_LINK_TYPED( UpdateEnableClickHdl, Button*, void ); + DECL_LINK( UpdateEnableHdl, ListBox&, void ); + DECL_LINK( UpdateEnableClickHdl, Button*, void ); private: VclPtr<ListBox> m_pLbHorAlign; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 5005acf32a2c..5c832436e976 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -49,7 +49,7 @@ class OfaAutoCorrDlg : public SfxTabDialog sal_uInt16 m_nReplacePageId; sal_uInt16 m_nExceptionsPageId; - DECL_LINK_TYPED(SelectLanguageHdl, ListBox&, void); + DECL_LINK(SelectLanguageHdl, ListBox&, void); public: OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet); @@ -160,9 +160,9 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(EditHdl, Button*, void); - DECL_LINK_TYPED(DoubleClickEditHdl, SvTreeListBox*, bool); + DECL_LINK(SelectHdl, SvTreeListBox*, void); + DECL_LINK(EditHdl, Button*, void); + DECL_LINK(DoubleClickEditHdl, SvTreeListBox*, bool); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); @@ -263,10 +263,10 @@ private: bool bReplaceEditChanged:1; bool bSWriter:1; - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); - DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void); + DECL_LINK(NewDelButtonHdl, Button*, void); + DECL_LINK(NewDelActionHdl, AutoCorrEdit&, bool); + DECL_LINK(ModifyHdl, Edit&, void); bool NewDelHdl(void*); void RefillReplaceBox( bool bFromReset, @@ -323,10 +323,10 @@ private: CollatorWrapper* pCompareClass; LanguageType eLang; - DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); - DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(NewDelButtonHdl, Button*, void); + DECL_LINK(NewDelActionHdl, AutoCorrEdit&, bool); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(ModifyHdl, Edit&, void); bool NewDelHdl(void*); /// Box filled with new language void RefillReplaceBoxes(bool bFromReset, @@ -393,8 +393,8 @@ private: sal_UCS4 cStartQuote; sal_UCS4 cEndQuote; - DECL_LINK_TYPED( QuoteHdl, Button*, void ); - DECL_LINK_TYPED( StdQuoteHdl, Button*, void ); + DECL_LINK( QuoteHdl, Button*, void ); + DECL_LINK( StdQuoteHdl, Button*, void ); OUString ChangeStringExt_Impl( sal_UCS4 ); @@ -451,7 +451,7 @@ private: editeng::SortedAutoCompleteStrings* m_pAutoCompleteList; sal_uInt16 m_nAutoCmpltListCnt; - DECL_LINK_TYPED( CheckHdl, CheckBox&, void ); + DECL_LINK( CheckHdl, CheckBox&, void ); OfaAutoCompleteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -466,7 +466,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; void CopyToClipboard() const; - DECL_LINK_TYPED(DeleteHdl, Button*, void); + DECL_LINK(DeleteHdl, Button*, void); }; // class OfaSmartTagOptionsTabPage --------------------------------------------- @@ -502,21 +502,21 @@ private: Enables/disables all controls in the tab page (except from the check box. */ - DECL_LINK_TYPED(CheckHdl, CheckBox&, void); + DECL_LINK(CheckHdl, CheckBox&, void); /** Handler for the push button Calls the displayPropertyPage function of the smart tag recognizer associated with the currently selected smart tag type. */ - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(ClickHdl, Button*, void); /** Handler for the list box Enables/disables the properties push button if selection in the smart tag types list box changes. */ - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void); public: /// construction via Create() diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 49714edce8b1..9a4d2545b203 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -132,13 +132,13 @@ private: bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot); void ResetFromWallpaperItem( const SfxItemSet& rSet ); - DECL_LINK_TYPED( LoadIdleHdl_Impl, Idle*, void ); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void); - DECL_LINK_TYPED( RadioClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FileClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED(BackgroundColorHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED( TblDestinationHdl_Impl, ListBox&, void ); + DECL_LINK( LoadIdleHdl_Impl, Idle*, void ); + DECL_LINK(SelectHdl_Impl, ListBox&, void ); + DECL_LINK(BrowseHdl_Impl, Button*, void); + DECL_LINK( RadioClickHdl_Impl, Button*, void ); + DECL_LINK( FileClickHdl_Impl, Button*, void ); + DECL_LINK(BackgroundColorHdl_Impl, ValueSet*, void); + DECL_LINK( TblDestinationHdl_Impl, ListBox&, void ); }; #endif // INCLUDED_CUI_SOURCE_INC_BACKGRND_HXX diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index f2b2eaa1bb7f..c32dba59e174 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -118,15 +118,15 @@ private: std::set<sal_Int16> maUsedBorderStyles; // Handler - DECL_LINK_TYPED( SelStyleHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SelColHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( LinesChanged_Impl, LinkParamNone*, void ); - DECL_LINK_TYPED( ModifyDistanceHdl_Impl, Edit&, void); - DECL_LINK_TYPED( ModifyWidthHdl_Impl, Edit&, void); - DECL_LINK_TYPED( SyncHdl_Impl, Button*, void); - DECL_LINK_TYPED( RemoveAdjacentCellBorderHdl_Impl, Button*, void); + DECL_LINK( SelStyleHdl_Impl, ListBox&, void ); + DECL_LINK( SelColHdl_Impl, ListBox&, void ); + DECL_LINK( SelPreHdl_Impl, ValueSet*, void ); + DECL_LINK( SelSdwHdl_Impl, ValueSet*, void ); + DECL_LINK( LinesChanged_Impl, LinkParamNone*, void ); + DECL_LINK( ModifyDistanceHdl_Impl, Edit&, void); + DECL_LINK( ModifyWidthHdl_Impl, Edit&, void); + DECL_LINK( SyncHdl_Impl, Button*, void); + DECL_LINK( RemoveAdjacentCellBorderHdl_Impl, Button*, void); sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const; sal_uInt16 GetPresetStringId( sal_uInt16 nValueSetIdx ) const; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index c91fa99c4e97..6ca5756ab118 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -354,8 +354,8 @@ private: bool bInitialised; SaveInData* pCurrentSaveInData; - DECL_LINK_TYPED( SelectSaveInLocation, ListBox&, void ); - DECL_LINK_TYPED( AsyncInfoMsg, void*, void ); + DECL_LINK( SelectSaveInLocation, ListBox&, void ); + DECL_LINK( AsyncInfoMsg, void*, void ); protected: @@ -402,7 +402,7 @@ protected: SvxConfigPage( vcl::Window*, const SfxItemSet& ); - DECL_LINK_TYPED( MoveHdl, Button *, void ); + DECL_LINK( MoveHdl, Button *, void ); virtual SaveInData* CreateSaveInData( const css::uno::Reference< css::ui::XUIConfigurationManager >&, @@ -477,15 +477,15 @@ class SvxMenuConfigPage : public SvxConfigPage { private: bool m_bIsMenuBar; - DECL_LINK_TYPED( SelectMenu, ListBox&, void ); - DECL_LINK_TYPED( SelectMenuEntry, SvTreeListBox *, void ); - DECL_LINK_TYPED( NewMenuHdl, Button *, void ); - DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); - DECL_LINK_TYPED( AddSeparatorHdl, Button *, void ); - DECL_LINK_TYPED( DeleteCommandHdl, Button *, void ); - DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); + DECL_LINK( SelectMenu, ListBox&, void ); + DECL_LINK( SelectMenuEntry, SvTreeListBox *, void ); + DECL_LINK( NewMenuHdl, Button *, void ); + DECL_LINK( MenuSelectHdl, MenuButton *, void ); + DECL_LINK( EntrySelectHdl, MenuButton *, void ); + DECL_LINK( AddCommandsHdl, Button *, void ); + DECL_LINK( AddSeparatorHdl, Button *, void ); + DECL_LINK( DeleteCommandHdl, Button *, void ); + DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog&, void ); void Init() override; void UpdateButtonStates() override; @@ -521,9 +521,9 @@ class SvxMainMenuOrganizerDialog : public ModalDialog void UpdateButtonStates(); - DECL_LINK_TYPED( MoveHdl, Button *, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( MoveHdl, Button *, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); public: SvxMainMenuOrganizerDialog ( @@ -571,18 +571,18 @@ class SvxToolbarConfigPage : public SvxConfigPage { private: - DECL_LINK_TYPED( SelectToolbar, ListBox&, void ); - DECL_LINK_TYPED( SelectToolbarEntry, SvTreeListBox*, void ); - DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( StyleChangeHdl, Button *, void ); - DECL_LINK_TYPED( NewToolbarHdl, Button *, void ); - DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); - DECL_LINK_TYPED( AddSeparatorHdl, Button *, void ); - DECL_LINK_TYPED( DeleteCommandHdl, Button *, void ); - DECL_LINK_TYPED( ResetTopLevelHdl, Button *, void ); - DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); - DECL_LINK_TYPED( MoveHdl, Button *, void ); + DECL_LINK( SelectToolbar, ListBox&, void ); + DECL_LINK( SelectToolbarEntry, SvTreeListBox*, void ); + DECL_LINK( ToolbarSelectHdl, MenuButton *, void ); + DECL_LINK( EntrySelectHdl, MenuButton *, void ); + DECL_LINK( StyleChangeHdl, Button *, void ); + DECL_LINK( NewToolbarHdl, Button *, void ); + DECL_LINK( AddCommandsHdl, Button *, void ); + DECL_LINK( AddSeparatorHdl, Button *, void ); + DECL_LINK( DeleteCommandHdl, Button *, void ); + DECL_LINK( ResetTopLevelHdl, Button *, void ); + DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog&, void ); + DECL_LINK( MoveHdl, Button *, void ); void UpdateButtonStates() override; short QueryReset() override; @@ -727,9 +727,9 @@ public: css::uno::Reference< css::graphic::XGraphic > GetSelectedIcon(); - DECL_LINK_TYPED( SelectHdl, ToolBox *, void ); - DECL_LINK_TYPED( ImportHdl, Button *, void ); - DECL_LINK_TYPED( DeleteHdl, Button *, void ); + DECL_LINK( SelectHdl, ToolBox *, void ); + DECL_LINK( ImportHdl, Button *, void ); + DECL_LINK( DeleteHdl, Button *, void ); }; class SvxIconReplacementDialog : public MessBox diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index b700b4507774..1dbda947bdd4 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -133,10 +133,10 @@ private: void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); - DECL_LINK_TYPED( UpdateHdl_Impl, Idle *, void ); - DECL_LINK_TYPED( FontModifyEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( FontModifyListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( FontModifyComboBoxHdl_Impl, ComboBox&, void ); + DECL_LINK( UpdateHdl_Impl, Idle *, void ); + DECL_LINK( FontModifyEditHdl_Impl, Edit&, void ); + DECL_LINK( FontModifyListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( FontModifyComboBoxHdl_Impl, ComboBox&, void ); void FontModifyHdl_Impl(void*); public: @@ -222,11 +222,11 @@ private: bool FillItemSetColor_Impl( SfxItemSet& rSet ); void SelectHdl_Impl(ListBox*); - DECL_LINK_TYPED(SelectListBoxHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(CbClickHdl_Impl, Button*, void); - DECL_LINK_TYPED(TristClickHdl_Impl, Button*, void); - DECL_LINK_TYPED(UpdatePreview_Impl, ListBox&, void); - DECL_LINK_TYPED(ColorBoxSelectHdl_Impl, ListBox&, void); + DECL_LINK(SelectListBoxHdl_Impl, ListBox&, void); + DECL_LINK(CbClickHdl_Impl, Button*, void); + DECL_LINK(TristClickHdl_Impl, Button*, void); + DECL_LINK(UpdatePreview_Impl, ListBox&, void); + DECL_LINK(ColorBoxSelectHdl_Impl, ListBox&, void); public: virtual ~SvxCharEffectsPage() override; @@ -297,15 +297,15 @@ private: void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); void SetEscapement_Impl( SvxEscapement nEsc ); - DECL_LINK_TYPED( PositionHdl_Impl, Button*, void ); - DECL_LINK_TYPED( RotationHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FontModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( AutoPositionHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void ); - DECL_LINK_TYPED( KerningSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( KerningModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( LoseFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( ScaleWidthModifyHdl_Impl, Edit&, void ); + DECL_LINK( PositionHdl_Impl, Button*, void ); + DECL_LINK( RotationHdl_Impl, Button*, void ); + DECL_LINK( FontModifyHdl_Impl, Edit&, void ); + DECL_LINK( AutoPositionHdl_Impl, Button*, void ); + DECL_LINK( FitToLineHdl_Impl, Button*, void ); + DECL_LINK( KerningSelectHdl_Impl, ListBox&, void ); + DECL_LINK( KerningModifyHdl_Impl, Edit&, void ); + DECL_LINK( LoseFocusHdl_Impl, Control&, void ); + DECL_LINK( ScaleWidthModifyHdl_Impl, Edit&, void ); public: virtual ~SvxCharPositionPage() override; @@ -350,8 +350,8 @@ private: void SelectCharacter( ListBox* pBox ); void SetBracket( sal_Unicode cBracket, bool bStart ); - DECL_LINK_TYPED(TwoLinesHdl_Impl, Button*, void); - DECL_LINK_TYPED(CharacterMapHdl_Impl, ListBox&, void ); + DECL_LINK(TwoLinesHdl_Impl, Button*, void); + DECL_LINK(CharacterMapHdl_Impl, ListBox&, void ); public: virtual ~SvxCharTwoLinesPage() override; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 362b9569f278..ab291494e7d3 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -57,8 +57,8 @@ private: void FillTypeLB(); - DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeAttrEditHdl_Impl, Edit&, void ); + DECL_LINK( ChangeAttrListBoxHdl_Impl, ListBox&, void ); void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 0d48662e830c..41382bb45949 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -83,15 +83,15 @@ private: const SubsetMap* pSubsetMap; enum class Radix : sal_Int16 {decimal = 10, hexadecimal=16}; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(FontSelectHdl, ListBox&, void); - DECL_LINK_TYPED(SubsetSelectHdl, ListBox&, void); - DECL_LINK_TYPED(CharDoubleClickHdl, SvxShowCharSet*,void); - DECL_LINK_TYPED(CharSelectHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(CharPreSelectHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(DecimalCodeChangeHdl, Edit&, void); - DECL_LINK_TYPED(HexCodeChangeHdl, Edit&, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(FontSelectHdl, ListBox&, void); + DECL_LINK(SubsetSelectHdl, ListBox&, void); + DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*,void); + DECL_LINK(CharSelectHdl, SvxShowCharSet*, void); + DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void); + DECL_LINK(CharPreSelectHdl, SvxShowCharSet*, void); + DECL_LINK(DecimalCodeChangeHdl, Edit&, void); + DECL_LINK(HexCodeChangeHdl, Edit&, void); static void fillAllSubsets(ListBox &rListBox); void selectCharByCode(Radix radix); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 5cc0ae265a5b..b61fd63adb16 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -157,23 +157,23 @@ protected: private: // Handler for the Controls - DECL_LINK_TYPED( OnClickedFieldRadios, Button*, void ); - DECL_LINK_TYPED(OnClickedSearchAgain, Button *, void); - DECL_LINK_TYPED( OnClickedSpecialSettings, Button*, void ); + DECL_LINK( OnClickedFieldRadios, Button*, void ); + DECL_LINK(OnClickedSearchAgain, Button *, void); + DECL_LINK( OnClickedSpecialSettings, Button*, void ); - DECL_LINK_TYPED(OnSearchTextModified, Edit&, void); + DECL_LINK(OnSearchTextModified, Edit&, void); - DECL_LINK_TYPED( OnPositionSelected, ListBox&, void ); - DECL_LINK_TYPED( OnFieldSelected, ListBox&, void ); + DECL_LINK( OnPositionSelected, ListBox&, void ); + DECL_LINK( OnFieldSelected, ListBox&, void ); - DECL_LINK_TYPED( OnFocusGrabbed, Control&, void ); - DECL_LINK_TYPED( OnCheckBoxToggled, CheckBox&, void ); + DECL_LINK( OnFocusGrabbed, Control&, void ); + DECL_LINK( OnCheckBoxToggled, CheckBox&, void ); - DECL_LINK_TYPED( OnContextSelection, ListBox&, void ); + DECL_LINK( OnContextSelection, ListBox&, void ); - DECL_LINK_TYPED( OnSearchProgress, const FmSearchProgress*, void ); + DECL_LINK( OnSearchProgress, const FmSearchProgress*, void ); - DECL_LINK_TYPED( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI + DECL_LINK( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI void initCommon( const css::uno::Reference< css::sdbc::XResultSet >& _rxCursor ); }; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 64343fbfa1f9..7fe1f00b1974 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -88,7 +88,7 @@ private: INetURLObject startUrl_; rtl::Reference< SearchThread > maSearchThread; - DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); + DECL_LINK( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -96,7 +96,7 @@ public: virtual ~SearchProgress() override; virtual void dispose() override; - DECL_LINK_TYPED( CleanUpHdl, void*, void ); + DECL_LINK( CleanUpHdl, void*, void ); virtual short Execute() override; virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; @@ -133,7 +133,7 @@ private: rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; - DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); + DECL_LINK( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -142,7 +142,7 @@ public: virtual ~TakeProgress() override; virtual void dispose() override; - DECL_LINK_TYPED( CleanUpHdl, void*, void ); + DECL_LINK( CleanUpHdl, void*, void ); void SetFile( const INetURLObject& rURL ) { m_pFtTakeFile->SetText( GetReducedString( rURL, 30 ) ); } virtual short Execute() override; @@ -158,9 +158,9 @@ private: GalleryTheme* pTheme; GalleryProgress aStatusProgress; - DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); - DECL_LINK_TYPED( TimeoutHdl, Idle*, void ); - DECL_LINK_TYPED( ActualizeHdl, const INetURLObject&, void ); + DECL_LINK( ClickCancelBtn, Button*, void ); + DECL_LINK( TimeoutHdl, Idle*, void ); + DECL_LINK( ActualizeHdl, const INetURLObject&, void ); public: ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); @@ -188,7 +188,7 @@ private: VclPtr<ListBox> m_pLbResName; GalleryTheme* pThm; - DECL_LINK_TYPED( ClickOkHdl, Button*, void ); + DECL_LINK( ClickOkHdl, Button*, void ); public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); virtual ~GalleryIdDialog() override; @@ -278,16 +278,16 @@ class TPGalleryThemeProperties : public SfxTabPage void TakeFiles(); void DoPreview(); - DECL_LINK_TYPED( ClickPreviewHdl, Button*, void ); - DECL_LINK_TYPED( ClickSearchHdl, Button*, void ); - DECL_LINK_TYPED( ClickTakeHdl, Button*, void ); - DECL_LINK_TYPED( ClickTakeAllHdl, Button*, void ); - DECL_LINK_TYPED( SelectFoundHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectFileTypeHdl, ComboBox&, void ); - DECL_LINK_TYPED( DClickFoundHdl, ListBox&, void ); - DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void ); - DECL_LINK_TYPED( EndSearchProgressHdl, Dialog&, void ); - DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_LINK( ClickPreviewHdl, Button*, void ); + DECL_LINK( ClickSearchHdl, Button*, void ); + DECL_LINK( ClickTakeHdl, Button*, void ); + DECL_LINK( ClickTakeAllHdl, Button*, void ); + DECL_LINK( SelectFoundHdl, ListBox&, void ); + DECL_LINK( SelectFileTypeHdl, ComboBox&, void ); + DECL_LINK( DClickFoundHdl, ListBox&, void ); + DECL_LINK( PreviewTimerHdl, Timer*, void ); + DECL_LINK( EndSearchProgressHdl, Dialog&, void ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); public: TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ); diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 53874f2255bb..ad3803a960df 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -73,8 +73,8 @@ private: Size maSizePixel; bool bIsBitmap; - DECL_LINK_TYPED( ImplPreviewTimeoutHdl, Timer *, void ); - DECL_LINK_TYPED( ImplModifyHdl, LinkParamNone*, void); + DECL_LINK( ImplPreviewTimeoutHdl, Timer *, void ); + DECL_LINK( ImplModifyHdl, LinkParamNone*, void); protected: VclPtr<GraphicPreviewWindow> mpPreview; @@ -95,7 +95,7 @@ class GraphicFilterSmooth : public GraphicFilterDialog { private: VclPtr<NumericField> mpMtrRadius; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: @@ -113,8 +113,8 @@ private: VclPtr<MetricField> mpMtrWidth; VclPtr<MetricField> mpMtrHeight; VclPtr<CheckBox> mpCbxEdges; - DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, @@ -133,8 +133,8 @@ class GraphicFilterSolarize : public GraphicFilterDialog private: VclPtr<MetricField> mpMtrThreshold; VclPtr<CheckBox> mpCbxInvert; - DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: @@ -152,7 +152,7 @@ class GraphicFilterSepia : public GraphicFilterDialog { private: VclPtr<MetricField> mpMtrSepia; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); @@ -169,7 +169,7 @@ class GraphicFilterPoster : public GraphicFilterDialog { private: VclPtr<NumericField> mpNumPoster; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 95cea405e05a..056e4cd0eb9b 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -68,9 +68,9 @@ private: bool mbReadOnly : 1; bool mbIsHTMLDoc : 1; - DECL_LINK_TYPED (ClickOkHdl_Impl, Button *, void ); - DECL_LINK_TYPED (ClickApplyHdl_Impl, Button *, void ); - DECL_LINK_TYPED (ClickCloseHdl_Impl, Button *, void ); + DECL_LINK (ClickOkHdl_Impl, Button *, void ); + DECL_LINK (ClickApplyHdl_Impl, Button *, void ); + DECL_LINK (ClickCloseHdl_Impl, Button *, void ); protected: virtual bool Close() override; diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index b4bedc9c18d5..5f1065ada287 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -49,7 +49,7 @@ private: // "name" fields unsigned nShortNameField; - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); bool GetData_Impl(); void SetData_Impl(); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 86f5119aae80..0c103cc22e71 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -94,7 +94,7 @@ private: protected: virtual short Ok() override; - DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); + DECL_LINK( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -156,12 +156,12 @@ class SvxTransparenceTabPage : public SvxTabPage XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - DECL_LINK_TYPED(ClickTransOffHdl_Impl, Button*, void ); - DECL_LINK_TYPED(ClickTransLinearHdl_Impl, Button*, void ); - DECL_LINK_TYPED(ClickTransGradientHdl_Impl, Button*, void ); - DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ModifiedTrgrEditHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ModifiedTrgrListBoxHdl_Impl, ListBox&, void); + DECL_LINK(ClickTransOffHdl_Impl, Button*, void ); + DECL_LINK(ClickTransLinearHdl_Impl, Button*, void ); + DECL_LINK(ClickTransGradientHdl_Impl, Button*, void ); + DECL_LINK(ModifyTransparentHdl_Impl, Edit&, void); + DECL_LINK(ModifiedTrgrEditHdl_Impl, Edit&, void); + DECL_LINK(ModifiedTrgrListBoxHdl_Impl, ListBox&, void); void ModifiedTrgrHdl_Impl(void*); void ActivateLinear(bool bActivate); @@ -239,15 +239,15 @@ private: MapUnit m_ePoolUnit; - DECL_LINK_TYPED(SelectDialogTypeHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ModifyColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyGradientHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void ); + DECL_LINK(SelectDialogTypeHdl_Impl, ListBox&, void); + DECL_LINK( ModifyColorHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyGradientHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyHatchingHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyBitmapHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyTileHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ModifyTileClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickScaleHdl_Impl, Button*, void ); + DECL_LINK( ModifyTileHdl_Impl, Edit&, void ); + DECL_LINK( ModifyTileClickHdl_Impl, Button*, void ); + DECL_LINK( ClickScaleHdl_Impl, Button*, void ); void ClickInvisibleHdl_Impl(); void ClickHatchingHdl_Impl(); void ClickGradientHdl_Impl(); @@ -318,9 +318,9 @@ private: SfxItemSet& m_rXFSet; MapUnit m_ePoolUnit; - DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ModifyShadowHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( SelectShadowHdl_Impl, ListBox&, void ); + DECL_LINK( ClickShadowHdl_Impl, Button*, void ); + DECL_LINK( ModifyShadowHdl_Impl, Edit&, void ); + DECL_LINK( SelectShadowHdl_Impl, ListBox&, void ); public: SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); @@ -389,16 +389,16 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeGradientHdl, ValueSet*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ChangeGradientHdl, ValueSet*, void ); void ChangeGradientHdl_Impl(); - DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeAutoStepHdl_Impl, CheckBox&, void ); - DECL_LINK_TYPED( ModifiedSliderHdl_Impl, Slider*, void ); + DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ModifiedEditHdl_Impl, Edit&, void ); + DECL_LINK( ModifiedListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeAutoStepHdl_Impl, CheckBox&, void ); + DECL_LINK( ModifiedSliderHdl_Impl, Slider*, void ); void ModifiedHdl_Impl(void*); void SetControlState_Impl( css::awt::GradientStyle eXGS ); @@ -470,18 +470,18 @@ private: MapUnit m_ePoolUnit; - DECL_LINK_TYPED( ChangeHatchHdl, ValueSet*, void ); + DECL_LINK( ChangeHatchHdl, ValueSet*, void ); void ChangeHatchHdl_Impl(); - DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ToggleHatchBackgroundColor_Impl, CheckBox&, void ); - DECL_LINK_TYPED( ModifiedBackgroundHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifiedSliderHdl_Impl, Slider*, void ); + DECL_LINK( ModifiedEditHdl_Impl, Edit&, void ); + DECL_LINK( ModifiedListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ToggleHatchBackgroundColor_Impl, CheckBox&, void ); + DECL_LINK( ModifiedBackgroundHdl_Impl, ListBox&, void ); + DECL_LINK( ModifiedSliderHdl_Impl, Slider*, void ); void ModifiedHdl_Impl(void*); - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); sal_Int32 SearchHatchList(const OUString& rHatchName); @@ -568,16 +568,16 @@ private: sal_Int64 nFilledHeightPercent; sal_Int64 nZoomedWidthPercent; sal_Int64 nZoomedHeightPercent; - DECL_LINK_TYPED( ModifyBitmapHdl, ValueSet*, void ); - DECL_LINK_TYPED( ClickScaleHdl, Button*, void ); - DECL_LINK_TYPED( ModifyBitmapStyleHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyBitmapSizeHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyBitmapPositionHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyPositionOffsetHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyTileOffsetHdl, Edit&, void ); - DECL_LINK_TYPED( ClickRenameHdl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickImportHdl, Button*, void ); + DECL_LINK( ModifyBitmapHdl, ValueSet*, void ); + DECL_LINK( ClickScaleHdl, Button*, void ); + DECL_LINK( ModifyBitmapStyleHdl, ListBox&, void ); + DECL_LINK( ModifyBitmapSizeHdl, Edit&, void ); + DECL_LINK( ModifyBitmapPositionHdl, ListBox&, void ); + DECL_LINK( ModifyPositionOffsetHdl, Edit&, void ); + DECL_LINK( ModifyTileOffsetHdl, Edit&, void ); + DECL_LINK( ClickRenameHdl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl, SvxPresetListBox*, void ); + DECL_LINK( ClickImportHdl, Button*, void ); void ClickBitmapHdl_Impl(); void CalculateBitmapPresetSize(); sal_Int32 SearchBitmapList(const OUString& rBitmapName); @@ -646,12 +646,12 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangePatternHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( ChangeColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ChangePatternHdl_Impl, ValueSet*, void ); + DECL_LINK( ChangeColorHdl_Impl, ListBox&, void ); + DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); public: SvxPatternTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); @@ -766,19 +766,19 @@ private: void ImpColorCountChanged(); void FillPaletteLB(); - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickWorkOnHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickWorkOnHdl_Impl, Button*, void ); + DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectPaletteLBHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectValSetHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( SelectColorModeHdl_Impl, RadioButton&, void ); + DECL_LINK( SelectPaletteLBHdl, ListBox&, void ); + DECL_LINK( SelectValSetHdl_Impl, ValueSet*, void ); + DECL_LINK( SelectColorModeHdl_Impl, RadioButton&, void ); void ChangeColor(const Color &rNewColor); void SetColorModel(ColorModel eModel); void ChangeColorModel(); void UpdateColorValues(); static sal_Int32 SearchColorList(OUString const & aColorName); - DECL_LINK_TYPED( ModifiedHdl_Impl, Edit&, void ); + DECL_LINK( ModifiedHdl_Impl, Edit&, void ); void UpdateModified(); css::uno::Reference< css::uno::XComponentContext > m_context; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index fc84623aa6b2..07f101f2c993 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -60,7 +60,7 @@ private: protected: virtual short Ok() override; - DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); + DECL_LINK( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -168,29 +168,29 @@ private: sal_Int32 m_nActLineWidth; // handler for gallery popup menu button + size - DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( MenuCreateHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); - - DECL_LINK_TYPED( ClickInvisibleHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeStartClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeStartListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeStartModifyHdl_Impl, Edit&, void ); + DECL_LINK( GraphicHdl_Impl, MenuButton *, void ); + DECL_LINK( MenuCreateHdl_Impl, MenuButton *, void ); + DECL_LINK( SizeHdl_Impl, Edit&, void ); + DECL_LINK( RatioHdl_Impl, Button*, void ); + + DECL_LINK( ClickInvisibleHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeStartClickHdl_Impl, Button*, void ); + DECL_LINK( ChangeStartListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeStartModifyHdl_Impl, Edit&, void ); void ChangeStartHdl_Impl(void*); - DECL_LINK_TYPED( ChangeEndListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeEndModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void ); + DECL_LINK( ChangeEndListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeEndModifyHdl_Impl, Edit&, void ); + DECL_LINK( ChangeEndClickHdl_Impl, Button*, void ); void ChangeEndHdl_Impl(void*); - DECL_LINK_TYPED( ChangePreviewListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangePreviewModifyHdl_Impl, Edit&, void ); + DECL_LINK( ChangePreviewListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangePreviewModifyHdl_Impl, Edit&, void ); void ChangePreviewHdl_Impl(void*); - DECL_LINK_TYPED( ChangeTransparentHdl_Impl, Edit&, void ); + DECL_LINK( ChangeTransparentHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeEdgeStyleHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeEdgeStyleHdl_Impl, ListBox&, void ); // LineCaps - DECL_LINK_TYPED( ChangeCapStyleHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeCapStyleHdl_Impl, ListBox&, void ); void FillXLSet_Impl(); @@ -285,18 +285,18 @@ private: void FillDash_Impl(); void FillDialog_Impl(); - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectLinestyleListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK( SelectLinestyleListBoxHdl_Impl, ListBox&, void ); void SelectLinestyleHdl_Impl(ListBox*); - DECL_LINK_TYPED( ChangePreviewHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeNumber1Hdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeNumber2Hdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeMetricHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectTypeListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangePreviewHdl_Impl, Edit&, void ); + DECL_LINK( ChangeNumber1Hdl_Impl, Edit&, void ); + DECL_LINK( ChangeNumber2Hdl_Impl, Edit&, void ); + DECL_LINK( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK( ClickSaveHdl_Impl, Button*, void ); + DECL_LINK( ChangeMetricHdl_Impl, Button*, void ); + DECL_LINK( SelectTypeListBoxHdl_Impl, ListBox&, void ); void SelectTypeHdl_Impl(ListBox*); void CheckChanges_Impl(); @@ -361,12 +361,12 @@ private: sal_uInt16 nDlgType; sal_Int32* pPosLineEndLb; - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectLineEndHdl_Impl, ListBox&, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK( ClickSaveHdl_Impl, Button*, void ); + DECL_LINK( SelectLineEndHdl_Impl, ListBox&, void ); void ChangePreviewHdl_Impl(); void CheckChanges_Impl(); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 3a120616f54f..80b6638ece00 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -51,16 +51,16 @@ namespace svx sal_uLong m_nOldCount; bool m_bModified; - DECL_LINK_TYPED( NewHdl, Button*, void ); - DECL_LINK_TYPED( EditHdl, Button*, void ); - DECL_LINK_TYPED( DeleteHdl, Button*, void ); - DECL_LINK_TYPED( PathBoxDoubleClickHdl, SvTreeListBox*, bool); + DECL_LINK( NewHdl, Button*, void ); + DECL_LINK( EditHdl, Button*, void ); + DECL_LINK( DeleteHdl, Button*, void ); + DECL_LINK( PathBoxDoubleClickHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED( PathSelect_Impl, SvTreeListBox*, void); + DECL_LINK( PathSelect_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( NameValidator, const OUString&, bool); + DECL_LINK( HeaderSelect_Impl, HeaderBar *, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar *, void ); + DECL_LINK( NameValidator, const OUString&, bool); /** inserts a new entry in the tablistbox diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 07dc6d03e4c3..11dbed3de84a 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -36,7 +36,7 @@ private: Link<SvxNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); @@ -49,7 +49,7 @@ public: field is changed. The Link result determines whether the OK Button is enabled (> 0) or disabled (== 0). - @param rLink a Callback declared with DECL_LINK_TYPED and implemented with + @param rLink a Callback declared with DECL_LINK and implemented with IMPL_LINK, that is executed on modification. @param bCheckImmediately If true, the Link is called directly after @@ -85,7 +85,7 @@ private: // callback link for name uniqueness Link<SvxObjectNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); public: // constructor @@ -138,8 +138,8 @@ private: VclPtr<FixedImage> pFtImage; Image* pImage; - DECL_LINK_TYPED(Button1Hdl, Button*, void); - DECL_LINK_TYPED(Button2Hdl, Button*, void); + DECL_LINK(Button1Hdl, Button*, void); + DECL_LINK(Button2Hdl, Button*, void); public: SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = nullptr ); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index bfbd63a293eb..a750bdb26597 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -95,13 +95,13 @@ class SvxGrfCropPage : public SfxTabPage virtual ~SvxGrfCropPage() override; virtual void dispose() override; - DECL_LINK_TYPED( ZoomHdl, Edit&, void ); - DECL_LINK_TYPED( SizeHdl, Edit&, void ); - DECL_LINK_TYPED( CropHdl, SpinField&, void ); - DECL_LINK_TYPED( CropLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( CropModifyHdl, Edit&, void ); - DECL_LINK_TYPED( OrigSizeHdl, Button*, void ); - DECL_LINK_TYPED( Timeout, Timer *, void ); + DECL_LINK( ZoomHdl, Edit&, void ); + DECL_LINK( SizeHdl, Edit&, void ); + DECL_LINK( CropHdl, SpinField&, void ); + DECL_LINK( CropLoseFocusHdl, Control&, void ); + DECL_LINK( CropModifyHdl, Edit&, void ); + DECL_LINK( OrigSizeHdl, Button*, void ); + DECL_LINK( Timeout, Timer *, void ); void CalcZoom(); void CalcMinMaxBorder(); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index bf29f12f9582..91c55eb3a2b1 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -79,8 +79,8 @@ namespace svx virtual void LoseFocus() override; virtual void Command( const CommandEvent& rCEvt ) override; - DECL_LINK_TYPED( SelectSuggestionListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectSuggestionValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectSuggestionListBoxHdl, ListBox&, void ); + DECL_LINK( SelectSuggestionValueSetHdl, ValueSet*, void ); void SelectSuggestionHdl(Control*); void SetHelpIds(); @@ -182,11 +182,11 @@ namespace svx void EnableRubySupport( bool bVal ); private: - DECL_LINK_TYPED( OnOption, Button*, void ); - DECL_LINK_TYPED( OnSuggestionModified, Edit&, void ); - DECL_LINK_TYPED( OnSuggestionSelected, SuggestionDisplay&, void ); - DECL_LINK_TYPED( OnConversionDirectionClicked, Button*, void ); - DECL_LINK_TYPED( ClickByCharacterHdl, Button*, void ); + DECL_LINK( OnOption, Button*, void ); + DECL_LINK( OnSuggestionModified, Edit&, void ); + DECL_LINK( OnSuggestionSelected, SuggestionDisplay&, void ); + DECL_LINK( OnConversionDirectionClicked, Button*, void ); + DECL_LINK( ClickByCharacterHdl, Button*, void ); /// fill the suggestion list box with suggestions for the actual input void FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions ); @@ -212,11 +212,11 @@ namespace svx HHDictList m_aDictList; css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( DictsLB_SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( NewDictHdl, Button*, void ); - DECL_LINK_TYPED( EditDictHdl, Button*, void ); - DECL_LINK_TYPED( DeleteDictHdl, Button*, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( DictsLB_SelectHdl, SvTreeListBox*, void ); + DECL_LINK( NewDictHdl, Button*, void ); + DECL_LINK( EditDictHdl, Button*, void ); + DECL_LINK( DeleteDictHdl, Button*, void ); void Init(); ///< reads settings from core and init controls public: @@ -236,8 +236,8 @@ namespace svx bool m_bEntered; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); virtual ~HangulHanjaNewDictDialog() override; @@ -291,16 +291,16 @@ namespace svx bool m_bModifiedSuggestions; bool m_bModifiedOriginal; - DECL_LINK_TYPED( OriginalModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EditModifyHdl1, Edit&, void ); - DECL_LINK_TYPED( EditModifyHdl2, Edit&, void ); - DECL_LINK_TYPED( EditModifyHdl3, Edit&, void ); - DECL_LINK_TYPED( EditModifyHdl4, Edit&, void ); + DECL_LINK( OriginalModifyHdl, Edit&, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( EditModifyHdl1, Edit&, void ); + DECL_LINK( EditModifyHdl2, Edit&, void ); + DECL_LINK( EditModifyHdl3, Edit&, void ); + DECL_LINK( EditModifyHdl4, Edit&, void ); - DECL_LINK_TYPED( BookLBSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( NewPBPushHdl, Button*, void ); - DECL_LINK_TYPED( DeletePBPushHdl, Button*, void ); + DECL_LINK( BookLBSelectHdl, ListBox&, void ); + DECL_LINK( NewPBPushHdl, Button*, void ); + DECL_LINK( DeletePBPushHdl, Button*, void ); void InitEditDictDialog( sal_uInt32 _nSelDict ); void UpdateOriginalLB(); diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 5fc81255614c..085213fc9eb1 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -30,7 +30,7 @@ private: VclPtr<HeaderBar> maHeaderBar; VclPtr<SvHeaderTabListBox> maListBox; protected: - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar*, void ); virtual bool Notify( NotifyEvent& rNEvt ) override; public: MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 7be89e1aee9f..82bf563f53cd 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -39,7 +39,7 @@ private: bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); - DECL_LINK_TYPED (ClickNewHdl_Impl, Button*, void ); + DECL_LINK (ClickNewHdl_Impl, Button*, void ); protected: void FillDlgFields(const OUString& rStrURL) override; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 59622ec19965..be739f471468 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -41,15 +41,15 @@ private: bool mbMarkWndOpen; - DECL_LINK_TYPED (ClickFileopenHdl_Impl, Button*, void ); - DECL_LINK_TYPED (ClickTargetHdl_Impl , Button*, void ); + DECL_LINK (ClickFileopenHdl_Impl, Button*, void ); + DECL_LINK (ClickTargetHdl_Impl , Button*, void ); - DECL_LINK_TYPED (ModifiedPathHdl_Impl , Edit&, void ); ///< Contents of combobox "Path" modified - DECL_LINK_TYPED (ModifiedTargetHdl_Impl, Edit&, void ); ///< Contents of editfield "Target" modified + DECL_LINK (ModifiedPathHdl_Impl , Edit&, void ); ///< Contents of combobox "Path" modified + DECL_LINK (ModifiedTargetHdl_Impl, Edit&, void ); ///< Contents of editfield "Target" modified - DECL_LINK_TYPED( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus + DECL_LINK( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus - DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void ); ///< Handler for timer -timeout + DECL_LINK( TimeoutHdl_Impl, Timer *, void ); ///< Handler for timer -timeout enum EPathType { Type_Unknown, Type_Invalid, Type_ExistsFile, Type_File, diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 42cf3c6c51c0..f10bf5a0b297 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -46,13 +46,13 @@ private: bool mbMarkWndOpen; - DECL_LINK_TYPED( Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP - DECL_LINK_TYPED( ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User - DECL_LINK_TYPED( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified - DECL_LINK_TYPED( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus - DECL_LINK_TYPED( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified + DECL_LINK( Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP + DECL_LINK( ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User + DECL_LINK( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified + DECL_LINK( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus + DECL_LINK( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified - DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout + DECL_LINK( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout void SetScheme(const OUString& rScheme); diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 9385d25f799d..349437d1ef2e 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -35,9 +35,9 @@ private: VclPtr<FixedText> m_pFtSubject; VclPtr<Edit> m_pEdSubject; - DECL_STATIC_LINK_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); + DECL_STATIC_LINK(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); ///< Button : Address book - DECL_LINK_TYPED (ModifiedReceiverHdl_Impl, Edit&, void ); ///< Combobox "receiver" modified + DECL_LINK (ModifiedReceiverHdl_Impl, Edit&, void ); ///< Combobox "receiver" modified void SetScheme(const OUString& rScheme); void RemoveImproperProtocol(const OUString& aProperScheme); diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index f497ab0f1ccc..b652f8c24b1b 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -86,9 +86,9 @@ protected: virtual void Move () override; - DECL_LINK_TYPED( ClickApplyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DoubleClickApplyHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ClickCloseHdl_Impl, Button*, void ); + DECL_LINK( ClickApplyHdl_Impl, Button*, void ); + DECL_LINK( DoubleClickApplyHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( ClickCloseHdl_Impl, Button*, void ); public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 2c2193e82565..4f24e11e0d04 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -97,7 +97,7 @@ protected: OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ); - DECL_LINK_TYPED (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script + DECL_LINK (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script static OUString GetSchemeFromURL( const OUString& rStrURL ); diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 7fc2a335527a..f5adb46d55d8 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -70,14 +70,14 @@ class SvxHyphenWordDialog : public SfxModalDialog void ContinueHyph_Impl( sal_Int32 nInsPos = -1 ); // continue by default sal_uInt16 GetHyphIndex_Impl(); - DECL_LINK_TYPED(Left_Impl, Button*, void); - DECL_LINK_TYPED(Right_Impl, Button*, void); - DECL_LINK_TYPED(CutHdl_Impl, Button*, void); - DECL_LINK_TYPED(ContinueHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED( HyphenateAllHdl_Impl, Button*, void ); - DECL_LINK_TYPED(CancelHdl_Impl, Button*, void); - DECL_LINK_TYPED(GetFocusHdl_Impl, Control&, void); + DECL_LINK(Left_Impl, Button*, void); + DECL_LINK(Right_Impl, Button*, void); + DECL_LINK(CutHdl_Impl, Button*, void); + DECL_LINK(ContinueHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK( HyphenateAllHdl_Impl, Button*, void ); + DECL_LINK(CancelHdl_Impl, Button*, void); + DECL_LINK(GetFocusHdl_Impl, Control&, void); public: SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang, diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index eb8a7432f576..66a61d114f41 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -120,11 +120,11 @@ private: bool bInOK; - DECL_LINK_TYPED( ChosePageHdl_Impl, SvtIconChoiceCtrl*, void ); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( ApplyHdl, Button*, void) ; - DECL_LINK_TYPED( ResetHdl, Button*, void) ; - DECL_LINK_TYPED( CancelHdl, Button*, void ); + DECL_LINK( ChosePageHdl_Impl, SvtIconChoiceCtrl*, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( ApplyHdl, Button*, void) ; + DECL_LINK( ResetHdl, Button*, void) ; + DECL_LINK( CancelHdl, Button*, void ); IconChoicePageData* GetPageData ( sal_uInt16 nId ); void Start_Impl(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index b982ba8ff93b..40dffa18087c 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -69,9 +69,9 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl css::uno::Sequence< sal_Int8 > m_aIconMetaFile; OUString m_aIconMediaType; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); - DECL_LINK_TYPED(RadioHdl, Button*, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); + DECL_LINK(BrowseHdl, Button*, void); + DECL_LINK(RadioHdl, Button*, void); void SelectDefault(); ListBox& GetObjectTypes() { return *m_pLbObjecttype; } @@ -115,8 +115,8 @@ private: VclPtr<NumericField> m_pNMMarginHeight; VclPtr<CheckBox> m_pCBMarginHeightDefault; - DECL_LINK_TYPED(OpenHdl, Button*, void ); - DECL_LINK_TYPED(CheckHdl, Button*, void ); + DECL_LINK(OpenHdl, Button*, void ); + DECL_LINK(CheckHdl, Button*, void ); void Init(); diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 52e9fd7ab717..7935a9f75a76 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -70,10 +70,10 @@ private: void SetupAnsatz_Impl( sal_uInt16 nType ); void SetupType_Impl( SdrCaptionType nType ); - DECL_LINK_TYPED( AnsatzSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( AnsatzRelSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( LineOptHdl_Impl, Button *, void ); - DECL_LINK_TYPED( SelectCaptTypeHdl_Impl, ValueSet*, void ); + DECL_LINK( AnsatzSelectHdl_Impl, ListBox&, void ); + DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox&, void ); + DECL_LINK( LineOptHdl_Impl, Button *, void ); + DECL_LINK( SelectCaptTypeHdl_Impl, ValueSet*, void ); const SfxItemSet& rOutAttrs; const SdrView* pView; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 3d1006a512fe..313b2cfa7646 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -64,15 +64,15 @@ class SvBaseLinksDlg : public ModalDialog bool bHtmlMode; Idle aUpdateIdle; - DECL_LINK_TYPED( LinksSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( LinksDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( AutomaticClickHdl, Button *, void ); - DECL_LINK_TYPED( ManualClickHdl, Button *, void ); - DECL_LINK_TYPED( UpdateNowClickHdl, Button *, void); - DECL_LINK_TYPED( ChangeSourceClickHdl, Button *, void ); - DECL_LINK_TYPED( BreakLinkClickHdl, Button *, void ); - DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void ); - DECL_LINK_TYPED( EndEditHdl, sfx2::SvBaseLink&, void ); + DECL_LINK( LinksSelectHdl, SvTreeListBox*, void ); + DECL_LINK( LinksDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( AutomaticClickHdl, Button *, void ); + DECL_LINK( ManualClickHdl, Button *, void ); + DECL_LINK( UpdateNowClickHdl, Button *, void); + DECL_LINK( ChangeSourceClickHdl, Button *, void ); + DECL_LINK( BreakLinkClickHdl, Button *, void ); + DECL_LINK( UpdateWaitingHdl, Idle *, void ); + DECL_LINK( EndEditHdl, sfx2::SvBaseLink&, void ); sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos ); OUString ImplGetStateStr( const sfx2::SvBaseLink& ); void SetType( sfx2::SvBaseLink& rLink, sal_uLong nPos, SfxLinkUpdateMode nType ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 056f337a53b5..66906fda727d 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -36,14 +36,14 @@ class SfxMacroTabPage_Impl; class SfxMacroTabPage : public SfxTabPage { SvxMacroTableDtor aTbl; - DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectGroup_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectMacro_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectEvent_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectGroup_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectMacro_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AssignDeleteHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); + DECL_LINK( AssignDeleteHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( AssignDeleteClickHdl_Impl, Button *, void ); bool AssignDeleteHdl(Control *); - DECL_LINK_TYPED( TimeOut_Impl, Idle*, void ); + DECL_LINK( TimeOut_Impl, Idle*, void ); protected: std::unique_ptr<SfxMacroTabPage_Impl> mpImpl; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index fb9860012a11..8767b671360f 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -58,9 +58,9 @@ class SvxMacroTabPage_Impl; class SvxMacroTabPage_ : public SfxTabPage { - DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void ); - DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( SelectEvent_Impl, SvTreeListBox*, void ); + DECL_LINK( AssignDeleteHdl_Impl, Button *, void ); + DECL_LINK( DoubleClickHdl_Impl, SvTreeListBox*, bool ); static long GenericHandler_Impl( SvxMacroTabPage_* pThis, PushButton* pBtn ); @@ -118,7 +118,7 @@ public: SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: - DECL_LINK_TYPED( OKHdl_Impl, Button *, void ); + DECL_LINK( OKHdl_Impl, Button *, void ); }; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index d2f632252991..1cece6f8cab7 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -60,10 +60,10 @@ private: void FillUnitLB(); - DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void ); + DECL_LINK( ClickAutoPosHdl_Impl, Button*, void ); + DECL_LINK( ChangeAttrEditHdl_Impl, Edit&, void ); + DECL_LINK( ChangeAttrListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeAttrClickHdl_Impl, Button*, void ); void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 03b86343f0cf..f059a55bcca1 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -43,10 +43,10 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(DelHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(DelHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK(CheckHdl_Impl, SvTreeListBox*, void); public: SvxMultiPathDialog(vcl::Window* pParent); @@ -64,9 +64,9 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(DelHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(DelHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, ListBox&, void); public: SvxPathSelectDialog(vcl::Window* pParent); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index fac8bccfe8dd..0446cbf047e7 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -149,17 +149,17 @@ private: void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); bool Click_Impl(PushButton* pIB); // Handler - DECL_LINK_TYPED( LostFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); + DECL_LINK( LostFocusHdl_Impl, Control&, void ); + DECL_LINK( DoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( SelFormatListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( SelFormatClickHdl_Impl, Button*, void ); void SelFormatHdl_Impl(void*); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OptEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( TimeHdl_Impl, Timer *, void); + DECL_LINK( ClickHdl_Impl, Button*, void ); + DECL_LINK( EditModifyHdl_Impl, Edit&, void ); + DECL_LINK( OptEditHdl_Impl, Edit&, void ); + DECL_LINK( OptClickHdl_Impl, Button*, void ); + DECL_LINK( TimeHdl_Impl, Timer *, void); void EditHdl_Impl(Edit*); void OptHdl_Impl(void*); }; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 6b7e70b771c3..101f62f28c0d 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -95,8 +95,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage sal_uInt16 nNumItemId; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxSingleNumPickTabPage(vcl::Window* pParent, @@ -129,8 +129,8 @@ class SvxBulletPickTabPage : public SfxTabPage OUString sBulletCharFormatName; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -172,8 +172,8 @@ class SvxNumPickTabPage : public SfxTabPage protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxNumPickTabPage(vcl::Window* pParent, @@ -217,9 +217,9 @@ class SvxBitmapPickTabPage : public SfxTabPage bool bPreset : 1; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(ClickAddBrowseHdl_Impl, Button*, void ); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(ClickAddBrowseHdl_Impl, Button*, void ); public: @@ -315,22 +315,22 @@ class SvxNumOptionsTabPage : public SfxTabPage void SwitchNumberType( sal_uInt8 nType, bool bBmp = false ); void CheckForStartValue_Impl(sal_uInt16 nNumberingType); - DECL_LINK_TYPED( NumberTypeSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( PopupActivateHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( BulletHdl_Impl, Button*, void); - DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); - DECL_LINK_TYPED( CharFmtHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( EditListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( AllLevelHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OrientHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( BulColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( BulRelSizeHdl_Impl, Edit&, void); - DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void); + DECL_LINK( NumberTypeSelectHdl_Impl, ListBox&, void ); + DECL_LINK( LevelHdl_Impl, ListBox&, void ); + DECL_LINK( PopupActivateHdl_Impl, MenuButton *, void ); + DECL_LINK( GraphicHdl_Impl, MenuButton *, void ); + DECL_LINK( BulletHdl_Impl, Button*, void); + DECL_LINK( SizeHdl_Impl, Edit&, void ); + DECL_LINK( RatioHdl_Impl, Button*, void ); + DECL_LINK( CharFmtHdl_Impl, ListBox&, void ); + DECL_LINK( EditModifyHdl_Impl, Edit&, void ); + DECL_LINK( EditListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( AllLevelHdl_Impl, Edit&, void ); + DECL_LINK( OrientHdl_Impl, ListBox&, void ); + DECL_LINK( SameLevelHdl_Impl, Button*, void ); + DECL_LINK( BulColorHdl_Impl, ListBox&, void ); + DECL_LINK( BulRelSizeHdl_Impl, Edit&, void); + DECL_LINK( PreviewInvalidateHdl_Impl, Timer *, void); void EditModifyHdl_Impl(Edit*); public: @@ -410,23 +410,23 @@ class SvxNumPositionTabPage : public SfxTabPage void InitControls(); - DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( DistanceHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( DistanceFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( RelativeHdl_Impl, Button*, void ); - DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); + DECL_LINK( LevelHdl_Impl, ListBox&, void ); + DECL_LINK( EditModifyHdl_Impl, ListBox&, void); + DECL_LINK( DistanceHdl_Impl, SpinField&, void ); + DECL_LINK( DistanceFocusHdl_Impl, Control&, void ); + DECL_LINK( RelativeHdl_Impl, Button*, void ); + DECL_LINK( StandardHdl_Impl, Button*, void); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); - DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ListtabPosHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( ListtabPosFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( AlignAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( AlignAtFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( IndentAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( IndentAtFocusHdl_Impl, Control&, void ); + DECL_LINK(LabelFollowedByHdl_Impl, ListBox&, void); + DECL_LINK( ListtabPosHdl_Impl, SpinField&, void ); + DECL_LINK( ListtabPosFocusHdl_Impl, Control&, void ); + DECL_LINK( AlignAtHdl_Impl, SpinField&, void ); + DECL_LINK( AlignAtFocusHdl_Impl, Control&, void ); + DECL_LINK( IndentAtHdl_Impl, SpinField&, void ); + DECL_LINK( IndentAtFocusHdl_Impl, Control&, void ); public: SvxNumPositionTabPage(vcl::Window* pParent, diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 8f00b697aed8..ce3070fb02e8 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -48,9 +48,9 @@ class SvxAsianLayoutPage : public SfxTabPage std::unique_ptr<SvxAsianLayoutPage_Impl> pImpl; - DECL_LINK_TYPED(LanguageHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeStandardHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(LanguageHdl, ListBox&, void); + DECL_LINK(ChangeStandardHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 21bb74699162..4cfa42b73913 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -57,8 +57,8 @@ private: css::uno::Reference< css::linguistic2::XDictionary > xNewDic; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(ModifyHdl_Impl, Edit&, void); public: SvxNewDictionaryDialog( vcl::Window* pParent ); @@ -120,12 +120,12 @@ private: bool bDoNothing; bool bDicIsReadonly; - DECL_LINK_TYPED(SelectBookHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SelectLangHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); - DECL_LINK_TYPED(NewDelActionHdl, SvxDictEdit&, bool); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SelectBookHdl_Impl, ListBox&, void); + DECL_LINK(SelectLangHdl_Impl, ListBox&, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void); + DECL_LINK(NewDelButtonHdl, Button*, void); + DECL_LINK(NewDelActionHdl, SvxDictEdit&, bool); + DECL_LINK(ModifyHdl, Edit&, void); bool NewDelHdl(void*); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index b841937a96c2..3742d5291996 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -74,14 +74,14 @@ class SvxEditModulesDlg : public ModalDialog SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( UpDownHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( BackHdl_Impl, Button*, void ); - DECL_LINK_TYPED( LangSelectListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ); - DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( OpenURLHdl_Impl, FixedHyperlink&, void ); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( UpDownHdl_Impl, Button*, void ); + DECL_LINK( ClickHdl_Impl, Button*, void ); + DECL_LINK( BackHdl_Impl, Button*, void ); + DECL_LINK( LangSelectListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ); + DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( OpenURLHdl_Impl, FixedHyperlink&, void ); void LangSelectHdl_Impl(ListBox*); public: @@ -138,12 +138,12 @@ private: void AddDicBoxEntry( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ClickHdl_Impl, Button *, void ); - DECL_LINK_TYPED( BoxDoubleClickHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( PostDblClickHdl_Impl, void *, void); - DECL_LINK_TYPED( OpenURLHdl_Impl, FixedHyperlink&, void ); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( ClickHdl_Impl, Button *, void ); + DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( PostDblClickHdl_Impl, void *, void); + DECL_LINK( OpenURLHdl_Impl, FixedHyperlink&, void ); void UpdateModulesBox_Impl(); void UpdateDicBox_Impl(); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index cb279f3a109c..914cbc74d1c5 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -53,15 +53,15 @@ private: void ChangeCurrentEntry( const OUString& _rFolder ); - DECL_LINK_TYPED( PathHdl_Impl, Button*, void); - DECL_LINK_TYPED( DoubleClickPathHdl_Impl, SvTreeListBox*, bool); - DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); + DECL_LINK( PathHdl_Impl, Button*, void); + DECL_LINK( DoubleClickPathHdl_Impl, SvTreeListBox*, bool); + DECL_LINK( StandardHdl_Impl, Button*, void); - DECL_LINK_TYPED( PathSelect_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); + DECL_LINK( PathSelect_Impl, SvTreeListBox*, void); + DECL_LINK( HeaderSelect_Impl, HeaderBar *, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); void GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 951d35179861..c0cd03089449 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -150,26 +150,26 @@ private: bool mbEnableDrawingLayerFillStyles : 1; void Init_Impl(); - DECL_LINK_TYPED( LayoutHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( PaperBinHdl_Impl, Control&, void); - DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void ); + DECL_LINK( LayoutHdl_Impl, ListBox&, void); + DECL_LINK( PaperBinHdl_Impl, Control&, void); + DECL_LINK( SwapOrientation_Impl, Button*, void ); void SwapFirstValues_Impl( bool bSet ); - DECL_LINK_TYPED( BorderModify_Impl, Edit&, void); + DECL_LINK( BorderModify_Impl, Edit&, void); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK_TYPED( CenterHdl_Impl, Button*, void); + DECL_LINK( CenterHdl_Impl, Button*, void); void UpdateExample_Impl( bool bResetbackground = false ); - DECL_LINK_TYPED( PaperSizeSelect_Impl, ListBox&, void ); - DECL_LINK_TYPED( PaperSizeModify_Impl, Edit&, void); + DECL_LINK( PaperSizeSelect_Impl, ListBox&, void ); + DECL_LINK( PaperSizeModify_Impl, Edit&, void); - DECL_LINK_TYPED( FrameDirectionModify_Impl, ListBox&, void ); + DECL_LINK( FrameDirectionModify_Impl, ListBox&, void ); void ResetBackground_Impl( const SfxItemSet& rSet ); - DECL_LINK_TYPED( RangeHdl_Impl, Control&, void ); + DECL_LINK( RangeHdl_Impl, Control&, void ); void CalcMargin_Impl(); - DECL_LINK_TYPED( RegisterModify, Button*, void ); + DECL_LINK( RegisterModify, Button*, void ); // page direction /** Disables vertical page direction entries in the text flow listbox. */ diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index d16a057c5246..8b621f217bfe 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -90,9 +90,9 @@ private: void Init_Impl(); void UpdateExample_Impl(); - DECL_LINK_TYPED( LineDistHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); + DECL_LINK( LineDistHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( AutoHdl_Impl, Button*, void ); protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; @@ -102,7 +102,7 @@ public: virtual ~SvxStdParagraphTabPage() override; virtual void dispose() override; - DECL_LINK_TYPED(ELRLoseFocusHdl, Control&, void); + DECL_LINK(ELRLoseFocusHdl, Control&, void); static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pStdRanges; } @@ -153,9 +153,9 @@ class SvxParaAlignTabPage : public SfxTabPage VclPtr<VclFrame> m_pPropertiesFL; VclPtr<svx::FrameDirectionListBox> m_pTextDirectionLB; - DECL_LINK_TYPED(AlignHdl_Impl, Button*, void); - DECL_LINK_TYPED(LastLineHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(TextDirectionHdl_Impl, ListBox&, void); + DECL_LINK(AlignHdl_Impl, Button*, void); + DECL_LINK(LastLineHdl_Impl, ListBox&, void); + DECL_LINK(TextDirectionHdl_Impl, ListBox&, void); void UpdateExample_Impl(); @@ -256,14 +256,14 @@ private: bool bHtmlMode; sal_uInt16 nStdPos; - DECL_LINK_TYPED(PageBreakHdl_Impl, Button*, void); - DECL_LINK_TYPED(KeepTogetherHdl_Impl, Button*, void); - DECL_LINK_TYPED(WidowHdl_Impl, Button*, void); - DECL_LINK_TYPED(OrphanHdl_Impl, Button*, void); - DECL_LINK_TYPED(HyphenClickHdl_Impl, Button*, void); - DECL_LINK_TYPED(ApplyCollClickHdl_Impl, Button*, void); - DECL_LINK_TYPED( PageBreakPosHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( PageBreakTypeHdl_Impl, ListBox&, void ); + DECL_LINK(PageBreakHdl_Impl, Button*, void); + DECL_LINK(KeepTogetherHdl_Impl, Button*, void); + DECL_LINK(WidowHdl_Impl, Button*, void); + DECL_LINK(OrphanHdl_Impl, Button*, void); + DECL_LINK(HyphenClickHdl_Impl, Button*, void); + DECL_LINK(ApplyCollClickHdl_Impl, Button*, void); + DECL_LINK( PageBreakPosHdl_Impl, ListBox&, void ); + DECL_LINK( PageBreakTypeHdl_Impl, ListBox&, void ); virtual void PageCreated(const SfxAllItemSet& aSet) override; }; @@ -279,7 +279,7 @@ class SvxAsianTabPage : public SfxTabPage SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - DECL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, void ); + DECL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, Button*, void ); public: virtual ~SvxAsianTabPage() override; diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index b4d6c413569d..b43f4731d50a 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -50,8 +50,8 @@ class SvPasteObjectDialog : public ModalDialog FixedText& ObjectSource() { return *m_pFtObjectSource; } void SelectObject(); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DoubleClickHdl, ListBox&, void ); public: SvPasteObjectDialog( vcl::Window* pParent ); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 4a2c53fc3303..9c351b1c9193 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -94,10 +94,10 @@ private: Link<SvxPostItDialog&,void> aPrevHdlLink; Link<SvxPostItDialog&,void> aNextHdlLink; - DECL_LINK_TYPED(Stamp, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(PrevHdl, Button*, void); - DECL_LINK_TYPED(NextHdl, Button*, void); + DECL_LINK(Stamp, Button*, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(PrevHdl, Button*, void); + DECL_LINK(NextHdl, Button*, void); }; #endif diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 428d6d831170..7a582ed20ccc 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -152,8 +152,8 @@ protected: const OUString m_renameErrStr; const OUString m_renameErrTitleStr; - DECL_LINK_TYPED( ScriptSelectHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( ButtonHdl, Button *, void ); + DECL_LINK( ScriptSelectHdl, SvTreeListBox *, void ); + DECL_LINK( ButtonHdl, Button *, void ); static bool getBoolProperty( css::uno::Reference< css::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( css::uno::Reference< css::script::browse::XBrowseNode >& node ); @@ -185,7 +185,7 @@ private: OUString m_sMessage; - DECL_STATIC_LINK_TYPED( SvxScriptErrorDialog, ShowDialog, void*, void ); + DECL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, void ); public: diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 6f8e20c97284..826a4ccefe34 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -92,7 +92,7 @@ friend class SvxConfigGroupListBox; SvxGroupInfoArr_Impl aArr; SvTreeListEntry* m_pDraggingEntry; - DECL_LINK_TYPED(TimerHdl, Timer *, void); + DECL_LINK(TimerHdl, Timer *, void); virtual void MouseMove( const MouseEvent& rMEvt ) override; public: @@ -187,9 +187,9 @@ class SvxScriptSelectorDialog : public ModalDialog bool m_bShowSlots; Link<SvxScriptSelectorDialog&,void> m_aAddHdl; - DECL_LINK_TYPED( ClickHdl, Button *, void ); - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( FunctionDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( ClickHdl, Button *, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( FunctionDoubleClickHdl, SvTreeListBox*, bool ); void UpdateUI(); diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index 6fad2cda4f06..4fce7ae2550b 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -48,7 +48,7 @@ public: void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols); protected: - DECL_LINK_TYPED(OnClickedOk, Button*, void); + DECL_LINK(OnClickedOk, Button*, void); }; #endif // INCLUDED_CUI_SOURCE_INC_SHOWCOLS_HXX diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 3fc5b5e6dcaa..df85c2f73cb8 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -41,7 +41,7 @@ public: SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); virtual ~SvxSplitTableDlg() override; - DECL_LINK_TYPED( ClickHdl, Button *, void ); + DECL_LINK( ClickHdl, Button *, void ); virtual bool IsHorizontal() const override; virtual bool IsProportional() const override; diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 85f889920cc9..876111059e25 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -60,7 +60,7 @@ private: SearchAttrItemList& rList; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); }; // class SvxSearchSimilarityDialog --------------------------------------- diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index ebc4a7d74523..aa5f90a7175d 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -100,14 +100,14 @@ class SvxSwPosSizeTabPage : public SfxTabPage bool m_bIsInRightToLeft; - DECL_LINK_TYPED(RangeModifyHdl, Control&, void); - DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); - DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); - DECL_LINK_TYPED( PosHdl, ListBox&, void ); - DECL_LINK_TYPED( RelHdl, ListBox&, void ); - DECL_LINK_TYPED(MirrorHdl, Button*, void); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED(ProtectHdl, Button*, void); + DECL_LINK(RangeModifyHdl, Control&, void); + DECL_LINK(RangeModifyClickHdl, Button*, void); + DECL_LINK(AnchorTypeHdl, Button*, void); + DECL_LINK( PosHdl, ListBox&, void ); + DECL_LINK( RelHdl, ListBox&, void ); + DECL_LINK(MirrorHdl, Button*, void); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK(ProtectHdl, Button*, void); void InitPos(short nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, sal_uInt16 nV, sal_uInt16 nVRel, diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 6fd0c44485c2..77505c1090ab 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -107,17 +107,17 @@ private: void SetFillAndTabType_Impl(); // Handler - DECL_LINK_TYPED( NewHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DelAllHdl_Impl, Button*, void ); + DECL_LINK( NewHdl_Impl, Button*, void ); + DECL_LINK( DelHdl_Impl, Button*, void ); + DECL_LINK( DelAllHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void ); - DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void ); + DECL_LINK( FillTypeCheckHdl_Impl, Button*, void ); + DECL_LINK( TabTypeCheckHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectHdl_Impl, ComboBox&, void ); - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( GetFillCharHdl_Impl, Control&, void ); - DECL_LINK_TYPED( GetDezCharHdl_Impl, Control&, void ); + DECL_LINK( SelectHdl_Impl, ComboBox&, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( GetFillCharHdl_Impl, Control&, void ); + DECL_LINK( GetDezCharHdl_Impl, Control&, void ); virtual void PageCreated(const SfxAllItemSet& aSet) override; }; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 3bfb857094a6..8469f3601637 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -65,11 +65,11 @@ private: FieldUnit eFUnit; MapUnit eUnit; - DECL_LINK_TYPED( SelectEffectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ClickEndlessHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickAutoHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickPixelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDirectionHdl_Impl, Button*, void ); + DECL_LINK( SelectEffectHdl_Impl, ListBox&, void ); + DECL_LINK( ClickEndlessHdl_Impl, Button*, void ); + DECL_LINK( ClickAutoHdl_Impl, Button*, void ); + DECL_LINK( ClickPixelHdl_Impl, Button*, void ); + DECL_LINK( ClickDirectionHdl_Impl, Button*, void ); void SelectDirection( SdrTextAniDirection nValue ); sal_uInt16 GetSelectedDirection(); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index c60a743f5460..88b77845d134 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -70,8 +70,8 @@ private: bool bWordWrapTextEnabled; bool bFitToSizeEnabled; - DECL_LINK_TYPED( ClickFullWidthHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); + DECL_LINK( ClickFullWidthHdl_Impl, Button*, void ); + DECL_LINK( ClickHdl_Impl, Button*, void ); /** Return whether the text direction is from left to right (</sal_True>) or top to bottom (</sal_False>). diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index ab0f46517d2e..1efd4921ca30 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -45,7 +45,7 @@ public: virtual ~LookUpComboBox() override; virtual void dispose() override; - DECL_LINK_TYPED( ModifyTimer_Hdl, Idle *, void ); + DECL_LINK( ModifyTimer_Hdl, Idle *, void ); void init(SvxThesaurusDialog *pDialog); @@ -142,14 +142,14 @@ public: const OUString& getErrStr() const { return m_aErrStr; } // Handler - DECL_LINK_TYPED( ReplaceBtnHdl_Impl, Button *, void ); - DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void ); - DECL_LINK_TYPED( LanguageHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( WordSelectHdl_Impl, ComboBox&, void ); - DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool ); - - DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); + DECL_LINK( ReplaceBtnHdl_Impl, Button *, void ); + DECL_LINK( LeftBtnHdl_Impl, Button *, void ); + DECL_LINK( LanguageHdl_Impl, ListBox&, void ); + DECL_LINK( WordSelectHdl_Impl, ComboBox&, void ); + DECL_LINK( AlternativesSelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool ); + + DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index ee7f474c9a5c..1728a30c9b60 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -124,16 +124,16 @@ private: RectPoint meRP; - DECL_LINK_TYPED( ChangePosProtectHdl, Button*, void ); - DECL_LINK_TYPED( ChangeSizeProtectHdl, Button*, void ); + DECL_LINK( ChangePosProtectHdl, Button*, void ); + DECL_LINK( ChangeSizeProtectHdl, Button*, void ); void SetMinMaxPosition(); void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange); - DECL_LINK_TYPED( ChangeWidthHdl, Edit&, void ); - DECL_LINK_TYPED( ChangeHeightHdl, Edit&, void ); - DECL_LINK_TYPED( ClickSizeProtectHdl, Button*, void ); - DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); + DECL_LINK( ChangeWidthHdl, Edit&, void ); + DECL_LINK( ChangeHeightHdl, Edit&, void ); + DECL_LINK( ClickSizeProtectHdl, Button*, void ); + DECL_LINK( ClickAutoHdl, Button*, void ); public: SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 832ab1a1ec89..c497b8367163 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -162,10 +162,10 @@ private: void InsertNodes( const VectorOfNodes& rNodeList ); protected: - DECL_STATIC_LINK_TYPED(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED(ShowPageHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(BackHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void ); + DECL_LINK(ShowPageHdl_Impl, SvTreeListBox*, void); + DECL_LINK(BackHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); void SelectHdl_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) override; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 7235e0e764bd..7620a46f687b 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -48,12 +48,12 @@ private: std::unique_ptr<SfxItemSet> mpOutSet; bool mbModified; - DECL_LINK_TYPED(UserHdl, Button*, void); - DECL_LINK_TYPED(SpinHdl, Edit&, void); - DECL_LINK_TYPED(ViewLayoutUserHdl, Button*, void); - DECL_LINK_TYPED(ViewLayoutSpinHdl, Edit&, void); - DECL_LINK_TYPED(ViewLayoutCheckHdl, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(UserHdl, Button*, void); + DECL_LINK(SpinHdl, Edit&, void); + DECL_LINK(ViewLayoutUserHdl, Button*, void); + DECL_LINK(ViewLayoutSpinHdl, Edit&, void); + DECL_LINK(ViewLayoutCheckHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: SvxZoomDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet); diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index cc0955fedf91..18ad0b14abac 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -115,7 +115,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent) AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding())); } -IMPL_LINK_NOARG_TYPED(CertPathDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl, Button*, void) { try { @@ -161,7 +161,7 @@ void CertPathDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( CertPathDialog, CheckHdl_Impl, SvTreeListBox*, pList, void ) +IMPL_LINK( CertPathDialog, CheckHdl_Impl, SvTreeListBox*, pList, void ) { SvTreeListEntry* pEntry = pList ? m_pCertPathList->GetEntry(m_pCertPathList->GetCurMousePoint()) : m_pCertPathList->FirstSelected(); @@ -213,7 +213,7 @@ void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath HandleCheckEntry(pEntry); } -IMPL_LINK_NOARG_TYPED(CertPathDialog, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl, Button*, void) { try { diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 42fbf49288c2..528f4fbc79e0 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -26,9 +26,9 @@ private: OUString m_sAddDialogText; OUString m_sManual; - DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK(CheckHdl_Impl, SvTreeListBox*, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); void HandleCheckEntry(SvTreeListEntry* _pEntry); void AddCertPath(const OUString &rProfile, const OUString &rPath); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 0cd9fb241577..9362469caf3a 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -409,7 +409,7 @@ namespace offapp } - IMPL_LINK_TYPED( ConnectionPoolOptionsPage, OnDriverRowChanged, const DriverPooling*, pDriverPos, void ) + IMPL_LINK( ConnectionPoolOptionsPage, OnDriverRowChanged, const DriverPooling*, pDriverPos, void ) { bool bValidRow = (nullptr != pDriverPos); m_pDriverPoolingEnabled->Enable(bValidRow && m_pEnablePooling->IsChecked()); @@ -441,7 +441,7 @@ namespace offapp } - IMPL_LINK_TYPED( ConnectionPoolOptionsPage, OnEnabledDisabled, Button*, _pCheckBox, void ) + IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, Button*, _pCheckBox, void ) { bool bGloballyEnabled = m_pEnablePooling->IsChecked(); bool bLocalDriverChanged = m_pDriverPoolingEnabled == _pCheckBox; diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 3204c1e39e2a..e143b39fd9c1 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -61,8 +61,8 @@ namespace offapp virtual void ActivatePage( const SfxItemSet& _rSet) override; protected: - DECL_LINK_TYPED( OnEnabledDisabled, Button*, void ); - DECL_LINK_TYPED( OnDriverRowChanged, const DriverPooling*, void ); + DECL_LINK( OnEnabledDisabled, Button*, void ); + DECL_LINK( OnDriverRowChanged, const DriverPooling*, void ); void implInitControls(const SfxItemSet& _rSet, bool _bFromReset); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index a8cd6ea7b4b7..be470fc95c0b 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -269,7 +269,7 @@ void DbRegistrationOptionsPage::FillUserData() SetUserData( aUserData ); } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl, Button*, void) { SvTreeListEntry* pEntry = m_pPathBox->FirstSelected(); if ( pEntry ) @@ -280,20 +280,20 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, DeleteHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, NewHdl, Button*, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl, Button*, void) { OUString sNewName,sNewLocation; openLinkDialog(sNewName,sNewLocation); } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, SvTreeListBox*, bool) { EditHdl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl, Button*, void) { SvTreeListEntry* pEntry = m_pPathBox->GetCurEntry(); if ( !pEntry ) @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void) } -IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { assert(pBar); @@ -339,7 +339,7 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, } -IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { assert(pBar); @@ -370,7 +370,7 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathSelect_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pPathBox->FirstSelected(); @@ -428,7 +428,7 @@ void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const O } } -IMPL_LINK_TYPED( DbRegistrationOptionsPage, NameValidator, const OUString&, _rName, bool ) +IMPL_LINK( DbRegistrationOptionsPage, NameValidator, const OUString&, _rName, bool ) { sal_uLong nCount = m_pPathBox->GetEntryCount(); for ( sal_uLong i = 0; i < nCount; ++i ) diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 6ecc562e66ed..600d6cb3f871 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -103,7 +103,7 @@ namespace svx } - IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnOk, Button*, void) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk, Button*, void) { // get the current URL OUString sURL = m_pURL->GetText(); @@ -160,7 +160,7 @@ namespace svx } - IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnBrowseFile, Button*, void) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile, Button*, void) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION); @@ -204,7 +204,7 @@ namespace svx } - IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnTextModified, Edit&, void) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnTextModified, Edit&, void) { validate( ); } diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 6cc26cfa3793..6406ae737ee5 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -59,9 +59,9 @@ namespace svx void getLink( OUString& _rName, OUString& _rURL ) const; protected: - DECL_LINK_TYPED( OnTextModified, Edit&, void ); - DECL_LINK_TYPED( OnBrowseFile, Button*, void ); - DECL_LINK_TYPED( OnOk, Button*, void ); + DECL_LINK( OnTextModified, Edit&, void ); + DECL_LINK( OnBrowseFile, Button*, void ); + DECL_LINK( OnOk, Button*, void ); void validate( ); }; diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 239e6895b4d0..9abe7d4db52b 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -253,19 +253,19 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* ) m_pFontHeightLB->SaveValue(); } -IMPL_LINK_TYPED(SvxFontSubstTabPage, ClickHdl, Button*, pButton, void) +IMPL_LINK(SvxFontSubstTabPage, ClickHdl, Button*, pButton, void) { SelectHdl(pButton); } -IMPL_LINK_TYPED(SvxFontSubstTabPage, TreeListBoxSelectHdl, SvTreeListBox*, pButton, void) +IMPL_LINK(SvxFontSubstTabPage, TreeListBoxSelectHdl, SvTreeListBox*, pButton, void) { SelectHdl(pButton); } -IMPL_LINK_TYPED(SvxFontSubstTabPage, SelectComboBoxHdl, ComboBox&, rBox, void) +IMPL_LINK(SvxFontSubstTabPage, SelectComboBoxHdl, ComboBox&, rBox, void) { SelectHdl(&rBox); } -IMPL_LINK_TYPED(SvxFontSubstTabPage, SelectEditHdl, Edit&, rBox, void) +IMPL_LINK(SvxFontSubstTabPage, SelectEditHdl, Edit&, rBox, void) { SelectHdl(&rBox); } @@ -344,7 +344,7 @@ void SvxFontSubstTabPage::SelectHdl(vcl::Window* pWin) } -IMPL_LINK_TYPED(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void) +IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void) { OUString sFontName = m_pFontNameLB->GetSelectEntry(); bool bNonPropOnly = static_cast<CheckBox*>(pBox)->IsChecked(); diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 9a73817c1fe4..4c5e7bf670f5 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -81,11 +81,11 @@ class SvxFontSubstTabPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK_TYPED(SelectEditHdl, Edit&, void); - DECL_LINK_TYPED(SelectComboBoxHdl, ComboBox&, void); - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(TreeListBoxSelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(NonPropFontsHdl, Button*, void); + DECL_LINK(SelectEditHdl, Edit&, void); + DECL_LINK(SelectComboBoxHdl, ComboBox&, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(TreeListBoxSelectHdl, SvTreeListBox*, void); + DECL_LINK(NonPropFontsHdl, Button*, void); void SelectHdl(vcl::Window*); SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2); diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 15d354472bf0..a6c06a9c4ba4 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -562,18 +562,18 @@ void CuiAboutConfigValueDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void ) { Reset(); } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool ) { StandardHdl_Impl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { SvTreeListEntry* pEntry = m_pPrefBox->GetHdlEntry(); if(pEntry == nullptr) @@ -808,7 +808,7 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) } } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, SearchHdl_Impl, Button*, void) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl, Button*, void) { m_pPrefBox->Clear(); m_pPrefBox->SetUpdateMode( false ); @@ -905,7 +905,7 @@ void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry) m_pPrefBox->Expand( pParentEntry ); } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ExpandingHdl_Impl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, ExpandingHdl_Impl, SvTreeListBox*, bool ) { SvTreeListEntry* pEntry = m_pPrefBox->GetHdlEntry(); diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index ad762bfd076d..91641d1616b7 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -59,11 +59,11 @@ private: static std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString ); void InsertEntry( SvTreeListEntry *pEntry); - DECL_LINK_TYPED( StandardHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ResetBtnHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SearchHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ExpandingHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( StandardHdl_Impl, Button*, void ); + DECL_LINK( DoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( ResetBtnHdl_Impl, Button*, void ); + DECL_LINK( SearchHdl_Impl, Button*, void ); + DECL_LINK( ExpandingHdl_Impl, SvTreeListBox*, bool ); public: explicit CuiAboutConfigTabPage(vcl::Window* pParent); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index ed4341aa6b0e..c9c99ecb6830 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -308,7 +308,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet* ) LanguageHdl(*m_pLanguageLB); } -IMPL_LINK_NOARG_TYPED(SvxAsianLayoutPage, LanguageHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl, ListBox&, void) { //set current value LanguageType eSelectLanguage = m_pLanguageLB->GetSelectLanguage(); @@ -371,7 +371,7 @@ IMPL_LINK_NOARG_TYPED(SvxAsianLayoutPage, LanguageHdl, ListBox&, void) m_pEndED->SetText(sEnd); } -IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void) +IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void) { bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); m_pStartED->Enable(!bCheck); @@ -382,7 +382,7 @@ IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void) ModifyHdl(*m_pStartED); } -IMPL_LINK_TYPED(SvxAsianLayoutPage, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit&, rEdit, void) { LanguageType eSelectLanguage = m_pLanguageLB->GetSelectLanguage(); Locale aLocale( LanguageTag::convertToLocale( eSelectLanguage )); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 7c668a36aaf4..3d95da759c74 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -178,7 +178,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) // ResetToDefaults -IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, ResetToDefaults, Button*, void) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults, Button*, void) { if( pColorConfig ) { @@ -195,7 +195,7 @@ IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, ResetToDefaults, Button*, void) // AddChartColor -IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, AddChartColor, Button*, void) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor, Button*, void) { if( pColorConfig ) { @@ -214,7 +214,7 @@ IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, AddChartColor, Button*, void) // RemoveChartColor -IMPL_LINK_TYPED( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) +IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) { sal_Int32 nIndex = m_pLbChartColors->GetSelectEntryPos(); @@ -245,7 +245,7 @@ IMPL_LINK_TYPED( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, voi } } -IMPL_LINK_TYPED( SvxDefaultColorOptPage, ListClickedHdl, ListBox&, _rBox, void ) +IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ListBox&, _rBox, void ) { Color aCol = static_cast<ColorLB&>(_rBox).GetSelectEntryColor(); @@ -257,7 +257,7 @@ IMPL_LINK_TYPED( SvxDefaultColorOptPage, ListClickedHdl, ListBox&, _rBox, void ) m_pValSetColorBox->SelectItem( nIndex + 1 ); // ValueSet is 1-based } -IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void) { sal_Int32 nIdx = m_pLbChartColors->GetSelectEntryPos(); if( nIdx != LISTBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 1be71a4c546d..34cd2113f2a3 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -43,11 +43,11 @@ private: SvxChartColorTableItem* pColorConfig; XColorListRef pColorList; - DECL_LINK_TYPED( ResetToDefaults, Button *, void ); - DECL_LINK_TYPED( AddChartColor, Button *, void ); - DECL_LINK_TYPED( RemoveChartColor, Button *, void ); - DECL_LINK_TYPED( ListClickedHdl, ListBox&, void ); - DECL_LINK_TYPED(BoxClickedHdl, ValueSet*, void); + DECL_LINK( ResetToDefaults, Button *, void ); + DECL_LINK( AddChartColor, Button *, void ); + DECL_LINK( RemoveChartColor, Button *, void ); + DECL_LINK( ListClickedHdl, ListBox&, void ); + DECL_LINK(BoxClickedHdl, ValueSet*, void); void FillColorBox(); long GetColorIndex( const Color& rCol ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 16db5dcb5747..e41c82a09e07 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -843,10 +843,10 @@ class ColorConfigCtrl_Impl : public VclVBox EditableColorConfig* pColorConfig; EditableExtendedColorConfig* pExtColorConfig; - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(ColorHdl, ListBox&, void); - DECL_LINK_TYPED(ControlFocusHdl, Control&, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(ColorHdl, ListBox&, void); + DECL_LINK(ControlFocusHdl, Control&, void); virtual bool PreNotify (NotifyEvent& rNEvt) override; virtual void Command (CommandEvent const& rCEvt) override; @@ -947,7 +947,7 @@ void ColorConfigCtrl_Impl::Update () m_pScrollWindow->Update(pColorConfig, pExtColorConfig); } -IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar, void) +IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar, void) { m_pScrollWindow->ScrollHdl(*pScrollBar); } @@ -998,19 +998,19 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } } -IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ClickHdl, Button*, pBox, void) +IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, Button*, pBox, void) { DBG_ASSERT(pColorConfig, "Configuration not set"); m_pScrollWindow->ClickHdl(pColorConfig, static_cast<CheckBox*>(pBox)); } // a color list has changed -IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ColorHdl, ListBox&, rBox, void) +IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ListBox&, rBox, void) { DBG_ASSERT(pColorConfig, "Configuration not set" ); m_pScrollWindow->ColorHdl(pColorConfig, pExtColorConfig, static_cast<ColorListBox*>(&rBox)); } -IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void) +IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void) { // determine whether a control is completely visible // and make it visible @@ -1171,14 +1171,14 @@ void SvxColorOptionsTabPage::UpdateColorConfig() m_pColorConfigCT->Update(); } -IMPL_LINK_TYPED(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox&, rBox, void) { pColorConfig->LoadScheme(rBox.GetSelectEntry()); pExtColorConfig->LoadScheme(rBox.GetSelectEntry()); UpdateColorConfig(); } -IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) +IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) { if (m_pSaveSchemePB == pButton) { @@ -1222,7 +1222,7 @@ IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, vo m_pDeleteSchemePB->Enable( m_pColorSchemeLB->GetEntryCount() > 1 ); } -IMPL_LINK_TYPED(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog&, rDialog, bool ) +IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog&, rDialog, bool ) { OUString sName; rDialog.GetName(sName); diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index f65db335551f..f91a2312be5b 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -41,9 +41,9 @@ class SvxColorOptionsTabPage : public SfxTabPage svtools::EditableColorConfig* pColorConfig; svtools::EditableExtendedColorConfig* pExtColorConfig; - DECL_LINK_TYPED(SchemeChangedHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SaveDeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(CheckNameHdl_Impl, AbstractSvxNameDialog&, bool); + DECL_LINK(SchemeChangedHdl_Impl, ListBox&, void); + DECL_LINK(SaveDeleteHdl_Impl, Button*, void); + DECL_LINK(CheckNameHdl_Impl, AbstractSvxNameDialog&, bool); void UpdateColorConfig(); public: diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 4ef91cbfafb8..4f258008d0cb 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -24,7 +24,7 @@ // class SvxCTLOptionsPage ----------------------------------------------------- -IMPL_LINK_NOARG_TYPED(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, Button*, void) +IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, Button*, void) { bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); m_pRestrictedCB->Enable( bIsSequenceChecking ); diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index bafe3b48abe3..b377fda219be 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -39,7 +39,7 @@ private: VclPtr<ListBox> m_pNumeralsLB; - DECL_LINK_TYPED( SequenceCheckingCB_Hdl, Button*, void ); + DECL_LINK( SequenceCheckingCB_Hdl, Button*, void ); public: SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index b3db8c2e6d6d..a44d7d15c279 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -129,7 +129,7 @@ void SvxNewDictionaryDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) { // add extension for personal dictionaries @@ -200,7 +200,7 @@ IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxNewDictionaryDialog, ModifyHdl_Impl, Edit&, void) { if ( !pNameEdit->GetText().isEmpty() ) pOKBtn->Enable(); @@ -421,7 +421,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry) } -IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void) { sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos(); @@ -444,7 +444,7 @@ IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, voi } -IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) { sal_Int32 nDicPos = pAllDictsLB->GetSelectEntryPos(); sal_Int32 nLang = pLangLB->GetSelectLanguage(); @@ -547,7 +547,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) } -IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) +IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) { if(!bDoNothing) { @@ -572,12 +572,12 @@ IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) }; -IMPL_LINK_TYPED(SvxEditDictionaryDialog, NewDelButtonHdl, Button*, pBtn, void) +IMPL_LINK(SvxEditDictionaryDialog, NewDelButtonHdl, Button*, pBtn, void) { NewDelHdl(static_cast<PushButton*>(pBtn)); } -IMPL_LINK_TYPED(SvxEditDictionaryDialog, NewDelActionHdl, SvxDictEdit&, rDictEdit, bool) +IMPL_LINK(SvxEditDictionaryDialog, NewDelActionHdl, SvxDictEdit&, rDictEdit, bool) { return NewDelHdl(&rDictEdit); } @@ -677,7 +677,7 @@ bool SvxEditDictionaryDialog::NewDelHdl(void* pBtn) } -IMPL_LINK_TYPED(SvxEditDictionaryDialog, ModifyHdl, Edit&, rEdt, void) +IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit&, rEdt, void) { OUString rEntry = rEdt.GetText(); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index e7f3057902a8..d3c9fc1002c8 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -73,12 +73,12 @@ void OfaMSFilterTabPage::dispose() } -IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, Button*, void) { aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void) { aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() ); } diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 3253ccfca25b..4e28a04ad883 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -37,8 +37,8 @@ class OfaMSFilterTabPage : public SfxTabPage VclPtr<CheckBox> aPBasicStgCB; - DECL_LINK_TYPED(LoadWordBasicCheckHdl_Impl, Button*, void); - DECL_LINK_TYPED(LoadExcelBasicCheckHdl_Impl, Button*, void); + DECL_LINK(LoadWordBasicCheckHdl_Impl, Button*, void); + DECL_LINK(LoadExcelBasicCheckHdl_Impl, Button*, void); public: OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage() override; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index fcbe8c9ce338..78f5ad6b99a4 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -406,7 +406,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) m_pCollectUsageInfo->SaveValue(); } -IMPL_LINK_NOARG_TYPED( OfaMiscTabPage, TwoFigureHdl, Edit&, void ) +IMPL_LINK_NOARG( OfaMiscTabPage, TwoFigureHdl, Edit&, void ) { OUString aOutput( m_aStrDateInfo ); OUString aStr( m_pYearValueField->GetText() ); @@ -425,11 +425,11 @@ IMPL_LINK_NOARG_TYPED( OfaMiscTabPage, TwoFigureHdl, Edit&, void ) m_pToYearFT->SetText( aOutput ); } -IMPL_LINK_TYPED( OfaMiscTabPage, TwoFigureConfigFocusHdl, Control&, rControl, void ) +IMPL_LINK( OfaMiscTabPage, TwoFigureConfigFocusHdl, Control&, rControl, void ) { TwoFigureConfigHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( OfaMiscTabPage, TwoFigureConfigHdl, SpinField&, rEd, void ) +IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, SpinField&, rEd, void ) { sal_Int64 nNum = m_pYearValueField->GetValue(); OUString aOutput(OUString::number(nNum)); @@ -727,7 +727,7 @@ void OfaViewTabPage::dispose() } #if defined( UNX ) -IMPL_LINK_NOARG_TYPED( OfaViewTabPage, OnAntialiasingToggled, CheckBox&, void ) +IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, CheckBox&, void ) { bool bAAEnabled = m_pFontAntiAliasing->IsChecked(); @@ -1717,7 +1717,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) } } -IMPL_LINK_TYPED( OfaLanguagesTabPage, SupportHdl, Button*, pButton, void ) +IMPL_LINK( OfaLanguagesTabPage, SupportHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" ); @@ -1756,7 +1756,7 @@ namespace } } -IMPL_LINK_TYPED( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void ) +IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void ) { SvxLanguageBox* pBox = static_cast<SvxLanguageBox*>(&rListBox); LanguageType eLang = pBox->GetSelectLanguage(); @@ -1805,7 +1805,7 @@ IMPL_LINK_TYPED( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void m_pDatePatternsED->SetText( aDatePatternsString); } -IMPL_LINK_TYPED( OfaLanguagesTabPage, DatePatternsHdl, Edit&, rEd, void ) +IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit&, rEd, void ) { const OUString aPatterns( rEd.GetText()); OUStringBuffer aBuf( aPatterns); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index b204930eb035..b6bc275551df 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -57,9 +57,9 @@ private: VclPtr<CheckBox> m_pCollectUsageInfo; - DECL_LINK_TYPED( TwoFigureHdl, Edit&, void ); - DECL_LINK_TYPED( TwoFigureConfigHdl, SpinField&, void ); - DECL_LINK_TYPED( TwoFigureConfigFocusHdl, Control&, void ); + DECL_LINK( TwoFigureHdl, Edit&, void ); + DECL_LINK( TwoFigureConfigHdl, SpinField&, void ); + DECL_LINK( TwoFigureConfigFocusHdl, Control&, void ); protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; @@ -117,7 +117,7 @@ private: std::vector<vcl::IconThemeInfo> mInstalledIconThemes; #if defined( UNX ) - DECL_LINK_TYPED( OnAntialiasingToggled, CheckBox&, void ); + DECL_LINK( OnAntialiasingToggled, CheckBox&, void ); #endif void UpdateOGLStatus(); @@ -163,9 +163,9 @@ class OfaLanguagesTabPage : public SfxTabPage bool m_bDatePatternsValid; - DECL_LINK_TYPED( SupportHdl, Button*, void ) ; - DECL_LINK_TYPED( LocaleSettingHdl, ListBox&, void ) ; - DECL_LINK_TYPED( DatePatternsHdl, Edit&, void ) ; + DECL_LINK( SupportHdl, Button*, void ) ; + DECL_LINK( LocaleSettingHdl, ListBox&, void ) ; + DECL_LINK( DatePatternsHdl, Edit&, void ) ; public: OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index bccdb88610ce..559e5690cce8 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -317,7 +317,7 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) // ModifyHdl_Impl() // This handler updates the initials (short name) // when the name field was updated. -IMPL_LINK_TYPED( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void ) { // short name field and row Field& rShortName = *vFields[nShortNameField]; diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index a54e17f63871..2f449abbddd3 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -182,7 +182,7 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* ) aCharSetLB->SelectTextEncoding( rHtmlOpt.GetTextEncoding() ); } -IMPL_LINK_TYPED(OfaHtmlTabPage, CheckBoxHdl_Impl, Button*, pBox, void) +IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, Button*, pBox, void) { aStarBasicWarningCB->Enable(!static_cast<CheckBox*>(pBox)->IsChecked()); } diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 5d578039451e..55b7281cab60 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -47,7 +47,7 @@ class OfaHtmlTabPage : public SfxTabPage VclPtr<CheckBox> aSaveGrfLocalCB; VclPtr<SvxTextEncodingBox> aCharSetLB; - DECL_LINK_TYPED(CheckBoxHdl_Impl, Button*, void); + DECL_LINK(CheckBoxHdl_Impl, Button*, void); public: virtual ~OfaHtmlTabPage() override; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index fc817a31d4b8..064764916ac3 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -527,7 +527,7 @@ void SvxProxyTabPage::EnableControls_Impl(bool bEnable) } -IMPL_LINK_TYPED( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -541,7 +541,7 @@ IMPL_LINK_TYPED( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) } -IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, void ) +IMPL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, void ) { Edit* pEdit = static_cast<Edit*>(&rControl); OUString aValue = pEdit->GetText(); @@ -630,14 +630,14 @@ void SvxSecurityTabPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void) { if ( !mpSecOptDlg ) mpSecOptDlg = VclPtr<svx::SecurityOptionsDialog>::Create( this, mpSecOptions ); mpSecOptDlg->Execute(); } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SavePasswordHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, Button*, void) { try { @@ -690,7 +690,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SavePasswordHdl, Button*, void) } } -IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl, Button*, void) { try { @@ -704,7 +704,7 @@ IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, voi {} } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void) { try { @@ -746,7 +746,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void) { try { @@ -763,7 +763,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void) {} } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, CertPathPBHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, Button*, void) { if (!mpCertPathDlg) mpCertPathDlg = VclPtr<CertPathDialog>::Create(this); @@ -778,7 +778,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, CertPathPBHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void) { // Unlike the mpCertPathDlg, we *don't* keep the same dialog object around between // invocations. Seems clearer to my little brain that way. @@ -788,7 +788,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void) pTSAURLsDlg->Execute(); } -IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl, Button*, void) { try { @@ -1026,7 +1026,7 @@ void SvxEMailTabPage::Reset( const SfxItemSet* ) /* -------------------------------------------------------------------------*/ -IMPL_LINK_TYPED( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void ) +IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void ) { if (m_pMailerURLPB == pButton && !pImpl->bROProgram) { diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 7ae2fd20a1d3..fd0850870a60 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -86,8 +86,8 @@ private: void ReadConfigDefaults_Impl(); void RestoreConfigDefaults_Impl(); - DECL_LINK_TYPED( ProxyHdl_Impl, ListBox&, void ); - DECL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, void ); + DECL_LINK( ProxyHdl_Impl, ListBox&, void ); + DECL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, void ); public: SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -133,14 +133,14 @@ private: OUString m_sPasswordStoringDeactivateStr; - DECL_LINK_TYPED(SecurityOptionsHdl, Button*, void); - DECL_LINK_TYPED(SavePasswordHdl, Button*, void); - DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void); - DECL_LINK_TYPED(MasterPasswordCBHdl, Button*, void); - DECL_LINK_TYPED(ShowPasswordsHdl, Button*, void); - DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void ); - DECL_LINK_TYPED(CertPathPBHdl, Button*, void ); - DECL_LINK_TYPED(TSAURLsPBHdl, Button*, void ); + DECL_LINK(SecurityOptionsHdl, Button*, void); + DECL_LINK(SavePasswordHdl, Button*, void); + DECL_STATIC_LINK(SvxSecurityTabPage, MasterPasswordHdl, Button*, void); + DECL_LINK(MasterPasswordCBHdl, Button*, void); + DECL_LINK(ShowPasswordsHdl, Button*, void); + DECL_STATIC_LINK(SvxSecurityTabPage, MacroSecPBHdl, Button*, void ); + DECL_LINK(CertPathPBHdl, Button*, void ); + DECL_LINK(TSAURLsPBHdl, Button*, void ); void InitControls(); @@ -173,7 +173,7 @@ class SvxEMailTabPage : public SfxTabPage std::unique_ptr<SvxEMailTabPage_Impl> pImpl; - DECL_LINK_TYPED( FileDialogHdl_Impl, Button*, void ); + DECL_LINK( FileDialogHdl_Impl, Button*, void ); public: SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 70db94543c09..9ddc4fff0cf8 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -238,7 +238,7 @@ void SvxJavaOptionsPage::dispose() } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) { bool bEnable = m_pJavaEnableCB->IsChecked(); m_pJavaBox->Enable(bEnable); @@ -246,7 +246,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void ) +IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void ) { SvTreeListEntry* pEntry = pList ? m_pJavaList->GetEntry( m_pJavaList->GetCurMousePoint() ) : m_pJavaList->FirstSelected(); @@ -255,7 +255,7 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) { // set installation directory info SvTreeListEntry* pEntry = m_pJavaList->FirstSelected(); @@ -269,7 +269,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) { try { @@ -293,7 +293,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA Sequence< OUString > aParameterList; @@ -345,7 +345,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA OUString sClassPath; @@ -390,13 +390,13 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void) { LoadJREs(); } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) { try { @@ -413,7 +413,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) } -IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) +IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { if ( RET_OK == pEvt->DialogResult ) { @@ -424,7 +424,7 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, } -IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) { ScopedVclPtrInstance< CuiAboutConfigTabPage > pExpertConfigDlg(this); pExpertConfigDlg->Reset();//initialize and reset function @@ -824,14 +824,14 @@ void SvxJavaParameterDlg::dispose() } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl, Edit&, void) { OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' '); m_pAssignBtn->Enable(!sParam.isEmpty()); } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) { OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' '); if (!sParam.isEmpty()) @@ -847,26 +847,26 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, EditHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, EditHdl_Impl, Button*, void) { EditParameter(); } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl, ListBox&, void) { EnableEditButton(); EnableRemoveButton(); } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void) { EditParameter(); } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -996,7 +996,7 @@ void SvxJavaClassPathDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) { sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE ); aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); @@ -1031,7 +1031,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); @@ -1066,7 +1066,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pPathList->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -1085,7 +1085,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl, ListBox&, void) { EnableRemoveButton(); } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 6a83b280e24e..4a4f7bbfd04a 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -84,18 +84,18 @@ private: rtl::Reference< ::svt::DialogClosedListener > xDialogListener; css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker; - DECL_LINK_TYPED( EnableHdl_Impl, Button*, void); - DECL_LINK_TYPED( CheckHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( AddHdl_Impl, Button*, void); - DECL_LINK_TYPED( ParameterHdl_Impl, Button*, void); - DECL_LINK_TYPED( ClassPathHdl_Impl, Button*, void); - DECL_LINK_TYPED( ResetHdl_Impl, Idle *, void); + DECL_LINK( EnableHdl_Impl, Button*, void); + DECL_LINK( CheckHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK( AddHdl_Impl, Button*, void); + DECL_LINK( ParameterHdl_Impl, Button*, void); + DECL_LINK( ClassPathHdl_Impl, Button*, void); + DECL_LINK( ResetHdl_Impl, Idle *, void); - DECL_LINK_TYPED( StartFolderPickerHdl, void *, void ); - DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_LINK( StartFolderPickerHdl, void *, void ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); - DECL_LINK_TYPED( ExpertConfigHdl_Impl, Button*, void); + DECL_LINK( ExpertConfigHdl_Impl, Button*, void); void ClearJavaInfo(); void ClearJavaList(); @@ -129,13 +129,13 @@ private: VclPtr<PushButton> m_pEditBtn; - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); - DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(DblClickHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void); + DECL_LINK(ModifyHdl_Impl, Edit&, void); + DECL_LINK(AssignHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, ListBox&, void); + DECL_LINK(DblClickHdl_Impl, ListBox&, void); + DECL_LINK(RemoveHdl_Impl, Button*, void); - DECL_LINK_TYPED(EditHdl_Impl, Button*, void); + DECL_LINK(EditHdl_Impl, Button*, void); inline void EnableRemoveButton() { m_pRemoveBtn->Enable( @@ -183,10 +183,10 @@ private: OUString m_sOldPath; - DECL_LINK_TYPED(AddArchiveHdl_Impl, Button*, void); - DECL_LINK_TYPED(AddPathHdl_Impl, Button*, void); - DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); + DECL_LINK(AddArchiveHdl_Impl, Button*, void); + DECL_LINK(AddPathHdl_Impl, Button*, void); + DECL_LINK(RemoveHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, ListBox&, void); bool IsPathDuplicate( const OUString& _rPath ); inline void EnableRemoveButton() diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 7a16eae7fe72..fc9f3c612240 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1496,7 +1496,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) } -IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, bool ) +IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, bool ) { if (pBox == m_pLinguModulesCLB) { @@ -1514,20 +1514,20 @@ IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, } -IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void) +IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void) { ClickHdl_Impl(m_pLinguModulesEditPB); } -IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, OpenURLHdl_Impl, FixedHyperlink&, void) +IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl, FixedHyperlink&, void) { OUString sURL( m_pMoreDictsLink->GetURL() ); lcl_OpenURL( sURL ); } -IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void ) { if (pBox == m_pLinguModulesCLB) { @@ -1556,7 +1556,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, } -IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) { if (m_pLinguModulesEditPB == pBtn) { @@ -1734,7 +1734,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) } -IMPL_LINK_TYPED( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void ) +IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { if (m_pLinguModulesCLB == pBox) { @@ -1913,7 +1913,7 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry( OUString& rTxt, sal_uInt16 nCol return pEntry; } -IMPL_LINK_TYPED( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void ) +IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { if (m_pModulesCLB == pBox) { @@ -1947,11 +1947,11 @@ IMPL_LINK_TYPED( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void ) } } -IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ) +IMPL_LINK_NOARG( SvxEditModulesDlg, BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ) { BoxCheckButtonHdl_Impl(nullptr); } -IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, void ) +IMPL_LINK_NOARG( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, void ) { SvTreeListEntry *pCurEntry = m_pModulesCLB->GetCurEntry(); if (pCurEntry) @@ -1979,7 +1979,7 @@ IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox } } -IMPL_LINK_TYPED( SvxEditModulesDlg, LangSelectListBoxHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxEditModulesDlg, LangSelectListBoxHdl_Impl, ListBox&, rBox, void ) { LangSelectHdl_Impl(&rBox); } @@ -2238,7 +2238,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) aLastLocale = aCurLocale; } -IMPL_LINK_TYPED( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void ) { bool bUp = m_pPrioUpPB == pBtn; sal_uLong nCurPos = m_pModulesCLB->GetSelectEntryPos(); @@ -2266,21 +2266,21 @@ IMPL_LINK_TYPED( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, ClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxEditModulesDlg, ClickHdl_Impl, Button*, void) { // store language config LangSelectHdl_Impl(m_pLanguageLB); EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, BackHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl, Button*, void) { rLinguData = *pDefaultLinguData; LangSelectHdl_Impl(nullptr); } -IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, OpenURLHdl_Impl, FixedHyperlink&, void) +IMPL_LINK_NOARG(SvxEditModulesDlg, OpenURLHdl_Impl, FixedHyperlink&, void) { OUString sURL( m_pMoreDictsLink->GetURL() ); lcl_OpenURL( sURL ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 31cc66dce7b9..27cb5b48f383 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -252,12 +252,12 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) m_pQuickLaunchCB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(OfaMemoryOptionsPage, GraphicCacheLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheLoseFocusHdl, Control&, void) { GraphicCacheConfigHdl(*m_pNfGraphicCache); } -IMPL_LINK_NOARG_TYPED(OfaMemoryOptionsPage, GraphicCacheConfigHdl, SpinField&, void) +IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl, SpinField&, void) { sal_Int32 n = GetNfGraphicCacheVal(); SetNfGraphicObjectCacheMax( n ); diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 3906d9350bca..68605b19e961 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -41,8 +41,8 @@ private: VclPtr<VclContainer> m_pQuickStarterFrame; VclPtr<CheckBox> m_pQuickLaunchCB; - DECL_LINK_TYPED(GraphicCacheConfigHdl, SpinField&, void); - DECL_LINK_TYPED(GraphicCacheLoseFocusHdl, Control&, void); + DECL_LINK(GraphicCacheConfigHdl, SpinField&, void); + DECL_LINK(GraphicCacheLoseFocusHdl, Control&, void); sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes inline void SetNfGraphicCacheVal( long nSizeInBytes ); diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 1045772f2491..05612b57f5ef 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -129,7 +129,7 @@ void SvxOpenCLTabPage::EnableOpenCLHdl(VclFrame* pFrame, bool aEnable) } -IMPL_STATIC_LINK_NOARG_TYPED(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void) { } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index c24d5253935a..e6560202d5d4 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -37,7 +37,7 @@ private: VclPtr<FixedText> mpOclUsed; VclPtr<FixedText> mpOclNotUsed; - DECL_STATIC_LINK_TYPED(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void); + DECL_STATIC_LINK(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void); static void EnableOpenCLHdl(VclFrame* pFrame, bool aEnable); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 4f45c9787ca0..88d7fd5b6eb8 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -387,7 +387,7 @@ void SvxPathTabPage::FillUserData() } -IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) { sal_uInt16 nSelCount = 0; SvTreeListEntry* pEntry = pPathBox->FirstSelected(); @@ -408,7 +408,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) } -IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = pPathBox->FirstSelected(); while ( pEntry ) @@ -536,13 +536,13 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) } -IMPL_LINK_NOARG_TYPED(SvxPathTabPage, DoubleClickPathHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl, SvTreeListBox*, bool) { PathHdl_Impl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); sal_uInt16 nPos = ( pEntry != nullptr ) ? static_cast<PathUserData_Impl*>(pEntry->GetUserData())->nRealId : 0; @@ -666,7 +666,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { if (!pBar || pBar->GetCurItemId() != ITEMID_TYPE) return; @@ -693,7 +693,7 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) } -IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if (!pBar || !pBar->GetCurItemId()) return; @@ -721,7 +721,7 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) } } -IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) +IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { if (RET_OK == pEvt->DialogResult) { diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 1130bb882ee6..de06da1b0e03 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -509,7 +509,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* ) } -IMPL_LINK_TYPED( SvxSaveTabPage, AutoClickHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxSaveTabPage, AutoClickHdl_Impl, Button*, pBox, void ) { if ( pBox == aAutoSaveCB ) { @@ -553,7 +553,7 @@ static OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties) return sName; } -IMPL_LINK_TYPED( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void ) { const sal_Int32 nCurPos = aDocTypeLB->GetSelectEntryPos(); @@ -616,7 +616,7 @@ IMPL_LINK_TYPED( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void ) ODFVersionHdl_Impl( *aSaveAsLB ); }; -IMPL_LINK_NOARG_TYPED(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void) { sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectEntryData() ); bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST; diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 0c64f774d3d2..53e80181d150 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -59,9 +59,9 @@ private: std::unique_ptr<SvxSaveTabPage_Impl> pImpl; - DECL_LINK_TYPED( AutoClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FilterHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED(ODFVersionHdl_Impl, ListBox&, void ); + DECL_LINK( AutoClickHdl_Impl, Button*, void ); + DECL_LINK( FilterHdl_Impl, ListBox&, void ); + DECL_LINK(ODFVersionHdl_Impl, ListBox&, void ); void DetectHiddenControls(); diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 518e3a118c62..58bd1aa60a00 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -336,7 +336,7 @@ void SvxOnlineUpdateTabPage::FillUserData() { } -IMPL_LINK_TYPED( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, Button*, pBox, void ) { bool bEnabled = static_cast<CheckBox*>(pBox)->IsChecked(); beans::Property aProperty = m_xReadWriteAccess->getPropertyByHierarchicalName("/org.openoffice.Office.Jobs/Jobs/org.openoffice.Office.Jobs:Job['UpdateCheck']/Arguments/CheckInterval"); @@ -346,12 +346,12 @@ IMPL_LINK_TYPED( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, Button*, pBox, void m_pEveryMonthButton->Enable(bEnabled && !bReadOnly); } -IMPL_LINK_TYPED( SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl, Button*, , void ) +IMPL_LINK( SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl, Button*, , void ) { UpdateUserAgent(); } -IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, FileDialogHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl, Button*, void) { uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < ui::dialogs::XFolderPicker2 > xFolderPicker = ui::dialogs::FolderPicker::create(xContext); @@ -371,7 +371,7 @@ IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, FileDialogHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void) { uno::Reference < uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 5ff091163d97..788ae988f92e 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -45,10 +45,10 @@ private: OUString m_aNeverChecked; OUString m_aLastCheckedTemplate; - DECL_LINK_TYPED(FileDialogHdl_Impl, Button*, void); - DECL_LINK_TYPED(CheckNowHdl_Impl, Button*, void); - DECL_LINK_TYPED(AutoCheckHdl_Impl, Button*, void); - DECL_LINK_TYPED(ExtrasCheckHdl_Impl, Button*, void); + DECL_LINK(FileDialogHdl_Impl, Button*, void); + DECL_LINK(CheckNowHdl_Impl, Button*, void); + DECL_LINK(AutoCheckHdl_Impl, Button*, void); + DECL_LINK(ExtrasCheckHdl_Impl, Button*, void); css::uno::Reference< css::container::XNameReplace > m_xUpdateAccess; css::uno::Reference<css::configuration::XReadWriteAccess> m_xReadWriteAccess; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 4b2658f2aab5..956e7c1d5022 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -122,7 +122,7 @@ OUString SelectPersonaDialog::GetSelectedPersona() const return OUString(); } -IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) +IMPL_LINK( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) { /* * English category names should be used for search. @@ -171,7 +171,7 @@ IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) m_pSearchThread->launch(); } -IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionOK, Button*, void ) +IMPL_LINK_NOARG( SelectPersonaDialog, ActionOK, Button*, void ) { OUString aSelectedPersona = GetSelectedPersona(); @@ -189,7 +189,7 @@ IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionOK, Button*, void ) } } -IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionCancel, Button*, void ) +IMPL_LINK_NOARG( SelectPersonaDialog, ActionCancel, Button*, void ) { if( m_pSearchThread.is() ) m_pSearchThread->StopExecution(); @@ -197,7 +197,7 @@ IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionCancel, Button*, void ) EndDialog(); } -IMPL_LINK_TYPED( SelectPersonaDialog, SelectPersona, Button*, pButton, void ) +IMPL_LINK( SelectPersonaDialog, SelectPersona, Button*, pButton, void ) { if( m_pSearchThread.is() ) m_pSearchThread->StopExecution(); @@ -486,7 +486,7 @@ void SvxPersonalizationTabPage::LoadExtensionThemes() } } -IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectPersona, Button*, void ) +IMPL_LINK_NOARG( SvxPersonalizationTabPage, SelectPersona, Button*, void ) { ScopedVclPtrInstance< SelectPersonaDialog > aDialog(nullptr); @@ -500,13 +500,13 @@ IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectPersona, Button*, void ) } } -IMPL_LINK_TYPED( SvxPersonalizationTabPage, ForceSelect, Button*, pButton, void ) +IMPL_LINK( SvxPersonalizationTabPage, ForceSelect, Button*, pButton, void ) { if ( pButton == m_pOwnPersona && m_aPersonaSettings.isEmpty() ) SelectPersona( m_pSelectPersona ); } -IMPL_LINK_TYPED( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, void ) +IMPL_LINK( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, void ) { m_pDefaultPersona->Check(); for( sal_Int32 nIndex = 0; nIndex < 3; nIndex++ ) @@ -516,7 +516,7 @@ IMPL_LINK_TYPED( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, vo } } -IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox&, void) +IMPL_LINK_NOARG( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox&, void) { m_pOwnPersona->Check(); diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 65bb8470ca55..c2053a15e42e 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -63,16 +63,16 @@ public: private: /// Handle the Persona selection - DECL_LINK_TYPED( SelectPersona, Button*, void ); + DECL_LINK( SelectPersona, Button*, void ); /// When 'own' is chosen, but the Persona is not chosen yet. - DECL_LINK_TYPED( ForceSelect, Button*, void ); + DECL_LINK( ForceSelect, Button*, void ); /// Handle the default Persona selection - DECL_LINK_TYPED( DefaultPersona, Button*, void ); + DECL_LINK( DefaultPersona, Button*, void ); /// Handle the Personas installed through extensions selection - DECL_LINK_TYPED( SelectInstalledPersona, ListBox&, void ); + DECL_LINK( SelectInstalledPersona, ListBox&, void ); }; /** Dialog that will allow the user to choose a Persona to use. */ @@ -107,10 +107,10 @@ public: private: /// Handle the Search button - DECL_LINK_TYPED( SearchPersonas, Button*, void ); - DECL_LINK_TYPED( SelectPersona, Button*, void ); - DECL_LINK_TYPED( ActionOK, Button*, void ); - DECL_LINK_TYPED( ActionCancel, Button*, void ); + DECL_LINK( SearchPersonas, Button*, void ); + DECL_LINK( SelectPersona, Button*, void ); + DECL_LINK( ActionOK, Button*, void ); + DECL_LINK( ActionCancel, Button*, void ); }; class SearchAndParseThread: public salhelper::Thread diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 4a5c51fbd886..716bb2a253e1 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -638,12 +638,12 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const OUString& rGroupName, return nRet - 1; } -IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, void) { SelectHdl_Impl(); } -IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void) { if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) ) { @@ -659,7 +659,7 @@ IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void) { pTreeLB->EndSelection(); if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) ) @@ -709,7 +709,7 @@ IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void) } // an opened group shall be completely visible -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox, void ) { pBox->Update(); diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index 2c5e8a849bdd..505b8f66638b 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -52,7 +52,7 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent) } } -IMPL_LINK_NOARG_TYPED(TSAURLsDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl, Button*, void) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); @@ -92,7 +92,7 @@ void TSAURLsDialog::AddTSAURL(const OUString& rURL) m_pURLListBox->SetUpdateMode(true); } -IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl, Button*, void) { OUString aURL; OUString aDesc( get<FixedText>("enteraurl")->GetText() ); @@ -109,7 +109,7 @@ IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(TSAURLsDialog, DeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(TSAURLsDialog, DeleteHdl_Impl, Button*, void) { sal_Int32 nSel = m_pURLListBox->GetSelectEntryPos(); diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx index 5d321e8cc34d..0ab0cf81d0b0 100644 --- a/cui/source/options/tsaurls.hxx +++ b/cui/source/options/tsaurls.hxx @@ -21,9 +21,9 @@ private: VclPtr<PushButton> m_pDeleteBtn; VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); std::set<OUString> m_aURLs; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 67d244b8e005..21ed6daa0e88 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -154,7 +154,7 @@ void WebConnectionInfoDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable, void ) +IMPL_LINK( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable, void ) { m_pPasswordsLB->Resort( nullptr == pTable ); } @@ -205,7 +205,7 @@ void WebConnectionInfoDialog::FillPasswordList() } -IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemovePasswordHdl, Button*, void) +IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl, Button*, void) { try { @@ -235,7 +235,7 @@ IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemovePasswordHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemoveAllPasswordsHdl, Button*, void) +IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl, Button*, void) { try { @@ -257,7 +257,7 @@ IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemoveAllPasswordsHdl, Button*, v } -IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void) +IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void) { try { @@ -293,7 +293,7 @@ IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, EntrySelectedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); if ( !pEntry ) diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index b829aa969c03..24c29aa69ee3 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -50,11 +50,11 @@ namespace svx VclPtr<PushButton> m_pChangeBtn; sal_Int32 m_nPos; - DECL_LINK_TYPED( HeaderBarClickedHdl, SvSimpleTable*, void ); - DECL_LINK_TYPED( RemovePasswordHdl, Button*, void ); - DECL_LINK_TYPED( RemoveAllPasswordsHdl, Button*, void ); - DECL_LINK_TYPED( ChangePasswordHdl, Button*, void ); - DECL_LINK_TYPED( EntrySelectedHdl, SvTreeListBox*, void ); + DECL_LINK( HeaderBarClickedHdl, SvSimpleTable*, void ); + DECL_LINK( RemovePasswordHdl, Button*, void ); + DECL_LINK( RemoveAllPasswordsHdl, Button*, void ); + DECL_LINK( ChangePasswordHdl, Button*, void ); + DECL_LINK( EntrySelectedHdl, SvTreeListBox*, void ); void FillPasswordList(); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 98653e3c3aab..aa6ea21dd25c 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -417,12 +417,12 @@ bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 n return eMethodOld != eMethodNew; } -IMPL_LINK_NOARG_TYPED(AlignmentTabPage, UpdateEnableClickHdl, Button*, void) +IMPL_LINK_NOARG(AlignmentTabPage, UpdateEnableClickHdl, Button*, void) { UpdateEnableControls(); } -IMPL_LINK_NOARG_TYPED(AlignmentTabPage, UpdateEnableHdl, ListBox&, void) +IMPL_LINK_NOARG(AlignmentTabPage, UpdateEnableHdl, ListBox&, void) { UpdateEnableControls(); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index bcfe6e8b592b..64ab34f826f5 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -174,7 +174,7 @@ static bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry, return false; } -IMPL_LINK_TYPED(OfaAutoCorrDlg, SelectLanguageHdl, ListBox&, rBox, void) +IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox&, rBox, void) { sal_Int32 nPos = rBox.GetSelectEntryPos(); void* pVoid = rBox.GetEntryData(nPos); @@ -715,18 +715,18 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) m_pCheckLB->SetUpdateMode(true); } -IMPL_LINK_TYPED(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void) +IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void) { m_pEditPB->Enable(nullptr != pBox->FirstSelected()->GetUserData()); } -IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, bool) { EditHdl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) +IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) { sal_uLong nSelEntryPos = m_pCheckLB->GetSelectEntryPos(); if( nSelEntryPos == REPLACE_BULLETS || @@ -1119,7 +1119,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) } } -IMPL_LINK_TYPED(OfaAutocorrReplacePage, SelectHdl, SvTreeListBox*, pBox, void) +IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTreeListBox*, pBox, void) { if(!bFirstSelect || !bHasSelectionText) { @@ -1209,12 +1209,12 @@ void OfaAutocorrReplacePage::DeleteEntry(const OUString& sShort, const OUString& rDeletedArray.push_back(aDeletedString); } -IMPL_LINK_TYPED(OfaAutocorrReplacePage, NewDelButtonHdl, Button*, pBtn, void) +IMPL_LINK(OfaAutocorrReplacePage, NewDelButtonHdl, Button*, pBtn, void) { NewDelHdl(pBtn); } -IMPL_LINK_TYPED(OfaAutocorrReplacePage, NewDelActionHdl, AutoCorrEdit&, rEdit, bool) +IMPL_LINK(OfaAutocorrReplacePage, NewDelActionHdl, AutoCorrEdit&, rEdit, bool) { return NewDelHdl(&rEdit); } @@ -1288,7 +1288,7 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn) return true; } -IMPL_LINK_TYPED(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void) +IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void) { SvTreeListEntry* pFirstSel = m_pReplaceTLB->FirstSelected(); bool bShort = &rEdt == m_pShortED; @@ -1659,12 +1659,12 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet* ) m_pAutoCapsCB->SaveValue(); } -IMPL_LINK_TYPED(OfaAutocorrExceptPage, NewDelButtonHdl, Button*, pBtn, void) +IMPL_LINK(OfaAutocorrExceptPage, NewDelButtonHdl, Button*, pBtn, void) { NewDelHdl(pBtn); } -IMPL_LINK_TYPED(OfaAutocorrExceptPage, NewDelActionHdl, AutoCorrEdit&, rEdit, bool) +IMPL_LINK(OfaAutocorrExceptPage, NewDelActionHdl, AutoCorrEdit&, rEdit, bool) { return NewDelHdl(&rEdit); } @@ -1696,7 +1696,7 @@ bool OfaAutocorrExceptPage::NewDelHdl(void* pBtn) return false; } -IMPL_LINK_TYPED(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void) +IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void) { if (&rBox == m_pAbbrevLB) { @@ -1712,7 +1712,7 @@ IMPL_LINK_TYPED(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void) } } -IMPL_LINK_TYPED(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void) +IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void) { // sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry(); const OUString& sEntry = rEdt.GetText(); @@ -2050,7 +2050,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet* ) #define DBL_END 3 -IMPL_LINK_TYPED( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) +IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) { sal_uInt16 nMode = SGL_START; if (pBtn == m_pSglEndQuotePB) @@ -2122,7 +2122,7 @@ IMPL_LINK_TYPED( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( OfaQuoteTabPage, StdQuoteHdl, Button*, pBtn, void ) +IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, Button*, pBtn, void ) { if (pBtn == m_pDblStandardPB) { @@ -2357,7 +2357,7 @@ void OfaAutoCompleteTabPage::ActivatePage( const SfxItemSet& ) static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage( false ); } -IMPL_LINK_NOARG_TYPED(OfaAutoCompleteTabPage, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl, Button*, void) { sal_Int32 nSelCnt = (m_pAutoCompleteList) ? m_pLBEntries->GetSelectEntryCount() : 0; @@ -2371,7 +2371,7 @@ IMPL_LINK_NOARG_TYPED(OfaAutoCompleteTabPage, DeleteHdl, Button*, void) } } -IMPL_LINK_TYPED( OfaAutoCompleteTabPage, CheckHdl, CheckBox&, rBox, void ) +IMPL_LINK( OfaAutoCompleteTabPage, CheckHdl, CheckBox&, rBox, void ) { bool bEnable = rBox.IsChecked(); if (&rBox == m_pCBActiv) @@ -2577,7 +2577,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) /** Handler for the push button */ -IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void) { const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos(); const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos); @@ -2592,7 +2592,7 @@ IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void) /** Handler for the check box */ -IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, CheckHdl, CheckBox&, void) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl, CheckBox&, void) { const bool bEnable = m_pMainCB->IsChecked(); m_pSmartTagTypesLB->Enable( bEnable ); @@ -2609,7 +2609,7 @@ IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, CheckHdl, CheckBox&, void) /** Handler for the list box */ -IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, SelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl, SvTreeListBox*, void) { if ( m_pSmartTagTypesLB->GetEntryCount() < 1 ) return; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 16cbc1d72266..741928dbc352 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1133,7 +1133,7 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() // Handler /** Handler, called when color selection is changed */ -IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, void) { sal_uInt16 nItemId = m_pBackgroundColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId ) ) : Color( COL_TRANSPARENT ); @@ -1141,7 +1141,7 @@ IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, m_pPreviewWin1->NotifyChange( aBgdColor ); } -IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl, ListBox&, void) { if ( drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect) ) { @@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, SelectHdl_Impl, ListBox&, void) } } -IMPL_LINK_TYPED( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void ) { if (m_pBtnLink == pBox) { @@ -1199,7 +1199,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void ) } } -IMPL_LINK_TYPED( SvxBackgroundTabPage, RadioClickHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, Button*, pBtn, void ) { if (pBtn == m_pBtnPosition) { @@ -1219,7 +1219,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, RadioClickHdl_Impl, Button*, pBtn, void ) /** Handler, called by pressing the browse button. Create graphic/insert dialog, set path and start. */ -IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void) { if ( pPageImpl->pLoadIdle->IsActive() ) return; @@ -1255,7 +1255,7 @@ IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void) Graphic is only loaded, if it's different to the current graphic. */ -IMPL_LINK_TYPED( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle, void ) +IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle, void ) { if ( pIdle == pPageImpl->pLoadIdle ) { @@ -1314,7 +1314,7 @@ void SvxBackgroundTabPage::ShowTblControl() m_pAsGrid->Show(); } -IMPL_LINK_TYPED( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nSelPos = rBox.GetSelectEntryPos(); if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index d061a480d908..f94fb4aba33c 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -799,7 +799,7 @@ void SvxBorderTabPage::HideShadowControls() } -IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) { const svx::FrameBorderState SHOW = svx::FrameBorderState::Show; const svx::FrameBorderState HIDE = svx::FrameBorderState::Hide; @@ -870,7 +870,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) } -IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) { bool bEnable = m_pWndShadows->GetSelectItemId() > 1; m_pFtShadowSize->Enable(bEnable); @@ -880,7 +880,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) } -IMPL_LINK_TYPED( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void ) +IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void ) { ColorListBox* pColLb = static_cast<ColorListBox*>(&rLb); @@ -891,7 +891,7 @@ IMPL_LINK_TYPED( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void ) } } -IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void) { sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( m_pLineWidthMF->GetValue( ), @@ -904,7 +904,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxBorderTabPage, SelStyleHdl_Impl, ListBox&, rLb, void ) +IMPL_LINK( SvxBorderTabPage, SelStyleHdl_Impl, ListBox&, rLb, void ) { if (&rLb == m_pLbLineStyle) { @@ -1116,7 +1116,7 @@ void SvxBorderTabPage::FillLineListBox_Impl() } -IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) +IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) { if(!mbUseMarginItem && m_pLeftMF->IsVisible()) { @@ -1193,7 +1193,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) } -IMPL_LINK_TYPED( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void) +IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void) { if ( mbSync ) { @@ -1209,12 +1209,12 @@ IMPL_LINK_TYPED( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void) } } -IMPL_LINK_TYPED( SvxBorderTabPage, SyncHdl_Impl, Button*, pBox, void) +IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, Button*, pBox, void) { mbSync = static_cast<CheckBox*>(pBox)->IsChecked(); } -IMPL_LINK_TYPED( SvxBorderTabPage, RemoveAdjacentCellBorderHdl_Impl, Button*, pBox, void) +IMPL_LINK( SvxBorderTabPage, RemoveAdjacentCellBorderHdl_Impl, Button*, pBox, void) { mbRemoveAdjacentCellBorders = static_cast<CheckBox*>(pBox)->IsChecked(); } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 9f325160e104..444fd626376e 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1164,21 +1164,21 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp } -IMPL_LINK_NOARG_TYPED(SvxCharNamePage, UpdateHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl, Idle *, void) { UpdatePreview_Impl(); } -IMPL_LINK_TYPED( SvxCharNamePage, FontModifyComboBoxHdl_Impl, ComboBox&, rBox, void ) +IMPL_LINK( SvxCharNamePage, FontModifyComboBoxHdl_Impl, ComboBox&, rBox, void ) { FontModifyHdl_Impl(&rBox); } -IMPL_LINK_TYPED( SvxCharNamePage, FontModifyListBoxHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxCharNamePage, FontModifyListBoxHdl_Impl, ListBox&, rBox, void ) { FontModifyHdl_Impl(&rBox); } -IMPL_LINK_TYPED( SvxCharNamePage, FontModifyEditHdl_Impl, Edit&, rBox, void ) +IMPL_LINK( SvxCharNamePage, FontModifyEditHdl_Impl, Edit&, rBox, void ) { FontModifyHdl_Impl(&rBox); } @@ -1692,7 +1692,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) } -IMPL_LINK_TYPED( SvxCharEffectsPage, SelectListBoxHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxCharEffectsPage, SelectListBoxHdl_Impl, ListBox&, rBox, void ) { SelectHdl_Impl(&rBox); } @@ -1728,7 +1728,7 @@ void SvxCharEffectsPage::SelectHdl_Impl( ListBox* pBox ) } -IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) { bool bEnable = ( ( m_pUnderlineLB->GetSelectEntryPos() > 0 ) || ( m_pOverlineLB->GetSelectEntryPos() > 0 ) || @@ -1739,19 +1739,19 @@ IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, CbClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxCharEffectsPage, CbClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, TristClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxCharEffectsPage, TristClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); } -IMPL_LINK_TYPED( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ListBox&, rListBox, void ) { ColorListBox* pBox = static_cast<ColorListBox*>(&rListBox); SvxFont& rFont = GetPreviewFont(); @@ -2762,7 +2762,7 @@ void SvxCharPositionPage::SetEscapement_Impl( SvxEscapement nEsc ) } -IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) { SvxEscapement nEsc = SvxEscapement::Off; // also when pBtn == NULL @@ -2775,7 +2775,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) } -IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) { bool bEnable = false; if (m_p90degRB == pBtn || m_p270degRB == pBtn) @@ -2786,7 +2786,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) } -IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) { sal_uInt8 nEscProp = (sal_uInt8)m_pFontSizeMF->GetValue(); short nEsc = (short)m_pHighLowMF->GetValue(); @@ -2795,7 +2795,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void ) { if ( static_cast<CheckBox*>(pBox)->IsChecked() ) { @@ -2809,7 +2809,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void } -IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) { if (m_pFitToLineCB == pBox) { @@ -2823,7 +2823,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) } -IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) { long nVal = static_cast<long>(m_pKerningMF->GetValue()); nVal = LogicToLogic( nVal, MAP_POINT, MAP_TWIP ); @@ -2840,7 +2840,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, void ) { MetricField* pField = static_cast<MetricField*>(&rControl); bool bHigh = m_pHighPosBtn->IsChecked(); @@ -2864,7 +2864,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, voi } -IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, Edit&, void) { m_pPreviewWin->SetFontWidthScale( sal_uInt16( m_pScaleWidthMF->GetValue() ) ); } @@ -3374,7 +3374,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) } -IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) { bool bChecked = m_pTwoLinesBtn->IsChecked(); m_pEnclosingFrame->Enable( bChecked ); @@ -3383,7 +3383,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); if ( CHRDLG_ENCLOSE_SPECIAL_CHAR == reinterpret_cast<sal_uLong>(rBox.GetEntryData( nPos )) ) diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index c92886723cb7..48680745fefd 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -396,11 +396,11 @@ VclPtr<SfxTabPage> SvxConnectionPage::Create( vcl::Window* pWindow, return VclPtr<SvxConnectionPage>::Create( pWindow, *rAttrs ); } -IMPL_LINK_TYPED( SvxConnectionPage, ChangeAttrListBoxHdl_Impl, ListBox&, r, void ) +IMPL_LINK( SvxConnectionPage, ChangeAttrListBoxHdl_Impl, ListBox&, r, void ) { ChangeAttrHdl_Impl(&r); } -IMPL_LINK_TYPED( SvxConnectionPage, ChangeAttrEditHdl_Impl, Edit&, r, void ) +IMPL_LINK( SvxConnectionPage, ChangeAttrEditHdl_Impl, Edit&, r, void ) { ChangeAttrHdl_Impl(&r); } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index e1b4a94cd43d..5c09f6b10d39 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -414,7 +414,7 @@ DeactivateRC SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) description: scale changed, adjust size --------------------------------------------------------------------*/ -IMPL_LINK_TYPED( SvxGrfCropPage, ZoomHdl, Edit&, rField, void ) +IMPL_LINK( SvxGrfCropPage, ZoomHdl, Edit&, rField, void ) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -443,7 +443,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, ZoomHdl, Edit&, rField, void ) description: change size, adjust scale --------------------------------------------------------------------*/ -IMPL_LINK_TYPED( SvxGrfCropPage, SizeHdl, Edit&, rField, void ) +IMPL_LINK( SvxGrfCropPage, SizeHdl, Edit&, rField, void ) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -479,7 +479,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, SizeHdl, Edit&, rField, void ) description: evaluate border --------------------------------------------------------------------*/ -IMPL_LINK_TYPED( SvxGrfCropPage, CropHdl, SpinField&, rField, void ) +IMPL_LINK( SvxGrfCropPage, CropHdl, SpinField&, rField, void ) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -563,7 +563,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropHdl, SpinField&, rField, void ) description: set original size --------------------------------------------------------------------*/ -IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, OrigSizeHdl, Button*, void) +IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl, Button*, void) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -724,7 +724,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound ) m_pZoomConstRB->Enable(bFound); } -IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, Timeout, Timer *, void) +IMPL_LINK_NOARG(SvxGrfCropPage, Timeout, Timer *, void) { DBG_ASSERT(pLastCropField,"Timeout ohne Feld?"); CropHdl(*pLastCropField); @@ -732,7 +732,7 @@ IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, Timeout, Timer *, void) } -IMPL_LINK_TYPED( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void ) { MetricField* pField = static_cast<MetricField*>(&rControl); aTimer.Stop(); @@ -741,7 +741,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void ) } -IMPL_LINK_TYPED( SvxGrfCropPage, CropModifyHdl, Edit&, rField, void ) +IMPL_LINK( SvxGrfCropPage, CropModifyHdl, Edit&, rField, void ) { aTimer.Start(); pLastCropField = static_cast<MetricField*>(&rField); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 3c2d3e9c0fdf..c325ff9d19a3 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -419,7 +419,7 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType ) } -IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, void ) { if (&rListBox == m_pLB_ANSATZ) { @@ -427,7 +427,7 @@ IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, vo } } -IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox&, rListBox, void ) { if (&rListBox == m_pLB_ANSATZ_REL) { @@ -435,7 +435,7 @@ IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox&, rListBox, } } -IMPL_LINK_TYPED( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) +IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) { if (pButton == m_pCB_LAENGE) { @@ -453,7 +453,7 @@ IMPL_LINK_TYPED( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) } -IMPL_LINK_NOARG_TYPED(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void) { SetupType_Impl( (SdrCaptionType) m_pCT_CAPTTYPE->GetSelectItemId() ); } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index b95b6a14fe7d..b980bc1f38cb 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -274,7 +274,7 @@ bool SfxMacroTabPage::IsReadOnly() const return mpImpl->bReadOnly; } -IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG( SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void) { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); @@ -290,7 +290,7 @@ IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void) EnableButtons(); } -IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG( SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void) { mpImpl->pGroupLB->GroupSelected(); const OUString sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI(); @@ -302,17 +302,17 @@ IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void) EnableButtons(); } -IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG( SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void) { EnableButtons(); } -IMPL_LINK_TYPED( SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void ) { AssignDeleteHdl(pBtn); } -IMPL_LINK_TYPED( SfxMacroTabPage, AssignDeleteHdl_Impl, SvTreeListBox*, pBtn, bool ) +IMPL_LINK( SfxMacroTabPage, AssignDeleteHdl_Impl, SvTreeListBox*, pBtn, bool ) { return AssignDeleteHdl(pBtn); } @@ -363,7 +363,7 @@ bool SfxMacroTabPage::AssignDeleteHdl(Control* pBtn) return false; } -IMPL_LINK_TYPED( SfxMacroTabPage, TimeOut_Impl, Idle*,, void ) +IMPL_LINK( SfxMacroTabPage, TimeOut_Impl, Idle*,, void ) { // FillMacroList() can take a long time -> show wait cursor and disable input SfxTabDialog* pTabDlg = GetTabDialog(); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 6da107c1c4ab..6fabe1fee2a1 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -612,7 +612,7 @@ void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RectPoint /*eRP*/ ) ChangeAttrHdl_Impl( pWindow ); } -IMPL_LINK_TYPED( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void ) { if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE ) { @@ -659,15 +659,15 @@ IMPL_LINK_TYPED( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void ) ChangeAttrHdl_Impl( p ); } -IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrClickHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxMeasurePage, ChangeAttrClickHdl_Impl, Button*, p, void ) { ChangeAttrHdl_Impl(p); } -IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrListBoxHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxMeasurePage, ChangeAttrListBoxHdl_Impl, ListBox&, rBox, void ) { ChangeAttrHdl_Impl(&rBox); } -IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrEditHdl_Impl, Edit&, rBox, void ) +IMPL_LINK( SvxMeasurePage, ChangeAttrEditHdl_Impl, Edit&, rBox, void ) { ChangeAttrHdl_Impl(&rBox); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index e0f460a47a0c..cd726724aad8 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1195,7 +1195,7 @@ void SvxNumberFormatTabPage::UpdateDecimalsDenominatorEditBox() #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pLb, bool ) +IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pLb, bool ) { if (pLb == m_pLbFormat) { @@ -1229,15 +1229,15 @@ IMPL_LINK_TYPED( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pL #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatClickHdl_Impl, Button*, pLb, void ) +IMPL_LINK( SvxNumberFormatTabPage, SelFormatClickHdl_Impl, Button*, pLb, void ) { SelFormatHdl_Impl(pLb); } -IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, pLb, void ) +IMPL_LINK( SvxNumberFormatTabPage, SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, pLb, void ) { SelFormatHdl_Impl(pLb); } -IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatListBoxHdl_Impl, ListBox&, rLb, void ) +IMPL_LINK( SvxNumberFormatTabPage, SelFormatListBoxHdl_Impl, ListBox&, rLb, void ) { SelFormatHdl_Impl(&rLb); } @@ -1361,7 +1361,7 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb ) #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, ClickHdl_Impl, Button*, pIB, void) +IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, Button*, pIB, void) { Click_Impl(static_cast<PushButton*>(pIB)); } @@ -1539,7 +1539,7 @@ bool SvxNumberFormatTabPage::Click_Impl(PushButton* pIB) #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxNumberFormatTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) { EditHdl_Impl(&rEdit); } @@ -1610,11 +1610,11 @@ void SvxNumberFormatTabPage::EditHdl_Impl( Edit* pEdFormat ) #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptClickHdl_Impl, Button*, pOptCtrl, void ) +IMPL_LINK( SvxNumberFormatTabPage, OptClickHdl_Impl, Button*, pOptCtrl, void ) { OptHdl_Impl(pOptCtrl); } -IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptEditHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxNumberFormatTabPage, OptEditHdl_Impl, Edit&, rEdit, void ) { OptHdl_Impl(&rEdit); } @@ -1669,7 +1669,7 @@ void SvxNumberFormatTabPage::OptHdl_Impl( void* pOptCtrl ) } } -IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) { pLastActivWindow=nullptr; } @@ -1686,7 +1686,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, LostFocusHdl_Impl, Control&, rControl, void) +IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Control&, rControl, void) { Edit* pEd = static_cast<Edit*>(&rControl); if (pEd == m_pEdComment) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index b971d05839ca..04cabab006d1 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -320,7 +320,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -359,7 +359,7 @@ IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, voi } } -IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); @@ -484,7 +484,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -515,7 +515,7 @@ IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void) } -IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); @@ -688,7 +688,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) } // all levels are changed here -IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -771,7 +771,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) } } -IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); @@ -944,7 +944,7 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -982,14 +982,14 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void) } } -IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); rOk.GetClickHdl().Call(&rOk); } -IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void) { sfx2::FileDialogHelper aFileDialog(0); @@ -1735,7 +1735,7 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, bool ) m_pOrientLB->Enable(bEnableBitmap); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox&, rBox, void ) { sal_uInt16 nSaveNumLvl = nActNumLvl; nActNumLvl = 0; @@ -1776,12 +1776,12 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox&, rBox, void ) InitControls(); } -IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer *, void) { m_pPreviewWIN->Invalidate(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, AllLevelHdl_Impl, Edit&, rBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, Edit&, rBox, void ) { for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { @@ -1800,7 +1800,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, AllLevelHdl_Impl, Edit&, rBox, void ) SetModified(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, void ) { OUString sSelectStyle; bool bShowOrient = false; @@ -1892,7 +1892,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) m_pStartED->GetModifyHdl().Call(*m_pStartED); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); nPos ++; // no VERT_NONE @@ -1917,7 +1917,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void ) SetModified(false); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, SameLevelHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, Button*, pBox, void ) { bool bSet = static_cast<CheckBox*>(pBox)->IsChecked(); pActNum->SetContinuousNumbering(bSet); @@ -1935,7 +1935,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, SameLevelHdl_Impl, Button*, pBox, void ) InitControls(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulColorHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ListBox&, rListBox, void ) { ColorListBox* pBox = static_cast<ColorListBox*>(&rListBox); Color nSetColor = pBox->GetSelectEntryColor(); @@ -1954,7 +1954,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulColorHdl_Impl, ListBox&, rListBox, voi SetModified(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, Edit&, rField, void) +IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, Edit&, rField, void) { sal_uInt16 nRelSize = (sal_uInt16)static_cast<MetricField&>(rField).GetValue(); @@ -1972,7 +1972,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, Edit&, rField, void) SetModified(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) +IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) { sal_uInt16 nItemId = pButton->GetCurItemId(); OUString aGrfName; @@ -2050,7 +2050,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, v } } -IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void) { if(!bMenuButtonInitialized) { @@ -2104,7 +2104,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, } } -IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) { VclPtrInstance< SvxCharacterMap > pMap( this, true ); @@ -2163,7 +2163,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void) +IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void) { bool bWidth = &rField == m_pWidthMF; bLastWidthModified = bWidth; @@ -2230,7 +2230,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void) SetModified(bRepaint); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) { if (static_cast<CheckBox*>(pBox)->IsChecked()) { @@ -2241,7 +2241,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) } } -IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void) { bAutomaticCharStyles = false; sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos(); @@ -2266,11 +2266,11 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void) SetModified(false); }; -IMPL_LINK_NOARG_TYPED( SvxNumOptionsTabPage, EditListBoxHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SvxNumOptionsTabPage, EditListBoxHdl_Impl, ListBox&, void ) { EditModifyHdl_Impl(nullptr); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) { EditModifyHdl_Impl(&rEdit); } @@ -3230,7 +3230,7 @@ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) m_pIndentAtMF->SetUnit( eMetric ); } -IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, EditModifyHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl, ListBox&, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -3255,7 +3255,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, EditModifyHdl_Impl, ListBox&, void) SetModified(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void ) { sal_uInt16 nSaveNumLvl = nActNumLvl; nActNumLvl = 0; @@ -3300,11 +3300,11 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void ) InitControls(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, DistanceFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxNumPositionTabPage, DistanceFocusHdl_Impl, Control&, rControl, void ) { DistanceHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, DistanceHdl_Impl, SpinField&, rFld, void ) +IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, SpinField&, rFld, void ) { if(bInInintControl) return; @@ -3364,7 +3364,7 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, DistanceHdl_Impl, SpinField&, rFld, void } } -IMPL_LINK_TYPED( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void ) { bool bOn = static_cast<CheckBox*>(pBox)->IsChecked(); bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && SAL_MAX_UINT16 != nActNumLvl; @@ -3405,7 +3405,7 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void ) bLastRelative = bOn; } -IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void) { // determine value to be set at the chosen list levels SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB; @@ -3462,11 +3462,11 @@ IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, SetModified(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) { ListtabPosHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, void ) +IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, void ) { // determine value to be set at the chosen list levels const long nValue = GetCoreValue( static_cast<MetricField&>(rFld), eCoreUnit ); @@ -3487,11 +3487,11 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, vo SetModified(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) { AlignAtHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void ) +IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void ) { // determine value to be set at the chosen list levels const long nValue = GetCoreValue( static_cast<MetricField&>(rFld), eCoreUnit ); @@ -3513,11 +3513,11 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void SetModified(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) { IndentAtHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rFld, void ) +IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rFld, void ) { // determine value to be set at the chosen list levels const long nValue = GetCoreValue( static_cast<MetricField&>(rFld), eCoreUnit ); @@ -3542,7 +3542,7 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rFld, void SetModified(); } -IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, StandardHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxNumPositionTabPage, StandardHdl_Impl, Button*, void) { sal_uInt16 nMask = 1; SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(), diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index d025d5b8119a..b0940e4f85f7 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -891,7 +891,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) { // switch inside outside const sal_uInt16 nPos = PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ); @@ -914,7 +914,7 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) { if ( m_pPaperTrayBox->GetEntryCount() > 1 ) // already filled @@ -946,7 +946,7 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) } -IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) { PaperSizeListBox& rListBox = static_cast<PaperSizeListBox&>( rBox ); Paper ePaper = rListBox.GetSelection(); @@ -1016,7 +1016,7 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) { sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE ); MapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich ); @@ -1029,7 +1029,7 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) { if ( (!bLandscape && pBtn == m_pLandscapeBtn) || @@ -1123,7 +1123,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, BorderModify_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxPageDescPage, BorderModify_Impl, Edit&, void) { if ( !bBorderModified ) bBorderModified = true; @@ -1470,7 +1470,7 @@ DeactivateRC SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, RangeHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl, Control&, void) { // example window long nHHeight = m_pBspWin->GetHdHeight(); @@ -1579,7 +1579,7 @@ void SvxPageDescPage::CalcMargin_Impl() } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, CenterHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPageDescPage, CenterHdl_Impl, Button*, void) { m_pBspWin->SetHorz( m_pHorzBox->IsChecked() ); m_pBspWin->SetVert( m_pVertBox->IsChecked() ); @@ -1601,7 +1601,7 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) } -IMPL_LINK_TYPED( SvxPageDescPage, RegisterModify, Button*, pBox, void ) +IMPL_LINK( SvxPageDescPage, RegisterModify, Button*, pBox, void ) { bool bEnable = false; if(static_cast<CheckBox*>(pBox)->IsChecked()) @@ -1627,7 +1627,7 @@ void SvxPageDescPage::DisableVerticalPageDir() } } -IMPL_LINK_NOARG_TYPED( SvxPageDescPage, FrameDirectionModify_Impl, ListBox&, void) +IMPL_LINK_NOARG( SvxPageDescPage, FrameDirectionModify_Impl, ListBox&, void) { m_pBspWin->SetFrameDirection( (sal_uInt32) m_pTextFlowBox->GetSelectEntryValue() ); m_pBspWin->Invalidate(); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index de32a1576703..1266cc67d36c 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -161,7 +161,7 @@ sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet) } -IMPL_LINK_NOARG_TYPED(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -781,7 +781,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl LineDistHdl_Impl( *m_pLineDist ); } -IMPL_LINK_TYPED( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void ) { switch( rBox.GetSelectEntryPos() ) { @@ -848,7 +848,7 @@ IMPL_LINK_TYPED( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void UpdateExample_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxStdParagraphTabPage, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxStdParagraphTabPage, ModifyHdl_Impl, Edit&, void) { UpdateExample_Impl(); } @@ -925,7 +925,7 @@ void SvxStdParagraphTabPage::EnableContextualMode() m_pContextualCB->Show(); } -IMPL_LINK_TYPED( SvxStdParagraphTabPage, AutoHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, Button*, pBox, void ) { bool bEnable = !static_cast<CheckBox*>(pBox)->IsChecked(); m_pFLineLabel->Enable(bEnable); @@ -1293,7 +1293,7 @@ void SvxParaAlignTabPage::ChangesApplied() m_pExpandCB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void) { bool bJustify = m_pJustify->IsChecked(); m_pLastLineFT->Enable(bJustify); @@ -1303,7 +1303,7 @@ IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void) UpdateExample_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, LastLineHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl, ListBox&, void) { //fdo#41350 only enable 'Expand last word' if last line is also justified bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2; @@ -1311,7 +1311,7 @@ IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, LastLineHdl_Impl, ListBox&, void) UpdateExample_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox&, void) { SvxFrameDirection eDir = m_pTextDirectionLB->GetSelectEntryValue(); switch ( eDir ) @@ -2000,7 +2000,7 @@ void SvxExtParagraphTabPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void) { switch ( m_pPageBreakBox->GetState() ) { @@ -2041,14 +2041,14 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, KeepTogetherHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, KeepTogetherHdl_Impl, Button*, void) { bool bEnable = m_pKeepTogetherBox->GetState() == TRISTATE_FALSE; m_pWidowBox->Enable(bEnable); m_pOrphanBox->Enable(bEnable); } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, WidowHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl, Button*, void) { switch ( m_pWidowBox->GetState() ) { @@ -2070,7 +2070,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, WidowHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, OrphanHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl, Button*, void) { switch( m_pOrphanBox->GetState() ) { @@ -2092,7 +2092,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, OrphanHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, HyphenClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, HyphenClickHdl_Impl, Button*, void) { bool bEnable = m_pHyphenBox->GetState() == TRISTATE_TRUE; @@ -2105,7 +2105,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, HyphenClickHdl_Impl, Button*, void m_pHyphenBox->SetState( bEnable ? TRISTATE_TRUE : TRISTATE_FALSE); } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, void) { bool bEnable = false; if ( m_pApplyCollBtn->GetState() == TRISTATE_TRUE && @@ -2126,7 +2126,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, v } } -IMPL_LINK_TYPED( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, void ) { if ( 0 == rListBox.GetSelectEntryPos() ) { @@ -2152,7 +2152,7 @@ IMPL_LINK_TYPED( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBo } } -IMPL_LINK_TYPED( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox&, rListBox, void ) { //column break or break break after sal_Int32 nBreakPos = m_pBreakPositionLB->GetSelectEntryPos(); @@ -2281,7 +2281,7 @@ void SvxAsianTabPage::ChangesApplied() m_pHangingPunctCB->SaveValue(); m_pScriptSpaceCB->SaveValue(); } -IMPL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, pBox, void ) +IMPL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, Button*, pBox, void ) { static_cast<CheckBox*>(pBox)->EnableTriState( false ); } diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 7c03cf4a11b2..c11767a955a7 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1146,11 +1146,11 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) return nRet; } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyClickHdl, Button*, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyClickHdl, Button*, void) { RangeModifyHdl(*m_pWidthMF); } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) { if(m_bPositioningDisabled) return; @@ -1228,7 +1228,7 @@ IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) m_pVertByMF->SetValue(m_pVertByMF->Normalize(aVal.nVPos), FUNIT_TWIP); } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void) { m_pHoriMirrorCB->Enable(!m_pAsCharRB->IsChecked() && !m_bIsMultiSelection); @@ -1248,13 +1248,13 @@ IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, MirrorHdl, Button*, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, MirrorHdl, Button*, void) { short nId = GetAnchorType(); InitPos( nId, USHRT_MAX, 0, USHRT_MAX, 0, LONG_MAX, LONG_MAX); } -IMPL_LINK_TYPED( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void ) +IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void ) { bool bHori = &rLB == m_pHoriToLB; @@ -1283,7 +1283,7 @@ IMPL_LINK_TYPED( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void ) RangeModifyHdl(*m_pWidthMF); } -IMPL_LINK_TYPED( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) +IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) { bool bHori = &rLB == m_pHoriLB; ListBox *pRelLB = bHori ? m_pHoriToLB : m_pVertToLB; @@ -1385,7 +1385,7 @@ IMPL_LINK_TYPED( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) } } -IMPL_LINK_TYPED( SvxSwPosSizeTabPage, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit&, rEdit, void ) { sal_Int64 nWidth = m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_TWIP)); sal_Int64 nHeight = m_pHeightMF->Denormalize(m_pHeightMF->GetValue(FUNIT_TWIP)); @@ -1406,7 +1406,7 @@ IMPL_LINK_TYPED( SvxSwPosSizeTabPage, ModifyHdl, Edit&, rEdit, void ) UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, ProtectHdl, Button*, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl, Button*, void) { m_pSizeCB->Enable(m_pPositionCB->IsEnabled() && !m_pPositionCB->IsChecked()); } diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index a3813ae8df29..787fa7625282 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -247,7 +247,7 @@ short SvxAreaTabDialog::Ok() } -IMPL_LINK_NOARG_TYPED(SvxAreaTabDialog, CancelHdlImpl, Button*, void) +IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 6441aadfe019..b9efb53c7850 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -181,7 +181,7 @@ short SvxLineTabDialog::Ok() } -IMPL_LINK_NOARG_TYPED(SvxLineTabDialog, CancelHdlImpl, Button*, void) +IMPL_LINK_NOARG(SvxLineTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 142c75b72b26..477ac3bce31a 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -461,7 +461,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() pFillBtn->Check(); } -IMPL_LINK_TYPED( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void ) { // Add a new one and select it // Get the value from the display @@ -516,7 +516,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void ) m_pTabBox->SetSelection(Selection(0, m_pTabBox->GetText().getLength())); } -IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl, Button*, void) { sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue() ); @@ -556,7 +556,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelHdl_Impl, Button*, void) bCheck = true; } -IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void) { if ( aNewTabs.Count() ) { @@ -568,7 +568,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void ) +IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void ) { bCheck = true; SvxTabAdjust eAdj; @@ -600,7 +600,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void } } -IMPL_LINK_TYPED( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, void ) +IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, void ) { bCheck = true; sal_uInt8 cFill = ' '; @@ -628,7 +628,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, voi } } -IMPL_LINK_TYPED( SvxTabulatorTabPage, GetFillCharHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Control&, rControl, void ) { OUString aChar( static_cast<Edit&>(rControl).GetText() ); @@ -643,7 +643,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, GetFillCharHdl_Impl, Control&, rControl, v } } -IMPL_LINK_TYPED( SvxTabulatorTabPage, GetDezCharHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Control&, rControl, void ) { OUString aChar( static_cast<Edit*>(&rControl)->GetText() ); if ( !aChar.isEmpty() && ( aChar[0] >= ' ')) @@ -657,7 +657,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, GetDezCharHdl_Impl, Control&, rControl, vo } } -IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void) +IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void) { sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) @@ -668,7 +668,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void) } } -IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl, Edit&, void) { sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index b2ffc914913a..2dcc3d39e7f4 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -480,7 +480,7 @@ VclPtr<SfxTabPage> SvxTextAnimationPage::Create( vcl::Window* pWindow, return VclPtr<SvxTextAnimationPage>::Create( pWindow, *rAttrs ); } -IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void) { sal_Int32 nPos = m_pLbEffect->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -537,7 +537,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void } } -IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickEndlessHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, Button*, void) { if( eAniKind != SDRTEXTANI_SLIDE ) @@ -556,7 +556,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickEndlessHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickAutoHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl, Button*, void) { TriState eState = m_pTsbAuto->GetState(); if( eState != TRISTATE_FALSE ) @@ -571,7 +571,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickAutoHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickPixelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, Button*, void) { TriState eState = m_pTsbPixel->GetState(); if( eState == TRISTATE_TRUE ) @@ -608,7 +608,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickPixelHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( SvxTextAnimationPage, ClickDirectionHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxTextAnimationPage, ClickDirectionHdl_Impl, Button *, pBtn, void ) { m_pBtnUp->Check( pBtn == m_pBtnUp ); m_pBtnLeft->Check( pBtn == m_pBtnLeft ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index a53b3695b12f..3058bb9bbf5a 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -579,7 +579,7 @@ void SvxTextAttrPage::PointChanged( vcl::Window*, RectPoint eRP ) to be moved to a valid and adjacent position. This position depends on the current anchor position and the text writing direction. */ -IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void) { if( m_pTsbFullWidth->GetState() == TRISTATE_TRUE ) { @@ -636,7 +636,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void) |* \************************************************************************/ -IMPL_LINK_TYPED(SvxTextAttrPage, ClickHdl_Impl, Button*, pButton, void) +IMPL_LINK(SvxTextAttrPage, ClickHdl_Impl, Button*, pButton, void) { if (pButton == m_pTsbAutoGrowSize) { diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index e0caa7e3111e..a9022678b390 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -670,7 +670,7 @@ VclPtr<SfxTabPage> SvxAreaTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, SelectDialogTypeHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl, ListBox&, void) { switch( (drawing::FillStyle)m_pTypeLB->GetSelectEntryPos() ) { @@ -715,7 +715,7 @@ void SvxAreaTabPage::ClickColorHdl_Impl() } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyColorHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbColor->GetSelectEntryPos(); @@ -755,7 +755,7 @@ void SvxAreaTabPage::ClickGradientHdl_Impl() } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbGradient->GetSelectEntryPos(); @@ -800,7 +800,7 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl() ModifyHatchingHdl_Impl( *m_pLbHatching ); } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) { // fill Hatch ItemSet const SfxPoolItem* pPoolItem = nullptr; @@ -855,7 +855,7 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl() } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbBitmap->GetSelectEntryPos(); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 2f37ff9c11f7..5265f34fbb12 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -498,7 +498,7 @@ void SvxBitmapTabPage::CalculateBitmapPresetSize() } } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void) { std::unique_ptr<GraphicObject> pGraphicObject; size_t nPos = m_pBitmapLB->GetSelectItemPos(); @@ -550,7 +550,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pBitmapLB->GetSelectItemId(); size_t nPos = m_pBitmapLB->GetSelectItemPos(); @@ -593,7 +593,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) } } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pBitmapLB->GetSelectItemId(); size_t nPos = m_pBitmapLB->GetSelectItemPos(); @@ -616,7 +616,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void) } } -IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ModifyBitmapSizeHdl, Edit&, void ) +IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapSizeHdl, Edit&, void ) { if( m_pTsbScale->GetState() != TRISTATE_TRUE && static_cast<BitmapStyle>(m_pBitmapStyleLB->GetSelectEntryPos()) != TILED ) { @@ -637,12 +637,12 @@ IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ModifyBitmapSizeHdl, Edit&, void ) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ClickScaleHdl, Button*, void ) +IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, Button*, void ) { ModifyBitmapStyleHdl( *m_pBitmapStyleLB ); } -IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void ) +IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void ) { BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectEntryPos(); bool bIsStretched( eStylePos == STRETCHED ); @@ -716,7 +716,7 @@ IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void ) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyBitmapPositionHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapPositionHdl, ListBox&, void) { if(m_pPositionLB->IsEnabled()) m_rXFSet.Put( XFillBmpPosItem( static_cast< RectPoint >( m_pPositionLB->GetSelectEntryPos() ) ) ); @@ -725,7 +725,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyBitmapPositionHdl, ListBox&, void) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyPositionOffsetHdl, Edit&, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyPositionOffsetHdl, Edit&, void) { if(m_pPositionOffX->IsEnabled()) m_rXFSet.Put( XFillBmpPosOffsetXItem( m_pPositionOffX->GetValue() ) ); @@ -737,7 +737,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyPositionOffsetHdl, Edit&, void) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void) { sal_uInt16 nTileXOff = 0; sal_uInt16 nTileYOff = 0; @@ -755,7 +755,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl, Button*, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) { ResMgr& rMgr = CUI_MGR(); SvxOpenGraphicDialog aDlg( OUString("Import") ); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 870854f7c428..d0335f325bee 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -341,7 +341,7 @@ VclPtr<SfxTabPage> SvxColorTabPage::Create( vcl::Window* pWindow, } // is called when the content of the MtrFields is changed for color values -IMPL_LINK_TYPED(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void) +IMPL_LINK(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void) { if (eCM == ColorModel::RGB) { @@ -374,7 +374,7 @@ IMPL_LINK_TYPED(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void) } -IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_COLOR ) ); OUString aDesc( CUI_RES( RID_SVXSTR_DESC_COLOR ) ); @@ -444,7 +444,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) UpdateModified(); } -IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) { std::unique_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() )); @@ -465,7 +465,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_uInt16 nId = m_pValSetColorList->GetSelectItemId(); size_t nPos = m_pValSetColorList->GetSelectItemPos(); @@ -497,7 +497,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectPaletteLBHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, ListBox&, void) { m_pValSetColorList->Clear(); sal_Int32 nPos = m_pSelectPalette->GetSelectEntryPos(); @@ -531,7 +531,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectPaletteLBHdl, ListBox&, void) m_pValSetColorList->Resize(); } -IMPL_LINK_TYPED(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void) +IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void) { sal_Int32 nPos = pValSet->GetSelectItemId(); if( nPos != 0 ) @@ -579,7 +579,7 @@ void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell) break; } } -IMPL_LINK_TYPED(SvxColorTabPage, SelectColorModeHdl_Impl, RadioButton&, rRadioButton, void) +IMPL_LINK(SvxColorTabPage, SelectColorModeHdl_Impl, RadioButton&, rRadioButton, void) { if( &rRadioButton == m_pRbRGB ) eCM = ColorModel::RGB; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 12cc67df15ad..11effdd86c9b 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -319,22 +319,22 @@ VclPtr<SfxTabPage> SvxGradientTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) { ModifiedHdl_Impl(&rListBox); } -IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedEditHdl_Impl, Edit&, rBox, void ) +IMPL_LINK( SvxGradientTabPage, ModifiedEditHdl_Impl, Edit&, rBox, void ) { ModifiedHdl_Impl(&rBox); } -IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedSliderHdl_Impl, Slider*, rSlider, void ) +IMPL_LINK( SvxGradientTabPage, ModifiedSliderHdl_Impl, Slider*, rSlider, void ) { ModifiedHdl_Impl(rSlider); } -IMPL_LINK_NOARG_TYPED( SvxGradientTabPage, ChangeAutoStepHdl_Impl, CheckBox&, void ) +IMPL_LINK_NOARG( SvxGradientTabPage, ChangeAutoStepHdl_Impl, CheckBox&, void ) { if(m_pCbIncrement->IsChecked()) { @@ -389,7 +389,7 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl ) } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) ); OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) ); @@ -466,7 +466,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) { sal_uInt16 nId = m_pGradientLB->GetSelectItemId(); size_t nPos = m_pGradientLB->GetSelectItemPos(); @@ -496,7 +496,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pGradientLB->GetSelectItemId(); size_t nPos = m_pGradientLB->GetSelectItemPos(); @@ -525,7 +525,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox* m_pBtnModify->Disable(); } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pGradientLB->GetSelectItemId(); size_t nPos = m_pGradientLB->GetSelectItemPos(); @@ -568,7 +568,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox* } } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ChangeGradientHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl, ValueSet*, void) { ChangeGradientHdl_Impl(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index b9c9c384dcc5..6d8d4567c0ea 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -349,12 +349,12 @@ VclPtr<SfxTabPage> SvxHatchTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) { ModifiedHdl_Impl(&rListBox); } -IMPL_LINK_NOARG_TYPED( SvxHatchTabPage, ToggleHatchBackgroundColor_Impl, CheckBox&, void ) +IMPL_LINK_NOARG( SvxHatchTabPage, ToggleHatchBackgroundColor_Impl, CheckBox&, void ) { if(m_pCbBackgroundColor->IsChecked()) m_pLbBackgroundColor->Enable(); @@ -364,7 +364,7 @@ IMPL_LINK_NOARG_TYPED( SvxHatchTabPage, ToggleHatchBackgroundColor_Impl, CheckBo ModifiedBackgroundHdl_Impl(*m_pLbBackgroundColor); } -IMPL_LINK_NOARG_TYPED( SvxHatchTabPage, ModifiedBackgroundHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SvxHatchTabPage, ModifiedBackgroundHdl_Impl, ListBox&, void ) { Color aColor(COL_TRANSPARENT); if(m_pCbBackgroundColor->IsChecked()) @@ -379,12 +379,12 @@ IMPL_LINK_NOARG_TYPED( SvxHatchTabPage, ModifiedBackgroundHdl_Impl, ListBox&, vo m_pCtlPreview->Invalidate(); } -IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedEditHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxHatchTabPage, ModifiedEditHdl_Impl, Edit&, rEdit, void ) { ModifiedHdl_Impl(&rEdit); } -IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedSliderHdl_Impl, Slider*, rSlider, void ) +IMPL_LINK( SvxHatchTabPage, ModifiedSliderHdl_Impl, Slider*, rSlider, void ) { ModifiedHdl_Impl(rSlider); } @@ -407,7 +407,7 @@ void SvxHatchTabPage::ModifiedHdl_Impl( void* p ) m_pCtlPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ChangeHatchHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl, ValueSet*, void) { ChangeHatchHdl_Impl(); } @@ -471,7 +471,7 @@ void SvxHatchTabPage::ChangeHatchHdl_Impl() m_pHatchLB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_HATCH ) ); OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) ); @@ -540,7 +540,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) { sal_uInt16 nId = m_pHatchLB->GetSelectItemId(); size_t nPos = m_pHatchLB->GetSelectItemPos(); @@ -572,7 +572,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pHatchLB->GetSelectItemId(); size_t nPos = m_pHatchLB->GetSelectItemPos(); @@ -598,7 +598,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, v } } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void ) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void ) { sal_uInt16 nId = m_pHatchLB->GetSelectItemId(); size_t nPos = m_pHatchLB->GetSelectItemPos(); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index afd5858c9028..6b5ade69f9eb 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1511,11 +1511,11 @@ VclPtr<SfxTabPage> SvxLineTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_TYPED( SvxLineTabPage, ChangePreviewListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineTabPage, ChangePreviewListBoxHdl_Impl, ListBox&, rListBox, void ) { ChangePreviewHdl_Impl(&rListBox); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangePreviewModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxLineTabPage, ChangePreviewModifyHdl_Impl, Edit&, rEdit, void ) { ChangePreviewHdl_Impl(&rEdit); } @@ -1579,15 +1579,15 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(void * pCntrl ) } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartClickHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxLineTabPage, ChangeStartClickHdl_Impl, Button*, p, void ) { ChangeStartHdl_Impl(p); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineTabPage, ChangeStartListBoxHdl_Impl, ListBox&, rListBox, void ) { ChangeStartHdl_Impl(&rListBox); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxLineTabPage, ChangeStartModifyHdl_Impl, Edit&, rEdit, void ) { ChangeStartHdl_Impl(&rEdit); } @@ -1607,7 +1607,7 @@ void SvxLineTabPage::ChangeStartHdl_Impl( void * p ) } -IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeEdgeStyleHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl, ListBox&, void) { ChangePreviewHdl_Impl( nullptr ); } @@ -1615,13 +1615,13 @@ IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeEdgeStyleHdl_Impl, ListBox&, void) // fdo#43209 -IMPL_LINK_NOARG_TYPED( SvxLineTabPage, ChangeCapStyleHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SvxLineTabPage, ChangeCapStyleHdl_Impl, ListBox&, void ) { ChangePreviewHdl_Impl( nullptr ); } -IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void) { if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible { @@ -1654,15 +1654,15 @@ IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void) } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndClickHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxLineTabPage, ChangeEndClickHdl_Impl, Button*, p, void ) { ChangeEndHdl_Impl(p); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineTabPage, ChangeEndListBoxHdl_Impl, ListBox&, rListBox, void ) { ChangeEndHdl_Impl(&rListBox); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxLineTabPage, ChangeEndModifyHdl_Impl, Edit&, rEdit, void ) { ChangeEndHdl_Impl(&rEdit); } @@ -1682,7 +1682,7 @@ void SvxLineTabPage::ChangeEndHdl_Impl( void * p ) } -IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void) { sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue(); XLineTransparenceItem aItem( nVal ); @@ -1713,19 +1713,19 @@ void SvxLineTabPage::FillUserData() // #58425# Symbols on a list (e.g. StarChart) // Handler for the symbol selection's popup menu (NumMenueButton) // The following link originates from SvxNumOptionsTabPage -IMPL_LINK_TYPED( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton, void ) +IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton, void ) { InitSymbols(pButton); } // #58425# Symbols on a list (e.g. StarChart) // Handler for menu button -IMPL_LINK_TYPED( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) +IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) { SymbolSelected(pButton); } -IMPL_LINK_TYPED( SvxLineTabPage, SizeHdl_Impl, Edit&, rField, void) +IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, Edit&, rField, void) { m_bNewSize = true; bool bWidth = &rField == m_pSymbolWidthMF; @@ -1771,7 +1771,7 @@ IMPL_LINK_TYPED( SvxLineTabPage, SizeHdl_Impl, Edit&, rField, void) m_pCtlPreview->ResizeSymbol(m_aSymbolSize); m_aSymbolLastSize=m_aSymbolSize; } -IMPL_LINK_TYPED( SvxLineTabPage, RatioHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxLineTabPage, RatioHdl_Impl, Button*, pBox, void ) { if (static_cast<CheckBox*>(pBox)->IsChecked()) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 0620d442ab5e..f9949a33ae84 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -349,7 +349,7 @@ VclPtr<SfxTabPage> SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxIte } -IMPL_LINK_TYPED( SvxLineDefTabPage, SelectLinestyleListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineDefTabPage, SelectLinestyleListBoxHdl_Impl, ListBox&, rListBox, void ) { SelectLinestyleHdl_Impl(&rListBox); } @@ -386,13 +386,13 @@ void SvxLineDefTabPage::SelectLinestyleHdl_Impl(ListBox* p) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangePreviewHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ChangePreviewHdl_Impl, Edit&, void) { FillDash_Impl(); m_pCtlPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void) { if( m_pNumFldNumber1->GetValue() == 0L ) { @@ -409,7 +409,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) { if( m_pNumFldNumber2->GetValue() == 0L ) { @@ -426,7 +426,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) { if( !m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != eFUnit ) { @@ -493,7 +493,7 @@ IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) } -IMPL_LINK_TYPED( SvxLineDefTabPage, SelectTypeListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineDefTabPage, SelectTypeListBoxHdl_Impl, ListBox&, rListBox, void ) { SelectTypeHdl_Impl(&rListBox); } @@ -531,7 +531,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); OUString aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) ); @@ -613,7 +613,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -679,7 +679,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -714,7 +714,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -794,7 +794,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE ); OUString aStrFilterType( "*.sod" ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 6412f7ba8e64..aa0067b63020 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -280,7 +280,7 @@ VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const Sfx } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void) { if( pLineEndList->Count() > 0 ) { @@ -311,7 +311,7 @@ void SvxLineEndDefTabPage::ChangePreviewHdl_Impl() } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -389,7 +389,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) { if( pPolyObj ) { @@ -497,7 +497,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -531,7 +531,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -612,7 +612,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE ); OUString aStrFilterType( "*.soe" ); diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index de13c2089745..0342d1eeaabd 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -314,7 +314,7 @@ VclPtr<SfxTabPage> SvxPatternTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) { std::unique_ptr<GraphicObject> pGraphicObject; size_t nPos = m_pPatternLB->GetSelectItemPos(); @@ -420,7 +420,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_PATTERN_UNTITLED ) ); @@ -525,7 +525,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) /******************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void) { sal_uInt16 nId = m_pPatternLB->GetSelectItemId(); size_t nPos = m_pPatternLB->GetSelectItemPos(); @@ -551,7 +551,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) { size_t nPos = m_pPatternLB->GetSelectItemPos(); sal_Int32 nId = m_pPatternLB->GetSelectItemId(); @@ -609,7 +609,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pPatternLB->GetSelectItemId(); size_t nPos = m_pPatternLB->GetSelectItemPos(); @@ -641,7 +641,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, } } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ChangeColorHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ChangeColorHdl_Impl, ListBox&, void) { ChangeColor_Impl(); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 4073e715fe33..d2b1dca3ce28 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -473,7 +473,7 @@ VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) { if( m_pTsbShowShadow->GetState() == TRISTATE_FALSE ) { @@ -489,11 +489,11 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, void) { ModifyShadowHdl_Impl(*m_pMtrTransparent); } -IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void) { if( m_pTsbShowShadow->GetState() == TRISTATE_TRUE ) m_rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index cc718cc949a8..1c62d1b60d7a 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -62,7 +62,7 @@ const sal_uInt16 SvxTransparenceTabPage::pTransparenceRanges[] = |* \************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransOffHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl, Button*, void) { // disable all other controls ActivateLinear(false); @@ -77,7 +77,7 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransOffHdl_Impl, Button*, vo InvalidatePreview( false ); } -IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*, void) { // enable linear, disable other ActivateLinear(true); @@ -88,7 +88,7 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*, ModifyTransparentHdl_Impl (*m_pMtrTransparent); } -IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button*, void) { // enable gradient, disable other ActivateLinear(false); @@ -131,7 +131,7 @@ void SvxTransparenceTabPage::ActivateLinear(bool bActivate) m_pMtrTransparent->Enable(bActivate); } -IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, Edit&, void) { sal_uInt16 nPos = (sal_uInt16)m_pMtrTransparent->GetValue(); XFillTransparenceItem aItem(nPos); @@ -141,12 +141,12 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, Edit&, InvalidatePreview(); } -IMPL_LINK_TYPED(SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl, ListBox&, rListBox, void) +IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl, ListBox&, rListBox, void) { ModifiedTrgrHdl_Impl(&rListBox); } -IMPL_LINK_TYPED(SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl, Edit&, rBox, void) +IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl, Edit&, rBox, void) { ModifiedTrgrHdl_Impl(&rBox); } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 5944f58eb4ab..d673aa64725a 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -1178,7 +1178,7 @@ DeactivateRC SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void) { // #106572# Remember user's last choice m_pTsbSizeProtect->SetState( m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? TRISTATE_TRUE : mnProtectSizeState ); @@ -1219,7 +1219,7 @@ void SvxPositionSizeTabPage::UpdateControlStates() } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, void) { if( m_pTsbSizeProtect->IsEnabled() ) { @@ -1547,7 +1547,7 @@ void SvxPositionSizeTabPage::DisableProtect() } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) { @@ -1569,7 +1569,7 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) { @@ -1591,13 +1591,13 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickSizeProtectHdl, Button*, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl, Button*, void) { UpdateControlStates(); } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void) { if( m_pCbxScale->IsChecked() ) { diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index ad00847c8c8e..a768615455c0 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -175,7 +175,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValu } } -IMPL_LINK_TYPED( OInterceptor, OnDispatch, void*, _pDispatcher, void ) +IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher, void ) { std::unique_ptr<DispatchHelper> pHelper( static_cast< DispatchHelper* >( _pDispatcher ) ); try diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 73d8b3c2e6d4..80675245446e 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -37,7 +37,7 @@ class OInterceptor : public ::cppu::WeakImplHelper< css::frame::XDispatchProvide css::frame::XInterceptorInfo, css::frame::XDispatch > { - DECL_LINK_TYPED( OnDispatch, void*, void ); + DECL_LINK( OnDispatch, void*, void ); protected: virtual ~OInterceptor() override; public: diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index cd94f2110ec9..ab736b1ad026 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -272,7 +272,7 @@ namespace dbmm return MacroMigrationDialog_Base::onFinish(); } - IMPL_LINK_NOARG_TYPED( MacroMigrationDialog, OnStartMigration, void*, void ) + IMPL_LINK_NOARG( MacroMigrationDialog, OnStartMigration, void*, void ) { // prevent closing m_pData->bMigrationIsRunning = true; diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index ee65942d0a75..28ef816ec166 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -65,7 +65,7 @@ namespace dbmm void impl_reloadDocument_nothrow( bool _bMigrationSuccess ); private: - DECL_LINK_TYPED( OnStartMigration, void*, void ); + DECL_LINK( OnStartMigration, void*, void ); private: ::std::unique_ptr< MacroMigrationDialog_Data > m_pData; diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 9192eb6601a8..c8d58bcdbe07 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -112,7 +112,7 @@ namespace dbmm m_pStartMigration->Show(!m_pSaveAsLocation->GetText().isEmpty()); } - IMPL_LINK_NOARG_TYPED( SaveDBDocPage, OnLocationModified, Edit&, void ) + IMPL_LINK_NOARG( SaveDBDocPage, OnLocationModified, Edit&, void ) { impl_updateLocationDependentItems(); } diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index 9115aa34a0bc..ad82d28c54ee 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -94,7 +94,7 @@ namespace dbmm virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnLocationModified, Edit&, void ); + DECL_LINK( OnLocationModified, Edit&, void ); void impl_updateLocationDependentItems(); }; diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index b5135f870371..16a21a7ab53d 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -230,7 +230,7 @@ private: OUString m_sCurrentURL; ImplSVEvent * m_nStartWizard; - DECL_LINK_TYPED( OnStartTableWizard, void*, void ); + DECL_LINK( OnStartTableWizard, void*, void ); public: explicit DBContentLoader(const Reference< XComponentContext >&); virtual ~DBContentLoader() override; @@ -560,7 +560,7 @@ void DBContentLoader::cancel() throw(std::exception) { } -IMPL_LINK_NOARG_TYPED( DBContentLoader, OnStartTableWizard, void*, void ) +IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard, void*, void ) { m_nStartWizard = nullptr; try diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 18c2fe562bcd..9aa1a837a469 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1879,14 +1879,14 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const return xRet; } -IMPL_LINK_TYPED( OApplicationController, OnSelectContainer, void*, _pType, void ) +IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType, void ) { ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType ); if (getContainer()) getContainer()->selectContainer(eType); } -IMPL_LINK_TYPED( OApplicationController, OnCreateWithPilot, void*, _pType, void ) +IMPL_LINK( OApplicationController, OnCreateWithPilot, void*, _pType, void ) { ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType ); newElementWithPilot( eType ); @@ -2233,7 +2233,7 @@ void OApplicationController::showPreviewFor(const ElementType _eType,const OUStr } } -IMPL_LINK_NOARG_TYPED(OApplicationController, OnClipboardChanged, TransferableDataHelper*, void) +IMPL_LINK_NOARG(OApplicationController, OnClipboardChanged, TransferableDataHelper*, void) { OnInvalidateClipboard(); } diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index f6f1201c323e..928a46e8aca9 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -537,10 +537,10 @@ namespace dbaui getCurrentSelection( Control& _rControl ) const override; void OnInvalidateClipboard(); - DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK_TYPED( OnAsyncDrop, void*, void ); - DECL_LINK_TYPED( OnCreateWithPilot, void*, void ); - DECL_LINK_TYPED( OnSelectContainer, void*, void ); + DECL_LINK( OnClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( OnAsyncDrop, void*, void ); + DECL_LINK( OnCreateWithPilot, void*, void ); + DECL_LINK( OnSelectContainer, void*, void ); void OnFirstControllerConnected(); protected: diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 692d9868a024..819cbf6372a1 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -797,7 +797,7 @@ bool OApplicationController::isTableFormat() const return OTableCopyHelper::isTableFormat(getViewClipboard()); } -IMPL_LINK_NOARG_TYPED( OApplicationController, OnAsyncDrop, void*, void ) +IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop, void*, void ) { m_nAsyncDrop = nullptr; SolarMutexGuard aSolarGuard; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index e8c9f37e19ef..2b2867ec23c6 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -128,7 +128,7 @@ namespace // class OPreviewWindow class OTablePreviewWindow : public vcl::Window { - DECL_LINK_TYPED(OnDisableInput, void*, void); + DECL_LINK(OnDisableInput, void*, void); void ImplInitSettings(); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; @@ -147,7 +147,7 @@ namespace PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), nullptr, true ); return bRet; } - IMPL_LINK_NOARG_TYPED(OTablePreviewWindow, OnDisableInput, void*, void) + IMPL_LINK_NOARG(OTablePreviewWindow, OnDisableInput, void*, void) { EnableInput(false); } @@ -888,33 +888,33 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _r } } -IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryEnterKey, DBTreeListBox*, _pTree, void ) +IMPL_LINK(OAppDetailPageHelper, OnEntryEnterKey, DBTreeListBox*, _pTree, void ) { OnEntryDoubleClick(_pTree); } -IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree, bool) +IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree, bool) { OSL_ENSURE( _pTree, "OAppDetailPageHelper, OnEntryDoubleClick: invalid callback!" ); bool bHandled = ( _pTree != nullptr ) && getBorderWin().getView()->getAppController().onEntryDoubleClick( *_pTree ); return bHandled; } -IMPL_LINK_NOARG_TYPED(OAppDetailPageHelper, OnEntrySelChange, LinkParamNone*, void) +IMPL_LINK_NOARG(OAppDetailPageHelper, OnEntrySelChange, LinkParamNone*, void) { getBorderWin().getView()->getAppController().onSelectionChanged(); } -IMPL_LINK_NOARG_TYPED( OAppDetailPageHelper, OnCopyEntry, LinkParamNone*, void ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnCopyEntry, LinkParamNone*, void ) { getBorderWin().getView()->getAppController().onCopyEntry(); } -IMPL_LINK_NOARG_TYPED( OAppDetailPageHelper, OnPasteEntry, LinkParamNone*, void ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnPasteEntry, LinkParamNone*, void ) { getBorderWin().getView()->getAppController().onPasteEntry(); } -IMPL_LINK_NOARG_TYPED( OAppDetailPageHelper, OnDeleteEntry, LinkParamNone*, void ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnDeleteEntry, LinkParamNone*, void ) { getBorderWin().getView()->getAppController().onDeleteEntry(); } @@ -1136,7 +1136,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName, } } -IMPL_LINK_NOARG_TYPED(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void) +IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void) { m_aTBPreview->EndSelection(); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 65426cc027b2..fb933c64e130 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -149,16 +149,16 @@ namespace dbaui */ DBTreeListBox* createSimpleTree( const OString& _sHelpId, const Image& _rImage); - DECL_LINK_TYPED( OnEntryDoubleClick, SvTreeListBox*, bool ); - DECL_LINK_TYPED( OnEntryEnterKey, DBTreeListBox*, void ); - DECL_LINK_TYPED( OnEntrySelChange, LinkParamNone*, void ); + DECL_LINK( OnEntryDoubleClick, SvTreeListBox*, bool ); + DECL_LINK( OnEntryEnterKey, DBTreeListBox*, void ); + DECL_LINK( OnEntrySelChange, LinkParamNone*, void ); - DECL_LINK_TYPED( OnCopyEntry, LinkParamNone*, void ); - DECL_LINK_TYPED( OnPasteEntry, LinkParamNone*, void ); - DECL_LINK_TYPED( OnDeleteEntry, LinkParamNone*, void ); + DECL_LINK( OnCopyEntry, LinkParamNone*, void ); + DECL_LINK( OnPasteEntry, LinkParamNone*, void ); + DECL_LINK( OnDeleteEntry, LinkParamNone*, void ); // click a TB slot - DECL_LINK_TYPED(OnDropdownClickHdl, ToolBox*, void); + DECL_LINK(OnDropdownClickHdl, ToolBox*, void); inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } void ImplInitSettings(); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 0b2e9b9c9b6d..dfa9c280ea2d 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -430,7 +430,7 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId) } -IMPL_LINK_NOARG_TYPED(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_aCreation->GetHdlEntry(); if ( pEntry ) diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 2471e05d11d0..988be3f003b9 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -117,7 +117,7 @@ namespace dbaui VclPtr<FixedLine> m_aFL; VclPtr<OApplicationDetailView> m_pDetailView; - DECL_LINK_TYPED( OnEntrySelectHdl, SvTreeListBox*, void ); + DECL_LINK( OnEntrySelectHdl, SvTreeListBox*, void ); void ImplInitSettings(); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 6d9b50f5d31e..644b846b86ae 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -149,7 +149,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType ) return false; } -IMPL_LINK_TYPED(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl, void) +IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl, void) { SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry(); ElementType eType = E_NONE; @@ -160,7 +160,7 @@ IMPL_LINK_TYPED(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl* } } -IMPL_LINK_NOARG_TYPED(OApplicationSwapWindow, ChangeToLastSelected, void*, void) +IMPL_LINK_NOARG(OApplicationSwapWindow, ChangeToLastSelected, void*, void) { selectContainer(m_eLastType); } diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 0fabc5329020..a902bdae1df9 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -37,8 +37,8 @@ namespace dbaui void ImplInitSettings(); - DECL_LINK_TYPED( OnContainerSelectHdl, SvtIconChoiceCtrl*, void ); - DECL_LINK_TYPED( ChangeToLastSelected, void*, void ); + DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl*, void ); + DECL_LINK( ChangeToLastSelected, void*, void ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: diff --git a/dbaccess/source/ui/browser/AsynchronousLink.cxx b/dbaccess/source/ui/browser/AsynchronousLink.cxx index 7381437bd0ac..2fbedc81d1f9 100644 --- a/dbaccess/source/ui/browser/AsynchronousLink.cxx +++ b/dbaccess/source/ui/browser/AsynchronousLink.cxx @@ -65,7 +65,7 @@ void OAsynchronousLink::CancelCall() m_nEventId = nullptr; } -IMPL_LINK_TYPED(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) +IMPL_LINK(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) { { ::osl::MutexGuard aDestructionGuard( m_aDestructionSafety ); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 23b613c5cb60..a95e5ec6adc2 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1262,7 +1262,7 @@ void SbaXDataBrowserController::frameAction(const css::frame::FrameActionEvent& } } -IMPL_LINK_NOARG_TYPED( SbaXDataBrowserController, OnAsyncDisplayError, void*, void ) +IMPL_LINK_NOARG( SbaXDataBrowserController, OnAsyncDisplayError, void*, void ) { if ( m_aCurrentError.isValid() ) { @@ -2272,13 +2272,13 @@ void SbaXDataBrowserController::CellDeactivated() OnInvalidateClipboard( nullptr ); } -IMPL_LINK_NOARG_TYPED(SbaXDataBrowserController, OnClipboardChanged, TransferableDataHelper*, void) +IMPL_LINK_NOARG(SbaXDataBrowserController, OnClipboardChanged, TransferableDataHelper*, void) { SolarMutexGuard aGuard; OnInvalidateClipboard( nullptr ); } -IMPL_LINK_TYPED(SbaXDataBrowserController, OnInvalidateClipboard, Timer*, _pTimer, void) +IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, Timer*, _pTimer, void) { InvalidateFeature(ID_BROWSER_CUT); InvalidateFeature(ID_BROWSER_COPY); @@ -2315,7 +2315,7 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField() const return xEmptyReturn; } -IMPL_LINK_TYPED(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext&, rContext, sal_uInt32) +IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext&, rContext, sal_uInt32) { Reference< css::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); @@ -2361,7 +2361,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnSearchContextRequest, FmSearchConte return rContext.arrFields.size(); } -IMPL_LINK_TYPED(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation&, rInfo, void) +IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation&, rInfo, void) { Reference< css::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY); OSL_ENSURE(xCursor.is(), "SbaXDataBrowserController::OnFoundData : xCursor is empty"); @@ -2396,7 +2396,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation xGrid->setCurrentColumnPosition(nViewPos); } -IMPL_LINK_TYPED(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformation&, rInfo, void) +IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformation&, rInfo, void) { Reference< css::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY); @@ -2426,7 +2426,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInfo } } -IMPL_LINK_NOARG_TYPED(SbaXDataBrowserController, OnAsyncGetCellFocus, void*, void) +IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus, void*, void) { SbaGridControl* pVclGrid = getBrowserView() ? getBrowserView()->getVclControl() : nullptr; // if we have a controller, but the window for the controller doesn't have the focus, we correct this diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index dec8db487258..d041f10fcec4 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -138,7 +138,7 @@ void UnoDataBrowserView::dispose() ODataView::dispose(); } -IMPL_LINK_NOARG_TYPED( UnoDataBrowserView, SplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( UnoDataBrowserView, SplitHdl, Splitter*, void ) { long nYPos = m_pSplitter->GetPosPixel().Y(); m_pSplitter->SetPosPixel( Point( m_pSplitter->GetSplitPosPixel(), nYPos ) ); diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 6591a859ac0e..95dd2906d97f 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -194,7 +194,7 @@ namespace dbaui return nullptr != pTransfer; } - IMPL_LINK_NOARG_TYPED(SbaTableQueryBrowser, OnCopyEntry, LinkParamNone*, void) + IMPL_LINK_NOARG(SbaTableQueryBrowser, OnCopyEntry, LinkParamNone*, void) { SvTreeListEntry* pSelected = m_pTreeView->getListBox().FirstSelected(); if( isEntryCopyAllowed( pSelected ) ) @@ -215,7 +215,7 @@ namespace dbaui if (pTransfer) pTransfer->CopyToClipboard(getView()); } - IMPL_LINK_NOARG_TYPED( SbaTableQueryBrowser, OnAsyncDrop, void*, void ) + IMPL_LINK_NOARG( SbaTableQueryBrowser, OnAsyncDrop, void*, void ) { m_nAsyncDrop = nullptr; SolarMutexGuard aSolarGuard; diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 011b5c0dda9a..7526a6a3e31d 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -251,7 +251,7 @@ bool OGenericUnoController::Construct(vcl::Window* /*pParent*/) return true; } -IMPL_LINK_NOARG_TYPED(OGenericUnoController, OnAsyncInvalidateAll, void*, void) +IMPL_LINK_NOARG(OGenericUnoController, OnAsyncInvalidateAll, void*, void) { if ( !OGenericUnoController_Base::rBHelper.bInDispose && !OGenericUnoController_Base::rBHelper.bDisposed ) InvalidateFeature_Impl(); @@ -1028,7 +1028,7 @@ void OGenericUnoController::closeTask() m_aAsyncCloseTask.Call(); } -IMPL_LINK_NOARG_TYPED(OGenericUnoController, OnAsyncCloseTask, void*, void) +IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask, void*, void) { if ( !OGenericUnoController_Base::rBHelper.bInDispose ) { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index e0225324aabc..7092450fb83b 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -361,7 +361,7 @@ Reference< css::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const c return FmXGridPeer::queryDispatch(aURL, aTargetFrameName, nSearchFlags); } -IMPL_LINK_NOARG_TYPED( SbaXGridPeer, OnDispatchEvent, void*, void ) +IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent, void*, void ) { VclPtr< SbaGridControl > pGrid = GetAs< SbaGridControl >(); if ( pGrid ) // if this fails, we were disposing before arriving here @@ -1438,7 +1438,7 @@ Reference< XPropertySet > SbaGridControl::getDataSource() const return xReturn; } -IMPL_LINK_NOARG_TYPED(SbaGridControl, AsynchDropEvent, void*, void) +IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void) { m_nAsyncDropEvent = nullptr; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 6069119ee8f8..da2d7c9d275c 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2146,7 +2146,7 @@ SvTreeListEntry* SbaTableQueryBrowser::implAppendEntry( SvTreeListEntry* _pParen return pNewEntry; } -IMPL_LINK_TYPED(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent, bool) +IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent, bool) { if (_pParent->HasChildren()) // nothing to do... @@ -2479,7 +2479,7 @@ bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, const OU return false; } -IMPL_LINK_NOARG_TYPED(SbaTableQueryBrowser, OnSelectionChange, LinkParamNone*, void) +IMPL_LINK_NOARG(SbaTableQueryBrowser, OnSelectionChange, LinkParamNone*, void) { implSelect( m_pTreeView->getListBox().FirstSelected() ); } @@ -3344,7 +3344,7 @@ bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* p return _rConnection.is(); } -IMPL_LINK_TYPED( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 ) +IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 ) { const SvTreeListEntry* pLHS = static_cast<const SvTreeListEntry*>(_rSortData.pLeft); const SvTreeListEntry* pRHS = static_cast<const SvTreeListEntry*>(_rSortData.pRight); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 9752c627252d..b9735ec0c03b 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -241,7 +241,7 @@ void OFieldDescControl::Init() ::dbaui::setEvalDateFormatForFormatter(xFormatter); } -IMPL_LINK_TYPED(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/, void) +IMPL_LINK(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/, void) { ScrollAllAggregates(); } @@ -525,7 +525,7 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r } } -IMPL_LINK_NOARG_TYPED( OFieldDescControl, FormatClickHdl, Button *, void ) +IMPL_LINK_NOARG( OFieldDescControl, FormatClickHdl, Button *, void ) { // Create temporary Column, which is used for data exchange with Dialog if( !pActFieldDescr ) @@ -565,7 +565,7 @@ void OFieldDescControl::SetModified(bool /*bModified*/) { } -IMPL_LINK_TYPED( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) +IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) { if ( !pActFieldDescr ) return; @@ -1380,7 +1380,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) SetReadOnly( bRead ); } -IMPL_LINK_TYPED(OFieldDescControl, OnControlFocusGot, Control&, rControl, void ) +IMPL_LINK(OFieldDescControl, OnControlFocusGot, Control&, rControl, void ) { OUString strHelpText; OPropNumericEditCtrl* pNumeric = dynamic_cast< OPropNumericEditCtrl* >( &rControl ); @@ -1420,7 +1420,7 @@ IMPL_LINK_TYPED(OFieldDescControl, OnControlFocusGot, Control&, rControl, void ) m_pActFocusWindow = &rControl; } -IMPL_LINK_TYPED(OFieldDescControl, OnControlFocusLost, Control&, rControl, void ) +IMPL_LINK(OFieldDescControl, OnControlFocusLost, Control&, rControl, void ) { if ((&rControl == pLength) || (&rControl == pTextLen) || (&rControl == pScale)) { diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index e892251ecc3f..ea6987518c1e 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -119,10 +119,10 @@ namespace dbaui virtual void CellModified() override; - DECL_LINK_TYPED( AsynchDeactivate, void*, void ); + DECL_LINK( AsynchDeactivate, void*, void ); private: - DECL_LINK_TYPED( AsynchActivate, void*, void ); + DECL_LINK( AsynchActivate, void*, void ); }; @@ -199,12 +199,12 @@ namespace dbaui return EditBrowseBox::PreNotify(rNEvt); } - IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchActivate, void*, void) + IMPL_LINK_NOARG(ORelationControl, AsynchActivate, void*, void) { ActivateCell(); } - IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchDeactivate, void*, void) + IMPL_LINK_NOARG(ORelationControl, AsynchDeactivate, void*, void) { DeactivateCell(); } @@ -514,7 +514,7 @@ namespace dbaui m_pLeftTable->GrabFocus(); } - IMPL_LINK_TYPED( OTableListBoxControl, OnTableChanged, ListBox&, rListBox, void ) + IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox&, rListBox, void ) { OUString strSelected(rListBox.GetSelectEntry()); OTableWindow* pLeft = nullptr; diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index f696857f512b..a077cda997d3 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -162,13 +162,13 @@ bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt) return EditBrowseBox::PreNotify(rNEvt); } -IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchActivate, void*, void) +IMPL_LINK_NOARG(OTableGrantControl, AsynchActivate, void*, void) { m_nDeactivateEvent = nullptr; ActivateCell(); } -IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchDeactivate, void*, void) +IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate, void*, void) { m_nDeactivateEvent = nullptr; DeactivateCell(); diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 8425a281435d..45e11a6c20e1 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -49,7 +49,7 @@ void OSplitterView::dispose() vcl::Window::dispose(); } -IMPL_LINK_NOARG_TYPED( OSplitterView, SplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( OSplitterView, SplitHdl, Splitter*, void ) { OSL_ENSURE(m_pSplitter, "Splitter is NULL!"); m_pSplitter->SetPosPixel( Point( m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) ); diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 305383b348aa..6c0562a7cb84 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -176,7 +176,7 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) SvTreeListBox::MouseButtonDown(rMEvt); } -IMPL_LINK_TYPED(DBTreeListBox, OnResetEntry, void*, p, void) +IMPL_LINK(DBTreeListBox, OnResetEntry, void*, p, void) { SvTreeListEntry* pEntry = static_cast<SvTreeListEntry*>(p); // set the flag which allows if the entry can be expanded @@ -395,12 +395,12 @@ void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,bool _bUp) } } -IMPL_LINK_NOARG_TYPED( DBTreeListBox, ScrollUpHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( DBTreeListBox, ScrollUpHdl, LinkParamNone*, void ) { scrollWindow(this,m_aMousePos,true); } -IMPL_LINK_NOARG_TYPED( DBTreeListBox, ScrollDownHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( DBTreeListBox, ScrollDownHdl, LinkParamNone*, void ) { scrollWindow(this,m_aMousePos,false); } @@ -638,7 +638,7 @@ void DBTreeListBox::ExecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) m_pContextMenuProvider->getCommandController().executeChecked( _nSelectedPopupEntry, Sequence< PropertyValue >() ); } -IMPL_LINK_NOARG_TYPED(DBTreeListBox, OnTimeOut, Timer*, void) +IMPL_LINK_NOARG(DBTreeListBox, OnTimeOut, Timer*, void) { implStopSelectionTimer(); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index d06125abc262..1e2237d66203 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -149,7 +149,7 @@ void OSqlEdit::GetFocus() MultiLineEditSyntaxHighlight::GetFocus(); } -IMPL_LINK_NOARG_TYPED(OSqlEdit, OnUndoActionTimer, Timer *, void) +IMPL_LINK_NOARG(OSqlEdit, OnUndoActionTimer, Timer *, void) { OUString aText = GetText(); if(aText != m_strOrigText) @@ -168,7 +168,7 @@ IMPL_LINK_NOARG_TYPED(OSqlEdit, OnUndoActionTimer, Timer *, void) } } -IMPL_LINK_NOARG_TYPED(OSqlEdit, OnInvalidateTimer, Timer *, void) +IMPL_LINK_NOARG(OSqlEdit, OnInvalidateTimer, Timer *, void) { OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController(); rController.InvalidateFeature(SID_CUT); @@ -177,7 +177,7 @@ IMPL_LINK_NOARG_TYPED(OSqlEdit, OnInvalidateTimer, Timer *, void) m_timerInvalidate.Start(); } -IMPL_LINK_NOARG_TYPED(OSqlEdit, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(OSqlEdit, ModifyHdl, Edit&, void) { if (m_timerUndoActionCreation.IsActive()) m_timerUndoActionCreation.Stop(); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 256515258bac..65cf5de52a44 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -107,7 +107,7 @@ void OCollectionView::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(OCollectionView, Save_Click, Button*, void) +IMPL_LINK_NOARG(OCollectionView, Save_Click, Button*, void) { OUString sName = m_pName->GetText(); if ( sName.isEmpty() ) @@ -194,7 +194,7 @@ IMPL_LINK_NOARG_TYPED(OCollectionView, Save_Click, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OCollectionView, NewFolder_Click, Button*, void) +IMPL_LINK_NOARG(OCollectionView, NewFolder_Click, Button*, void) { try { @@ -212,7 +212,7 @@ IMPL_LINK_NOARG_TYPED(OCollectionView, NewFolder_Click, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OCollectionView, Up_Click, Button*, void) +IMPL_LINK_NOARG(OCollectionView, Up_Click, Button*, void) { try { @@ -236,7 +236,7 @@ IMPL_LINK_NOARG_TYPED(OCollectionView, Up_Click, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OCollectionView, Dbl_Click_FileView, SvTreeListBox*, bool) +IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView, SvTreeListBox*, bool) { try { diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 7efded163552..b9c0bd70df4a 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -164,7 +164,7 @@ namespace dbaui m_pAdminDialog->enableConfirmSettings( !getURLNoPrefix().isEmpty() ); } - IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnBrowseConnections, Button*, void) + IMPL_LINK_NOARG(OConnectionHelper, OnBrowseConnections, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType); @@ -337,7 +337,7 @@ namespace dbaui checkTestConnection(); } - IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnCreateDatabase, Button*, void) + IMPL_LINK_NOARG(OConnectionHelper, OnCreateDatabase, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType); diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 53afdc9c3e3a..f8b6ac1a87e5 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -91,8 +91,8 @@ namespace dbaui virtual bool checkTestConnection(); private: - DECL_LINK_TYPED(OnBrowseConnections, Button*, void); - DECL_LINK_TYPED(OnCreateDatabase, Button*, void); + DECL_LINK(OnBrowseConnections, Button*, void); + DECL_LINK(OnCreateDatabase, Button*, void); OUString impl_getURL() const; void impl_setURL( const OUString& _rURL, bool _bPrefix ); void implUpdateURLDependentStates() const; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 7eb9d3cc0466..03e094ec4b26 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -287,7 +287,7 @@ namespace dbaui return bChangedSomething; } - IMPL_LINK_NOARG_TYPED(OConnectionTabPage, OnTestJavaClickHdl, Button*, void) + IMPL_LINK_NOARG(OConnectionTabPage, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); bool bSuccess = false; @@ -320,7 +320,7 @@ namespace dbaui m_pTestConnection->Enable(bEnableTestConnection); return true; } - IMPL_LINK_TYPED(OConnectionTabPage, OnEditModified, Edit&, _rEdit, void) + IMPL_LINK(OConnectionTabPage, OnEditModified, Edit&, _rEdit, void) { if ( &_rEdit == m_pJavaDriver ) m_pTestJavaDriver->Enable( !m_pJavaDriver->GetText().trim().isEmpty() ); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 7ee50279fda3..5eee03ec4d6f 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -52,8 +52,8 @@ namespace dbaui VclPtr<PushButton> m_pTestConnection; // called when the test connection button was clicked - DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); - DECL_LINK_TYPED(OnEditModified, Edit&, void); + DECL_LINK(OnTestJavaClickHdl, Button*, void); + DECL_LINK(OnEditModified, Edit&, void); public: virtual ~OConnectionTabPage() override; diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 864b4066baa9..7341eb3897a2 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -176,7 +176,7 @@ namespace dbaui return !m_pConnectionURL->IsVisible() || !m_pConnectionURL->GetTextNoPrefix().isEmpty(); } - IMPL_LINK_NOARG_TYPED(OConnectionTabPageSetup, OnEditModified, Edit&, void) + IMPL_LINK_NOARG(OConnectionTabPageSetup, OnEditModified, Edit&, void) { SetRoadmapStateValue(checkTestConnection()); callModifiedHdl(); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index e2246b3db336..3a34c73f4b8d 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -43,7 +43,7 @@ namespace dbaui VclPtr<FixedText> m_pHeaderText; // called when the test connection button was clicked - DECL_LINK_TYPED(OnEditModified, Edit&, void); + DECL_LINK(OnEditModified, Edit&, void); public: virtual ~OConnectionTabPageSetup() override; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 8d6a0405d494..729acc566df7 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -85,7 +85,7 @@ using namespace ::com::sun::star; OConnectionTabPageSetup::dispose(); } - IMPL_LINK_NOARG_TYPED(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, void) + IMPL_LINK_NOARG(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, void) { SetRoadmapStateValue(!m_pTextConnectionHelper->GetExtension().isEmpty() && OConnectionTabPageSetup::checkTestConnection()); callModifiedHdl(); @@ -269,7 +269,7 @@ using namespace ::com::sun::star; OGenericAdministrationPage::dispose(); } - IMPL_LINK_NOARG_TYPED(OMySQLIntroPageSetup, OnSetupModeSelected, RadioButton&, void) + IMPL_LINK_NOARG(OMySQLIntroPageSetup, OnSetupModeSelected, RadioButton&, void) { maClickHdl.Call( this ); } @@ -532,7 +532,7 @@ using namespace ::com::sun::star; SetRoadmapStateValue(bRoadmapState); } - IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) + IMPL_LINK_NOARG(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -654,7 +654,7 @@ using namespace ::com::sun::star; return bEnableTestConnection; } - IMPL_LINK_NOARG_TYPED(OJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) + IMPL_LINK_NOARG(OJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); bool bSuccess = false; @@ -678,7 +678,7 @@ using namespace ::com::sun::star; aMsg->Execute(); } - IMPL_LINK_TYPED(OJDBCConnectionPageSetup, OnEditModified, Edit&, _rEdit, void) + IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, Edit&, _rEdit, void) { if ( &_rEdit == m_pETDriverClass ) m_pPBTestJavaDriver->Enable( !m_pETDriverClass->GetText().isEmpty() ); @@ -899,7 +899,7 @@ using namespace ::com::sun::star; return true; } - IMPL_LINK_TYPED(OFinalDBPageSetup, OnOpenSelected, Button*, _pBox, void) + IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, Button*, _pBox, void) { m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && static_cast<CheckBox*>(_pBox)->IsChecked() ); callModifiedHdl(); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 8961cadeaf60..3a4c168b4dfc 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -74,7 +74,7 @@ namespace dbaui bool checkTestConnection() override; private: - DECL_LINK_TYPED(ImplGetExtensionHdl, OTextConnectionHelper*, void); + DECL_LINK(ImplGetExtensionHdl, OTextConnectionHelper*, void); }; // OLDAPConnectionPageSetup @@ -152,7 +152,7 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void callModifiedHdl(void* pControl = nullptr) override; - DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); + DECL_LINK(OnTestJavaClickHdl, Button*, void); VclPtr<FixedText> m_pHeaderText; VclPtr<FixedText> m_pFTHelpText; VclPtr<FixedText> m_pFTDatabasename; @@ -188,8 +188,8 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; - DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); - DECL_LINK_TYPED(OnEditModified, Edit&, void); + DECL_LINK(OnTestJavaClickHdl, Button*, void); + DECL_LINK(OnEditModified, Edit&, void); VclPtr<FixedText> m_pFTDriverClass; VclPtr<Edit> m_pETDriverClass; VclPtr<PushButton> m_pPBTestJavaDriver; @@ -226,7 +226,7 @@ namespace dbaui VclPtr<RadioButton> m_pNATIVEDatabase; Link<OMySQLIntroPageSetup *, void> maClickHdl; - DECL_LINK_TYPED(OnSetupModeSelected, RadioButton&, void); + DECL_LINK(OnSetupModeSelected, RadioButton&, void); }; @@ -277,7 +277,7 @@ namespace dbaui bool IsTableWizardToBeStarted(); void enableTableWizardCheckBox( bool _bSupportsTableCreation); - DECL_LINK_TYPED(OnOpenSelected, Button*, void); + DECL_LINK(OnOpenSelected, Button*, void); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 547e5bcb7b91..98bbba66ae03 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -152,7 +152,7 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD } } -IMPL_LINK_NOARG_TYPED( ORelationDialog, OKClickHdl, Button*, void ) +IMPL_LINK_NOARG( ORelationDialog, OKClickHdl, Button*, void ) { // RadioButtons auslesen sal_uInt16 nAttrib = 0; diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 00c5be330508..3298d498a004 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -169,12 +169,12 @@ namespace dbaui TabPage::dispose(); } - IMPL_LINK_NOARG_TYPED(OTextConnectionHelper, OnEditModified, Edit&, void) + IMPL_LINK_NOARG(OTextConnectionHelper, OnEditModified, Edit&, void) { m_aGetExtensionHandler.Call(this); } - IMPL_LINK_NOARG_TYPED(OTextConnectionHelper, OnSetExtensionHdl, RadioButton&, void) + IMPL_LINK_NOARG(OTextConnectionHelper, OnSetExtensionHdl, RadioButton&, void) { bool bDoEnable = m_pAccessOtherFiles->IsChecked(); m_pOwnExtension->Enable(bDoEnable); diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 47f408f25926..473df12b6fcb 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -76,8 +76,8 @@ namespace dbaui short m_nAvailableSections; protected: - DECL_LINK_TYPED(OnSetExtensionHdl,RadioButton&,void); - DECL_LINK_TYPED(OnEditModified, Edit&, void); + DECL_LINK(OnSetExtensionHdl,RadioButton&,void); + DECL_LINK(OnEditModified, Edit&, void); private: OUString GetSeparator( const ComboBox& rBox, const OUString& rList ); diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index c1c828c11acd..a477eb642f30 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -57,8 +57,8 @@ class OPasswordDialog : public ModalDialog VclPtr<Edit> m_pEDPasswordRepeat; VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED( OKHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ModifiedHdl, Edit&, void ); + DECL_LINK( OKHdl_Impl, Button*, void ); + DECL_LINK( ModifiedHdl, Edit&, void ); public: OPasswordDialog( vcl::Window* pParent,const OUString& _sUserName); @@ -95,7 +95,7 @@ OPasswordDialog::OPasswordDialog(vcl::Window* _pParent,const OUString& _sUserNam m_pEDOldPassword->SetModifyHdl( LINK( this, OPasswordDialog, ModifiedHdl ) ); } -IMPL_LINK_NOARG_TYPED(OPasswordDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl, Button*, void) { if( m_pEDPassword->GetText() == m_pEDPasswordRepeat->GetText() ) EndDialog( RET_OK ); @@ -110,7 +110,7 @@ IMPL_LINK_NOARG_TYPED(OPasswordDialog, OKHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( OPasswordDialog, ModifiedHdl, Edit&, rEdit, void ) +IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit&, rEdit, void ) { m_pOKBtn->Enable(!rEdit.GetText().isEmpty()); } @@ -205,7 +205,7 @@ VclPtr<SfxTabPage> OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _ return VclPtr<OUserAdmin>::Create( pParent, *_rAttrSet ); } -IMPL_LINK_TYPED( OUserAdmin, UserHdl, Button *, pButton, void ) +IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void ) { try { @@ -274,7 +274,7 @@ IMPL_LINK_TYPED( OUserAdmin, UserHdl, Button *, pButton, void ) } } -IMPL_LINK_NOARG_TYPED( OUserAdmin, ListDblClickHdl, ListBox&, void ) +IMPL_LINK_NOARG( OUserAdmin, ListDblClickHdl, ListBox&, void ) { m_TableCtrl->setUserName(GetUser()); m_TableCtrl->UpdateTables(); diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 2a68deabfaf1..80c536b5714e 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -55,8 +55,8 @@ protected: OUString m_UserName; // methods - DECL_LINK_TYPED( ListDblClickHdl, ListBox&, void ); - DECL_LINK_TYPED( UserHdl, Button *, void ); + DECL_LINK( ListDblClickHdl, ListBox&, void ); + DECL_LINK( UserHdl, Button *, void ); void FillUserNames(); diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 0e5df0670461..8b493c9cd0fa 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -169,12 +169,12 @@ namespace dbaui #endif } - IMPL_LINK_TYPED(MySQLNativeSettings, RadioToggleHdl, RadioButton&, rRadioButton, void) + IMPL_LINK(MySQLNativeSettings, RadioToggleHdl, RadioButton&, rRadioButton, void) { m_aControlModificationLink.Call(&rRadioButton); } - IMPL_LINK_TYPED(MySQLNativeSettings, EditModifyHdl, Edit&, rEdit, void) + IMPL_LINK(MySQLNativeSettings, EditModifyHdl, Edit&, rEdit, void) { m_aControlModificationLink.Call(&rEdit); } diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index ae7b7afae1c2..fcd9cd32b9b9 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -50,8 +50,8 @@ namespace dbaui Link<void*,void> m_aControlModificationLink; ::svt::ControlDependencyManager m_aControlDependencies; - DECL_LINK_TYPED(RadioToggleHdl, RadioButton&, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(RadioToggleHdl, RadioButton&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: MySQLNativeSettings( vcl::Window& _rParent, const Link<void*,void>& _rControlModificationLink ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 3efb3bc15638..0a5f62e811bb 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -102,19 +102,19 @@ namespace dbaui _rReadonly = !_rValid || (pReadonly && pReadonly->GetValue()); } - IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModified, void*, pCtrl, void) + IMPL_LINK(OGenericAdministrationPage, OnControlModified, void*, pCtrl, void) { callModifiedHdl(pCtrl); } - IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void) + IMPL_LINK(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void) { callModifiedHdl(pCtrl); } - IMPL_LINK_TYPED(OGenericAdministrationPage, ControlModifiedCheckBoxHdl, CheckBox&, rCtrl, void) + IMPL_LINK(OGenericAdministrationPage, ControlModifiedCheckBoxHdl, CheckBox&, rCtrl, void) { callModifiedHdl(&rCtrl); } - IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlEditModifyHdl, Edit&, rCtrl, void) + IMPL_LINK(OGenericAdministrationPage, OnControlEditModifyHdl, Edit&, rCtrl, void) { callModifiedHdl(&rCtrl); } @@ -229,7 +229,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OGenericAdministrationPage, OnTestConnectionClickHdl, Button*, void) + IMPL_LINK_NOARG(OGenericAdministrationPage, OnTestConnectionClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); bool bSuccess = false; diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index f674ffd0bcec..ed0bc5fd4e6c 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -206,12 +206,12 @@ namespace dbaui /** This link be used for controls where the tabpage does not need to take any special action when the control is modified. The implementation just calls callModifiedHdl. */ - DECL_LINK_TYPED(OnControlModified, void*, void); - DECL_LINK_TYPED(OnControlEditModifyHdl, Edit&, void); - DECL_LINK_TYPED(OnControlModifiedClick, Button*, void); - DECL_LINK_TYPED(ControlModifiedCheckBoxHdl, CheckBox&, void); + DECL_LINK(OnControlModified, void*, void); + DECL_LINK(OnControlEditModifyHdl, Edit&, void); + DECL_LINK(OnControlModifiedClick, Button*, void); + DECL_LINK(ControlModifiedCheckBoxHdl, CheckBox&, void); - DECL_LINK_TYPED(OnTestConnectionClickHdl, Button*, void); + DECL_LINK(OnTestConnectionClickHdl, Button*, void); }; // ControlRelation diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 5d1cdfb6aef8..71e5f26e9b18 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -417,12 +417,12 @@ void OAddTableDlg::impl_addTable() } } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, AddClickHdl, Button*, void ) +IMPL_LINK_NOARG( OAddTableDlg, AddClickHdl, Button*, void ) { TableListDoubleClickHdl(nullptr); } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bool ) { if ( impl_isAddAllowed() ) { @@ -435,17 +435,17 @@ IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bo return false; // not handled } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListSelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl, SvTreeListBox*, void ) { m_pAddButton->Enable( m_xCurrentList->isLeafSelected() ); } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, CloseClickHdl, Button*, void ) +IMPL_LINK_NOARG( OAddTableDlg, CloseClickHdl, Button*, void ) { Close(); } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, OnTypeSelected, Button*, void ) +IMPL_LINK_NOARG( OAddTableDlg, OnTypeSelected, Button*, void ) { if ( m_pCaseTables->IsChecked() ) impl_switchTo( Tables ); diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index e6d7160e8b8c..27e0a5db8261 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -134,7 +134,7 @@ namespace dbaui } } - IMPL_LINK_TYPED(SpecialSettingsPage, BooleanComparisonSelectHdl, ListBox&, rControl, void) + IMPL_LINK(SpecialSettingsPage, BooleanComparisonSelectHdl, ListBox&, rControl, void) { callModifiedHdl(&rControl); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index a9d9d7a5696a..f7c80977352d 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -91,7 +91,7 @@ namespace dbaui private: void impl_initBooleanSettings(); - DECL_LINK_TYPED(BooleanComparisonSelectHdl, ListBox&, void); + DECL_LINK(BooleanComparisonSelectHdl, ListBox&, void); }; // GeneratedValuesPage diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index c9860820633e..3ed234ce954d 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -179,7 +179,7 @@ void ODbaseIndexDialog::InsertTableIndex( const OUString& _rTableName, const OTa implInsertIndex(_rIndex, aTablePos->aIndexList, *m_pLB_TableIndexes); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OKClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, OKClickHdl, Button*, void ) { // let all tables write their INF file @@ -192,7 +192,7 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OKClickHdl, Button*, void ) EndDialog(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, AddClickHdl, Button*, void ) { OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry(); OUString aTableName = m_pCB_Tables->GetText(); @@ -202,7 +202,7 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddClickHdl, Button*, void ) checkButtons(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, RemoveClickHdl, Button*, void ) { OUString aSelection = m_pLB_TableIndexes->GetSelectEntry(); OUString aTableName = m_pCB_Tables->GetText(); @@ -212,7 +212,7 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveClickHdl, Button*, void ) checkButtons(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddAllClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, AddAllClickHdl, Button*, void ) { const sal_Int32 nCnt = m_pLB_FreeIndexes->GetEntryCount(); OUString aTableName = m_pCB_Tables->GetText(); @@ -223,7 +223,7 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddAllClickHdl, Button*, void ) checkButtons(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void ) { const sal_Int32 nCnt = m_pLB_TableIndexes->GetEntryCount(); OUString aTableName = m_pCB_Tables->GetText(); @@ -234,12 +234,12 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void ) checkButtons(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OnListEntrySelected, ListBox&, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, OnListEntrySelected, ListBox&, void ) { checkButtons(); } -IMPL_LINK_TYPED( ODbaseIndexDialog, TableSelectHdl, ComboBox&, rComboBox, void ) +IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox&, rComboBox, void ) { // search the table TableInfoList::iterator aTablePos; diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index b58e1529ee38..d1fa3a04f0cb 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -82,13 +82,13 @@ protected: VclPtr<PushButton> m_pAddAll; VclPtr<PushButton> m_pRemoveAll; - DECL_LINK_TYPED( TableSelectHdl, ComboBox&, void ); - DECL_LINK_TYPED( AddClickHdl, Button*, void ); - DECL_LINK_TYPED( RemoveClickHdl, Button*, void ); - DECL_LINK_TYPED( AddAllClickHdl, Button*, void ); - DECL_LINK_TYPED( RemoveAllClickHdl, Button*, void ); - DECL_LINK_TYPED( OKClickHdl, Button*, void ); - DECL_LINK_TYPED( OnListEntrySelected, ListBox&, void ); + DECL_LINK( TableSelectHdl, ComboBox&, void ); + DECL_LINK( AddClickHdl, Button*, void ); + DECL_LINK( RemoveClickHdl, Button*, void ); + DECL_LINK( AddAllClickHdl, Button*, void ); + DECL_LINK( RemoveAllClickHdl, Button*, void ); + DECL_LINK( OKClickHdl, Button*, void ); + DECL_LINK( OnListEntrySelected, ListBox&, void ); OUString m_aDSN; TableInfoList m_aTableInfoList; diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 06ce8f6c4919..2062b4269d4f 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -107,7 +107,7 @@ void ODbTypeWizDialog::dispose() svt::OWizardMachine::dispose(); } -IMPL_LINK_TYPED(ODbTypeWizDialog, OnTypeSelected, OGeneralPage&, _rTabPage, void) +IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage&, _rTabPage, void) { m_eType = _rTabPage.GetSelectedType(); const bool bURLRequired = m_pCollection->isConnectionUrlRequired(m_eType); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index b9f5e1535920..3e1c2200216b 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -274,7 +274,7 @@ void ODbTypeWizDialogSetup::dispose() svt::RoadmapWizard::dispose(); } -IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage&, void) +IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage&, void) { activateDatabasePath(); } @@ -571,7 +571,7 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState) return pPage; } -IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage const *, _pConnectionPageSetup, void) +IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage const *, _pConnectionPageSetup, void) { m_bIsConnectable = _pConnectionPageSetup->GetRoadmapStateValue( ); enableState(PAGE_DBSETUPWIZARD_FINAL, m_bIsConnectable); @@ -583,7 +583,7 @@ IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPa enableButtons( WizardButtonFlags::NEXT, m_bIsConnectable && (getCurrentState() != PAGE_DBSETUPWIZARD_FINAL)); } -IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup, void) +IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup, void) { OUString sURLPrefix; switch( _pMySQLIntroPageSetup->getMySQLMode() ) @@ -601,17 +601,17 @@ IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMy activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), true); } -IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPageWizard&, void) +IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPageWizard&, void) { activateDatabasePath(); } -IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPageWizard&, void) +IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPageWizard&, void) { enableButtons( WizardButtonFlags::FINISH, !m_pGeneralPage->GetSelectedDocument().sURL.isEmpty() ); } -IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard&, void) +IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard&, void) { if ( prepareLeaveCurrentState( eFinish ) ) onFinish(); @@ -892,7 +892,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: - DECL_LINK_TYPED( OnOpenDocument, void*, void ); + DECL_LINK( OnOpenDocument, void*, void ); }; AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL ) @@ -926,7 +926,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() m_aAsyncCaller.Call(); } - IMPL_LINK_NOARG_TYPED( AsyncLoader, OnOpenDocument, void*, void ) + IMPL_LINK_NOARG( AsyncLoader, OnOpenDocument, void*, void ) { try { diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index b873bb0401e3..c84a438fb6ec 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -94,7 +94,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OCommonBehaviourTabPage, CharsetSelectHdl, ListBox&, void) + IMPL_LINK_NOARG(OCommonBehaviourTabPage, CharsetSelectHdl, ListBox&, void) { callModifiedHdl(); } @@ -248,7 +248,7 @@ namespace dbaui return bChangedSomething; } - IMPL_LINK_TYPED( ODbaseDetailsPage, OnButtonClicked, Button*, pButton, void ) + IMPL_LINK( ODbaseDetailsPage, OnButtonClicked, Button*, pButton, void ) { if (m_pIndexes == pButton) { @@ -519,7 +519,7 @@ namespace dbaui m_pEDDriverClass->SetModifyFlag(); } } - IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, Button*, void) + IMPL_LINK_NOARG(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); OSL_ENSURE(m_bUseClass,"Who called me?"); @@ -705,7 +705,7 @@ namespace dbaui fillBool(*_rSet,m_pCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); return bChangedSomething; } - IMPL_LINK_TYPED( OLDAPDetailsPage, OnCheckBoxClick, Button*, pCheckBox, void ) + IMPL_LINK( OLDAPDetailsPage, OnCheckBoxClick, Button*, pCheckBox, void ) { callModifiedHdl(); if ( pCheckBox == m_pCBUseSSL) diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 10bcd9607340..8c5f0ff3f1a8 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -83,7 +83,7 @@ namespace dbaui // <method>OGenericAdministrationPage::fillWindows</method> virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: - DECL_LINK_TYPED(CharsetSelectHdl, ListBox&, void); + DECL_LINK(CharsetSelectHdl, ListBox&, void); }; // ODbaseDetailsPage @@ -106,7 +106,7 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; private: - DECL_LINK_TYPED( OnButtonClicked, Button *, void ); + DECL_LINK( OnButtonClicked, Button *, void ); }; // OAdoDetailsPage @@ -177,7 +177,7 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void callModifiedHdl(void* pControl = nullptr) override; - DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); + DECL_LINK(OnTestJavaClickHdl, Button*, void); VclPtr<Edit> m_pEDHostname; VclPtr<NumericField> m_pNFPortNumber; @@ -237,7 +237,7 @@ namespace dbaui sal_Int32 m_iSSLPort; sal_Int32 m_iNormalPort; - DECL_LINK_TYPED( OnCheckBoxClick, Button*, void ); + DECL_LINK( OnCheckBoxClick, Button*, void ); }; // OTextDetailsPage diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 97b79d2e408c..12dcc1773b7f 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -298,26 +298,26 @@ namespace dbaui OSL_FAIL("DirectSQLDialog::switchToHistory: invalid position!"); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnStatementModified, Edit&, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnStatementModified, Edit&, void ) { m_pExecute->Enable(!m_pSQL->GetText().isEmpty()); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnCloseClick, Button*, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnCloseClick, Button*, void ) { EndDialog( RET_OK ); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnClose, void*, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnClose, void*, void ) { EndDialog( RET_OK ); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnExecute, Button*, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnExecute, Button*, void ) { executeCurrent(); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnListEntrySelected, ListBox&, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnListEntrySelected, ListBox&, void ) { if (!m_pSQLHistory->IsTravelSelect()) { diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index ff0d5bfc7ee9..37d1cb59b590 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -277,7 +277,7 @@ void OSaveAsDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void) +IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void) { if (pButton == m_pImpl->m_pPB_OK) { m_pImpl->m_aName = m_pImpl->m_pTitle->GetText(); @@ -304,7 +304,7 @@ IMPL_LINK_TYPED(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void) } } -IMPL_LINK_TYPED(OSaveAsDlg, EditModifyHdl, Edit&, rEdit, void ) +IMPL_LINK(OSaveAsDlg, EditModifyHdl, Edit&, rEdit, void ) { if (&rEdit == m_pImpl->m_pTitle) m_pImpl->m_pPB_OK->Enable(!m_pImpl->m_pTitle->GetText().isEmpty()); diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index eee8a4dd2097..6c2293bf44b2 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -76,7 +76,7 @@ sal_Int32 DlgSize::GetValue() return (sal_Int32)m_pMF_VALUE->GetValue( FUNIT_CM ); } -IMPL_LINK_TYPED( DlgSize, CbClickHdl, Button *, pButton, void ) +IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton, void ) { if( pButton == m_pCB_STANDARD ) { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 2b8f7286dedf..10231f2ec1d9 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -84,7 +84,7 @@ void ODatasourceSelectDialog::dispose() } -IMPL_LINK_TYPED( ODatasourceSelectDialog, ListDblClickHdl, ListBox&, rListBox, void ) +IMPL_LINK( ODatasourceSelectDialog, ListDblClickHdl, ListBox&, rListBox, void ) { if (rListBox.GetSelectEntryCount()) EndDialog(RET_OK); @@ -101,7 +101,7 @@ bool ODatasourceSelectDialog::Close() } #ifdef HAVE_ODBC_ADMINISTRATION -IMPL_LINK_NOARG_TYPED(ODatasourceSelectDialog, ManageClickHdl, Button*, void) +IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl, Button*, void) { if ( !m_pODBCManagement.get() ) m_pODBCManagement.reset( new OOdbcManagement( LINK( this, ODatasourceSelectDialog, ManageProcessFinished ) ) ); @@ -122,7 +122,7 @@ IMPL_LINK_NOARG_TYPED(ODatasourceSelectDialog, ManageClickHdl, Button*, void) SAL_WARN_IF( !m_pODBCManagement->isRunning(), "dbaccess.ui", "ODatasourceSelectDialog::ManageClickHdl: success, but not running - you were *fast*!" ); } -IMPL_LINK_NOARG_TYPED( ODatasourceSelectDialog, ManageProcessFinished, void*, void ) +IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished, void*, void ) { StringBag aOdbcDatasources; OOdbcEnumeration aEnumeration; diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 3640938afe25..0de46b163af3 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -64,10 +64,10 @@ public: virtual bool Close() override; protected: - DECL_LINK_TYPED( ListDblClickHdl, ListBox&, void ); + DECL_LINK( ListDblClickHdl, ListBox&, void ); #ifdef HAVE_ODBC_ADMINISTRATION - DECL_LINK_TYPED(ManageClickHdl, Button*, void); - DECL_LINK_TYPED( ManageProcessFinished, void*, void ); + DECL_LINK(ManageClickHdl, Button*, void); + DECL_LINK( ManageProcessFinished, void*, void ); #endif void fillListBox(const StringBag& _rDatasources); }; diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 570302e98ef5..f5821d592028 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -404,7 +404,7 @@ namespace dbaui OGenericAdministrationPage::Reset(_rCoreAttrs); } - IMPL_LINK_TYPED( OGeneralPageWizard, OnEmbeddedDBTypeSelected, ListBox&, _rBox, void ) + IMPL_LINK( OGeneralPageWizard, OnEmbeddedDBTypeSelected, ListBox&, _rBox, void ) { // get the type from the entry data const sal_Int32 nSelected = _rBox.GetSelectEntryPos(); @@ -424,7 +424,7 @@ namespace dbaui return; } - IMPL_LINK_TYPED( OGeneralPage, OnDatasourceTypeSelected, ListBox&, _rBox, void ) + IMPL_LINK( OGeneralPage, OnDatasourceTypeSelected, ListBox&, _rBox, void ) { // get the type from the entry data const sal_Int32 nSelected = _rBox.GetSelectEntryPos(); @@ -695,25 +695,25 @@ namespace dbaui return aDocument; } - IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void ) + IMPL_LINK_NOARG( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void ) { m_aCreationModeHandler.Call( *this ); OnEmbeddedDBTypeSelected( *m_pEmbeddedDBType ); } - IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnSetupModeSelected, Button*, void ) + IMPL_LINK_NOARG( OGeneralPageWizard, OnSetupModeSelected, Button*, void ) { m_aCreationModeHandler.Call( *this ); OnDatasourceTypeSelected(*m_pDatasourceType); } - IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnDocumentSelected, ListBox&, void ) + IMPL_LINK_NOARG( OGeneralPageWizard, OnDocumentSelected, ListBox&, void ) { m_aDocumentSelectionHandler.Call( *this ); } - IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnOpenDocument, Button*, void ) + IMPL_LINK_NOARG( OGeneralPageWizard, OnOpenDocument, Button*, void ) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 4f02f191b993..b7a5246dd6f4 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -97,7 +97,7 @@ namespace dbaui /// sets the title of the parent dialog virtual void setParentTitle( const OUString& _sURLPrefix ); - DECL_LINK_TYPED(OnDatasourceTypeSelected, ListBox&, void); + DECL_LINK(OnDatasourceTypeSelected, ListBox&, void); }; // OGeneralPageDialog @@ -185,11 +185,11 @@ namespace dbaui void initializeEmbeddedDBList(); protected: - DECL_LINK_TYPED( OnEmbeddedDBTypeSelected, ListBox&, void ); - DECL_LINK_TYPED( OnCreateDatabaseModeSelected, Button*, void ); - DECL_LINK_TYPED( OnSetupModeSelected, Button*, void ); - DECL_LINK_TYPED( OnDocumentSelected, ListBox&, void ); - DECL_LINK_TYPED( OnOpenDocument, Button*, void ); + DECL_LINK( OnEmbeddedDBTypeSelected, ListBox&, void ); + DECL_LINK( OnCreateDatabaseModeSelected, Button*, void ); + DECL_LINK( OnSetupModeSelected, Button*, void ); + DECL_LINK( OnDocumentSelected, ListBox&, void ); + DECL_LINK( OnOpenDocument, Button*, void ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 0661a95e0e83..53ecfa10e867 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -540,7 +540,7 @@ namespace dbaui updateToolbox(); } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnIndexAction, ToolBox*, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnIndexAction, ToolBox*, void ) { sal_uInt16 nClicked = m_pActions->GetCurItemId(); if (nClicked == mnNewCmdId) @@ -555,7 +555,7 @@ namespace dbaui OnResetIndex(); } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnCloseDialog, Button*, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnCloseDialog, Button*, void ) { if (m_pIndexList->IsEditingActive()) { @@ -601,14 +601,14 @@ namespace dbaui EndDialog(RET_OK); } - IMPL_LINK_TYPED( DbaIndexDialog, OnEditIndexAgain, void*, p, void ) + IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, void*, p, void ) { SvTreeListEntry* _pEntry = static_cast<SvTreeListEntry*>(p); m_bEditAgain = false; m_pIndexList->EditEntry(_pEntry); } - IMPL_LINK_TYPED( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry, bool ) + IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry, bool ) { Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); @@ -729,11 +729,11 @@ namespace dbaui return true; } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModifiedClick, Button*, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnModifiedClick, Button*, void ) { OnModified(*m_pFields); } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModified, IndexFieldsControl&, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnModified, IndexFieldsControl&, void ) { OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!"); Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData()); @@ -771,7 +771,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnIndexSelected, DbaIndexList&, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnIndexSelected, DbaIndexList&, void ) { m_pIndexList->EndSelection(); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 77e395f025bd..a5f8509d9be1 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -380,7 +380,7 @@ namespace dbaui } } - IMPL_LINK_TYPED( IndexFieldsControl, OnListEntrySelected, DbaMouseDownListBoxController&, rController, void ) + IMPL_LINK( IndexFieldsControl, OnListEntrySelected, DbaMouseDownListBoxController&, rController, void ) { ListBoxControl& rListBox = rController.GetListBox(); if (!rListBox.IsTravelSelect()) diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index ee659136ebbb..a32a52f11477 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -157,7 +157,7 @@ namespace dbaui m_pParam->GrabFocus(); } - IMPL_LINK_NOARG_TYPED(OParameterDialog, OnValueLoseFocusHdl, Control&, void) + IMPL_LINK_NOARG(OParameterDialog, OnValueLoseFocusHdl, Control&, void) { OnValueLoseFocus(); } @@ -213,7 +213,7 @@ namespace dbaui return false; } - IMPL_LINK_TYPED(OParameterDialog, OnButtonClicked, Button*, pButton, void) + IMPL_LINK(OParameterDialog, OnButtonClicked, Button*, pButton, void) { if (m_pCancelBtn == pButton) { @@ -287,7 +287,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OParameterDialog, OnEntryListBoxSelected, ListBox&, void) + IMPL_LINK_NOARG(OParameterDialog, OnEntryListBoxSelected, ListBox&, void) { OnEntrySelected(); } @@ -329,7 +329,7 @@ namespace dbaui return false; } - IMPL_LINK_NOARG_TYPED(OParameterDialog, OnVisitedTimeout, Timer*, void) + IMPL_LINK_NOARG(OParameterDialog, OnVisitedTimeout, Timer*, void) { OSL_ENSURE(m_nCurrentlySelected != LISTBOX_ENTRY_NOTFOUND, "OParameterDialog::OnVisitedTimeout : invalid call !"); @@ -375,7 +375,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OParameterDialog, OnValueModified, Edit&, void) + IMPL_LINK_NOARG(OParameterDialog, OnValueModified, Edit&, void) { // mark the currently selected entry as dirty OSL_ENSURE(static_cast<size_t>(m_nCurrentlySelected) < m_aVisitedParams.size(), "OParameterDialog::OnValueModified : invalid entry !"); diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 5193bf587ede..710c5329ec56 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -453,7 +453,7 @@ Reference< XPropertySet > DlgFilterCrit::getMatchingColumn( const Edit& _rValueI return getColumn( sField ); } -IMPL_LINK_TYPED( DlgFilterCrit, PredicateLoseFocus, Control&, rControl, void ) +IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Control&, rControl, void ) { Edit* _pField = static_cast<Edit*>(&rControl); // retrieve the field affected @@ -644,7 +644,7 @@ void DlgFilterCrit::EnableLines() m_pET_WHEREVALUE3->Disable(); } -IMPL_LINK_TYPED( DlgFilterCrit, ListSelectHdl, ListBox&, rListBox, void ) +IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox&, rListBox, void ) { OUString aName; ListBox* pComp; @@ -701,7 +701,7 @@ IMPL_LINK_TYPED( DlgFilterCrit, ListSelectHdl, ListBox&, rListBox, void ) EnableLines(); } -IMPL_LINK_NOARG_TYPED( DlgFilterCrit, ListSelectCompHdl, ListBox&, void ) +IMPL_LINK_NOARG( DlgFilterCrit, ListSelectCompHdl, ListBox&, void ) { EnableLines(); } diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 7d7828f17a01..b4952833a769 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -143,7 +143,7 @@ void DlgOrderCrit::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( DlgOrderCrit, FieldListSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( DlgOrderCrit, FieldListSelectHdl, ListBox&, void ) { EnableLines(); } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index aa29808b950f..3a5cd53d4c82 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -295,7 +295,7 @@ public: } protected: - DECL_LINK_TYPED(OnExceptionSelected, SvTreeListBox*, void); + DECL_LINK(OnExceptionSelected, SvTreeListBox*, void); }; OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions) @@ -350,7 +350,7 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti } } -IMPL_LINK_NOARG_TYPED(OExceptionChainDialog, OnExceptionSelected, SvTreeListBox*, void) +IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected, SvTreeListBox*, void) { SvTreeListEntry* pSelected = m_pExceptionList->FirstSelected(); OSL_ENSURE(!pSelected || !m_pExceptionList->NextSelected(pSelected), "OExceptionChainDialog::OnExceptionSelected : multi selection ?"); @@ -685,7 +685,7 @@ void OSQLMessageBox::dispose() ButtonDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( OSQLMessageBox, ButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG( OSQLMessageBox, ButtonClickHdl, Button *, void ) { ScopedVclPtrInstance< OExceptionChainDialog > aDlg( this, m_pImpl->aDisplayInfo ); aDlg->Execute(); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 7cacd382dc2c..7886c4483a81 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -397,15 +397,15 @@ namespace dbaui return nResult; } - IMPL_LINK_NOARG_TYPED( OTableSubscriptionPage, OnTreeEntryButtonChecked, SvTreeListBox*, void ) + IMPL_LINK_NOARG( OTableSubscriptionPage, OnTreeEntryButtonChecked, SvTreeListBox*, void ) { callModifiedHdl(); } - IMPL_LINK_TYPED( OTableSubscriptionPage, OnTreeEntryChecked, void*, _pControl, void ) + IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, void*, _pControl, void ) { OnControlModified(_pControl); } - IMPL_LINK_TYPED( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 ) + IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 ) { const SvTreeListEntry* pLHS = static_cast<const SvTreeListEntry*>(_rSortData.pLeft); const SvTreeListEntry* pRHS = static_cast<const SvTreeListEntry*>(_rSortData.pRight); diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index fdedfff8cc9e..001248ed203a 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -64,9 +64,9 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; - DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); - DECL_LINK_TYPED( OnTreeEntryChecked, void*, void ); - DECL_LINK_TYPED( OnTreeEntryButtonChecked, SvTreeListBox*, void ); + DECL_LINK( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); + DECL_LINK( OnTreeEntryChecked, void*, void ); + DECL_LINK( OnTreeEntryButtonChecked, SvTreeListBox*, void ); private: diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index e52ca7aeec7f..af6d70529a5e 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -67,7 +67,7 @@ namespace dbaui return ModalDialog::Execute(); } - IMPL_LINK_NOARG_TYPED( TextConnectionSettingsDialog, OnOK, Button*, void ) + IMPL_LINK_NOARG( TextConnectionSettingsDialog, OnOK, Button*, void ) { if ( m_pTextConnectionHelper->prepareLeave() ) { diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index f60c345c4383..a4e560b3b163 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -44,10 +44,10 @@ namespace dbaui css::uno::Reference< css::uno::XComponentContext > m_xContext; bool m_bCreateForm; - DECL_LINK_TYPED(Up_Click, Button*, void); - DECL_LINK_TYPED(NewFolder_Click, Button*, void); - DECL_LINK_TYPED(Save_Click, Button*, void); - DECL_LINK_TYPED(Dbl_Click_FileView, SvTreeListBox*, bool); + DECL_LINK(Up_Click, Button*, void); + DECL_LINK(NewFolder_Click, Button*, void); + DECL_LINK(Save_Click, Button*, void); + DECL_LINK(Dbl_Click_FileView, SvTreeListBox*, bool); /// sets the fixedtext to the right content void initCurrentPath(); diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 3607e3e0c207..84c821e801b5 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -114,14 +114,14 @@ namespace dbaui OFieldDescription* pActFieldDescr; - DECL_LINK_TYPED( OnScroll, ScrollBar*, void); + DECL_LINK( OnScroll, ScrollBar*, void); - DECL_LINK_TYPED( FormatClickHdl, Button *, void ); - DECL_LINK_TYPED( ChangeHdl, ListBox&, void ); + DECL_LINK( FormatClickHdl, Button *, void ); + DECL_LINK( ChangeHdl, ListBox&, void ); // used by ActivatePropertyField - DECL_LINK_TYPED( OnControlFocusLost, Control&, void ); - DECL_LINK_TYPED( OnControlFocusGot, Control&, void ); + DECL_LINK( OnControlFocusLost, Control&, void ); + DECL_LINK( OnControlFocusGot, Control&, void ); void UpdateFormatSample(OFieldDescription* pFieldDescr); void ArrangeAggregates(); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index a25562e7c5e3..03fb8bb71ef4 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -103,7 +103,7 @@ namespace dbaui bool m_bTrackingInitiallyMoved; - DECL_LINK_TYPED(OnDragScrollTimer, Idle*, void); + DECL_LINK(OnDragScrollTimer, Idle*, void); protected: VclPtr<OTableWindow> m_pLastFocusTabWin; @@ -126,7 +126,7 @@ namespace dbaui // own methods ScrollBar& GetHScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetHScrollBar(); } ScrollBar& GetVScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetVScrollBar(); } - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); void DrawConnections(vcl::RenderContext& rRenderContext, const Rectangle& rRect); void InvalidateConnections(); diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 52e0a51e3132..a6c2d05deb9b 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -150,7 +150,7 @@ namespace dbaui protected: // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect) override; - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); private: using OJoinDesignView::SaveTabWinUIConfig; diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index fe2191bdbee3..24b9d2dc7b8a 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -41,7 +41,7 @@ namespace dbaui OUString m_strCurrentLeft; OUString m_strCurrentRight; private: - DECL_LINK_TYPED( OnTableChanged, ListBox&, void ); + DECL_LINK( OnTableChanged, ListBox&, void ); public: OTableListBoxControl(VclBuilderContainer* _pParent, const OJoinTableView::OTableWindowMap* _pTableMap, diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index ee2a5e86918d..d1e8df2fcbf9 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -73,7 +73,7 @@ namespace dbaui virtual void reset() override; virtual void impl_initialize() override; virtual OUString getPrivateTitle( ) const override; - DECL_LINK_TYPED( OnThreadFinished, void*, void ); + DECL_LINK( OnThreadFinished, void*, void ); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROLLER_HXX diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 109915570a85..469b5636c33e 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -78,7 +78,7 @@ namespace dbaui void Init(const TTableConnectionData::value_type& _pConnectionData); private: - DECL_LINK_TYPED( OKClickHdl, Button*, void ); + DECL_LINK( OKClickHdl, Button*, void ); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 9a8dee39c4ae..0d73d19078f1 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -37,7 +37,7 @@ namespace dbaui VclPtr<OTableEditorCtrl> m_pEditorCtrl; void ImplInitSettings(); - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 00071512a6f9..ddfd05e8c979 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -94,8 +94,8 @@ protected: virtual void CellModified() override; private: - DECL_LINK_TYPED( AsynchActivate, void*, void ); - DECL_LINK_TYPED( AsynchDeactivate, void*, void ); + DECL_LINK( AsynchActivate, void*, void ); + DECL_LINK( AsynchDeactivate, void*, void ); static bool isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege); void fillPrivilege(sal_Int32 _nRow) const; diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 1629afd4378a..c4aa82e1566c 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -47,11 +47,11 @@ namespace dbaui :public SvTreeListBox ,public IDragTransferableListener { - DECL_LINK_TYPED( OnDoubleClick, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ScrollUpHdl, Timer*, void ); - DECL_LINK_TYPED( ScrollDownHdl, Timer*, void ); - DECL_LINK_TYPED( DropHdl, void*, void ); - DECL_LINK_TYPED( LookForUiHdl, void*, void ); + DECL_LINK( OnDoubleClick, SvTreeListBox*, bool ); + DECL_LINK( ScrollUpHdl, Timer*, void ); + DECL_LINK( ScrollDownHdl, Timer*, void ); + DECL_LINK( DropHdl, void*, void ); + DECL_LINK( LookForUiHdl, void*, void ); Timer m_aScrollTimer; Point m_aMousePos; diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index 572625357365..1ccf6a0683f1 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -32,7 +32,7 @@ namespace dbaui VclPtr<vcl::Window> m_pRight; void ImplInitSettings(); - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index e9969b45358e..c2ee55adf374 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -51,9 +51,9 @@ namespace dbaui bool m_bPKeyAllowed; bool m_bUseHeaderAllowed; - DECL_LINK_TYPED( AppendDataClickHdl, Button*, void ); - DECL_LINK_TYPED( RadioChangeHdl, Button*, void ); - DECL_LINK_TYPED( KeyClickHdl, Button*, void ); + DECL_LINK( AppendDataClickHdl, Button*, void ); + DECL_LINK( RadioChangeHdl, Button*, void ); + DECL_LINK( KeyClickHdl, Button*, void ); bool checkAppendData(); void SetAppendDataRadio(); diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 5d87bf140f42..df829da3633a 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -42,8 +42,8 @@ namespace dbaui VclPtr<PushButton> m_pColumns_LH; VclPtr<ListBox> m_pNewColumnNames; // right side - DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); - DECL_LINK_TYPED( ListDoubleClickHdl, ListBox&, void ); + DECL_LINK( ButtonClickHdl, Button *, void ); + DECL_LINK( ListDoubleClickHdl, ListBox&, void ); static void clearListBox(ListBox& _rListBox); static void fillColumns( ListBox* pRight, diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 8214e43445e2..b24a974c8bfa 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -279,10 +279,10 @@ namespace dbaui bool m_bUseHeaderLine; private: - DECL_LINK_TYPED( ImplPrevHdl, Button*, void ); - DECL_LINK_TYPED( ImplNextHdl, Button*, void); - DECL_LINK_TYPED( ImplOKHdl, Button*, void ); - DECL_LINK_TYPED( ImplActivateHdl, WizardDialog*, void ); + DECL_LINK( ImplPrevHdl, Button*, void ); + DECL_LINK( ImplNextHdl, Button*, void); + DECL_LINK( ImplOKHdl, Button*, void ); + DECL_LINK( ImplActivateHdl, WizardDialog*, void ); bool CheckColumns(sal_Int32& _rnBreakPos); void loadData( const ICopyTableSourceObject& _rSourceObject, ODatabaseExport::TColumns& _rColumns, diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index baac1a0eee5a..004a659f4885 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -65,11 +65,11 @@ namespace dbaui Image m_aImgUp; Image m_aImgDown; - DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); - DECL_LINK_TYPED( RightButtonClickHdl, Button *, void ); - DECL_LINK_TYPED( AllNoneClickHdl, Button *, void ); - DECL_LINK_TYPED( TableListClickHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( TableListRightSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ButtonClickHdl, Button *, void ); + DECL_LINK( RightButtonClickHdl, Button *, void ); + DECL_LINK( AllNoneClickHdl, Button *, void ); + DECL_LINK( TableListClickHdl, SvTreeListBox*, void ); + DECL_LINK( TableListRightSelectHdl, SvTreeListBox*, void ); public: virtual void Reset ( ) override; diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index ff5f266402a0..f1514761e0a9 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -91,8 +91,8 @@ namespace dbaui friend class OWizTypeSelectControl; friend class OWizTypeSelectList; - DECL_LINK_TYPED( ColumnSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); + DECL_LINK( ColumnSelectHdl, ListBox&, void ); + DECL_LINK( ButtonClickHdl, Button *, void ); protected: VclPtr<OWizTypeSelectList> m_pColumnNames; VclPtr<FixedText> m_pColumns; diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 69dbae8eb41f..991ac705ca0c 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -70,11 +70,11 @@ namespace dbaui IAddTableDialogContext& m_rContext; - DECL_LINK_TYPED( AddClickHdl, Button*, void ); - DECL_LINK_TYPED( CloseClickHdl, Button*, void); - DECL_LINK_TYPED( TableListDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( TableListSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( OnTypeSelected, Button*, void ); + DECL_LINK( AddClickHdl, Button*, void ); + DECL_LINK( CloseClickHdl, Button*, void); + DECL_LINK( TableListDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( TableListSelectHdl, SvTreeListBox*, void ); + DECL_LINK( OnTypeSelected, Button*, void ); public: OAddTableDlg( diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 8cf693d5389e..2c14d5806a73 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -327,16 +327,16 @@ namespace dbaui void impl_checkForCannotSelectUnfiltered( const ::dbtools::SQLExceptionInfo& _rError ); // time to check the CUT/COPY/PASTE-slot-states - DECL_LINK_TYPED( OnInvalidateClipboard, Timer*, void ); - DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( OnInvalidateClipboard, Timer*, void ); + DECL_LINK( OnClipboardChanged, TransferableDataHelper*, void ); // search callbacks - DECL_LINK_TYPED(OnSearchContextRequest, FmSearchContext&, sal_uInt32); - DECL_LINK_TYPED(OnFoundData, FmFoundRecordInformation&, void); - DECL_LINK_TYPED(OnCanceledNotFound, FmFoundRecordInformation&, void); + DECL_LINK(OnSearchContextRequest, FmSearchContext&, sal_uInt32); + DECL_LINK(OnFoundData, FmFoundRecordInformation&, void); + DECL_LINK(OnCanceledNotFound, FmFoundRecordInformation&, void); - DECL_LINK_TYPED( OnAsyncGetCellFocus, void*, void ); - DECL_LINK_TYPED( OnAsyncDisplayError, void*, void ); + DECL_LINK( OnAsyncGetCellFocus, void*, void ); + DECL_LINK( OnAsyncDisplayError, void*, void ); }; } diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 8a8ec11a11c4..ad9618f71b0b 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -51,7 +51,7 @@ namespace dbaui mutable VclPtr<SbaGridControl> m_pVclControl; // our grid's VCL representation VclPtr<vcl::Window> m_pStatus; - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); // attribute access public: const css::uno::Reference< css::awt::XControl >& getGridControl() const { return m_xGrid; } diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 51cc5f1677fb..4c091dbe7b45 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -70,10 +70,10 @@ namespace dbaui private: void init(); - DECL_LINK_TYPED( OnTimeOut, Timer*, void ); - DECL_LINK_TYPED( OnResetEntry, void*, void ); - DECL_LINK_TYPED( ScrollUpHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( ScrollDownHdl, LinkParamNone*, void ); + DECL_LINK( OnTimeOut, Timer*, void ); + DECL_LINK( OnResetEntry, void*, void ); + DECL_LINK( ScrollUpHdl, LinkParamNone*, void ); + DECL_LINK( ScrollDownHdl, LinkParamNone*, void ); public: DBTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index ba68b45a0870..2c85d711de91 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -106,7 +106,7 @@ protected: }; private: - DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void); + DECL_LINK(OnTypeSelected, OGeneralPage&, void); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 225f26b96a7f..b800dece39e8 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -166,12 +166,12 @@ private: void updateTypeDependentStates(); bool callSaveAsDialog(); bool IsConnectionUrlRequired(); - DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void); - DECL_LINK_TYPED(OnChangeCreationMode, OGeneralPageWizard&, void); - DECL_LINK_TYPED(OnRecentDocumentSelected, OGeneralPageWizard&, void); - DECL_LINK_TYPED(OnSingleDocumentChosen, OGeneralPageWizard&, void); - DECL_LINK_TYPED(ImplClickHdl, OMySQLIntroPageSetup*, void); - DECL_LINK_TYPED(ImplModifiedHdl, OGenericAdministrationPage const *, void); + DECL_LINK(OnTypeSelected, OGeneralPage&, void); + DECL_LINK(OnChangeCreationMode, OGeneralPageWizard&, void); + DECL_LINK(OnRecentDocumentSelected, OGeneralPageWizard&, void); + DECL_LINK(OnSingleDocumentChosen, OGeneralPageWizard&, void); + DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*, void); + DECL_LINK(ImplModifiedHdl, OGenericAdministrationPage const *, void); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 4d081adf2365..9e6d74e62dd7 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -85,11 +85,11 @@ namespace dbaui virtual void _disposing( const css::lang::EventObject& _rSource ) override; protected: - DECL_LINK_TYPED( OnExecute, Button*, void ); - DECL_LINK_TYPED( OnClose, void*, void ); - DECL_LINK_TYPED( OnCloseClick, Button*, void ); - DECL_LINK_TYPED( OnListEntrySelected, ListBox&, void ); - DECL_LINK_TYPED( OnStatementModified, Edit&, void ); + DECL_LINK( OnExecute, Button*, void ); + DECL_LINK( OnClose, void*, void ); + DECL_LINK( OnCloseClick, Button*, void ); + DECL_LINK( OnListEntrySelected, ListBox&, void ); + DECL_LINK( OnStatementModified, Edit&, void ); private: /// adds a statement to the statement history diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 9866fd99fdcb..257117f8a577 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -73,8 +73,8 @@ namespace dbaui OUString getCatalog() const; OUString getSchema() const; private: - DECL_LINK_TYPED(ButtonClickHdl, Button *, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(ButtonClickHdl, Button *, void); + DECL_LINK(EditModifyHdl, Edit&, void); void implInitOnlyTitle(const OUString& _rLabel); void implInit(); diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 1c2be2a8a3b9..b0f8a32c0271 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -37,7 +37,7 @@ namespace dbaui void SetValue( sal_Int32 nVal ); protected: - DECL_LINK_TYPED( CbClickHdl, Button *, void ); + DECL_LINK( CbClickHdl, Button *, void ); VclPtr<MetricField> m_pMF_VALUE; VclPtr<CheckBox> m_pCB_STANDARD; diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index badb6bc235f9..b95418ed3911 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -127,14 +127,14 @@ namespace dbaui void updateControls(const SvTreeListEntry* _pEntry); protected: - DECL_LINK_TYPED( OnIndexSelected, DbaIndexList&, void ); - DECL_LINK_TYPED( OnIndexAction, ToolBox*, void ); - DECL_LINK_TYPED( OnEntryEdited, SvTreeListEntry*, bool ); - DECL_LINK_TYPED( OnModifiedClick, Button*, void ); - DECL_LINK_TYPED( OnModified, IndexFieldsControl&, void ); - DECL_LINK_TYPED( OnCloseDialog, Button*, void ); - - DECL_LINK_TYPED( OnEditIndexAgain, void*, void ); + DECL_LINK( OnIndexSelected, DbaIndexList&, void ); + DECL_LINK( OnIndexAction, ToolBox*, void ); + DECL_LINK( OnEntryEdited, SvTreeListEntry*, bool ); + DECL_LINK( OnModifiedClick, Button*, void ); + DECL_LINK( OnModified, IndexFieldsControl&, void ); + DECL_LINK( OnCloseDialog, Button*, void ); + + DECL_LINK( OnEditIndexAgain, void*, void ); private: sal_uInt16 mnNewCmdId; diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 7ea0ef629538..68586c62dfb3 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -86,7 +86,7 @@ namespace dbaui bool isNewField() const { return GetCurRow() >= (sal_Int32)m_aFields.size(); } - DECL_LINK_TYPED( OnListEntrySelected, DbaMouseDownListBoxController&, void ); + DECL_LINK( OnListEntrySelected, DbaMouseDownListBoxController&, void ); private: using ::svt::EditBrowseBox::Init; diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 8e29c278225d..43997f962efe 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -93,11 +93,11 @@ namespace dbaui void Construct(); private: - DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void); - DECL_LINK_TYPED(OnValueModified, Edit&, void); - DECL_LINK_TYPED(OnEntryListBoxSelected, ListBox&, void); - DECL_LINK_TYPED(OnButtonClicked, Button*, void); - DECL_LINK_TYPED(OnValueLoseFocusHdl, Control&, void); + DECL_LINK(OnVisitedTimeout, Timer*, void); + DECL_LINK(OnValueModified, Edit&, void); + DECL_LINK(OnEntryListBoxSelected, ListBox&, void); + DECL_LINK(OnButtonClicked, Button*, void); + DECL_LINK(OnValueLoseFocusHdl, Control&, void); bool OnValueLoseFocus(); bool OnEntrySelected(); }; diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 3b112a98cd4f..45f4ecc803af 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -46,7 +46,7 @@ namespace dbaui VclPtr<Splitter> m_pSplitter; css::uno::Reference< css::frame::XFrame2 > m_xBeamer; - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); public: OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >&); virtual ~OQueryContainerWindow() override; diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index edad899131f3..966f4f16a027 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -224,7 +224,7 @@ namespace dbaui virtual bool allowQueries() const override; private: - DECL_LINK_TYPED( OnExecuteAddTable, void*, void ); + DECL_LINK( OnExecuteAddTable, void*, void ); private: using OQueryController_PBase::getFastPropertyValue; diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 6990b5c028ed..f7253f1fa76a 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -91,8 +91,8 @@ namespace dbaui ::dbtools::OPredicateInputController m_aPredicateInput; static void SelectField( ListBox& rBox, const OUString& rField ); - DECL_LINK_TYPED( ListSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ListSelectCompHdl, ListBox&, void ); + DECL_LINK( ListSelectHdl, ListBox&, void ); + DECL_LINK( ListSelectCompHdl, ListBox&, void ); void SetLine( sal_uInt16 nIdx,const css::beans::PropertyValue& _rItem,bool _bOr ); void EnableLines(); @@ -118,7 +118,7 @@ namespace dbaui void BuildWherePart(); protected: - DECL_LINK_TYPED( PredicateLoseFocus, Control&, void ); + DECL_LINK( PredicateLoseFocus, Control&, void ); }; } diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index e4b885a1496c..71cca836f1b5 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -75,7 +75,7 @@ namespace dbaui VclPtr<ListBox> m_aColumnList[DOG_ROWS]; VclPtr<ListBox> m_aValueList[DOG_ROWS]; - DECL_LINK_TYPED( FieldListSelectHdl, ListBox&, void ); + DECL_LINK( FieldListSelectHdl, ListBox&, void ); void EnableLines(); public: diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index f410c1d7f1ca..f7feedcbc2b3 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -144,7 +144,7 @@ namespace dbaui css::uno::Sequence< css::beans::PropertyValue > aArgs; }; ::std::queue< DispatchArgs > m_aDispatchArgs; - DECL_LINK_TYPED( OnDispatchEvent, void*, void ); + DECL_LINK( OnDispatchEvent, void*, void ); // for dynamic states of our 4 dispatchable URLs enum DispatchType @@ -300,7 +300,7 @@ namespace dbaui SvNumberFormatter* GetDatasourceFormatter(); - DECL_LINK_TYPED(AsynchDropEvent, void*, void); + DECL_LINK(AsynchDropEvent, void*, void); private: bool IsReadOnlyDB() const; diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 8bfb22c1664b..4150b22da09c 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -51,8 +51,8 @@ namespace dbaui osl::Mutex m_mutex; css::uno::Reference< css::beans::XMultiPropertySet > m_notifier; - DECL_LINK_TYPED(OnUndoActionTimer, Timer*, void); - DECL_LINK_TYPED(OnInvalidateTimer, Timer*, void); + DECL_LINK(OnUndoActionTimer, Timer*, void); + DECL_LINK(OnInvalidateTimer, Timer*, void); private: void ImplSetFont(); @@ -61,7 +61,7 @@ namespace dbaui virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void GetFocus() override; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); public: OSqlEdit( OQueryTextView* pParent); diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 55426f57f07a..97428cc4fd5f 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -95,7 +95,7 @@ public: private: void Construct( WinBits nStyle, MessageType eImage ); - DECL_LINK_TYPED(ButtonClickHdl, Button*, void ); + DECL_LINK(ButtonClickHdl, Button*, void ); private: void impl_positionControls(); diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 8d3f538e0416..3bccf4a36a62 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -54,7 +54,7 @@ namespace dbaui SfxItemSet& m_rItems; private: - DECL_LINK_TYPED( OnOK, Button*, void ); + DECL_LINK( OnOK, Button*, void ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 29146bd6a54d..b66d671e877c 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -344,14 +344,14 @@ namespace dbaui OUString GetEntryText( SvTreeListEntry* _pEntry ) const; // is called when a table or a query was selected - DECL_LINK_TYPED( OnSelectionChange, LinkParamNone*, void ); - DECL_LINK_TYPED( OnExpandEntry, SvTreeListEntry*, bool ); + DECL_LINK( OnSelectionChange, LinkParamNone*, void ); + DECL_LINK( OnExpandEntry, SvTreeListEntry*, bool ); - DECL_LINK_TYPED( OnCopyEntry, LinkParamNone*, void ); + DECL_LINK( OnCopyEntry, LinkParamNone*, void ); - DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); + DECL_LINK( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); - DECL_LINK_TYPED( OnAsyncDrop, void*, void ); + DECL_LINK( OnAsyncDrop, void*, void ); void implRemoveStatusListeners(); diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 00c5df7c6afb..20d60659e778 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -63,7 +63,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OToolBoxHelper, ConfigOptionsChanged, LinkParamNone*, void) + IMPL_LINK_NOARG(OToolBoxHelper, ConfigOptionsChanged, LinkParamNone*, void) { if ( m_pToolBox ) { @@ -74,7 +74,7 @@ namespace dbaui m_pToolBox->SetOutStyle(aOptions.GetToolboxStyle()); } } - IMPL_LINK_TYPED(OToolBoxHelper, SettingsChanged, VclSimpleEvent&, _rEvt, void) + IMPL_LINK(OToolBoxHelper, SettingsChanged, VclSimpleEvent&, _rEvt, void) { if ( m_pToolBox && _rEvt.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index db54c29d2e67..96ea1442c38c 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -122,7 +122,7 @@ void OCopyTable::dispose() OWizardPage::dispose(); } -IMPL_LINK_NOARG_TYPED( OCopyTable, AppendDataClickHdl, Button*, void ) +IMPL_LINK_NOARG( OCopyTable, AppendDataClickHdl, Button*, void ) { SetAppendDataRadio(); } @@ -136,7 +136,7 @@ void OCopyTable::SetAppendDataRadio() m_pParent->setOperation(CopyTableOperation::AppendData); } -IMPL_LINK_TYPED( OCopyTable, RadioChangeHdl, Button*, pButton, void ) +IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton, void ) { m_pParent->EnableNextButton(pButton != m_pRB_View); bool bKey = m_bPKeyAllowed && pButton != m_pRB_View; @@ -154,7 +154,7 @@ IMPL_LINK_TYPED( OCopyTable, RadioChangeHdl, Button*, pButton, void ) m_pParent->setOperation( CopyTableOperation::CreateAsView ); } -IMPL_LINK_NOARG_TYPED( OCopyTable, KeyClickHdl, Button*, void ) +IMPL_LINK_NOARG( OCopyTable, KeyClickHdl, Button*, void ) { m_pEdKeyName->Enable(m_pCB_PrimaryColumn->IsChecked()); m_pFT_KeyName->Enable(m_pCB_PrimaryColumn->IsChecked()); diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index c0aa281d88ae..a83eb94c9bc7 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -183,7 +183,7 @@ bool OWizColumnSelect::LeavePage() return true; } -IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) +IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) { ListBox *pLeft = nullptr; ListBox *pRight = nullptr; @@ -246,7 +246,7 @@ IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) m_pOrgColumnNames->SelectEntryPos(0); } -IMPL_LINK_TYPED( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void ) +IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void ) { ListBox *pLeft,*pRight; if(&rListBox == m_pOrgColumnNames) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 56142ceee651..cd473baa5a50 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -717,7 +717,7 @@ void OCopyTableWizard::dispose() WizardDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplPrevHdl, Button*, void) +IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl, Button*, void) { m_ePressed = WIZARD_PREV; if ( GetCurLevel() ) @@ -734,7 +734,7 @@ IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplPrevHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplNextHdl, Button*, void) +IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl, Button*, void) { m_ePressed = WIZARD_NEXT; if ( GetCurLevel() < MAX_PAGES ) @@ -834,7 +834,7 @@ bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) return bRet; } -IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplOKHdl, Button*, void) +IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl, Button*, void) { m_ePressed = WIZARD_FINISH; bool bFinish = DeactivatePage(); @@ -937,7 +937,7 @@ void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rS pSettingsPage->setCreatePrimaryKey( _bDoCreate, _rSuggestedName ); } -IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplActivateHdl, WizardDialog*, void) +IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl, WizardDialog*, void) { OWizardPage* pCurrent = static_cast<OWizardPage*>(GetPage(GetCurLevel())); if(pCurrent) diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index afb4e1f1956d..477608d8e490 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -200,7 +200,7 @@ bool OWizNameMatching::LeavePage() OUString OWizNameMatching::GetTitle() const { return ModuleRes(STR_WIZ_NAME_MATCHING_TITEL); } -IMPL_LINK_TYPED( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) +IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) { SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected(); if ( pEntry ) @@ -227,7 +227,7 @@ IMPL_LINK_TYPED( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) } } -IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void ) +IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void ) { SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected(); if ( pEntry ) @@ -250,7 +250,7 @@ IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void } } -IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListClickHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl, SvTreeListBox*, void ) { SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected(); if(pEntry) @@ -282,7 +282,7 @@ IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListClickHdl, SvTreeListBox*, void } } -IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox*, void ) { SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected(); if(pEntry) @@ -314,7 +314,7 @@ IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox* } } -IMPL_LINK_TYPED( OWizNameMatching, AllNoneClickHdl, Button *, pButton, void ) +IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton, void ) { bool bAll = pButton == m_pAll; SvTreeListEntry* pEntry = m_pCTRL_LEFT->First(); diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 204a33610e46..b85b3e66e2e7 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -281,7 +281,7 @@ OUString OWizTypeSelect::GetTitle() const return ModuleRes(STR_WIZ_TYPE_SELECT_TITEL); } -IMPL_LINK_NOARG_TYPED( OWizTypeSelect, ColumnSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void ) { OUString aColumnName( m_pColumnNames->GetSelectEntry() ); @@ -348,7 +348,7 @@ void OWizTypeSelect::EnableAuto(bool bEnable) m_pAutoType->Show(bEnable); } -IMPL_LINK_NOARG_TYPED( OWizTypeSelect, ButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG( OWizTypeSelect, ButtonClickHdl, Button *, void ) { sal_Int32 nBreakPos; m_pParent->CheckColumns(nBreakPos); diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index a03b51239b46..f92e3af17640 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -54,10 +54,10 @@ namespace dbaui } private: - DECL_LINK_TYPED( onExecute, void*, void ); + DECL_LINK( onExecute, void*, void ); }; - IMPL_LINK_NOARG_TYPED( DialogExecutor_Impl, onExecute, void*, void ) + IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute, void*, void ) { try { diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 657582fde435..52d2de8844e9 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -200,7 +200,7 @@ void OJoinTableView::dispose() vcl::Window::dispose(); } -IMPL_LINK_TYPED( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar, void ) { // move all windows ScrollPane( pScrollBar->GetDelta(), (pScrollBar == &GetHScrollBar()), false ); @@ -1073,7 +1073,7 @@ void OJoinTableView::ScrollWhileDragging() ShowTracking( m_aDragRect, ShowTrackFlags::Small | ShowTrackFlags::TrackWindow ); } -IMPL_LINK_NOARG_TYPED(OJoinTableView, OnDragScrollTimer, Idle *, void) +IMPL_LINK_NOARG(OJoinTableView, OnDragScrollTimer, Idle *, void) { ScrollWhileDragging(); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 1e08467842ec..e5186d843a83 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2504,7 +2504,7 @@ void OQueryDesignView::dispose() OJoinDesignView::dispose(); } -IMPL_LINK_NOARG_TYPED( OQueryDesignView, SplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( OQueryDesignView, SplitHdl, Splitter*, void ) { if (!getController().isReadOnly()) { diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index fc93f451aa14..bd91b53a3db8 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2472,7 +2472,7 @@ void OSelectionBrowseBox::appendUndoAction(const OUString& _rOldValue,const OUSt } } -IMPL_LINK_NOARG_TYPED(OSelectionBrowseBox, OnInvalidateTimer, Timer *, void) +IMPL_LINK_NOARG(OSelectionBrowseBox, OnInvalidateTimer, Timer *, void) { static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_CUT); static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_COPY); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index c6be5d504e13..d11d45798faa 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -75,7 +75,7 @@ namespace dbaui bool m_bDisableErrorBox; bool m_bInUndoMode; - DECL_LINK_TYPED(OnInvalidateTimer, Timer*, void); + DECL_LINK(OnInvalidateTimer, Timer*, void); public: explicit OSelectionBrowseBox( vcl::Window* pParent ); virtual ~OSelectionBrowseBox() override; diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 6e5ba0670e71..0904e805b329 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -167,7 +167,7 @@ bool OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) return true; } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollUpHdl, Timer*, void ) +IMPL_LINK_NOARG( OTableWindowListBox, ScrollUpHdl, Timer*, void ) { SvTreeListEntry* pEntry = GetEntry( m_aMousePos ); if( !pEntry ) @@ -181,7 +181,7 @@ IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollUpHdl, Timer*, void ) } } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollDownHdl, Timer*, void ) +IMPL_LINK_NOARG( OTableWindowListBox, ScrollDownHdl, Timer*, void ) { SvTreeListEntry* pEntry = GetEntry( m_aMousePos ); if( !pEntry ) @@ -275,13 +275,13 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) return nDND_Action; } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, LookForUiHdl, void*, void ) +IMPL_LINK_NOARG( OTableWindowListBox, LookForUiHdl, void*, void ) { m_nUiEvent = nullptr; m_pTabWin->getTableView()->lookForUiActivities(); } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, DropHdl, void*, void ) +IMPL_LINK_NOARG( OTableWindowListBox, DropHdl, void*, void ) { // create the connection m_nDropEvent = nullptr; @@ -342,7 +342,7 @@ void OTableWindowListBox::GetFocus() SvTreeListBox::GetFocus(); } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, bool ) +IMPL_LINK_NOARG( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, bool ) { // tell my parent vcl::Window* pParent = Window::GetParent(); diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 686963571c27..f78cd420e7ba 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -133,7 +133,7 @@ namespace dbaui if(m_pViewSwitch) m_pViewSwitch->GrabFocus(); } - IMPL_LINK_NOARG_TYPED( OQueryContainerWindow, SplitHdl, Splitter*, void ) + IMPL_LINK_NOARG( OQueryContainerWindow, SplitHdl, Splitter*, void ) { m_pSplitter->SetPosPixel( Point( m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) ); Resize(); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index abdb2f01449f..499aefb19894 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1939,7 +1939,7 @@ void OQueryController::setEscapeProcessing_fireEvent( const bool _bEscapeProcess fire( &nHandle, &aNewValue, &aOldValue, 1, false ); } -IMPL_LINK_NOARG_TYPED( OQueryController, OnExecuteAddTable, void*, void ) +IMPL_LINK_NOARG( OQueryController, OnExecuteAddTable, void*, void ) { Execute( ID_BROWSER_ADDTABLE,Sequence<PropertyValue>() ); } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index f329f0b18743..7710a97be15b 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -154,7 +154,7 @@ void DlgQryJoin::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( DlgQryJoin, LBChangeHdl, ListBox&, void ) +IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) { if (m_pLB_JoinType->GetSelectEntryPos() == m_pLB_JoinType->GetSavedValue() ) return; @@ -240,7 +240,7 @@ IMPL_LINK_NOARG_TYPED( DlgQryJoin, LBChangeHdl, ListBox&, void ) m_pML_HelpText->SetText( sHelpText ); } -IMPL_LINK_NOARG_TYPED( DlgQryJoin, OKClickHdl, Button*, void ) +IMPL_LINK_NOARG( DlgQryJoin, OKClickHdl, Button*, void ) { m_pConnData->Update(); m_pOrigConnData->CopyFrom( *m_pConnData ); @@ -248,7 +248,7 @@ IMPL_LINK_NOARG_TYPED( DlgQryJoin, OKClickHdl, Button*, void ) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED( DlgQryJoin, NaturalToggleHdl, CheckBox&, void ) +IMPL_LINK_NOARG( DlgQryJoin, NaturalToggleHdl, CheckBox&, void ) { bool bChecked = m_pCBNatural->IsChecked(); static_cast<OQueryTableConnectionData*>(m_pConnData.get())->setNatural(bChecked); diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 82b318efc164..7b5ddf85f96e 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -54,9 +54,9 @@ namespace dbaui css::uno::Reference< css::sdbc::XConnection > m_xConnection; - DECL_LINK_TYPED( OKClickHdl, Button*, void ); - DECL_LINK_TYPED( LBChangeHdl, ListBox&, void ); - DECL_LINK_TYPED( NaturalToggleHdl, CheckBox&, void ); + DECL_LINK( OKClickHdl, Button*, void ); + DECL_LINK( LBChangeHdl, ListBox&, void ); + DECL_LINK( NaturalToggleHdl, CheckBox&, void ); /** setJoinType enables and set the new join type @param _eNewJoinType the new jointype diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 67690fb4f2cb..91df369e99b2 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -465,7 +465,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData } } -IMPL_LINK_NOARG_TYPED( ORelationController, OnThreadFinished, void*, void ) +IMPL_LINK_NOARG( ORelationController, OnThreadFinished, void*, void ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 686809058d92..23e0bd942c30 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -92,7 +92,7 @@ void OTableEditorCtrl::ClipboardInvalidator::Stop() m_aInvalidateTimer.Stop(); } -IMPL_LINK_NOARG_TYPED(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, Timer *, void) +IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, Timer *, void) { m_pOwner->GetView()->getController().InvalidateFeature(SID_CUT); m_pOwner->GetView()->getController().InvalidateFeature(SID_COPY); @@ -623,7 +623,7 @@ bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) return true; } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, InvalidateFieldType, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, InvalidateFieldType, void*, void ) { nInvalidateTypeEvent = nullptr; Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) ); @@ -1431,13 +1431,13 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedCut, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedCut, void*, void ) { nCutEvent = nullptr; OTableRowView::cut(); } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste, void*, void ) { nPasteEvent = nullptr; @@ -1463,13 +1463,13 @@ IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void ) GoToRow( nPastePosition ); } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedDelete, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedDelete, void*, void ) { nDeleteEvent = nullptr; DeleteRows(); } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedInsNewRows, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows, void*, void ) { nInsNewRowsEvent = nullptr; sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 9953a6b3b4e9..19efd28419eb 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -78,7 +78,7 @@ namespace dbaui void Stop(); protected: - DECL_LINK_TYPED(OnInvalidate, Timer*, void); + DECL_LINK(OnInvalidate, Timer*, void); }; friend class OTableEditorCtrl::ClipboardInvalidator; @@ -171,11 +171,11 @@ namespace dbaui virtual void paste() override; private: - DECL_LINK_TYPED( DelayedCut, void*, void ); - DECL_LINK_TYPED( DelayedPaste, void*, void ); - DECL_LINK_TYPED( DelayedDelete, void*, void ); - DECL_LINK_TYPED( DelayedInsNewRows, void*, void ); - DECL_LINK_TYPED( InvalidateFieldType, void*, void ); + DECL_LINK( DelayedCut, void*, void ); + DECL_LINK( DelayedPaste, void*, void ); + DECL_LINK( DelayedDelete, void*, void ); + DECL_LINK( DelayedInsNewRows, void*, void ); + DECL_LINK( InvalidateFieldType, void*, void ); void InitCellController(); sal_Int32 HasFieldName( const OUString& rFieldName ); diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index febe92a3a8df..05b30b82bcf9 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -105,7 +105,7 @@ void OTableBorderWindow::Resize() Size(nOutputWidth, nOutputHeight-nSplitPos-nSplitterHeight) ); } -IMPL_LINK_TYPED( OTableBorderWindow, SplitHdl, Splitter*, pSplit, void ) +IMPL_LINK( OTableBorderWindow, SplitHdl, Splitter*, pSplit, void ) { if(pSplit == m_aHorzSplitter.get()) { diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index f7e7e9265560..e4bc622a26ff 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -80,13 +80,13 @@ class Desktop : public Application virtual void OverrideSystemSettings( AllSettings& rSettings ) override; virtual void AppEvent( const ApplicationEvent& rAppEvent ) override; - DECL_LINK_TYPED( OpenClients_Impl, void*, void ); + DECL_LINK( OpenClients_Impl, void*, void ); static void OpenClients(); static void OpenDefault(); static void CheckOpenCLCompute(const css::uno::Reference<css::frame::XDesktop2> &); - DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void); + DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*, void); static void HandleAppEvent( const ApplicationEvent& rAppEvent ); static ResMgr* GetDesktopResManager(); @@ -147,8 +147,8 @@ class Desktop : public Application void OpenSplashScreen(); void CloseSplashScreen(); - DECL_STATIC_LINK_TYPED( Desktop, ImplInitFilterHdl, ::ConvertData&, bool ); - DECL_STATIC_LINK_TYPED( Desktop, AsyncInitFirstRun, Timer*, void ); + DECL_STATIC_LINK( Desktop, ImplInitFilterHdl, ::ConvertData&, bool ); + DECL_STATIC_LINK( Desktop, AsyncInitFirstRun, Timer*, void ); /** checks if the office is run the first time <p>If so, <method>DoFirstRunInitializations</method> is called (asynchronously and delayed) and the respective flag in the configuration is reset.</p> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 1805d60450fd..3456db21e578 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1757,7 +1757,7 @@ int Desktop::doShutdown() return EXIT_SUCCESS; } -IMPL_STATIC_LINK_TYPED( Desktop, ImplInitFilterHdl, ::ConvertData&, rData, bool ) +IMPL_STATIC_LINK( Desktop, ImplInitFilterHdl, ::ConvertData&, rData, bool ) { return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( rData ); } @@ -1908,7 +1908,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings ) } -IMPL_STATIC_LINK_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void) +IMPL_STATIC_LINK(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void) { DoFirstRunInitializations(); } @@ -1928,7 +1928,7 @@ class ExitTimer : public Timer } }; -IMPL_LINK_NOARG_TYPED(Desktop, OpenClients_Impl, void*, void) +IMPL_LINK_NOARG(Desktop, OpenClients_Impl, void*, void) { try { // #i114963# @@ -1965,7 +1965,7 @@ IMPL_LINK_NOARG_TYPED(Desktop, OpenClients_Impl, void*, void) } // enable acceptors -IMPL_STATIC_LINK_NOARG_TYPED(Desktop, EnableAcceptors_Impl, void*, void) +IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl, void*, void) { enableAcceptors(); } diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index aa0d0745560d..a5be36c03789 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -272,18 +272,18 @@ OUString CreateMD5FromString( const OUString& aMsg ) class ProcessEventsClass_Impl { public: - DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, void ); - DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, void ); + DECL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, void ); + DECL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, void ); }; -IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, pEvent, void ) +IMPL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, pEvent, void ) { // Application events are processed by the Desktop::HandleAppEvent implementation. Desktop::HandleAppEvent( *static_cast<ApplicationEvent*>(pEvent) ); delete static_cast<ApplicationEvent*>(pEvent); } -IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent, void ) +IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent, void ) { // Documents requests are processed by the RequestHandler implementation ProcessDocumentsRequest* pDocsRequest = static_cast<ProcessDocumentsRequest*>(pEvent); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 7c14fb3170d9..fd15aae69031 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -128,11 +128,11 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl MENU_COMMAND ShowPopupMenu( const Point &rPos, const long nPos ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( HandleOptionsBtn, Button*, void ); - DECL_LINK_TYPED( HandleEnableBtn, Button*, void ); - DECL_LINK_TYPED( HandleRemoveBtn, Button*, void ); + DECL_LINK( HandleOptionsBtn, Button*, void ); + DECL_LINK( HandleEnableBtn, Button*, void ); + DECL_LINK( HandleRemoveBtn, Button*, void ); public: explicit ExtBoxWithBtns_Impl(vcl::Window* pParent); @@ -466,7 +466,7 @@ void ExtBoxWithBtns_Impl::enableButtons( bool bEnable ) } -IMPL_LINK_TYPED( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar, void ) +IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar, void ) { long nDelta = pScrBar->GetDelta(); @@ -482,7 +482,7 @@ IMPL_LINK_TYPED( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar, void ) } -IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleOptionsBtn, Button*, void) +IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn, Button*, void) { const sal_Int32 nActive = getSelIndex(); @@ -501,7 +501,7 @@ IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleOptionsBtn, Button*, void) } -IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleEnableBtn, Button*, void) +IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn, Button*, void) { const sal_Int32 nActive = getSelIndex(); @@ -520,7 +520,7 @@ IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleEnableBtn, Button*, void) } -IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleRemoveBtn, Button*, void) +IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn, Button*, void) { const sal_Int32 nActive = getSelIndex(); @@ -932,7 +932,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() } -IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCancelBtn, Button*, void) +IMPL_LINK_NOARG(ExtMgrDialog, HandleCancelBtn, Button*, void) { if ( m_xAbortChannel.is() ) { @@ -947,13 +947,13 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCancelBtn, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCloseBtn, Button*, void) +IMPL_LINK_NOARG(ExtMgrDialog, HandleCloseBtn, Button*, void) { Close(); } -IMPL_LINK_TYPED( ExtMgrDialog, startProgress, void*, _bLockInterface, void ) +IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface, void ) { ::osl::MutexGuard aGuard( m_aMutex ); bool bLockInterface = (bool) _bLockInterface; @@ -1032,7 +1032,7 @@ void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage } -IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleAddBtn, Button*, void) +IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn, Button*, void) { setBusy( true ); @@ -1046,7 +1046,7 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleAddBtn, Button*, void) setBusy( false ); } -IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleExtTypeCbx, Button*, void) +IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx, Button*, void) { // re-creates the list of packages with addEntry selecting the packages prepareChecking(); @@ -1054,7 +1054,7 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleExtTypeCbx, Button*, void) checkEntries(); } -IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleUpdateBtn, Button*, void) +IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn, Button*, void) { #if ENABLE_EXTENSION_UPDATE m_pManager->checkUpdates( false, true ); @@ -1062,13 +1062,13 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleUpdateBtn, Button*, void) } -IMPL_LINK_TYPED( ExtMgrDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void ) +IMPL_LINK( ExtMgrDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void ) { openWebBrowser( rHyperlink.GetURL(), GetText() ); } -IMPL_LINK_NOARG_TYPED(ExtMgrDialog, TimeOutHdl, Idle *, void) +IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Idle *, void) { if ( m_bStopProgress ) { @@ -1140,7 +1140,7 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt ) return true; } -IMPL_STATIC_LINK_NOARG_TYPED(ExtMgrDialog, Restart, void*, void) +IMPL_STATIC_LINK_NOARG(ExtMgrDialog, Restart, void*, void) { SolarMutexGuard aGuard; ::svtools::executeRestartDialog(comphelper::getProcessComponentContext(), @@ -1264,7 +1264,7 @@ void UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPac } -IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCancelBtn, Button*, void) +IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn, Button*, void) { if ( m_xAbortChannel.is() ) { @@ -1280,7 +1280,7 @@ IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCancelBtn, Button*, void) } -IMPL_LINK_TYPED( UpdateRequiredDialog, startProgress, void*, _bLockInterface, void ) +IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface, void ) { ::osl::MutexGuard aGuard( m_aMutex ); bool bLockInterface = (bool) _bLockInterface; @@ -1367,7 +1367,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment:: } -IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleUpdateBtn, Button*, void) +IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn, Button*, void) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -1386,7 +1386,7 @@ IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleUpdateBtn, Button*, void) } -IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCloseBtn, Button*, void) +IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn, Button*, void) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1402,13 +1402,13 @@ IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCloseBtn, Button*, void) } -IMPL_LINK_TYPED( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void ) +IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void ) { openWebBrowser( rHyperlink.GetURL(), GetText() ); } -IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, TimeOutHdl, Idle *, void) +IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl, Idle *, void) { if ( m_bStopProgress ) { diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 801cdd264abe..39c406522c4f 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -132,15 +132,15 @@ class ExtMgrDialog : public ModelessDialog, bool removeExtensionWarn( const OUString &rExtensionTitle ) const; - DECL_LINK_TYPED( HandleAddBtn, Button*, void ); - DECL_LINK_TYPED( HandleUpdateBtn, Button*, void ); - DECL_LINK_TYPED( HandleCancelBtn, Button*, void ); - DECL_LINK_TYPED( HandleCloseBtn, Button*, void ); - DECL_LINK_TYPED( HandleExtTypeCbx, Button*, void ); - DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void ); - DECL_LINK_TYPED(TimeOutHdl, Idle *, void); - DECL_LINK_TYPED( startProgress, void *, void ); - DECL_STATIC_LINK_TYPED( ExtMgrDialog, Restart, void *, void ); + DECL_LINK( HandleAddBtn, Button*, void ); + DECL_LINK( HandleUpdateBtn, Button*, void ); + DECL_LINK( HandleCancelBtn, Button*, void ); + DECL_LINK( HandleCloseBtn, Button*, void ); + DECL_LINK( HandleExtTypeCbx, Button*, void ); + DECL_LINK( HandleHyperlink, FixedHyperlink&, void ); + DECL_LINK(TimeOutHdl, Idle *, void); + DECL_LINK( startProgress, void *, void ); + DECL_STATIC_LINK( ExtMgrDialog, Restart, void *, void ); public: ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); @@ -199,12 +199,12 @@ class UpdateRequiredDialog : public ModalDialog, css::uno::Reference< css::task::XAbortChannel > m_xAbortChannel; - DECL_LINK_TYPED( HandleUpdateBtn, Button*, void ); - DECL_LINK_TYPED( HandleCloseBtn, Button*, void ); - DECL_LINK_TYPED( HandleCancelBtn, Button*, void ); - DECL_LINK_TYPED(TimeOutHdl, Idle *, void); - DECL_LINK_TYPED( startProgress, void *, void ); - DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void ); + DECL_LINK( HandleUpdateBtn, Button*, void ); + DECL_LINK( HandleCloseBtn, Button*, void ); + DECL_LINK( HandleCancelBtn, Button*, void ); + DECL_LINK(TimeOutHdl, Idle *, void); + DECL_LINK( startProgress, void *, void ); + DECL_LINK( HandleHyperlink, FixedHyperlink&, void ); static bool isEnabled( const css::uno::Reference< css::deployment::XPackage > &xPackage ); static bool checkDependencies( const css::uno::Reference< css::deployment::XPackage > &xPackage ); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 445a7fa67e3f..375512bfc939 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -1178,7 +1178,7 @@ void ExtensionBox_Impl::DoScroll( long nDelta ) } -IMPL_LINK_TYPED( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar, void ) +IMPL_LINK( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar, void ) { DoScroll( pScrBar->GetDelta() ); } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index f20153eae304..403311fb5073 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -163,7 +163,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox void DeleteRemoved(); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); void Init(); public: diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index edac3f0cb38e..caf95d46c575 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -1137,7 +1137,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, } -IMPL_LINK_NOARG_TYPED(UpdateDialog, selectionHandler, SvTreeListBox*, void) +IMPL_LINK_NOARG(UpdateDialog, selectionHandler, SvTreeListBox*, void) { OUStringBuffer b; UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( @@ -1235,7 +1235,7 @@ IMPL_LINK_NOARG_TYPED(UpdateDialog, selectionHandler, SvTreeListBox*, void) showDescription( b.makeStringAndClear() ); } -IMPL_LINK_NOARG_TYPED(UpdateDialog, allHandler, CheckBox&, void) +IMPL_LINK_NOARG(UpdateDialog, allHandler, CheckBox&, void) { if (m_pAll->IsChecked()) { @@ -1277,7 +1277,7 @@ IMPL_LINK_NOARG_TYPED(UpdateDialog, allHandler, CheckBox&, void) } } -IMPL_LINK_NOARG_TYPED(UpdateDialog, okHandler, Button*, void) +IMPL_LINK_NOARG(UpdateDialog, okHandler, Button*, void) { //If users are going to update a shared extension then we need //to warn them @@ -1302,13 +1302,13 @@ IMPL_LINK_NOARG_TYPED(UpdateDialog, okHandler, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(UpdateDialog, closeHandler, Button*, void) +IMPL_LINK_NOARG(UpdateDialog, closeHandler, Button*, void) { m_thread->stop(); EndDialog(); } -IMPL_LINK_TYPED( UpdateDialog, hyperlink_clicked, FixedHyperlink&, rHyperlink, void ) +IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink&, rHyperlink, void ) { OUString sURL = rHyperlink.GetURL(); if ( sURL.isEmpty() ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 910d662a32ef..2662a41beb11 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -159,11 +159,11 @@ private: css::xml::dom::XNode > const & aUpdateInfo); bool showDescription( const OUString& rDescription); - DECL_LINK_TYPED(selectionHandler, SvTreeListBox*, void); - DECL_LINK_TYPED(allHandler, CheckBox&, void); - DECL_LINK_TYPED(okHandler, Button*, void); - DECL_LINK_TYPED(closeHandler, Button*, void); - DECL_LINK_TYPED(hyperlink_clicked, FixedHyperlink&, void); + DECL_LINK(selectionHandler, SvTreeListBox*, void); + DECL_LINK(allHandler, CheckBox&, void); + DECL_LINK(okHandler, Button*, void); + DECL_LINK(closeHandler, Button*, void); + DECL_LINK(hyperlink_clicked, FixedHyperlink&, void); css::uno::Reference< css::uno::XComponentContext > m_context; VclPtr<FixedText> m_pchecking; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 79d55a2f6109..11a9b3919f8c 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -320,7 +320,7 @@ void UpdateInstallDialog::setError(OUString const & exceptionMessage) m_pMle_info->SetText(m_pMle_info->GetText() + exceptionMessage + "\n"); } -IMPL_LINK_NOARG_TYPED(UpdateInstallDialog, cancelHandler, Button*, void) +IMPL_LINK_NOARG(UpdateInstallDialog, cancelHandler, Button*, void) { m_thread->stop(); EndDialog(); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index bd30805ddffa..ebb3e1d51ba4 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -73,7 +73,7 @@ private: friend class Thread; friend class UpdateCommandEnv; - DECL_LINK_TYPED(cancelHandler, Button*, void); + DECL_LINK(cancelHandler, Button*, void); //signals in the dialog that we have finished. void updateDone(); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 6d4de1fe7805..e94db4bb5f6b 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -84,11 +84,11 @@ struct LicenseDialogImpl : public ModalDialog VclPtr<PushButton> m_pAcceptButton; VclPtr<PushButton> m_pDeclineButton; - DECL_LINK_TYPED(PageDownHdl, Button*, void); - DECL_LINK_TYPED(ScrolledHdl, LicenseView&, void); - DECL_LINK_TYPED(EndReachedHdl, LicenseView&, void); - DECL_LINK_TYPED(CancelHdl, Button*, void); - DECL_LINK_TYPED(AcceptHdl, Button*, void); + DECL_LINK(PageDownHdl, Button*, void); + DECL_LINK(ScrolledHdl, LicenseView&, void); + DECL_LINK(EndReachedHdl, LicenseView&, void); + DECL_LINK(CancelHdl, Button*, void); + DECL_LINK(AcceptHdl, Button*, void); bool m_bLicenseRead; @@ -236,12 +236,12 @@ LicenseDialogImpl::LicenseDialogImpl( m_pDown->SetStyle( aStyle ); } -IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, AcceptHdl, Button*, void) +IMPL_LINK_NOARG(LicenseDialogImpl, AcceptHdl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, CancelHdl, Button*, void) +IMPL_LINK_NOARG(LicenseDialogImpl, CancelHdl, Button*, void) { EndDialog(); } @@ -266,7 +266,7 @@ void LicenseDialogImpl::Activate() } } -IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, ScrolledHdl, LicenseView&, void) +IMPL_LINK_NOARG(LicenseDialogImpl, ScrolledHdl, LicenseView&, void) { if (m_pLicense->IsEndReached()) m_pDown->Disable(); @@ -274,12 +274,12 @@ IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, ScrolledHdl, LicenseView&, void) m_pDown->Enable(); } -IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, PageDownHdl, Button*, void) +IMPL_LINK_NOARG(LicenseDialogImpl, PageDownHdl, Button*, void) { m_pLicense->ScrollDown( ScrollType::PageDown ); } -IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, EndReachedHdl, LicenseView&, void) +IMPL_LINK_NOARG(LicenseDialogImpl, EndReachedHdl, LicenseView&, void) { m_pAcceptButton->Enable(); m_pAcceptButton->GrabFocus(); diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index c86db11363d4..a9b62cb6a0e7 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -72,7 +72,7 @@ private: VclPtr<SplashScreenWindow> pWindow; - DECL_LINK_TYPED( AppEventListenerHdl, VclSimpleEvent&, void ); + DECL_LINK( AppEventListenerHdl, VclSimpleEvent&, void ); virtual ~SplashScreen() override; void loadConfig(); void updateStatus(); @@ -364,7 +364,7 @@ void SplashScreen::updateStatus() } // internal private methods -IMPL_LINK_TYPED( SplashScreen, AppEventListenerHdl, VclSimpleEvent&, inEvent, void ) +IMPL_LINK( SplashScreen, AppEventListenerHdl, VclSimpleEvent&, inEvent, void ) { if (static_cast<VclWindowEvent&>(inEvent).GetWindow() == pWindow) { diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 3daf3313a2fe..6143dfaea7fd 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -668,10 +668,10 @@ private: inline VirtualDevice* GetVirtualDevice( const MapMode& rMapMode, DrawModeFlags nDrawMode ); inline void EraseVirtualDevice() { pVirtDev.disposeAndClear(); } - DECL_LINK_TYPED( StatusTimerHdl, Timer *, void); - DECL_LINK_TYPED( IdleFormatHdl, Idle *, void); - DECL_LINK_TYPED( OnlineSpellHdl, Timer *, void); - DECL_LINK_TYPED( DocModified, LinkParamNone*, void ); + DECL_LINK( StatusTimerHdl, Timer *, void); + DECL_LINK( IdleFormatHdl, Idle *, void); + DECL_LINK( OnlineSpellHdl, Timer *, void); + DECL_LINK( DocModified, LinkParamNone*, void ); void CheckIdleFormatter(); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index ae6f37228fc0..0badeb5a712a 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -4367,7 +4367,7 @@ void ImpEditEngine::LeaveBlockNotifications() } } -IMPL_LINK_NOARG_TYPED(ImpEditEngine, DocModified, LinkParamNone*, void) +IMPL_LINK_NOARG(ImpEditEngine, DocModified, LinkParamNone*, void) { aModifyHdl.Call( nullptr /*GetEditEnginePtr()*/ ); // NULL, because also used for Outliner } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 0ec971186558..ad5ba382fd1f 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -302,7 +302,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView ) CallStatusHdl(); } -IMPL_LINK_NOARG_TYPED(ImpEditEngine, OnlineSpellHdl, Timer *, void) +IMPL_LINK_NOARG(ImpEditEngine, OnlineSpellHdl, Timer *, void) { if ( !Application::AnyInput( VclInputFlags::KEYBOARD ) && GetUpdateMode() && IsFormatted() ) DoOnlineSpelling(); @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(ImpEditEngine, OnlineSpellHdl, Timer *, void) aOnlineSpellTimer.Start(); } -IMPL_LINK_NOARG_TYPED(ImpEditEngine, IdleFormatHdl, Idle *, void) +IMPL_LINK_NOARG(ImpEditEngine, IdleFormatHdl, Idle *, void) { aIdleFormatter.ResetRestarts(); @@ -3882,7 +3882,7 @@ void ImpEditEngine::InvalidateFromParagraph( sal_Int32 nFirstInvPara ) pTmpPortion->ResetHeight(); } -IMPL_LINK_NOARG_TYPED(ImpEditEngine, StatusTimerHdl, Timer *, void) +IMPL_LINK_NOARG(ImpEditEngine, StatusTimerHdl, Timer *, void) { CallStatusHdl(); } diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index c0338efe5fc7..00b0da046717 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -152,14 +152,14 @@ namespace editeng bool ContinueConversion( bool _bRepeatCurrentUnit ); private: - DECL_LINK_TYPED( OnOptionsChanged, LinkParamNone*, void ); - DECL_LINK_TYPED( OnIgnore, Button*, void ); - DECL_LINK_TYPED( OnIgnoreAll, Button*, void ); - DECL_LINK_TYPED( OnChange, Button*, void ); - DECL_LINK_TYPED( OnChangeAll, Button*, void ); - DECL_LINK_TYPED( OnByCharClicked, CheckBox*, void ); - DECL_LINK_TYPED( OnConversionTypeChanged, Button*, void ); - DECL_LINK_TYPED( OnFind, Button*, void ); + DECL_LINK( OnOptionsChanged, LinkParamNone*, void ); + DECL_LINK( OnIgnore, Button*, void ); + DECL_LINK( OnIgnoreAll, Button*, void ); + DECL_LINK( OnChange, Button*, void ); + DECL_LINK( OnChangeAll, Button*, void ); + DECL_LINK( OnByCharClicked, CheckBox*, void ); + DECL_LINK( OnConversionTypeChanged, Button*, void ); + DECL_LINK( OnFind, Button*, void ); /** proceed, after the current convertible has been handled @@ -810,20 +810,20 @@ namespace editeng m_pAntiImpl->HandleNewUnit( m_nCurrentStartIndex - m_nReplacementBaseIndex, m_nCurrentEndIndex - m_nReplacementBaseIndex ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnOptionsChanged, LinkParamNone*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnOptionsChanged, LinkParamNone*, void) { //options and dictionaries might have been changed //-> update our internal settings and the dialog implUpdateData(); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnIgnore, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnore, Button*, void) { // simply ignore, and proceed implProceed( false ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnIgnoreAll, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnoreAll, Button*, void) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnIgnoreAll: no dialog! How this?" ); @@ -841,7 +841,7 @@ namespace editeng } } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnChange, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChange, Button*, void) { // change DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); @@ -851,7 +851,7 @@ namespace editeng implProceed( false ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnChangeAll, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChangeAll, Button*, void) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnChangeAll: no dialog! How this?" ); if ( m_pConversionDialog ) @@ -873,7 +873,7 @@ namespace editeng } } - IMPL_LINK_TYPED( HangulHanjaConversion_Impl, OnByCharClicked, CheckBox*, _pBox, void ) + IMPL_LINK( HangulHanjaConversion_Impl, OnByCharClicked, CheckBox*, _pBox, void ) { m_bByCharacter = _pBox->IsChecked(); @@ -881,14 +881,14 @@ namespace editeng implProceed( true ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnConversionTypeChanged, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged, Button*, void) { DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); if( m_pConversionDialog ) m_eConversionFormat = m_pConversionDialog->GetConversionFormat( ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnFind, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnFind, Button*, void) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnFind: where did this come from?" ); if ( m_pConversionDialog ) diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 1a2861054105..a7f86b652142 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1753,25 +1753,25 @@ SfxItemSet Outliner::GetParaAttribs( sal_Int32 nPara ) return pEditEngine->GetParaAttribs( nPara ); } -IMPL_LINK_TYPED( Outliner, ParaVisibleStateChangedHdl, Paragraph&, rPara, void ) +IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph&, rPara, void ) { sal_Int32 nPara = pParaList->GetAbsPos( &rPara ); pEditEngine->ShowParagraph( nPara, rPara.IsVisible() ); } -IMPL_LINK_NOARG_TYPED(Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo&, void) +IMPL_LINK_NOARG(Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo&, void) { if( !IsInUndo() ) aBeginMovingHdl.Call( this ); } -IMPL_LINK_TYPED( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) +IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) { UndoActionStart( EDITUNDO_DRAGANDDROP ); maBeginPasteOrDropHdl.Call(&rInfos); } -IMPL_LINK_TYPED( Outliner, EndPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) +IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) { bPasting = false; ImpTextPasted( rInfos.nStartPara, rInfos.nEndPara - rInfos.nStartPara + 1 ); @@ -1779,7 +1779,7 @@ IMPL_LINK_TYPED( Outliner, EndPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) UndoActionEnd( EDITUNDO_DRAGANDDROP ); } -IMPL_LINK_TYPED( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo&, rInfos, void ) +IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo&, rInfos, void ) { pParaList->MoveParagraphs( rInfos.nStartPara, rInfos.nDestPara, rInfos.nEndPara - rInfos.nStartPara + 1 ); sal_Int32 nChangesStart = std::min( rInfos.nStartPara, rInfos.nDestPara ); @@ -1985,7 +1985,7 @@ void Outliner::ImplBlockInsertionCallbacks( bool b ) } } -IMPL_LINK_TYPED( Outliner, EditEngineNotifyHdl, EENotify&, rNotify, void ) +IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify&, rNotify, void ) { if ( !nBlockInsCallback ) pEditEngine->aOutlinerNotifyHdl.Call( rNotify ); diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx index 874e76a65840..96dbd3771ee6 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx @@ -29,7 +29,7 @@ void MainThreadExecutor_Impl::execute() Application::PostUserEvent( LINK( this, MainThreadExecutor_Impl, executor ), NULL ); } -IMPL_LINK_NOARG_TYPED( MainThreadExecutor_Impl, executor, void*, void ) +IMPL_LINK_NOARG( MainThreadExecutor_Impl, executor, void*, void ) { if ( m_xJob.is() ) { diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx index 45f650d0dc42..1fc7d2e3cc31 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx @@ -77,7 +77,7 @@ uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::Named } -IMPL_STATIC_LINK_TYPED( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThreadExecutorRequest, void ) +IMPL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThreadExecutorRequest, void ) { pThreadExecutorRequest->doIt(); diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx index 918969ed63a1..9302d0371fa2 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx @@ -59,7 +59,7 @@ public: static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); - DECL_STATIC_LINK_TYPED( MainThreadExecutor, worker, MainThreadExecutorRequest*, void ); + DECL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest*, void ); // XJob virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException); diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 16c1e87f975b..de43b117c49e 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -211,13 +211,13 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( FinalPage, OnNameModified, Edit&, void ) + IMPL_LINK_NOARG( FinalPage, OnNameModified, Edit&, void ) { implCheckName(); } - IMPL_LINK_NOARG_TYPED(FinalPage, OnRegister, Button*, void) + IMPL_LINK_NOARG(FinalPage, OnRegister, Button*, void) { bool bEnable = m_pRegisterName->IsChecked(); m_pNameLabel->Enable(bEnable); @@ -225,7 +225,7 @@ namespace abp implCheckName(); } - IMPL_LINK_NOARG_TYPED(FinalPage, OnEmbed, Button*, void) + IMPL_LINK_NOARG(FinalPage, OnEmbed, Button*, void) { bool bEmbed = m_pEmbed->IsChecked(); m_pLocationLabel->Enable(!bEmbed); diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index 6fa03f4b4bb5..4766006cdf97 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -67,9 +67,9 @@ namespace abp virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnNameModified, Edit&, void ); - DECL_LINK_TYPED(OnRegister, Button*, void); - DECL_LINK_TYPED(OnEmbed, Button*, void); + DECL_LINK( OnNameModified, Edit&, void ); + DECL_LINK(OnRegister, Button*, void); + DECL_LINK(OnEmbed, Button*, void); bool isValidName() const; void implCheckName(); diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 5eee1ca3037d..c24f55da2a58 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -174,7 +174,7 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( OAddressBookSourcePilot, OnCancelClicked, Button*, void ) + IMPL_LINK_NOARG( OAddressBookSourcePilot, OnCancelClicked, Button*, void ) { // do cleanups implCleanup(); diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 41c216425335..545a090cea2f 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -74,7 +74,7 @@ namespace abp virtual bool Close() override; private: - DECL_LINK_TYPED( OnCancelClicked, Button*, void ); + DECL_LINK( OnCancelClicked, Button*, void ); /** creates a new data source of the type indicated by m_aSettings <p>If another data source has been created before, this one is deleted.</p> diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx index f23fb988949f..af975768d3b4 100644 --- a/extensions/source/abpilot/admininvokationpage.cxx +++ b/extensions/source/abpilot/admininvokationpage.cxx @@ -82,7 +82,7 @@ namespace abp } // davido: Do we need it? - IMPL_LINK_NOARG_TYPED( AdminDialogInvokationPage, OnInvokeAdminDialog, Button*, void ) + IMPL_LINK_NOARG( AdminDialogInvokationPage, OnInvokeAdminDialog, Button*, void ) { OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() ); if ( aInvokation.invokeAdministration() ) diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx index ce94f61dc9a8..bb03aba0c1b2 100644 --- a/extensions/source/abpilot/admininvokationpage.hxx +++ b/extensions/source/abpilot/admininvokationpage.hxx @@ -44,7 +44,7 @@ namespace abp virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnInvokeAdminDialog, Button*, void ); + DECL_LINK( OnInvokeAdminDialog, Button*, void ); void implTryConnect(); void implUpdateErrorMessage(); diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index d135a19bb7c8..93ebe3f22710 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -72,7 +72,7 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( FieldMappingPage, OnInvokeDialog, Button*, void ) + IMPL_LINK_NOARG( FieldMappingPage, OnInvokeDialog, Button*, void ) { AddressSettings& rSettings = getSettings(); diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx index 32b23133a826..edb34f14de05 100644 --- a/extensions/source/abpilot/fieldmappingpage.hxx +++ b/extensions/source/abpilot/fieldmappingpage.hxx @@ -45,7 +45,7 @@ namespace abp virtual void ActivatePage() override; private: - DECL_LINK_TYPED( OnInvokeDialog, Button*, void ); + DECL_LINK( OnInvokeDialog, Button*, void ); void implUpdateHint(); }; diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 95286851a87a..8cd92bb9a892 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -80,14 +80,14 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( TableSelectionPage, OnTableDoubleClicked, ListBox&, void ) + IMPL_LINK_NOARG( TableSelectionPage, OnTableDoubleClicked, ListBox&, void ) { if ( 1 == m_pTableList->GetSelectEntryCount() ) getDialog()->travelNext(); } - IMPL_LINK_NOARG_TYPED( TableSelectionPage, OnTableSelected, ListBox&, void ) + IMPL_LINK_NOARG( TableSelectionPage, OnTableSelected, ListBox&, void ) { updateDialogTravelUI(); } diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx index 681d9dc90fc2..595faf69885c 100644 --- a/extensions/source/abpilot/tableselectionpage.hxx +++ b/extensions/source/abpilot/tableselectionpage.hxx @@ -49,8 +49,8 @@ namespace abp virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnTableSelected, ListBox&, void ); - DECL_LINK_TYPED( OnTableDoubleClicked, ListBox&, void ); + DECL_LINK( OnTableSelected, ListBox&, void ); + DECL_LINK( OnTableDoubleClicked, ListBox&, void ); }; diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 3b3551c9dd98..524bdaa6c7dd 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -245,7 +245,7 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( TypeSelectionPage, OnTypeSelected, Button*, void ) + IMPL_LINK_NOARG( TypeSelectionPage, OnTypeSelected, Button*, void ) { getDialog()->typeSelectionChanged( getSelectedType() ); updateDialogTravelUI(); diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index 8bfa4aa13dfb..d757cfcd15ad 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -78,7 +78,7 @@ namespace abp virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnTypeSelected, Button*, void ); + DECL_LINK( OnTypeSelected, Button*, void ); void selectType( AddressSourceType _eType ); }; diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index d0a488dc77b1..a3e7e530ab6d 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -267,7 +267,7 @@ namespace bib pGridWin->GrabFocus(); } - IMPL_LINK_NOARG_TYPED( BibBeamer, RecalcLayout_Impl, void*, void ) + IMPL_LINK_NOARG( BibBeamer, RecalcLayout_Impl, void*, void ) { long nHeight = pToolBar->get_preferred_size().Height(); SetItemSize( ID_TOOLBAR, nHeight ); diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index ea03b209c55a..b69aa41b8fe9 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -51,7 +51,7 @@ namespace bib VclPtr<BibToolBar> pToolBar; VclPtr<BibGridwin> pGridWin; - DECL_LINK_TYPED( RecalcLayout_Impl, void*, void ); + DECL_LINK( RecalcLayout_Impl, void*, void ); protected: diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx index 53f177beb98a..834d400fae46 100644 --- a/extensions/source/bibliography/bibcont.cxx +++ b/extensions/source/bibliography/bibcont.cxx @@ -160,7 +160,7 @@ void BibBookContainer::Split() { aIdle.Start(); } -IMPL_LINK_NOARG_TYPED( BibBookContainer, SplitHdl, Idle*, void) +IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Idle*, void) { long nSize= GetItemSize( TOP_WINDOW); BibConfig* pConfig = BibModul::GetConfig(); diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index 6b6435c1c8b9..f8547538d222 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.hxx @@ -72,7 +72,7 @@ class BibBookContainer: public BibSplitWindow HdlBibModul pBibMod; Idle aIdle; - DECL_LINK_TYPED( SplitHdl, Idle*, void ); + DECL_LINK( SplitHdl, Idle*, void ); protected: diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 74de227ff6de..91e7a3ea80a6 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -175,7 +175,7 @@ namespace bib mpBibView->Resize(); } - IMPL_LINK_NOARG_TYPED( BibView, CallMappingHdl, void*, void) + IMPL_LINK_NOARG( BibView, CallMappingHdl, void*, void) { m_pDatMan->CreateMappingDialog( this ); } diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index 8e68191a9ec1..6b1e9743b5ba 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -63,7 +63,7 @@ namespace bib BibViewFormControlContainer m_aFormControlContainer; private: - DECL_LINK_TYPED(CallMappingHdl, void*, void); + DECL_LINK(CallMappingHdl, void*, void); public: // Window overridables diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 5062274d449a..6508e542e2af 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -236,8 +236,8 @@ class MappingDialog_Impl : public ModalDialog bool bModified; - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED(ListBoxSelectHdl, ListBox&, void); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK(ListBoxSelectHdl, ListBox&, void); public: MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pDatMan); @@ -422,7 +422,7 @@ void MappingDialog_Impl::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED(MappingDialog_Impl, ListBoxSelectHdl, ListBox&, rListBox, void) +IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox&, rListBox, void) { const sal_Int32 nEntryPos = rListBox.GetSelectEntryPos(); if(0 < nEntryPos) @@ -436,7 +436,7 @@ IMPL_LINK_TYPED(MappingDialog_Impl, ListBoxSelectHdl, ListBox&, rListBox, void) SetModified(); } -IMPL_LINK_NOARG_TYPED(MappingDialog_Impl, OkHdl, Button*, void) +IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl, Button*, void) { if(bModified) { @@ -473,7 +473,7 @@ class DBChangeDialog_Impl : public ModalDialog BibDataManager* pDatMan; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); public: DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan ); virtual ~DBChangeDialog_Impl() override; @@ -512,7 +512,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* p } } -IMPL_LINK_NOARG_TYPED(DBChangeDialog_Impl, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(DBChangeDialog_Impl, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index b1bceba699fb..65e1d061fcd2 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -626,7 +626,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } } } -IMPL_LINK_NOARG_TYPED( BibFrameController_Impl, DisposeHdl, void*, void ) +IMPL_LINK_NOARG( BibFrameController_Impl, DisposeHdl, void*, void ) { xFrame->dispose(); }; diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index 2efbbd0d3eed..6810af9e221d 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -70,7 +70,7 @@ friend class BibFrameCtrl_Impl; BibDataManager* pDatMan; HdlBibModul pBibMod; - DECL_LINK_TYPED( DisposeHdl, void*, void ); + DECL_LINK( DisposeHdl, void*, void ); static bool SaveModified(const css::uno::Reference< css::form::runtime::XFormController>& xController); public: diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 3a487e6f4b6b..db6fb3edf1fa 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -468,12 +468,12 @@ bool BibToolBar::PreNotify( NotifyEvent& rNEvt ) return bResult; } -IMPL_LINK_NOARG_TYPED( BibToolBar, SelHdl, ListBox&, void ) +IMPL_LINK_NOARG( BibToolBar, SelHdl, ListBox&, void ) { aIdle.Start(); } -IMPL_LINK_NOARG_TYPED( BibToolBar, SendSelHdl, Idle*, void ) +IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Idle*, void ) { Sequence<PropertyValue> aPropVal(1); PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray()); @@ -483,7 +483,7 @@ IMPL_LINK_NOARG_TYPED( BibToolBar, SendSelHdl, Idle*, void ) SendDispatch(nTBC_LB_SOURCE, aPropVal); } -IMPL_LINK_NOARG_TYPED( BibToolBar, MenuHdl, ToolBox*, void) +IMPL_LINK_NOARG( BibToolBar, MenuHdl, ToolBox*, void) { sal_uInt16 nId=GetCurItemId(); if (nId == nTBC_BT_AUTOFILTER) @@ -536,7 +536,7 @@ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt ) ToolBox::DataChanged( rDCEvt ); } -IMPL_LINK_NOARG_TYPED( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) +IMPL_LINK_NOARG( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) { bool bRebuildToolBar = false; sal_Int16 eSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); @@ -557,7 +557,7 @@ IMPL_LINK_NOARG_TYPED( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) } -IMPL_LINK_NOARG_TYPED( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void ) +IMPL_LINK_NOARG( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void ) { // Check if toolbar button size have changed and we have to use system settings sal_Int16 eSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index e8ae3c5cd54d..e6f4d1abc40b 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -135,11 +135,11 @@ class BibToolBar: public ToolBox sal_uInt16 nTBC_BT_REMOVEFILTER; BibDataManager* pDatMan; - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED( SendSelHdl, Idle*, void ); - DECL_LINK_TYPED( MenuHdl, ToolBox*, void ); - DECL_LINK_TYPED( OptionsChanged_Impl, LinkParamNone*, void ); - DECL_LINK_TYPED( SettingsChanged_Impl, VclSimpleEvent&, void ); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK( SendSelHdl, Idle*, void ); + DECL_LINK( MenuHdl, ToolBox*, void ); + DECL_LINK( OptionsChanged_Impl, LinkParamNone*, void ); + DECL_LINK( SettingsChanged_Impl, VclSimpleEvent&, void ); void ApplyImageList(); void RebuildToolbar(); diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index aec95586715e..84ee2e173d94 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -193,7 +193,7 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED( OTableSelectionPage, OnSearchClicked, Button*, void ) + IMPL_LINK_NOARG( OTableSelectionPage, OnSearchClicked, Button*, void ) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION); @@ -217,14 +217,14 @@ namespace dbp } } - IMPL_LINK_TYPED( OTableSelectionPage, OnListboxDoubleClicked, ListBox&, _rBox, void ) + IMPL_LINK( OTableSelectionPage, OnListboxDoubleClicked, ListBox&, _rBox, void ) { if (_rBox.GetSelectEntryCount()) getDialog()->travelNext(); } - IMPL_LINK_TYPED( OTableSelectionPage, OnListboxSelection, ListBox&, _rBox, void ) + IMPL_LINK( OTableSelectionPage, OnListboxSelection, ListBox&, _rBox, void ) { if (m_pDatasource == &_rBox) { // new data source selected @@ -408,7 +408,7 @@ namespace dbp implEnableWindows(); } - IMPL_LINK_NOARG_TYPED( OMaybeListSelectionPage, OnRadioSelected, Button*, void ) + IMPL_LINK_NOARG( OMaybeListSelectionPage, OnRadioSelected, Button*, void ) { implEnableWindows(); } diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 71c2a5f5e5bc..345113939c5b 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -54,9 +54,9 @@ namespace dbp virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; protected: - DECL_LINK_TYPED( OnListboxSelection, ListBox&, void ); - DECL_LINK_TYPED( OnListboxDoubleClicked, ListBox&, void ); - DECL_LINK_TYPED( OnSearchClicked, Button*, void ); + DECL_LINK( OnListboxSelection, ListBox&, void ); + DECL_LINK( OnListboxDoubleClicked, ListBox&, void ); + DECL_LINK( OnSearchClicked, Button*, void ); void implCollectDatasource(); void implFillTables(const css::uno::Reference< css::sdbc::XConnection >& @@ -79,7 +79,7 @@ namespace dbp virtual void dispose() override; protected: - DECL_LINK_TYPED( OnRadioSelected, Button*, void ); + DECL_LINK( OnRadioSelected, Button*, void ); // TabPage overridables void ActivatePage() override; diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index ae2c63ff9265..3795fa5e0bab 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -391,7 +391,7 @@ namespace dbp } - IMPL_LINK_TYPED(OGridFieldsSelection, OnEntryDoubleClicked, ListBox&, _rList, void) + IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, ListBox&, _rList, void) { PushButton* pSimulateButton = m_pExistFields == &_rList ? m_pSelectOne : m_pDeselectOne; if (pSimulateButton->IsEnabled()) @@ -401,13 +401,13 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED(OGridFieldsSelection, OnEntrySelected, ListBox&, void) + IMPL_LINK_NOARG(OGridFieldsSelection, OnEntrySelected, ListBox&, void) { implCheckButtons(); } - IMPL_LINK_TYPED(OGridFieldsSelection, OnMoveOneEntry, Button*, _pButton, void) + IMPL_LINK(OGridFieldsSelection, OnMoveOneEntry, Button*, _pButton, void) { bool bMoveRight = (m_pSelectOne == _pButton); ListBox& rMoveTo = bMoveRight ? *m_pSelFields : *m_pExistFields; @@ -461,7 +461,7 @@ namespace dbp } - IMPL_LINK_TYPED(OGridFieldsSelection, OnMoveAllEntries, Button*, _pButton, void) + IMPL_LINK(OGridFieldsSelection, OnMoveAllEntries, Button*, _pButton, void) { bool bMoveRight = (m_pSelectAll == _pButton); m_pExistFields->Clear(); diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index b03a754e267a..efb8a8488f07 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -94,10 +94,10 @@ namespace dbp virtual bool canAdvance() const override; protected: - DECL_LINK_TYPED(OnMoveOneEntry, Button*, void); - DECL_LINK_TYPED(OnMoveAllEntries, Button*, void); - DECL_LINK_TYPED(OnEntrySelected, ListBox&, void); - DECL_LINK_TYPED(OnEntryDoubleClicked, ListBox&, void); + DECL_LINK(OnMoveOneEntry, Button*, void); + DECL_LINK(OnMoveAllEntries, Button*, void); + DECL_LINK(OnEntrySelected, ListBox&, void); + DECL_LINK(OnEntryDoubleClicked, ListBox&, void); void implCheckButtons(); }; diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 66237014d9af..ddce66693089 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -259,7 +259,7 @@ namespace dbp } - IMPL_LINK_TYPED( ORadioSelectionPage, OnMoveEntry, Button*, _pButton, void ) + IMPL_LINK( ORadioSelectionPage, OnMoveEntry, Button*, _pButton, void ) { bool bMoveLeft = (m_pMoveLeft == _pButton); if (bMoveLeft) @@ -283,13 +283,13 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED( ORadioSelectionPage, OnEntrySelected, ListBox&, void ) + IMPL_LINK_NOARG( ORadioSelectionPage, OnEntrySelected, ListBox&, void ) { implCheckMoveButtons(); } - IMPL_LINK_NOARG_TYPED( ORadioSelectionPage, OnNameModified, Edit&, void ) + IMPL_LINK_NOARG( ORadioSelectionPage, OnNameModified, Edit&, void ) { implCheckMoveButtons(); } @@ -401,7 +401,7 @@ namespace dbp OGBWPage::dispose(); } - IMPL_LINK_NOARG_TYPED( OOptionValuesPage, OnOptionSelected, ListBox&, void ) + IMPL_LINK_NOARG( OOptionValuesPage, OnOptionSelected, ListBox&, void ) { implTraveledOptions(); } diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index e028357515f0..92ddc89cabaf 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -99,9 +99,9 @@ namespace dbp virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; virtual bool canAdvance() const override; - DECL_LINK_TYPED( OnMoveEntry, Button*, void ); - DECL_LINK_TYPED( OnEntrySelected, ListBox&, void ); - DECL_LINK_TYPED( OnNameModified, Edit&, void ); + DECL_LINK( OnMoveEntry, Button*, void ); + DECL_LINK( OnEntrySelected, ListBox&, void ); + DECL_LINK( OnNameModified, Edit&, void ); void implCheckMoveButtons(); }; @@ -151,7 +151,7 @@ namespace dbp void implTraveledOptions(); - DECL_LINK_TYPED( OnOptionSelected, ListBox&, void ); + DECL_LINK( OnOptionSelected, ListBox&, void ); }; class OOptionDBFieldPage : public ODBFieldPage diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index d7a764b22fb9..10087cf0044a 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -298,13 +298,13 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED( OContentTableSelection, OnTableSelected, ListBox&, void ) + IMPL_LINK_NOARG( OContentTableSelection, OnTableSelected, ListBox&, void ) { updateDialogTravelUI(); } - IMPL_LINK_TYPED( OContentTableSelection, OnTableDoubleClicked, ListBox&, _rListBox, void ) + IMPL_LINK( OContentTableSelection, OnTableDoubleClicked, ListBox&, _rListBox, void ) { if (_rListBox.GetSelectEntryCount()) getDialog()->travelNext(); @@ -399,14 +399,14 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED( OContentFieldSelection, OnTableDoubleClicked, ListBox&, void ) + IMPL_LINK_NOARG( OContentFieldSelection, OnTableDoubleClicked, ListBox&, void ) { if (m_pSelectTableField->GetSelectEntryCount()) getDialog()->travelNext(); } - IMPL_LINK_NOARG_TYPED( OContentFieldSelection, OnFieldSelected, ListBox&, void ) + IMPL_LINK_NOARG( OContentFieldSelection, OnFieldSelected, ListBox&, void ) { updateDialogTravelUI(); m_pDisplayedField->SetText(m_pSelectTableField->GetSelectEntry()); @@ -486,12 +486,12 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED(OLinkFieldsPage, OnSelectionModified, Edit&, void) + IMPL_LINK_NOARG(OLinkFieldsPage, OnSelectionModified, Edit&, void) { implCheckFinish(); } - IMPL_LINK_NOARG_TYPED(OLinkFieldsPage, OnSelectionModifiedCombBox, ComboBox&, void) + IMPL_LINK_NOARG(OLinkFieldsPage, OnSelectionModifiedCombBox, ComboBox&, void) { implCheckFinish(); } diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index a1d0e4237111..6a4d7489b536 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -113,8 +113,8 @@ namespace dbp virtual bool canAdvance() const override; protected: - DECL_LINK_TYPED( OnTableDoubleClicked, ListBox&, void ); - DECL_LINK_TYPED( OnTableSelected, ListBox&, void ); + DECL_LINK( OnTableDoubleClicked, ListBox&, void ); + DECL_LINK( OnTableSelected, ListBox&, void ); }; class OContentFieldSelection : public OLCPage @@ -131,8 +131,8 @@ namespace dbp virtual void dispose() override; protected: - DECL_LINK_TYPED( OnFieldSelected, ListBox&, void ); - DECL_LINK_TYPED( OnTableDoubleClicked, ListBox&, void ); + DECL_LINK( OnFieldSelected, ListBox&, void ); + DECL_LINK( OnTableDoubleClicked, ListBox&, void ); // TabPage overridables virtual void ActivatePage() override; @@ -167,8 +167,8 @@ namespace dbp private: void implCheckFinish(); - DECL_LINK_TYPED(OnSelectionModified, Edit&, void); - DECL_LINK_TYPED(OnSelectionModifiedCombBox, ComboBox&, void); + DECL_LINK(OnSelectionModified, Edit&, void); + DECL_LINK(OnSelectionModifiedCombBox, ComboBox&, void); }; class OComboDBFieldPage : public ODBFieldPage diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index ad5b9b4c7ed3..c223cc6dc305 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -471,14 +471,14 @@ namespace pcr } - IMPL_LINK_TYPED( OBrowserLine, OnButtonClicked, Button*, _pButton, void ) + IMPL_LINK( OBrowserLine, OnButtonClicked, Button*, _pButton, void ) { if ( m_pClickListener ) m_pClickListener->buttonClicked( this, _pButton == m_pBrowseButton ); } - IMPL_LINK_NOARG_TYPED( OBrowserLine, OnButtonFocus, Control&, void ) + IMPL_LINK_NOARG( OBrowserLine, OnButtonFocus, Control&, void ) { if ( m_xControl.is() ) { diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 7b61eca74a6f..5442c193a883 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -113,8 +113,8 @@ namespace pcr void IndentTitle( bool _bIndent ); private: - DECL_LINK_TYPED( OnButtonClicked, Button*, void ); - DECL_LINK_TYPED( OnButtonFocus, Control&, void ); + DECL_LINK( OnButtonClicked, Button*, void ); + DECL_LINK( OnButtonFocus, Control&, void ); void implHideBrowseButton( bool _bPrimary, bool _bReLayout ); void implUpdateEnabledDisabled(); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 86bd00caec55..bd9758a3fcf5 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -839,7 +839,7 @@ namespace pcr } - IMPL_LINK_TYPED(OBrowserListBox, ScrollHdl, ScrollBar*, _pScrollBar, void ) + IMPL_LINK(OBrowserListBox, ScrollHdl, ScrollBar*, _pScrollBar, void ) { DBG_ASSERT(_pScrollBar == m_aVScroll.get(), "OBrowserListBox::ScrollHdl: where does this come from?"); (void)_pScrollBar; diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 325afbe8fe76..9ef2c6fe2c54 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -155,7 +155,7 @@ namespace pcr using Window::SetHelpText; private: - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); /** retrieves the index of a given control in our line list @param _rxControl diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 276c5248c65e..d31417c85cf6 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -40,7 +40,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED(OPropertyBrowserView, OnPageActivation, LinkParamNone*, void) + IMPL_LINK_NOARG(OPropertyBrowserView, OnPageActivation, LinkParamNone*, void) { m_nActivePage = m_pPropBox->GetCurPage(); m_aPageActivationHandler.Call(nullptr); diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 2589a833a6bb..9057f754b48c 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -60,7 +60,7 @@ namespace pcr css::awt::Size getMinimumSize(); protected: - DECL_LINK_TYPED(OnPageActivation, LinkParamNone*, void); + DECL_LINK(OnPageActivation, LinkParamNone*, void); }; diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 4d37c7077500..745880465b52 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -94,17 +94,17 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, EditModifiedHdl, Edit&, void ) + IMPL_LINK_NOARG( CommonBehaviourControlHelper, EditModifiedHdl, Edit&, void ) { setModified(); } - IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, ModifiedHdl, ListBox&, void ) + IMPL_LINK_NOARG( CommonBehaviourControlHelper, ModifiedHdl, ListBox&, void ) { setModified(); } - IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, GetFocusHdl, Control&, void ) + IMPL_LINK_NOARG( CommonBehaviourControlHelper, GetFocusHdl, Control&, void ) { try { @@ -118,7 +118,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, LoseFocusHdl, Control&, void ) + IMPL_LINK_NOARG( CommonBehaviourControlHelper, LoseFocusHdl, Control&, void ) { // TODO/UNOize: should this be outside the default control's implementations? If somebody // has an own control implementation, which does *not* do this - would this be allowed? diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index f8c18336177d..da0fe76d8307 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -89,10 +89,10 @@ namespace pcr virtual vcl::Window* getVclWindow() = 0; /// may be used by derived classes, they forward the event to the PropCtrListener - DECL_LINK_TYPED( ModifiedHdl, ListBox&, void ); - DECL_LINK_TYPED( EditModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( ModifiedHdl, ListBox&, void ); + DECL_LINK( EditModifiedHdl, Edit&, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 0078123cd0e4..e6b40c64e8da 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -3224,7 +3224,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( FormComponentPropertyHandler, OnDesignerClosed, SQLCommandDesigner&, void ) + IMPL_LINK_NOARG( FormComponentPropertyHandler, OnDesignerClosed, SQLCommandDesigner&, void ) { OSL_ENSURE( m_xBrowserUI.is() && m_xCommandDesigner.is(), "FormComponentPropertyHandler::OnDesignerClosed: too many NULLs!" ); if ( m_xBrowserUI.is() && m_xCommandDesigner.is() ) diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 71c83c57dcd0..0041b124068e 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -430,7 +430,7 @@ namespace pcr OUString impl_getDocumentURL_nothrow() const; private: - DECL_LINK_TYPED( OnDesignerClosed, SQLCommandDesigner&, void ); + DECL_LINK( OnDesignerClosed, SQLCommandDesigner&, void ); private: FormComponentPropertyHandler( const FormComponentPropertyHandler& ) = delete; diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 22e9dc321382..500bbc982053 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -92,7 +92,7 @@ namespace pcr void fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames ); private: - DECL_LINK_TYPED( OnFieldNameChanged, Edit&, void ); + DECL_LINK( OnFieldNameChanged, Edit&, void ); }; @@ -147,7 +147,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( FieldLinkRow, OnFieldNameChanged, Edit&, void ) + IMPL_LINK_NOARG( FieldLinkRow, OnFieldNameChanged, Edit&, void ) { m_aLinkChangeHandler.Call( *this ); } @@ -658,19 +658,19 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnSuggest, Button*, void ) + IMPL_LINK_NOARG( FormLinkDialog, OnSuggest, Button*, void ) { initializeFieldRowsFrom( m_aRelationDetailColumns, m_aRelationMasterColumns ); } - IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnFieldChanged, FieldLinkRow&, void ) + IMPL_LINK_NOARG( FormLinkDialog, OnFieldChanged, FieldLinkRow&, void ) { updateOkButton(); } - IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnInitialize, void*, void ) + IMPL_LINK_NOARG( FormLinkDialog, OnInitialize, void*, void ) { initializeColumnLabels(); initializeFieldLists(); diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 215f02e7c9a3..867c16ab9fdb 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -84,9 +84,9 @@ namespace pcr virtual short Execute() override; private: - DECL_LINK_TYPED( OnSuggest, Button*, void ); - DECL_LINK_TYPED( OnFieldChanged, FieldLinkRow&, void ); - DECL_LINK_TYPED( OnInitialize, void*, void); + DECL_LINK( OnSuggest, Button*, void ); + DECL_LINK( OnFieldChanged, FieldLinkRow&, void ); + DECL_LINK( OnInitialize, void*, void); void updateOkButton(); void initializeFieldLists(); diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index f2905002eea7..0fae03df4f7d 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -77,7 +77,7 @@ namespace pcr ModalDialog::dispose(); } - IMPL_LINK_NOARG_TYPED( NewDataTypeDialog, OnNameModified, Edit&, void ) + IMPL_LINK_NOARG( NewDataTypeDialog, OnNameModified, Edit&, void ) { OUString sCurrentName = GetName(); bool bNameIsOK = ( !sCurrentName.isEmpty() ) diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index 94fd4e8b396b..e45a8a4a1e1b 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -49,7 +49,7 @@ namespace pcr OUString GetName() const { return m_pName->GetText(); } private: - DECL_LINK_TYPED( OnNameModified, Edit&, void ); + DECL_LINK( OnNameModified, Edit&, void ); }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index eda77ceda855..23cf9720d5d5 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -637,7 +637,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED(OPropertyBrowserController, OnPageActivation, LinkParamNone*, void) + IMPL_LINK_NOARG(OPropertyBrowserController, OnPageActivation, LinkParamNone*, void) { updateViewDataFromActivePage(); } diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index e7e289a59941..b771e67471f7 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -384,7 +384,7 @@ namespace pcr void impl_startOrStopModelListening_nothrow( bool _bDoListen ) const; private: - DECL_LINK_TYPED(OnPageActivation, LinkParamNone*, void); + DECL_LINK(OnPageActivation, LinkParamNone*, void); private: // constructors diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 128ffa20fabb..76013a7771e1 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -505,13 +505,13 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageActivate, TabControl*, void) + IMPL_LINK_NOARG(OPropertyEditor, OnPageActivate, TabControl*, void) { m_aPageActivationHandler.Call(nullptr); } - IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageDeactivate, TabControl *, bool) + IMPL_LINK_NOARG(OPropertyEditor, OnPageDeactivate, TabControl *, bool) { // commit the data on the current (to-be-deactivated) tab page // (79404) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index e5cba4ecb2f8..03be07a963b7 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -135,8 +135,8 @@ namespace pcr void setHelpLineLimits( OBrowserPage& _rPage, const void* ); protected: - DECL_LINK_TYPED(OnPageDeactivate, TabControl*, bool); - DECL_LINK_TYPED(OnPageActivate, TabControl*, void); + DECL_LINK(OnPageDeactivate, TabControl*, bool); + DECL_LINK(OnPageActivate, TabControl*, void); }; diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 35eac6e12d1a..2310a7d13f2b 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -240,7 +240,7 @@ namespace pcr } - IMPL_LINK_TYPED(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB, void) + IMPL_LINK(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB, void) { DBG_ASSERT(pLB == m_pControlTree, "OSelectLabelDialog::OnEntrySelected : where did this come from ?"); (void)pLB; @@ -256,7 +256,7 @@ namespace pcr } - IMPL_LINK_TYPED(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton, void) + IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton, void) { DBG_ASSERT(pButton == m_pNoAssignment, "OSelectLabelDialog::OnNoAssignmentClicked : where did this come from ?"); (void)pButton; diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 3cdfee4927f8..b16c19bf4509 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -64,8 +64,8 @@ namespace pcr protected: sal_Int32 InsertEntries(const css::uno::Reference< css::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry); - DECL_LINK_TYPED(OnEntrySelected, SvTreeListBox*, void); - DECL_LINK_TYPED(OnNoAssignmentClicked, Button*, void); + DECL_LINK(OnEntrySelected, SvTreeListBox*, void); + DECL_LINK(OnNoAssignmentClicked, Button*, void); }; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index ce0f6ecdc850..ca2412f9dbad 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -459,7 +459,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( OHyperlinkControl, OnHyperlinkClicked, void*, void ) + IMPL_LINK_NOARG( OHyperlinkControl, OnHyperlinkClicked, void*, void ) { ActionEvent aEvent( *this, OUString( "clicked" ) ); m_aActionListeners.forEach< XActionListener >( @@ -941,7 +941,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( OComboboxControl, OnEntrySelected, ComboBox&, void ) + IMPL_LINK_NOARG( OComboboxControl, OnEntrySelected, ComboBox&, void ) { if ( !getTypedControlWindow()->IsTravelSelect() ) // fire a commit @@ -1299,7 +1299,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( DropDownEditControl, ReturnHdl, FloatingWindow*, void) + IMPL_LINK_NOARG( DropDownEditControl, ReturnHdl, FloatingWindow*, void) { OUString aStr = m_pFloatingEdit->getEdit().GetText(); OUString aStr2 = GetText(); @@ -1313,7 +1313,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( DropDownEditControl, DropDownHdl, Button*, void ) + IMPL_LINK_NOARG( DropDownEditControl, DropDownHdl, Button*, void ) { ShowDropDown(!m_bDropdown); } diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 5da40afbb358..ab026d6e2ec4 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -62,7 +62,7 @@ namespace pcr void SetModifyHdl( const Link<ListBox&,void>& _rLink ) { aModifyHdl = _rLink;; } private: - DECL_LINK_TYPED(OnSelect, ListBox&, void); + DECL_LINK(OnSelect, ListBox&, void); Link<ListBox&,void> aModifyHdl; }; @@ -196,7 +196,7 @@ namespace pcr virtual void SAL_CALL disposing() override; protected: - DECL_LINK_TYPED( OnHyperlinkClicked, void*, void ); + DECL_LINK( OnHyperlinkClicked, void*, void ); }; @@ -335,7 +335,7 @@ namespace pcr virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) override; protected: - DECL_LINK_TYPED( OnEntrySelected, ComboBox&, void ); + DECL_LINK( OnEntrySelected, ComboBox&, void ); }; @@ -387,8 +387,8 @@ namespace pcr long FindPos(long nSinglePos); private: - DECL_LINK_TYPED( ReturnHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( DropDownHdl, Button*, void ); + DECL_LINK( ReturnHdl, FloatingWindow*, void ); + DECL_LINK( DropDownHdl, Button*, void ); void ShowDropDown( bool bShow ); }; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 0880464a2616..225c74629556 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -224,19 +224,19 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveUpClickHdl, Button*, void ) + IMPL_LINK_NOARG( TabOrderDialog, MoveUpClickHdl, Button*, void ) { m_pLB_Controls->MoveSelection( -1 ); } - IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveDownClickHdl, Button*, void ) + IMPL_LINK_NOARG( TabOrderDialog, MoveDownClickHdl, Button*, void ) { m_pLB_Controls->MoveSelection( 1 ); } - IMPL_LINK_NOARG_TYPED( TabOrderDialog, AutoOrderClickHdl, Button*, void ) + IMPL_LINK_NOARG( TabOrderDialog, AutoOrderClickHdl, Button*, void ) { try { @@ -258,7 +258,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( TabOrderDialog, OKClickHdl, Button*, void ) + IMPL_LINK_NOARG( TabOrderDialog, OKClickHdl, Button*, void ) { sal_uLong nEntryCount = m_pLB_Controls->GetEntryCount(); Sequence< Reference< XControlModel > > aSortedControlModelSeq( nEntryCount ); diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index cd6963a609c2..4e351568b4eb 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -81,10 +81,10 @@ namespace pcr ImageList* pImageList; - DECL_LINK_TYPED( MoveUpClickHdl, Button*, void ); - DECL_LINK_TYPED( MoveDownClickHdl, Button*, void ); - DECL_LINK_TYPED( AutoOrderClickHdl, Button*, void ); - DECL_LINK_TYPED( OKClickHdl, Button*, void ); + DECL_LINK( MoveUpClickHdl, Button*, void ); + DECL_LINK( MoveDownClickHdl, Button*, void ); + DECL_LINK( AutoOrderClickHdl, Button*, void ); + DECL_LINK( OKClickHdl, Button*, void ); void FillList(); Image GetImage( diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index e18281d78768..7c9e2f277f78 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -330,7 +330,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( OTimeDurationControl, OnCustomConvert, MetricFormatter&, void ) + IMPL_LINK_NOARG( OTimeDurationControl, OnCustomConvert, MetricFormatter&, void ) { long nMultiplier = 1; if ( getTypedControlWindow()->GetCurUnitText().equalsIgnoreAsciiCase( "ms" ) ) diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 973e99e926c7..d45876434c68 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -152,7 +152,7 @@ namespace pcr ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) override; private: - DECL_LINK_TYPED( OnCustomConvert, MetricFormatter&, void ); + DECL_LINK( OnCustomConvert, MetricFormatter&, void ); }; diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index c0687e369104..6a1cb1b5a9ad 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -699,7 +699,7 @@ void GridWindow::ChangeMode(int nType) Invalidate(); } -IMPL_LINK_TYPED( GridDialog, ClickButtonHdl, Button*, pButton, void ) +IMPL_LINK( GridDialog, ClickButtonHdl, Button*, pButton, void ) { if (pButton == m_pResetButton) { diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 146e06b98344..73effc64143b 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -44,7 +44,7 @@ class GridDialog : public ModalDialog VclPtr<GridWindow> m_pGridWindow; - DECL_LINK_TYPED( ClickButtonHdl, Button*, void ); + DECL_LINK( ClickButtonHdl, Button*, void ); public: GridDialog(double* pXValues, double* pYValues, int nValues, diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 1f9bd5d27c65..80cdbdadd379 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -603,7 +603,7 @@ void SaneDlg::InitFields() } } -IMPL_LINK_TYPED( SaneDlg, ClickBtnHdl, Button*, pButton, void ) +IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton, void ) { if( mrSane.IsOpen() ) { @@ -677,7 +677,7 @@ IMPL_LINK_TYPED( SaneDlg, ClickBtnHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( SaneDlg, SelectHdl, ListBox&, rListBox, void ) +IMPL_LINK( SaneDlg, SelectHdl, ListBox&, rListBox, void ) { if( &rListBox == mpDeviceBox && Sane::IsSane() && Sane::CountDevices() ) { @@ -707,7 +707,7 @@ IMPL_LINK_TYPED( SaneDlg, SelectHdl, ListBox&, rListBox, void ) } } -IMPL_LINK_TYPED( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox, void ) +IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox, void ) { if( pBox == mpOptionBox && Sane::IsSane() ) { @@ -775,7 +775,7 @@ IMPL_LINK_TYPED( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox, void ) } } -IMPL_LINK_TYPED( SaneDlg, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SaneDlg, ModifyHdl, Edit&, rEdit, void ) { if( mrSane.IsOpen() ) { @@ -867,7 +867,7 @@ IMPL_LINK_TYPED( SaneDlg, ModifyHdl, Edit&, rEdit, void ) } } -IMPL_LINK_NOARG_TYPED( SaneDlg, ReloadSaneOptionsHdl, Sane&, void ) +IMPL_LINK_NOARG( SaneDlg, ReloadSaneOptionsHdl, Sane&, void ) { mnCurrentOption = -1; mnCurrentElement = 0; diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 7044b5f13e21..555ffb9a33ee 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -80,11 +80,11 @@ private: bool doScan; - DECL_LINK_TYPED( ClickBtnHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ReloadSaneOptionsHdl, Sane&, void ); - DECL_LINK_TYPED( OptionsBoxSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ClickBtnHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( ReloadSaneOptionsHdl, Sane&, void ); + DECL_LINK( OptionsBoxSelectHdl, SvTreeListBox*, void ); void SaveState(); bool LoadState(); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 7075f7632e3d..558c45e0406b 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -105,8 +105,8 @@ class ImpTwain : public ::cppu::WeakImplHelper< util::XCloseListener > uno::Reference< frame::XFrame > ImplGetActiveFrame(); uno::Reference< util::XCloseBroadcaster > ImplGetActiveFrameCloseBroadcaster(); - DECL_LINK_TYPED( ImplFallbackHdl, void*, void ); - DECL_LINK_TYPED( ImplDestroyHdl, void*, void ); + DECL_LINK( ImplFallbackHdl, void*, void ); + DECL_LINK( ImplDestroyHdl, void*, void ); // from util::XCloseListener virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException); @@ -425,7 +425,7 @@ void ImpTwain::ImplFallback( ULONG_PTR nEvent ) Application::PostUserEvent( LINK( this, ImpTwain, ImplFallbackHdl ), (void*) nEvent ); } -IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void ) +IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData, void ) { const sal_uIntPtr nEvent = (sal_uIntPtr) pData; bool bFallback = true; @@ -495,7 +495,7 @@ IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void ) ImplFallback( nEvent ); } -IMPL_LINK_NOARG_TYPED( ImpTwain, ImplDestroyHdl, void*, void ) +IMPL_LINK_NOARG( ImpTwain, ImplDestroyHdl, void*, void ) { if( hTwainWnd ) DestroyWindow( hTwainWnd ); @@ -641,7 +641,7 @@ class Twain ImpTwain* mpImpTwain; TwainState meState; - DECL_LINK_TYPED( ImpNotifyHdl, unsigned long, void ); + DECL_LINK( ImpNotifyHdl, unsigned long, void ); public: @@ -708,7 +708,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X return bRet; } -IMPL_LINK_TYPED( Twain, ImpNotifyHdl, unsigned long, nEvent, void ) +IMPL_LINK( Twain, ImpNotifyHdl, unsigned long, nEvent, void ) { switch( nEvent ) { diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 7fb23d197b44..6973b657781f 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -139,13 +139,13 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper sal_uInt16 mnIconID; private: - DECL_LINK_TYPED(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool); - DECL_LINK_TYPED(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool); - DECL_LINK_TYPED(WaitTimeOutHdl, Idle *, void); - DECL_LINK_TYPED(TimeOutHdl, Timer *, void); - DECL_LINK_TYPED(UserEventHdl, void *, void); - DECL_LINK_TYPED(WindowEventHdl, VclWindowEvent&, void); - DECL_LINK_TYPED(ApplicationEventHdl, VclSimpleEvent&, void); + DECL_LINK(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool); + DECL_LINK(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool); + DECL_LINK(WaitTimeOutHdl, Idle *, void); + DECL_LINK(TimeOutHdl, Timer *, void); + DECL_LINK(UserEventHdl, void *, void); + DECL_LINK(WindowEventHdl, VclWindowEvent&, void); + DECL_LINK(ApplicationEventHdl, VclSimpleEvent&, void); BubbleWindow* GetBubbleWindow(); void RemoveBubbleWindow( bool bRemoveIcon ); @@ -571,7 +571,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool) +IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool) { SolarMutexGuard aGuard; @@ -594,7 +594,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg } -IMPL_LINK_TYPED( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rData, bool ) +IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rData, bool ) { if ( rData.bHighlight ) maWaitIdle.Start(); @@ -605,7 +605,7 @@ IMPL_LINK_TYPED( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg& } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, WaitTimeOutHdl, Idle *, void) +IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl, Idle *, void) { SolarMutexGuard aGuard; @@ -618,13 +618,13 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, WaitTimeOutHdl, Idle *, void) } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, TimeOutHdl, Timer *, void) +IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl, Timer *, void) { RemoveBubbleWindow( false ); } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void) +IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl, void*, void) { SolarMutexGuard aGuard; @@ -655,7 +655,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void) } -IMPL_LINK_TYPED( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) { sal_uLong nEventID = rEvent.GetId(); @@ -705,7 +705,7 @@ IMPL_LINK_TYPED( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) } -IMPL_LINK_TYPED( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) +IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) { diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index 3bca31968594..1d15cc09d1db 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -93,7 +93,7 @@ Sequence< PropertyValue > ImpSWFDialog::GetFilterData() /// This is called whenever the user toggles one of the checkboxes -IMPL_LINK_TYPED( ImpSWFDialog, OnToggleCheckbox, CheckBox&, rBox, void ) +IMPL_LINK( ImpSWFDialog, OnToggleCheckbox, CheckBox&, rBox, void ) { if (&rBox == mpCheckExportAll) { diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index 5d5f152902f0..325f4b1fe4b4 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -50,7 +50,7 @@ private: FilterConfigItem maConfigItem; - DECL_LINK_TYPED( OnToggleCheckbox, CheckBox&, void ); + DECL_LINK( OnToggleCheckbox, CheckBox&, void ); public: ImpSWFDialog( vcl::Window* pParent, diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index eb089d38f4c7..df7de8f45f9a 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -307,7 +307,7 @@ ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const } -IMPL_LINK_NOARG_TYPED(ImpPDFTabDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl, Button*, void) { EndDialog(); } @@ -775,18 +775,18 @@ VclPtr<SfxTabPage> ImpPDFTabGeneralPage::Create( vcl::Window* pParent, } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleAllHdl, RadioButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAllHdl, RadioButton&, void) { EnableExportNotesPages(); } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, TogglePagesHdl, RadioButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl, RadioButton&, void) { TogglePagesHdl(); EnableExportNotesPages(); } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleSelectionHdl, RadioButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleSelectionHdl, RadioButton&, void) { EnableExportNotesPages(); } @@ -807,29 +807,29 @@ void ImpPDFTabGeneralPage::EnableExportNotesPages() } } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, CheckBox&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, CheckBox&, void) { mpFormsFrame->Enable(mpCbExportFormFields->IsChecked()); } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportNotesPagesHdl, CheckBox&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportNotesPagesHdl, CheckBox&, void) { mpCbExportOnlyNotesPages->Enable(mpCbExportNotesPages->IsChecked()); } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleCompressionHdl, RadioButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl, RadioButton&, void) { mpQualityFrame->Enable(mpRbJPEGCompression->IsChecked()); } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl, CheckBox&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl, CheckBox&, void) { mpCoReduceImageResolution->Enable( mpCbReduceImageResolution->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleWatermarkHdl, CheckBox&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleWatermarkHdl, CheckBox&, void) { mpEdWatermark->Enable( mpCbWatermark->IsChecked() ); mpFtWatermark->Enable (mpCbWatermark->IsChecked() ); @@ -838,7 +838,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleWatermarkHdl, CheckBox&, void) } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleAddStreamHdl, CheckBox&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl, CheckBox&, void) { if( mpCbAddStream->IsVisible() ) { @@ -860,7 +860,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleAddStreamHdl, CheckBox&, void) } -IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void) { // set the security page status (and its controls as well) ImpPDFTabSecurityPage* pSecPage = mpaParent ? mpaParent->getSecurityPage() : nullptr; @@ -1077,7 +1077,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent } -IMPL_LINK_NOARG_TYPED(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, RadioButton&, void) +IMPL_LINK_NOARG(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, RadioButton&, void) { ToggleRbPgLyContinueFacingHdl(); } @@ -1089,7 +1089,7 @@ void ImpPDFTabOpnFtrPage::ToggleRbPgLyContinueFacingHdl() } -IMPL_LINK_NOARG_TYPED( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, RadioButton&, void ) +IMPL_LINK_NOARG( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, RadioButton&, void ) { mpNumZoom->Enable( mpRbMagnZoom->IsChecked() ); } @@ -1141,7 +1141,7 @@ void ImpPDFTabViewerPage::dispose() } -IMPL_LINK_NOARG_TYPED( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void ) +IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void ) { m_pNumBookmarkLevels->Enable( m_pRbVisibleBookmarkLevels->IsChecked() ); } @@ -1357,7 +1357,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen } -IMPL_LINK_NOARG_TYPED(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, Button*, void) +IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, Button*, void) { ScopedVclPtrInstance< SfxPasswordDialog > aPwdDialog( this, &msUserPwdTitle ); aPwdDialog->SetMinLen( 0 ); @@ -1598,7 +1598,7 @@ void ImpPDFTabLinksPage::ImplPDFALinkControl( bool bEnableLaunch ) /// Reset the memory of Launch action present when PDF/A-1 was requested -IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, Button*, void) +IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, Button*, void) { mbOpnLnksDefaultUserState = m_pRbOpnLnksDefault->IsChecked(); mbOpnLnksLaunchUserState = m_pRbOpnLnksLaunch->IsChecked(); @@ -1607,7 +1607,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, Button*, voi /// Reset the memory of a launch action present when PDF/A-1 was requested -IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, Button*, void) +IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, Button*, void) { mbOpnLnksDefaultUserState = m_pRbOpnLnksDefault->IsChecked(); mbOpnLnksLaunchUserState = m_pRbOpnLnksLaunch->IsChecked(); @@ -1704,7 +1704,7 @@ void ImplErrorDialog::dispose() } -IMPL_LINK_NOARG_TYPED(ImplErrorDialog, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl, ListBox&, void) { OUString* pStr = static_cast<OUString*>(m_pErrors->GetSelectEntryData()); m_pExplanation->SetText( pStr ? *pStr : OUString() ); @@ -1751,7 +1751,7 @@ void ImpPDFTabSigningPage::dispose() } -IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, void ) +IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, void ) { Reference< security::XDocumentDigitalSignatures > xSigner( @@ -1793,7 +1793,7 @@ IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, v } -IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertClear, Button*, void ) +IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear, Button*, void ) { mpEdSignCert->SetText(""); maSignCertificate.clear(); diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 62c9ea373265..c2ae742744db 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -58,7 +58,7 @@ private: VclPtr<ListBox> m_pErrors; VclPtr<FixedText> m_pExplanation; - DECL_LINK_TYPED(SelectHdl, ListBox&, void); + DECL_LINK(SelectHdl, ListBox&, void); public: explicit ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& ); @@ -81,7 +81,7 @@ private: Any maSelection; - DECL_LINK_TYPED(CancelHdl, Button*, void); + DECL_LINK(CancelHdl, Button*, void); sal_uInt16 mnSigningPageId; sal_uInt16 mnSecurityPageId; @@ -236,21 +236,21 @@ class ImpPDFTabGeneralPage : public SfxTabPage VclPtr<ImpPDFTabDialog> mpaParent; - DECL_LINK_TYPED( ToggleAllHdl, RadioButton&, void ); - DECL_LINK_TYPED( TogglePagesHdl, RadioButton&, void ); - DECL_LINK_TYPED( ToggleSelectionHdl, RadioButton&, void ); - DECL_LINK_TYPED( ToggleCompressionHdl, RadioButton&, void ); - DECL_LINK_TYPED( ToggleReduceImageResolutionHdl, CheckBox&, void ); - DECL_LINK_TYPED( ToggleWatermarkHdl, CheckBox&, void ); - DECL_LINK_TYPED( ToggleAddStreamHdl, CheckBox&, void ); - DECL_LINK_TYPED( ToggleExportFormFieldsHdl, CheckBox&, void ); - DECL_LINK_TYPED( ToggleExportNotesPagesHdl, CheckBox&, void ); + DECL_LINK( ToggleAllHdl, RadioButton&, void ); + DECL_LINK( TogglePagesHdl, RadioButton&, void ); + DECL_LINK( ToggleSelectionHdl, RadioButton&, void ); + DECL_LINK( ToggleCompressionHdl, RadioButton&, void ); + DECL_LINK( ToggleReduceImageResolutionHdl, CheckBox&, void ); + DECL_LINK( ToggleWatermarkHdl, CheckBox&, void ); + DECL_LINK( ToggleAddStreamHdl, CheckBox&, void ); + DECL_LINK( ToggleExportFormFieldsHdl, CheckBox&, void ); + DECL_LINK( ToggleExportNotesPagesHdl, CheckBox&, void ); void TogglePagesHdl(); void EnableExportNotesPages(); public: - DECL_LINK_TYPED( ToggleExportPDFAHdl, CheckBox&, void ); + DECL_LINK( ToggleExportPDFAHdl, CheckBox&, void ); ImpPDFTabGeneralPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabGeneralPage() override; @@ -286,8 +286,8 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage bool mbUseCTLFont; - DECL_LINK_TYPED( ToggleRbPgLyContinueFacingHdl, RadioButton&, void ); - DECL_LINK_TYPED( ToggleRbMagnHdl, RadioButton&, void ); + DECL_LINK( ToggleRbPgLyContinueFacingHdl, RadioButton&, void ); + DECL_LINK( ToggleRbMagnHdl, RadioButton&, void ); void ToggleRbPgLyContinueFacingHdl(); @@ -322,7 +322,7 @@ class ImpPDFTabViewerPage : public SfxTabPage VclPtr<RadioButton> m_pRbVisibleBookmarkLevels; VclPtr<NumericField> m_pNumBookmarkLevels; - DECL_LINK_TYPED( ToggleRbBookmarksHdl, RadioButton&, void ); + DECL_LINK( ToggleRbBookmarksHdl, RadioButton&, void ); public: ImpPDFTabViewerPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -374,7 +374,7 @@ class ImpPDFTabSecurityPage : public SfxTabPage css::uno::Reference< css::beans::XMaterialHolder > mxPreparedPasswords; - DECL_LINK_TYPED( ClickmaPbSetPwdHdl, Button*, void ); + DECL_LINK( ClickmaPbSetPwdHdl, Button*, void ); void enablePermissionControls(); @@ -406,8 +406,8 @@ class ImpPDFTabLinksPage : public SfxTabPage VclPtr<RadioButton> m_pRbOpnLnksBrowser; bool mbOpnLnksBrowserUserState; - DECL_LINK_TYPED( ClickRbOpnLnksDefaultHdl, Button*, void ); - DECL_LINK_TYPED( ClickRbOpnLnksBrowserHdl, Button*, void ); + DECL_LINK( ClickRbOpnLnksDefaultHdl, Button*, void ); + DECL_LINK( ClickRbOpnLnksBrowserHdl, Button*, void ); public: ImpPDFTabLinksPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -435,8 +435,8 @@ class ImpPDFTabSigningPage : public SfxTabPage VclPtr<ListBox> mpLBSignTSA; css::uno::Reference< css::security::XCertificate > maSignCertificate; - DECL_LINK_TYPED( ClickmaPbSignCertSelect, Button*, void ); - DECL_LINK_TYPED( ClickmaPbSignCertClear, Button*, void ); + DECL_LINK( ClickmaPbSignCertSelect, Button*, void ); + DECL_LINK( ClickmaPbSignCertClear, Button*, void ); public: ImpPDFTabSigningPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index cb07999e02e6..478845a3ee1d 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -159,11 +159,11 @@ public: } } - DECL_LINK_TYPED( DestroyedLink, VclWindowEvent&, void ); + DECL_LINK( DestroyedLink, VclWindowEvent&, void ); }; -IMPL_LINK_TYPED( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void ) +IMPL_LINK( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void ) { if( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) m_pFocusWindow = nullptr; diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx index 592ed457421a..62eee7edb76e 100644 --- a/filter/source/svg/impsvgdialog.cxx +++ b/filter/source/svg/impsvgdialog.cxx @@ -119,7 +119,7 @@ Sequence< PropertyValue > ImpSVGDialog::GetFilterData() } -IMPL_LINK_TYPED( ImpSVGDialog, OnToggleCheckbox, CheckBox&, rBox, void ) +IMPL_LINK( ImpSVGDialog, OnToggleCheckbox, CheckBox&, rBox, void ) { if( &rBox == maCBTinyProfile.get() ) { diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index 3bb35e98bee5..4cc661c345c9 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -58,7 +58,7 @@ private: FilterConfigItem maConfigItem; bool mbOldNativeDecoration; - DECL_LINK_TYPED( OnToggleCheckbox, CheckBox&, void ); + DECL_LINK( OnToggleCheckbox, CheckBox&, void ); public: diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 363bc068acd7..cce9f68d88cd 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2136,7 +2136,7 @@ OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf ) } -IMPL_LINK_TYPED( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void ) +IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void ) { bool bFieldProcessed = false; if( pInfo && mbPresentation ) diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 2d4763857dde..8571653785d1 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -279,7 +279,7 @@ private: static Any implSafeGetPagePropSet( const OUString & sPropertyName, const Reference< XPropertySet > & rxPropSet, const Reference< XPropertySetInfo > & rxPropSetInfo ); - DECL_LINK_TYPED( CalcFieldHdl, EditFieldInfo*, void ); + DECL_LINK( CalcFieldHdl, EditFieldInfo*, void ); static bool isStreamGZip(const css::uno::Reference<css::io::XInputStream>& xInput); static bool isStreamSvg(const css::uno::Reference<css::io::XInputStream>& xInput); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 94aa8d56ed10..d8a7aef7d3ca 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -123,7 +123,7 @@ void XMLFilterSettingsDialog::dispose() ModelessDialog::dispose(); } -IMPL_LINK_TYPED(XMLFilterSettingsDialog, ClickHdl_Impl, Button *, pButton, void ) +IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, Button *, pButton, void ) { m_bIsClosable = false; @@ -159,12 +159,12 @@ IMPL_LINK_TYPED(XMLFilterSettingsDialog, ClickHdl_Impl, Button *, pButton, void m_bIsClosable = true; } -IMPL_LINK_NOARG_TYPED(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, SvTreeListBox*, void) { updateStates(); } -IMPL_LINK_NOARG_TYPED(XMLFilterSettingsDialog, DoubleClickHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl, SvTreeListBox*, bool) { onEdit(); return false; @@ -1436,12 +1436,12 @@ void XMLFilterListBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle SvTabListBox::Paint(rRenderContext, rRect); } -IMPL_LINK_NOARG_TYPED( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTreeListBox*, void ) { m_pHeaderBar->SetOffset( -GetXOffset() ); } -IMPL_LINK_TYPED( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if ( pBar && !pBar->GetCurItemId() ) return; diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index ea40b64dd802..f1e2b5833520 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -62,8 +62,8 @@ class XMLFilterListBox : public SvTabListBox private: VclPtr<HeaderBar> m_pHeaderBar; - DECL_LINK_TYPED( TabBoxScrollHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); + DECL_LINK( TabBoxScrollHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar*, void ); static OUString getEntryString( const filter_info_impl* pInfo ); @@ -90,9 +90,9 @@ public: virtual ~XMLFilterSettingsDialog() override; virtual void dispose() override; - DECL_LINK_TYPED(ClickHdl_Impl, Button *, void ); - DECL_LINK_TYPED(SelectionChangedHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED(DoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK(ClickHdl_Impl, Button *, void ); + DECL_LINK(SelectionChangedHdl_Impl, SvTreeListBox*, void ); + DECL_LINK(DoubleClickHdl_Impl, SvTreeListBox*, bool ); virtual short Execute() override; diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index ae4610619bf7..917cb2cf5de1 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -278,14 +278,14 @@ bool XMLFilterTabDialog::onOk() } -IMPL_LINK_NOARG_TYPED(XMLFilterTabDialog, OkHdl, Button*, void) +IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl, Button*, void) { if( onOk() ) EndDialog(1); } -IMPL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) +IMPL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) { const sal_uInt16 nId = pTabCtrl->GetCurPageId(); TabPage* pTabPage = pTabCtrl->GetTabPage( nId ); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 7d164f0c1799..4602af7907b9 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -45,8 +45,8 @@ public: private: css::uno::Reference< css::uno::XComponentContext > mxContext; - DECL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl*, void ); - DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl*, void ); + DECL_LINK(OkHdl, Button*, void); ResMgr& mrResMgr; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index 2fbf0e83a3bc..e7f3f989885a 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -151,7 +151,7 @@ OUString XMLFilterTabPageXSLT::GetURL( SvtURLBox* rURLBox ) return aURL; } -IMPL_LINK_TYPED ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, Button *, pButton, void ) +IMPL_LINK ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, Button *, pButton, void ) { SvtURLBox* pURLBox; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 880e5d530c4e..9d88183cdf96 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -40,7 +40,7 @@ public: void FillInfo( filter_info_impl* pInfo ); void SetInfo(const filter_info_impl* pInfo); - DECL_LINK_TYPED( ClickBrowseHdl_Impl, Button *, void ); + DECL_LINK( ClickBrowseHdl_Impl, Button *, void ); VclPtr<Edit> m_pEDDocType; diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 618ea5e89e80..5c81b608edc9 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -655,7 +655,7 @@ void XMLFilterTestDialog::import( const OUString& rURL ) } } -IMPL_LINK_TYPED(XMLFilterTestDialog, ClickHdl_Impl, Button *, pButton, void ) +IMPL_LINK(XMLFilterTestDialog, ClickHdl_Impl, Button *, pButton, void ) { if (m_pPBExportBrowse == pButton) { diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 7825dd24fe5a..64144fa60d84 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -44,7 +44,7 @@ public: void updateCurrentDocumentButtonState( css::uno::Reference< css::lang::XComponent > * pRef = nullptr ); private: - DECL_LINK_TYPED(ClickHdl_Impl, Button *, void ); + DECL_LINK(ClickHdl_Impl, Button *, void ); void onExportBrowse(); void onExportCurrentDocument(); diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 603bf3aaf740..45f22e9c0244 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -424,7 +424,7 @@ void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( css: } -IMPL_LINK_NOARG_TYPED(OButtonControl, OnClick, void*, void) +IMPL_LINK_NOARG(OButtonControl, OnClick, void*, void) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); m_nClickEvent = nullptr; diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index c3d088f17939..bea42b75c2f7 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -181,7 +181,7 @@ protected: virtual void actionPerformed_Impl( bool bNotifyListener, const css::awt::MouseEvent& _rEvt ) override; private: - DECL_LINK_TYPED( OnClick, void*, void ); + DECL_LINK( OnClick, void*, void ); /// to be called whenever the feature URL represented by our model has potentially changed void modelFeatureUrlPotentiallyChanged( ); diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 6954b5fe1954..bd078be729c1 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2619,7 +2619,7 @@ void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( Runt } -IMPL_LINK_NOARG_TYPED(ODatabaseForm, OnTimeout, Timer *, void) +IMPL_LINK_NOARG(ODatabaseForm, OnTimeout, Timer *, void) { reload_impl(true); } diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index e76fc51352a5..85cfe2147b63 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -529,7 +529,7 @@ private: void impl_construct(); - DECL_LINK_TYPED( OnTimeout, Timer*, void ); + DECL_LINK( OnTimeout, Timer*, void ); protected: using OPropertySetHelper::getPropertyValues; }; diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 42e9f38ae2f1..e3dffb1ff966 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -247,7 +247,7 @@ void OEditControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css::uno } -IMPL_LINK_NOARG_TYPED(OEditControl, OnKeyPressed, void*, void) +IMPL_LINK_NOARG(OEditControl, OnKeyPressed, void*, void) { m_nKeyEvent = nullptr; diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 6fca35367a47..a8286005e25c 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -168,7 +168,7 @@ public: virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rxToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rxParent ) throw ( css::uno::RuntimeException, std::exception ) override; private: - DECL_LINK_TYPED( OnKeyPressed, void*, void ); + DECL_LINK( OnKeyPressed, void*, void ); }; } diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 2686b7b32784..174964f35d56 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -234,7 +234,7 @@ void OFormattedControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css { } -IMPL_LINK_NOARG_TYPED(OFormattedControl, OnKeyPressed, void*, void) +IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed, void*, void) { m_nKeyEvent = nullptr; Reference<XFormComponent> xFComp(getModel(), UNO_QUERY); diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 75399df9be49..beb5e702bbfa 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -178,7 +178,7 @@ class OFormattedModel using OBoundControl::disposing; private: - DECL_LINK_TYPED( OnKeyPressed, void*, void ); + DECL_LINK( OnKeyPressed, void*, void ); }; } #endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 7b6c7158f921..b5022a8548c9 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -657,7 +657,7 @@ void SAL_CALL OImageControlModel::startProduction( ) throw (RuntimeException, s } -IMPL_LINK_TYPED( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic, void ) +IMPL_LINK( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic, void ) { const Reference< XGraphic > xGraphic( i_pGraphic != nullptr ? Image( i_pGraphic->GetBitmapEx() ).GetXGraphic() : nullptr ); m_bExternalGraphic = false; diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 60a9a3310bc9..e7bc6bbfd987 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -136,7 +136,7 @@ protected: */ bool impl_updateStreamForURL_lck( const OUString& _rURL, ValueChangeInstigator _eInstigator ); - DECL_LINK_TYPED( OnImageImportDone, ::Graphic*, void ); + DECL_LINK( OnImageImportDone, ::Graphic*, void ); }; typedef ::cppu::ImplHelper2 < css::awt::XMouseListener diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 9d54a9b501c7..21fcc0d9f367 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -1976,7 +1976,7 @@ namespace frm } - IMPL_LINK_NOARG_TYPED(OListBoxControl, OnTimeout, Idle*, void) + IMPL_LINK_NOARG(OListBoxControl, OnTimeout, Idle*, void) { m_aChangeListeners.notifyEach( &XChangeListener::changed, EventObject( *this ) ); } diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index 2da96b921108..0df57d608356 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -329,7 +329,7 @@ protected: virtual void processEvent( const ::comphelper::AnyEvent& _rEvent ) override; private: - DECL_LINK_TYPED( OnTimeout, Idle*, void ); + DECL_LINK( OnTimeout, Idle*, void ); }; diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index f384978aaebe..b736520e79e3 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -819,7 +819,7 @@ namespace frm } - IMPL_LINK_NOARG_TYPED( OClickableImageBaseModel, DownloadDoneLink, void*, void ) + IMPL_LINK_NOARG( OClickableImageBaseModel, DownloadDoneLink, void*, void ) { ::osl::MutexGuard aGuard( m_aMutex ); DownloadDone(); @@ -848,7 +848,7 @@ namespace frm } } - IMPL_LINK_TYPED( OClickableImageBaseModel, OnImageImportDone, Graphic*, i_pGraphic, void ) + IMPL_LINK( OClickableImageBaseModel, OnImageImportDone, Graphic*, i_pGraphic, void ) { const Reference< XGraphic > xGraphic( i_pGraphic != nullptr ? Graphic(i_pGraphic->GetBitmapEx()).GetXGraphic() : nullptr ); if ( !xGraphic.is() ) diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 4a9b6880f6ff..ba0d752a8a57 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -77,7 +77,7 @@ namespace frm css::uno::Reference< css::form::submission::XSubmission > m_xSubmissionDelegate; - DECL_LINK_TYPED( DownloadDoneLink, void*, void ); + DECL_LINK( DownloadDoneLink, void*, void ); inline ImageProducer* GetImageProducer() { return m_pProducer; } @@ -153,7 +153,7 @@ namespace frm // to be called from within the cloning-ctor of your derived class void implInitializeImageURL( ); - DECL_LINK_TYPED( OnImageImportDone, ::Graphic*, void ); + DECL_LINK( OnImageImportDone, ::Graphic*, void ); }; class ImageModelMethodGuard : public ::osl::MutexGuard diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 53f58dc78b29..e8fe2321369b 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -151,7 +151,7 @@ namespace frm } - IMPL_LINK_TYPED( OPasteClipboardDispatcher, OnClipboardChanged, TransferableDataHelper*, _pDataHelper, void ) + IMPL_LINK( OPasteClipboardDispatcher, OnClipboardChanged, TransferableDataHelper*, _pDataHelper, void ) { OSL_ENSURE( _pDataHelper, "OPasteClipboardDispatcher::OnClipboardChanged: ooops!" ); m_bPastePossible = _pDataHelper->HasFormat( SotClipboardFormatId::STRING ) diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index b3ecf9006d5b..64ef645dc28f 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -82,7 +82,7 @@ namespace frm virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) override; private: - DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( OnClipboardChanged, TransferableDataHelper*, void ); }; diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 0e94313da277..21fce972d948 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -128,7 +128,7 @@ namespace frm } - IMPL_LINK_TYPED( RichTextEngine, EditEngineStatusChanged, EditStatus&, _rStatus, void ) + IMPL_LINK( RichTextEngine, EditEngineStatusChanged, EditStatus&, _rStatus, void ) { for ( ::std::vector< IEngineStatusListener* >::const_iterator aLoop = m_aStatusListeners.begin(); aLoop != m_aStatusListeners.end(); diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx index 63b08a3765e5..fe63d014d81c 100644 --- a/forms/source/richtext/richtextengine.hxx +++ b/forms/source/richtext/richtextengine.hxx @@ -67,7 +67,7 @@ namespace frm RichTextEngine& operator=( const RichTextEngine& ) = delete; private: - DECL_LINK_TYPED( EditEngineStatusChanged, EditStatus&, void ); + DECL_LINK( EditEngineStatusChanged, EditStatus&, void ); }; diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 708b13c935ed..ca1bda40792f 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -311,19 +311,19 @@ namespace frm } - IMPL_LINK_NOARG_TYPED( RichTextControlImpl, OnInvalidateAllAttributes, LinkParamNone*, void ) + IMPL_LINK_NOARG( RichTextControlImpl, OnInvalidateAllAttributes, LinkParamNone*, void ) { updateAllAttributes(); } - IMPL_LINK_TYPED( RichTextControlImpl, OnHScroll, ScrollBar*, _pScrollbar, void ) + IMPL_LINK( RichTextControlImpl, OnHScroll, ScrollBar*, _pScrollbar, void ) { m_pView->Scroll( -_pScrollbar->GetDelta(), 0, ScrollRangeCheck::PaperWidthTextSize ); } - IMPL_LINK_TYPED( RichTextControlImpl, OnVScroll, ScrollBar*, _pScrollbar, void ) + IMPL_LINK( RichTextControlImpl, OnVScroll, ScrollBar*, _pScrollbar, void ) { m_pView->Scroll( 0, -_pScrollbar->GetDelta(), ScrollRangeCheck::PaperWidthTextSize ); } diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index 2afbe9710bba..4f3a94764842 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -173,9 +173,9 @@ namespace frm virtual void EditEngineStatusChanged( const EditStatus& _rStatus ) override; private: - DECL_LINK_TYPED( OnInvalidateAllAttributes, LinkParamNone*, void ); - DECL_LINK_TYPED( OnHScroll, ScrollBar*, void ); - DECL_LINK_TYPED( OnVScroll, ScrollBar*, void ); + DECL_LINK( OnInvalidateAllAttributes, LinkParamNone*, void ); + DECL_LINK( OnHScroll, ScrollBar*, void ); + DECL_LINK( OnVScroll, ScrollBar*, void ); }; diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 205c86edf96e..9f63b605ce54 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -537,7 +537,7 @@ namespace frm } - IMPL_LINK_NOARG_TYPED( ORichTextModel, OnEngineContentModified, LinkParamNone*, void ) + IMPL_LINK_NOARG( ORichTextModel, OnEngineContentModified, LinkParamNone*, void ) { if ( !m_bSettingEngineText ) { diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index efea6024df6f..f3c1085ce698 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -168,7 +168,7 @@ namespace frm */ void impl_smlock_setEngineText( const OUString& _rText ); - DECL_LINK_TYPED( OnEngineContentModified, LinkParamNone*, void ); + DECL_LINK( OnEngineContentModified, LinkParamNone*, void ); static css::uno::Sequence< sal_Int8 > getEditEngineTunnelId(); diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index b1a6ed81d8a5..4fc48cc69f8d 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -34,7 +34,7 @@ private: Selection aOldSel; bool bMouseFlag; - DECL_LINK_TYPED(ChangedHdl, void *, void); + DECL_LINK(ChangedHdl, void *, void); protected: @@ -96,10 +96,10 @@ private: VclPtr<ArgEdit> pEdArg; VclPtr<RefButton> pRefBtn; - DECL_LINK_TYPED( FxBtnClickHdl, Button*, void ); - DECL_LINK_TYPED( FxBtnFocusHdl, Control&, void ); - DECL_LINK_TYPED( EdFocusHdl, Control&, void ); - DECL_LINK_TYPED( EdModifyHdl, Edit&, void ); + DECL_LINK( FxBtnClickHdl, Button*, void ); + DECL_LINK( FxBtnFocusHdl, Control&, void ); + DECL_LINK( EdFocusHdl, Control&, void ); + DECL_LINK( EdModifyHdl, Edit&, void ); protected: diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index b24759eb0324..b758523ae951 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -124,16 +124,16 @@ public: const FormulaHelper& GetFormulaHelper() const { return m_aFormulaHelper;} uno::Reference< sheet::XFormulaOpCodeMapper > const & GetFormulaOpCodeMapper() const; - DECL_LINK_TYPED( ModifyHdl, ParaWin&, void ); - DECL_LINK_TYPED( FxHdl, ParaWin&, void ); - - DECL_LINK_TYPED( MatrixHdl, Button*, void ); - DECL_LINK_TYPED( FormulaHdl, Edit&, void); - DECL_LINK_TYPED( FormulaCursorHdl, EditBox&, void ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( DblClkHdl, FuncPage&, void ); - DECL_LINK_TYPED( FuncSelHdl, FuncPage&, void ); - DECL_LINK_TYPED( StructSelHdl, StructPage&, void ); + DECL_LINK( ModifyHdl, ParaWin&, void ); + DECL_LINK( FxHdl, ParaWin&, void ); + + DECL_LINK( MatrixHdl, Button*, void ); + DECL_LINK( FormulaHdl, Edit&, void); + DECL_LINK( FormulaCursorHdl, EditBox&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( DblClkHdl, FuncPage&, void ); + DECL_LINK( FuncSelHdl, FuncPage&, void ); + DECL_LINK( StructSelHdl, StructPage&, void ); public: mutable uno::Reference< sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; uno::Sequence< sheet::FormulaToken > m_aTokenList; @@ -1009,7 +1009,7 @@ void FormulaDlg_Impl::DoEnter(bool bOk) } -IMPL_LINK_TYPED( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) { if ( pBtn == m_pBtnCancel ) { @@ -1056,7 +1056,7 @@ IMPL_LINK_TYPED( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) // Handler for Listboxes -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, DblClkHdl, FuncPage&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl, FuncPage&, void) { sal_Int32 nFunc = pFuncPage->GetFunction(); @@ -1240,7 +1240,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd ) } } -IMPL_LINK_TYPED( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void ) +IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void ) { if(&rPtr==pParaWin) { @@ -1274,7 +1274,7 @@ IMPL_LINK_TYPED( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void ) } } -IMPL_LINK_TYPED( FormulaDlg_Impl, ModifyHdl, ParaWin&, rPtr, void ) +IMPL_LINK( FormulaDlg_Impl, ModifyHdl, ParaWin&, rPtr, void ) { if(&rPtr==pParaWin) { @@ -1286,7 +1286,7 @@ IMPL_LINK_TYPED( FormulaDlg_Impl, ModifyHdl, ParaWin&, rPtr, void ) } } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FormulaHdl, Edit&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl, Edit&, void) { FormEditData* pData = m_pHelper->getFormEditData(); @@ -1350,7 +1350,7 @@ IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FormulaHdl, Edit&, void) bEditFlag=false; } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FormulaCursorHdl, EditBox&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaCursorHdl, EditBox&, void) { FormEditData* pData = m_pHelper->getFormEditData(); if (!pData) return; @@ -1587,20 +1587,20 @@ bool FormulaDlg_Impl::CheckMatrix(OUString& aFormula) m_pTabCtrl->SetCurPageId(TP_STRUCT); return bMatrix; } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, StructSelHdl, StructPage&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, StructSelHdl, StructPage&, void) { bStructUpdate=false; if(pStructPage->IsVisible()) m_pBtnForward->Enable(false); //@New bStructUpdate=true; } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, MatrixHdl, Button*, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, MatrixHdl, Button*, void) { bUserMatrixFlag=true; UpdateValues(true); } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FuncSelHdl, FuncPage&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, FuncSelHdl, FuncPage&, void) { if ( (pFuncPage->GetFunctionEntryCount() > 0) && (pFuncPage->GetFunction() != LISTBOX_ENTRY_NOTFOUND) ) @@ -1878,7 +1878,7 @@ void FormulaDlg::SetEdSelection() m_pImpl->SetEdSelection(); } -IMPL_LINK_NOARG_TYPED(FormulaDlg, UpdateFocusHdl, Idle *, void) +IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl, Idle *, void) { FormEditData* pData = m_pImpl->m_pHelper->getFormEditData(); if (!pData) diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index aa4502a81ab5..42dd5adc1656 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -160,7 +160,7 @@ void FuncPage::UpdateFunctionList() if(IsVisible()) SelHdl(*m_pLbFunction); } -IMPL_LINK_TYPED( FuncPage, SelHdl, ListBox&, rLb, void ) +IMPL_LINK( FuncPage, SelHdl, ListBox&, rLb, void ) { if(&rLb==m_pLbFunction) { @@ -180,7 +180,7 @@ IMPL_LINK_TYPED( FuncPage, SelHdl, ListBox&, rLb, void ) } } -IMPL_LINK_NOARG_TYPED(FuncPage, DblClkHdl, ListBox&, void) +IMPL_LINK_NOARG(FuncPage, DblClkHdl, ListBox&, void) { aDoubleClickLink.Call(*this); } diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index f7ef009c3b0f..b47c641de5f3 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -71,8 +71,8 @@ private: void impl_addFunctions(const IFunctionCategory* _pCategory); - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED(DblClkHdl, ListBox&, void); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK(DblClkHdl, ListBox&, void); protected: diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index d67bb00633a1..f1f014cebb0c 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -280,25 +280,25 @@ void ArgInput::EdModify() aEdModifyLink.Call(*this); } -IMPL_LINK_TYPED( ArgInput, FxBtnClickHdl, Button*, pBtn, void ) +IMPL_LINK( ArgInput, FxBtnClickHdl, Button*, pBtn, void ) { if(pBtn == pBtnFx) FxClick(); } -IMPL_LINK_TYPED( ArgInput, FxBtnFocusHdl, Control&, rControl, void ) +IMPL_LINK( ArgInput, FxBtnFocusHdl, Control&, rControl, void ) { if(&rControl == pBtnFx) FxFocus(); } -IMPL_LINK_TYPED( ArgInput, EdFocusHdl, Control&, rControl, void ) +IMPL_LINK( ArgInput, EdFocusHdl, Control&, rControl, void ) { if(&rControl == pEdArg) EdFocus(); } -IMPL_LINK_TYPED( ArgInput, EdModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( ArgInput, EdModifyHdl, Edit&, rEdit, void ) { if(&rEdit == pEdArg) EdModify(); @@ -403,7 +403,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt ) //When an Event cleared wurde, this routine is //first called. -IMPL_LINK_NOARG_TYPED(EditBox, ChangedHdl, void*, void) +IMPL_LINK_NOARG(EditBox, ChangedHdl, void*, void) { if(pMEdit!=nullptr) { @@ -553,7 +553,7 @@ void RefEdit::LoseFocus() pAnyRefDlg->HideReference(); } -IMPL_LINK_NOARG_TYPED(RefEdit, UpdateHdl, Idle *, void) +IMPL_LINK_NOARG(RefEdit, UpdateHdl, Idle *, void) { if( pAnyRefDlg ) pAnyRefDlg->ShowReference( GetText() ); diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index a7d5c66e3929..51a87c187985 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -548,7 +548,7 @@ void ParaWin::FxClick() } -IMPL_LINK_TYPED( ParaWin, GetFxHdl, ArgInput&, rPtr, void ) +IMPL_LINK( ParaWin, GetFxHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); nEdFocus=NOT_FOUND; @@ -569,7 +569,7 @@ IMPL_LINK_TYPED( ParaWin, GetFxHdl, ArgInput&, rPtr, void ) } } -IMPL_LINK_TYPED( ParaWin, GetFxFocusHdl, ArgInput&, rPtr, void ) +IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); nEdFocus=NOT_FOUND; @@ -591,7 +591,7 @@ IMPL_LINK_TYPED( ParaWin, GetFxFocusHdl, ArgInput&, rPtr, void ) } -IMPL_LINK_TYPED( ParaWin, GetEdFocusHdl, ArgInput&, rPtr, void ) +IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); nEdFocus=NOT_FOUND; @@ -615,12 +615,12 @@ IMPL_LINK_TYPED( ParaWin, GetEdFocusHdl, ArgInput&, rPtr, void ) } -IMPL_LINK_NOARG_TYPED(ParaWin, ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ParaWin, ScrollHdl, ScrollBar*, void) { SliderMoved(); } -IMPL_LINK_TYPED( ParaWin, ModifyHdl, ArgInput&, rPtr, void ) +IMPL_LINK( ParaWin, ModifyHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); nEdFocus=NOT_FOUND; diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index b50192017591..e6d4a65638ab 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -92,11 +92,11 @@ private: ::std::vector<OUString> aParaArray; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED( ModifyHdl, ArgInput&, void ); - DECL_LINK_TYPED( GetEdFocusHdl, ArgInput&, void ); - DECL_LINK_TYPED( GetFxFocusHdl, ArgInput&, void ); - DECL_LINK_TYPED( GetFxHdl, ArgInput&, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void); + DECL_LINK( ModifyHdl, ArgInput&, void ); + DECL_LINK( GetEdFocusHdl, ArgInput&, void ); + DECL_LINK( GetFxFocusHdl, ArgInput&, void ); + DECL_LINK( GetFxHdl, ArgInput&, void ); protected: diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 0be4acef4a66..7b5c4bcd7ca0 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -170,7 +170,7 @@ IFormulaToken* StructPage::GetFunctionEntry(SvTreeListEntry* pEntry) return nullptr; } -IMPL_LINK_TYPED( StructPage, SelectHdl, SvTreeListBox*, pTlb, void ) +IMPL_LINK( StructPage, SelectHdl, SvTreeListBox*, pTlb, void ) { if(m_pTlbStruct->GetActiveFlag()) { diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 5dab3c593808..873655c21ba9 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -75,7 +75,7 @@ private: IFormulaToken* pSelectedToken; - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); using Window::GetParent; diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 269e666453b1..daa905069be2 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -221,7 +221,7 @@ void SvtFilePicker::prepareExecute() } -IMPL_LINK_TYPED( SvtFilePicker, DialogClosedHdl, Dialog&, rDlg, void ) +IMPL_LINK( SvtFilePicker, DialogClosedHdl, Dialog&, rDlg, void ) { if ( m_xDlgClosedListener.is() ) { diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 1c9f19da76f0..8f940d272f97 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -222,7 +222,7 @@ protected: void prepareExecute( ); - DECL_LINK_TYPED( DialogClosedHdl, Dialog&, void ); + DECL_LINK( DialogClosedHdl, Dialog&, void ); }; // SvtRemoteFilePicker diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index b22db30e8981..ad09f8dcf89c 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -96,7 +96,7 @@ void SvtFolderPicker::prepareExecute() } } -IMPL_LINK_TYPED( SvtFolderPicker, DialogClosedHdl, Dialog&, rDlg, void ) +IMPL_LINK( SvtFolderPicker, DialogClosedHdl, Dialog&, rDlg, void ) { if ( m_xListener.is() ) { diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index 31e7dbd27089..3b2c175401f5 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -46,7 +46,7 @@ private: m_xListener; void prepareExecute( ); - DECL_LINK_TYPED( DialogClosedHdl, Dialog&, void ); + DECL_LINK( DialogClosedHdl, Dialog&, void ); public: SvtFolderPicker(); diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 64fe061eb76c..c146c5756c06 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -192,7 +192,7 @@ Image PlacesListBox::getEntryIcon( const PlacePtr& pPlace ) return theImage; } -IMPL_LINK_NOARG_TYPED( PlacesListBox, Selection, SvTreeListBox*, void ) +IMPL_LINK_NOARG( PlacesListBox, Selection, SvTreeListBox*, void ) { sal_uInt32 nSelected = mpImpl->GetCurrRow(); PlacePtr pPlace = maPlaces[nSelected]; @@ -204,7 +204,7 @@ IMPL_LINK_NOARG_TYPED( PlacesListBox, Selection, SvTreeListBox*, void ) mpDlg->RemovablePlaceSelected(false); } -IMPL_LINK_NOARG_TYPED( PlacesListBox, DoubleClick, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( PlacesListBox, DoubleClick, SvTreeListBox*, bool ) { sal_uInt16 nSelected = mpImpl->GetCurrRow(); PlacePtr pPlace = maPlaces[nSelected]; diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index 5ea96efa3ce2..d4c10de5601e 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -76,8 +76,8 @@ class PlacesListBox : public Control Image getEntryIcon( const PlacePtr& pPlace ); - DECL_LINK_TYPED( Selection, SvTreeListBox*, void ); - DECL_LINK_TYPED( DoubleClick, SvTreeListBox*, bool ); + DECL_LINK( Selection, SvTreeListBox*, void ); + DECL_LINK( DoubleClick, SvTreeListBox*, bool ); }; #endif diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx index 31cbc6485c56..d3555e3fa9b3 100644 --- a/fpicker/source/office/QueryFolderName.hxx +++ b/fpicker/source/office/QueryFolderName.hxx @@ -32,8 +32,8 @@ private: VclPtr<VclFrame> m_pNameLine; VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( NameHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( NameHdl, Edit&, void ); public: QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle, diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index cc74021ade8f..49b576dcfa31 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -733,17 +733,17 @@ void RemoteFilesDialog::SavePassword( const OUString& rURL, const OUString& rUse {} } -IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, IconViewHdl, Button*, void ) +IMPL_LINK_NOARG ( RemoteFilesDialog, IconViewHdl, Button*, void ) { m_pFileView->SetViewMode( eIcon ); } -IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, ListViewHdl, Button*, void ) +IMPL_LINK_NOARG ( RemoteFilesDialog, ListViewHdl, Button*, void ) { m_pFileView->SetViewMode( eDetailedList ); } -IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, AddServiceHdl, Button*, void ) +IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl, Button*, void ) { ScopedVclPtrInstance< PlaceEditDialog > aDlg( this ); aDlg->ShowPasswordControl(); @@ -786,7 +786,7 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, AddServiceHdl, Button*, void ) }; } -IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectServiceHdl, ListBox&, void ) +IMPL_LINK_NOARG( RemoteFilesDialog, SelectServiceHdl, ListBox&, void ) { int nPos = GetSelectedServicePos(); @@ -800,7 +800,7 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectServiceHdl, ListBox&, void ) } } -IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void ) +IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void ) { OString sIdent( pButton->GetCurItemIdent() ); if( sIdent == "edit_service" && m_pServices_lb->GetEntryCount() > 0 ) @@ -940,7 +940,7 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, EnableControls(); } -IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, DoubleClickHdl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( RemoteFilesDialog, DoubleClickHdl, SvTreeListBox*, bool ) { if( m_pFileView->GetSelectionCount() ) { @@ -967,7 +967,7 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, DoubleClickHdl, SvTreeListBox*, bool ) return true; } -IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( RemoteFilesDialog, SelectHdl, SvTreeListBox*, void ) { SvTreeListEntry* pEntry = m_pFileView->FirstSelected(); @@ -1004,19 +1004,19 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectHdl, SvTreeListBox*, void ) } } -IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, FileNameGetFocusHdl, Control&, void ) +IMPL_LINK_NOARG( RemoteFilesDialog, FileNameGetFocusHdl, Control&, void ) { m_pFileView->SetNoSelection(); } -IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, FileNameModifyHdl, Edit&, void ) +IMPL_LINK_NOARG( RemoteFilesDialog, FileNameModifyHdl, Edit&, void ) { m_pFileView->SetNoSelection(); if( !m_pOk_btn->IsEnabled() ) EnableControls(); } -IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( RemoteFilesDialog, SplitHdl, Splitter*, void ) { sal_Int32 nSplitPos = m_pSplitter->GetSplitPosPixel(); @@ -1038,7 +1038,7 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SplitHdl, Splitter*, void ) m_pSplitter->SetPosPixel( Point( placeSize.Width(), m_pSplitter->GetPosPixel().Y() ) ); } -IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectFilterHdl, ListBox&, void ) +IMPL_LINK_NOARG( RemoteFilesDialog, SelectFilterHdl, ListBox&, void ) { unsigned int nPos = m_pFilter_lb->GetSelectEntryPos(); @@ -1053,7 +1053,7 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectFilterHdl, ListBox&, void ) } } -IMPL_LINK_TYPED( RemoteFilesDialog, TreeSelectHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( RemoteFilesDialog, TreeSelectHdl, SvTreeListBox *, pBox, void ) { OUString* sURL = static_cast< OUString* >( pBox->GetHdlEntry()->GetUserData() ); @@ -1064,12 +1064,12 @@ IMPL_LINK_TYPED( RemoteFilesDialog, TreeSelectHdl, SvTreeListBox *, pBox, void ) } } -IMPL_LINK_TYPED ( RemoteFilesDialog, SelectBreadcrumbHdl, Breadcrumb*, pPtr, void ) +IMPL_LINK ( RemoteFilesDialog, SelectBreadcrumbHdl, Breadcrumb*, pPtr, void ) { OpenURL( pPtr->GetHdlURL() ); } -IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, NewFolderHdl, Button*, void ) +IMPL_LINK_NOARG ( RemoteFilesDialog, NewFolderHdl, Button*, void ) { m_pFileView->EndInplaceEditing(); @@ -1102,7 +1102,7 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, NewFolderHdl, Button*, void ) } } -IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, OkHdl, Button*, void ) +IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl, Button*, void ) { OUString sNameNoExt = m_pName_ed->GetText(); OUString sPathNoExt; @@ -1182,7 +1182,7 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, OkHdl, Button*, void ) EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, CancelHdl, Button*, void ) +IMPL_LINK_NOARG ( RemoteFilesDialog, CancelHdl, Button*, void ) { if( m_pCurrentAsyncAction.is() ) { diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 672e2fa3ff33..995a7b715c0d 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -186,30 +186,30 @@ private: void SavePassword( const OUString& rURL, const OUString& rUser , const OUString& rPassword, bool bPersistent ); - DECL_LINK_TYPED ( AddServiceHdl, Button*, void ); - DECL_LINK_TYPED ( SelectServiceHdl, ListBox&, void ); - DECL_LINK_TYPED ( EditServiceMenuHdl, MenuButton *, void ); + DECL_LINK ( AddServiceHdl, Button*, void ); + DECL_LINK ( SelectServiceHdl, ListBox&, void ); + DECL_LINK ( EditServiceMenuHdl, MenuButton *, void ); - DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( DoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( FileNameGetFocusHdl, Control&, void ); - DECL_LINK_TYPED( FileNameModifyHdl, Edit&, void ); + DECL_LINK( FileNameGetFocusHdl, Control&, void ); + DECL_LINK( FileNameModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); - DECL_LINK_TYPED( SelectFilterHdl, ListBox&, void ); + DECL_LINK( SelectFilterHdl, ListBox&, void ); - DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void ); + DECL_LINK( TreeSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectBreadcrumbHdl, Breadcrumb *, void ); + DECL_LINK( SelectBreadcrumbHdl, Breadcrumb *, void ); - DECL_LINK_TYPED( NewFolderHdl, Button*, void ); - DECL_LINK_TYPED( IconViewHdl, Button*, void ); - DECL_LINK_TYPED( ListViewHdl, Button*, void ); + DECL_LINK( NewFolderHdl, Button*, void ); + DECL_LINK( IconViewHdl, Button*, void ); + DECL_LINK( ListViewHdl, Button*, void ); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( CancelHdl, Button*, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( CancelHdl, Button*, void ); }; #endif // INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx index 2f390e621797..6f86b4161a86 100644 --- a/fpicker/source/office/asyncfilepicker.cxx +++ b/fpicker/source/office/asyncfilepicker.cxx @@ -125,7 +125,7 @@ namespace svt } - IMPL_LINK_TYPED( AsyncPickerAction, OnActionDone, void*, pEmptyArg, void ) + IMPL_LINK( AsyncPickerAction, OnActionDone, void*, pEmptyArg, void ) { DBG_TESTSOLARMUTEX(); // if this asserts, we'd need to have an own mutex per instance diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index 51089d35b349..ff287f56ba4c 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -83,7 +83,7 @@ namespace svt virtual ~AsyncPickerAction() override; private: - DECL_LINK_TYPED( OnActionDone, void*, void ); + DECL_LINK( OnActionDone, void*, void ); AsyncPickerAction( const AsyncPickerAction& ) = delete; AsyncPickerAction& operator=( const AsyncPickerAction& ) = delete; diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 0869654afe23..f498a79c0d0a 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -387,7 +387,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(OCommonPicker, OnCancelPicker, void*, void) + IMPL_LINK_NOARG(OCommonPicker, OnCancelPicker, void*, void) { // By definition, the solar mutex is locked when we arrive here. Note that this // is important, as for instance the consistency of m_pDlg depends on this mutex. diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index 5039254d7515..90d86a9c4a3a 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -184,7 +184,7 @@ namespace svt private: void stopWindowListening(); - DECL_LINK_TYPED( OnCancelPicker, void*, void ); + DECL_LINK( OnCancelPicker, void*, void ); }; } // namespace svt diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 6a8b5a26a8b4..9eab3c15cd6f 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -735,7 +735,7 @@ void SvtFileDialog::Init_Impl Resize(); } -IMPL_LINK_NOARG_TYPED( SvtFileDialog, NewFolderHdl_Impl, Button*, void) +IMPL_LINK_NOARG( SvtFileDialog, NewFolderHdl_Impl, Button*, void) { _pFileView->EndInplaceEditing(); @@ -830,7 +830,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const OUString& _rFilter ) } -IMPL_LINK_NOARG_TYPED(SvtFileDialog, CancelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl, Button*, void) { if ( m_pCurrentAsyncAction.is() ) { @@ -844,11 +844,11 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, CancelHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvtFileDialog, OpenClickHdl_Impl, Button*, pVoid, void ) +IMPL_LINK( SvtFileDialog, OpenClickHdl_Impl, Button*, pVoid, void ) { OpenHdl_Impl(pVoid); } -IMPL_LINK_TYPED( SvtFileDialog, OpenUrlHdl_Impl, SvtURLBox*, pVoid, void ) +IMPL_LINK( SvtFileDialog, OpenUrlHdl_Impl, SvtURLBox*, pVoid, void ) { OpenHdl_Impl(pVoid); } @@ -1153,7 +1153,7 @@ void SvtFileDialog::EnableAutocompletion( bool _bEnable ) } -IMPL_LINK_NOARG_TYPED( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void ) { OUString sSelectedFilterDisplayName; SvtFileDialogFilter_Impl* pSelectedFilter = _pImp->GetSelectedFilterEntry( sSelectedFilterDisplayName ); @@ -1225,33 +1225,33 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void ) } } -IMPL_LINK_NOARG_TYPED(SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, void) +IMPL_LINK_NOARG(SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, void) { // filter the view again ExecuteFilter(); } -IMPL_LINK_NOARG_TYPED( SvtFileDialog, FileNameGetFocusHdl_Impl, Control&, void ) +IMPL_LINK_NOARG( SvtFileDialog, FileNameGetFocusHdl_Impl, Control&, void ) { _pFileView->SetNoSelection(); _pFileView->Update(); } -IMPL_LINK_NOARG_TYPED( SvtFileDialog, FileNameModifiedHdl_Impl, Edit&, void ) +IMPL_LINK_NOARG( SvtFileDialog, FileNameModifiedHdl_Impl, Edit&, void ) { FileNameGetFocusHdl_Impl( *_pImp->_pEdFileName ); } -IMPL_LINK_NOARG_TYPED( SvtFileDialog, URLBoxModifiedHdl_Impl, SvtURLBox*, void ) +IMPL_LINK_NOARG( SvtFileDialog, URLBoxModifiedHdl_Impl, SvtURLBox*, void ) { OUString aPath = _pImp->_pEdCurrentPath->GetURL(); OpenURL_Impl(aPath); } -IMPL_LINK_NOARG_TYPED( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void ) +IMPL_LINK_NOARG( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void ) { _pFileView->EndInplaceEditing(); @@ -1274,7 +1274,7 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void } -IMPL_LINK_NOARG_TYPED ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void ) +IMPL_LINK_NOARG ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void ) { // Maybe open the PlacesDialog would have been a better idea // there is an ux choice to make we did not make... @@ -1286,7 +1286,7 @@ IMPL_LINK_NOARG_TYPED ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void ) } -IMPL_LINK_NOARG_TYPED ( SvtFileDialog, RemovePlacePressed_Hdl, Button*, void ) +IMPL_LINK_NOARG ( SvtFileDialog, RemovePlacePressed_Hdl, Button*, void ) { _pImp->_pPlaces->RemoveSelectedPlace(); } @@ -1429,7 +1429,7 @@ void SvtFileDialog::UpdateControls( const OUString& rURL ) } -IMPL_LINK_TYPED( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void ) +IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); assert( pEntry && "SelectHandler without selected entry" ); @@ -1480,7 +1480,7 @@ IMPL_LINK_TYPED( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void ) } -IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool) { _pImp->_bDoubleClick = true; OpenHdl_Impl( nullptr ); @@ -1490,13 +1490,13 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool) } -IMPL_LINK_NOARG_TYPED(SvtFileDialog, EntrySelectHdl_Impl, ComboBox&, void) +IMPL_LINK_NOARG(SvtFileDialog, EntrySelectHdl_Impl, ComboBox&, void) { FileSelect(); } -IMPL_LINK_TYPED( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) +IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) { OUString sCurrentFolder( pView->GetViewURL() ); // check if we can create new folders @@ -1517,7 +1517,7 @@ IMPL_LINK_TYPED( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) } -IMPL_LINK_NOARG_TYPED(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void) { if ( _pFileNotifier ) _pFileNotifier->notify( CTRL_STATE_CHANGED, @@ -1528,7 +1528,7 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void ) +IMPL_LINK( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void ) { if ( ! _pFileNotifier ) return; @@ -1553,7 +1553,7 @@ IMPL_LINK_TYPED( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void ) } -IMPL_LINK_NOARG_TYPED(SvtFileDialog, PlayButtonHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl, Button*, void) { if ( _pFileNotifier ) _pFileNotifier->notify( CTRL_STATE_CHANGED, @@ -2726,7 +2726,7 @@ void SvtFileDialog::initDefaultPlaces( ) _pImp->_pPlaces->IsUpdated(); } -IMPL_LINK_NOARG_TYPED( SvtFileDialog, Split_Hdl, Splitter*, void ) +IMPL_LINK_NOARG( SvtFileDialog, Split_Hdl, Splitter*, void ) { sal_Int32 nSplitPos = _pSplitter->GetSplitPosPixel(); @@ -2776,7 +2776,7 @@ void QueryFolderNameDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(QueryFolderNameDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl, Button*, void) { // trim the strings m_pNameEdit->SetText(comphelper::string::strip(m_pNameEdit->GetText(), ' ')); @@ -2784,7 +2784,7 @@ IMPL_LINK_NOARG_TYPED(QueryFolderNameDialog, OKHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(QueryFolderNameDialog, NameHdl, Edit&, void) +IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl, Edit&, void) { // trim the strings OUString aName = comphelper::string::strip(m_pNameEdit->GetText(), ' '); diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index a097aeaf1c88..f841ee44b73b 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -83,21 +83,21 @@ private: css::uno::Reference < css::uno::XComponentContext > m_context; - DECL_LINK_TYPED( FilterSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( FilterSelectTimerHdl_Impl, Timer*, void ); - DECL_LINK_TYPED( NewFolderHdl_Impl, Button*, void ); - DECL_LINK_TYPED( OpenUrlHdl_Impl, SvtURLBox*, void ); - DECL_LINK_TYPED( OpenClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( CancelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FileNameGetFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( FileNameModifiedHdl_Impl, Edit&, void ); - - DECL_LINK_TYPED( URLBoxModifiedHdl_Impl, SvtURLBox*, void ); - DECL_LINK_TYPED( ConnectToServerPressed_Hdl, Button*, void ); - - DECL_LINK_TYPED( AddPlacePressed_Hdl, Button*, void ); - DECL_LINK_TYPED( RemovePlacePressed_Hdl, Button*, void ); - DECL_LINK_TYPED( Split_Hdl, Splitter*, void ); + DECL_LINK( FilterSelectHdl_Impl, ListBox&, void ); + DECL_LINK( FilterSelectTimerHdl_Impl, Timer*, void ); + DECL_LINK( NewFolderHdl_Impl, Button*, void ); + DECL_LINK( OpenUrlHdl_Impl, SvtURLBox*, void ); + DECL_LINK( OpenClickHdl_Impl, Button*, void ); + DECL_LINK( CancelHdl_Impl, Button*, void ); + DECL_LINK( FileNameGetFocusHdl_Impl, Control&, void ); + DECL_LINK( FileNameModifiedHdl_Impl, Edit&, void ); + + DECL_LINK( URLBoxModifiedHdl_Impl, SvtURLBox*, void ); + DECL_LINK( ConnectToServerPressed_Hdl, Button*, void ); + + DECL_LINK( AddPlacePressed_Hdl, Button*, void ); + DECL_LINK( RemovePlacePressed_Hdl, Button*, void ); + DECL_LINK( Split_Hdl, Splitter*, void ); void OpenHdl_Impl(void* pVoid); void Init_Impl( PickerFlags nBits ); @@ -119,13 +119,13 @@ private: void OpenMultiSelection_Impl(); void AddControls_Impl( ); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( DblClickHdl_Impl, SvTreeListBox*, bool); - DECL_LINK_TYPED( EntrySelectHdl_Impl, ComboBox&, void); - DECL_LINK_TYPED( OpenDoneHdl_Impl, SvtFileView*, void ); - DECL_LINK_TYPED( AutoExtensionHdl_Impl, Button*, void); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( PlayButtonHdl_Impl, Button*, void); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( DblClickHdl_Impl, SvTreeListBox*, bool); + DECL_LINK( EntrySelectHdl_Impl, ComboBox&, void); + DECL_LINK( OpenDoneHdl_Impl, SvtFileView*, void ); + DECL_LINK( AutoExtensionHdl_Impl, Button*, void); + DECL_LINK( ClickHdl_Impl, Button*, void ); + DECL_LINK( PlayButtonHdl_Impl, Button*, void); // removes a filter with wildcards from the path and returns it diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx index 5bfa801a5546..c5c16066c403 100644 --- a/fpicker/test/svdem.cxx +++ b/fpicker/test/svdem.cxx @@ -162,7 +162,7 @@ void MyWin::Resize() } -IMPL_LINK_TYPED( MyWin, Test, PushButton*, pBtn, void ) +IMPL_LINK( MyWin, Test, PushButton*, pBtn, void ) { printf("Test\n"); if ( pBtn == &aOKBtn ) 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 ); 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 diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx index 8adefd1d45dc..1f19469c8504 100644 --- a/include/dbaccess/AsynchronousLink.hxx +++ b/include/dbaccess/AsynchronousLink.hxx @@ -58,7 +58,7 @@ namespace dbaui void CancelCall(); protected: - DECL_LINK_TYPED(OnAsyncCall, void*, void); + DECL_LINK(OnAsyncCall, void*, void); }; } #endif // INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX diff --git a/include/dbaccess/ToolBoxHelper.hxx b/include/dbaccess/ToolBoxHelper.hxx index 7386bf35cbc3..82f97a1c665d 100644 --- a/include/dbaccess/ToolBoxHelper.hxx +++ b/include/dbaccess/ToolBoxHelper.hxx @@ -69,8 +69,8 @@ namespace dbaui void checkImageList(); protected: - DECL_LINK_TYPED(ConfigOptionsChanged, LinkParamNone*, void); - DECL_LINK_TYPED(SettingsChanged, VclSimpleEvent&, void ); + DECL_LINK(ConfigOptionsChanged, LinkParamNone*, void); + DECL_LINK(SettingsChanged, VclSimpleEvent&, void ); }; } #endif // INCLUDED_DBACCESS_TOOLBOXHELPER_HXX diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 40b9086a144d..0b1501d6a99c 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -422,8 +422,8 @@ namespace dbaui void ImplBroadcastFeatureState(const OUString& _rFeature, const css::uno::Reference< css::frame::XStatusListener > & xListener, bool _bIgnoreCache); // link methods - DECL_LINK_TYPED(OnAsyncInvalidateAll, void*, void); - DECL_LINK_TYPED(OnAsyncCloseTask, void*, void); + DECL_LINK(OnAsyncInvalidateAll, void*, void); + DECL_LINK(OnAsyncCloseTask, void*, void); public: const css::uno::Reference< css::uno::XComponentContext >& getORB() const { return m_xContext; } diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 5cdf08dfcd43..7290b66ded3a 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -627,12 +627,12 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster bool bStrippingPortions; bool bPasting; - DECL_LINK_TYPED( ParaVisibleStateChangedHdl, Paragraph&, void ); - DECL_LINK_TYPED( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void ); - DECL_LINK_TYPED( EndMovingParagraphsHdl, MoveParagraphsInfo&, void ); - DECL_LINK_TYPED( BeginPasteOrDropHdl, PasteOrDropInfos&, void ); - DECL_LINK_TYPED( EndPasteOrDropHdl, PasteOrDropInfos&, void ); - DECL_LINK_TYPED( EditEngineNotifyHdl, EENotify&, void ); + DECL_LINK( ParaVisibleStateChangedHdl, Paragraph&, void ); + DECL_LINK( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void ); + DECL_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo&, void ); + DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos&, void ); + DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos&, void ); + DECL_LINK( EditEngineNotifyHdl, EENotify&, void ); void ImplCheckParagraphs( sal_Int32 nStart, sal_Int32 nEnd ); bool ImplHasNumberFormat( sal_Int32 nPara ) const; Size ImplGetBulletSize( sal_Int32 nPara ); diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 923c60fe9390..c0a12a3e0edd 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -107,7 +107,7 @@ public: private: ::std::unique_ptr<FormulaDlg_Impl> m_pImpl; - DECL_LINK_TYPED( UpdateFocusHdl, Idle*, void ); + DECL_LINK( UpdateFocusHdl, Idle*, void ); protected: void disableOk(); diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 04f919c46c6e..d5d3c00fc8dd 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -48,7 +48,7 @@ private: IControlReferenceHandler* pAnyRefDlg; // parent dialog VclPtr<vcl::Window> pLabelWidget; - DECL_LINK_TYPED( UpdateHdl, Idle*, void ); + DECL_LINK( UpdateHdl, Idle*, void ); protected: virtual void KeyInput( const KeyEvent& rKEvt ) override; diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 7117b6c0bb3c..67df6f296dbd 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -118,7 +118,7 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell { std::unique_ptr<SfxAppData_Impl> pImpl; - DECL_DLLPRIVATE_LINK_TYPED( GlobalBasicErrorHdl_Impl, StarBASIC*, bool ); + DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC*, bool ); void Deinitialize(); diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index afbf05596a38..04f642c9c872 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -106,7 +106,7 @@ public: SfxBindings& GetBindings() { return *pBindings; } - DECL_LINK_TYPED(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Idle *, void); }; @@ -146,7 +146,7 @@ public: virtual void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo* pInfo); - DECL_LINK_TYPED(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Idle *, void); }; @@ -186,7 +186,7 @@ protected: VclPtr<CancelButton> pCancelBtn; VclPtr<HelpButton> pHelpBtn; - DECL_DLLPRIVATE_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_DLLPRIVATE_LINK(OKHdl_Impl, Button*, void); private: std::unique_ptr<SingleTabDlgImpl> pImpl; diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index f3e5537a7d49..9597f5428a5d 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -132,7 +132,7 @@ private: const SfxPoolItem *pItem, SfxItemState eItemState ); SAL_DLLPRIVATE SfxStateCache* GetStateCache( sal_uInt16 nId, sal_uInt16 *pPos); - DECL_DLLPRIVATE_LINK_TYPED( NextJob, Timer *, void ); + DECL_DLLPRIVATE_LINK( NextJob, Timer *, void ); SAL_DLLPRIVATE bool NextJob_Impl(Timer * pTimer); public: diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx index 140c4700fdb7..77a8085b3f11 100644 --- a/include/sfx2/checkin.hxx +++ b/include/sfx2/checkin.hxx @@ -21,7 +21,7 @@ class SfxCheckinDialog : public ModalDialog VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: SfxCheckinDialog( vcl::Window* pParent ); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index bb177ccc5f93..e4a74d7a0caa 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -209,9 +209,9 @@ private: bool bEnableUseUserData : 1, bHandleDelete : 1; - DECL_LINK_TYPED(DeleteHdl, Button*, void); - DECL_LINK_TYPED(SignatureHdl, Button*, void); - DECL_STATIC_LINK_TYPED(SfxDocumentPage, ChangePassHdl, Button*, void); + DECL_LINK(DeleteHdl, Button*, void); + DECL_LINK(SignatureHdl, Button*, void); + DECL_STATIC_LINK(SfxDocumentPage, ChangePassHdl, Button*, void); void ImplUpdateSignatures(); void ImplCheckPasswordState(); @@ -340,7 +340,7 @@ class CustomPropertiesEditButton : public PushButton public: CustomPropertiesEditButton(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine); - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(ClickHdl, Button*, void); }; class CustomPropertiesRemoveButton : public ImageButton @@ -427,14 +427,14 @@ private: Idle m_aBoxLoseFocusIdle; Link<void*,void> m_aRemovedHdl; - DECL_STATIC_LINK_TYPED( CustomPropertiesWindow, TypeHdl, ListBox&, void ); - DECL_LINK_TYPED( RemoveHdl, Button*, void ); - DECL_LINK_TYPED( EditLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( BoxLoseFocusHdl, Control&, void ); + DECL_STATIC_LINK( CustomPropertiesWindow, TypeHdl, ListBox&, void ); + DECL_LINK( RemoveHdl, Button*, void ); + DECL_LINK( EditLoseFocusHdl, Control&, void ); + DECL_LINK( BoxLoseFocusHdl, Control&, void ); //add lose focus handlers of Date/TimeField? - DECL_LINK_TYPED(EditTimeoutHdl, Idle *, void); - DECL_LINK_TYPED(BoxTimeoutHdl, Idle *, void); + DECL_LINK(EditTimeoutHdl, Idle *, void); + DECL_LINK(BoxTimeoutHdl, Idle *, void); bool IsLineValid( CustomPropertyLine* pLine ) const; void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox ); @@ -475,8 +475,8 @@ private: sal_Int32 m_nThumbPos; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( RemovedHdl, void*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( RemovedHdl, void*, void ); public: CustomPropertiesControl(vcl::Window* pParent); @@ -501,7 +501,7 @@ class SfxCustomPropertiesPage : public SfxTabPage private: VclPtr<CustomPropertiesControl> m_pPropertiesCtrl; - DECL_LINK_TYPED(AddHdl, Button*, void); + DECL_LINK(AddHdl, Button*, void); using TabPage::DeactivatePage; @@ -598,7 +598,7 @@ private: CmisPropertiesWindow m_pPropertiesWin; VclScrolledWindow& m_rScrolledWindow; ScrollBar& m_rVertScroll; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); void checkAutoVScroll(); diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 416f003b1a49..8d88ce0b3946 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -87,8 +87,8 @@ private: friend class SfxApplication; friend class SfxViewFrame; - DECL_DLLPRIVATE_LINK_TYPED( EventHdl_Impl, Idle *, void ); - DECL_DLLPRIVATE_LINK_TYPED( PostMsgHandler, SfxRequest *, void ); + DECL_DLLPRIVATE_LINK( EventHdl_Impl, Idle *, void ); + DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest *, void ); SAL_DLLPRIVATE void Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord ); SAL_DLLPRIVATE void Update_Impl_( bool,bool,bool,SfxWorkWindow*); diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index 736577627a60..5d6ea0a40eef 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -49,7 +49,7 @@ private: SfxItemSet* m_pItemSet; std::vector<OUString> m_pURLList; - DECL_LINK_TYPED(DialogClosedHdl, sfx2::FileDialogHelper*, void); + DECL_LINK(DialogClosedHdl, sfx2::FileDialogHelper*, void); public: DocumentInserter(const OUString& rFactory, diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index b9f2e974ce32..03201c79dca0 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -99,7 +99,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); const Size& GetMinOutputSizePixel() const; virtual bool Notify( NotifyEvent& rNEvt ) override; - DECL_LINK_TYPED(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Idle *, void); SAL_DLLPRIVATE void Initialize_Impl(); SAL_DLLPRIVATE SplitWindowItemFlags GetWinBits_Impl() const; diff --git a/include/sfx2/emojicontrol.hxx b/include/sfx2/emojicontrol.hxx index e3271e4ae2ea..67835cd703d4 100644 --- a/include/sfx2/emojicontrol.hxx +++ b/include/sfx2/emojicontrol.hxx @@ -37,8 +37,8 @@ private: /// Return filter according to the currently selected tab page. FILTER_CATEGORY getCurrentFilter(); - DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void); - DECL_STATIC_LINK_TYPED(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, void); + DECL_LINK(ActivatePageHdl, TabControl*, void); + DECL_STATIC_LINK(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, void); VclPtr<TabControl> mpTabControl; VclPtr<EmojiView> mpEmojiView; diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index aded0de15b47..ed7055923188 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -81,7 +81,7 @@ public: SfxFilterMatcher& operator=( const SfxFilterMatcher& ) = delete; SAL_DLLPRIVATE static bool IsFilterInstalled_Impl( const std::shared_ptr<const SfxFilter>& pFilter ); - DECL_DLLPRIVATE_LINK_TYPED( MaybeFileHdl_Impl, OUString*, bool ); + DECL_DLLPRIVATE_LINK( MaybeFileHdl_Impl, OUString*, bool ); sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, std::shared_ptr<const SfxFilter>& ) const; sal_uInt32 GuessFilter( SfxMedium& rMedium, std::shared_ptr<const SfxFilter>& , SfxFilterFlags nMust = SfxFilterFlags::IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index c443638b619b..0c6ac8c10d42 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -223,7 +223,7 @@ public: */ void SetContext( Context _eNewContext ); - DECL_LINK_TYPED( ExecuteSystemFilePicker, void*, void ); + DECL_LINK( ExecuteSystemFilePicker, void*, void ); ErrCode Execute( std::vector<OUString>& rpURLList, SfxItemSet *& rpSet, diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index 63d6a17db7d2..fae4be363dd7 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -41,7 +41,7 @@ class SfxHintPoster : public SvRefBase private: Link<SfxRequest*,void> m_Link; - DECL_LINK_TYPED( DoEvent_Impl, void*, void ); + DECL_LINK( DoEvent_Impl, void*, void ); protected: virtual ~SfxHintPoster() override; diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 96359a1205fd..2d732bdb7526 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -70,7 +70,7 @@ class SfxInfoBarWindow : public vcl::Window void addButton(PushButton* pButton); private: - DECL_LINK_TYPED( CloseHandler, Button*, void ); + DECL_LINK( CloseHandler, Button*, void ); }; class SfxInfoBarContainerWindow : public vcl::Window diff --git a/include/sfx2/inputdlg.hxx b/include/sfx2/inputdlg.hxx index 11af70168f37..69cee70da20b 100644 --- a/include/sfx2/inputdlg.hxx +++ b/include/sfx2/inputdlg.hxx @@ -30,7 +30,7 @@ public: private: - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(ClickHdl, Button*, void); private: diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index f8e210ce3228..ad5c7c3eebd8 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -79,7 +79,7 @@ private: bool bUseCache : 1; // for Graphics Links! bool bWasLastEditOK : 1; - DECL_LINK_TYPED( EndEditHdl, const OUString&, void ); + DECL_LINK( EndEditHdl, const OUString&, void ); bool ExecuteEdit( const OUString& _rNewName ); diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index f5bc75e6afaa..637f928d867e 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -69,12 +69,12 @@ class SfxManageStyleSheetPage : public SfxTabPage private: friend class SfxStyleDialog; - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( EditStyleSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditStyleHdl_Impl, Button*, void ); - DECL_LINK_TYPED( EditLinkStyleSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditLinkStyleHdl_Impl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( EditStyleSelectHdl_Impl, ListBox&, void ); + DECL_LINK( EditStyleHdl_Impl, Button*, void ); + DECL_LINK( EditLinkStyleSelectHdl_Impl, ListBox&, void ); + DECL_LINK( EditLinkStyleHdl_Impl, Button*, void ); void UpdateName_Impl(ListBox *, const OUString &rNew); void SetDescriptionText_Impl(); diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index 142f707c7e34..bbafa704f76b 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -39,9 +39,9 @@ private: VclPtr<MessageDialog> aQueryOverwriteBox; SfxStyleSheetBasePool& rPool; - DECL_DLLPRIVATE_LINK_TYPED( OKHdl, ComboBox&, void ); - DECL_DLLPRIVATE_LINK_TYPED( OKClickHdl, Button *, void ); - DECL_DLLPRIVATE_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_DLLPRIVATE_LINK( OKHdl, ComboBox&, void ); + DECL_DLLPRIVATE_LINK( OKClickHdl, Button *, void ); + DECL_DLLPRIVATE_LINK( ModifyHdl, Edit&, void ); public: SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& ); diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx index de831ed45000..471e806d96c3 100644 --- a/include/sfx2/notebookbar/SfxNotebookBar.hxx +++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx @@ -45,7 +45,7 @@ public: private: static bool m_bLock; - DECL_STATIC_LINK_TYPED(SfxNotebookBar, OpenNotebookbarPopupMenu, NotebookBar*, void); + DECL_STATIC_LINK(SfxNotebookBar, OpenNotebookbarPopupMenu, NotebookBar*, void); }; } // namespace sfx2 diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 128a51a5fdfe..0a256e727c99 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -76,8 +76,8 @@ private: SfxShowExtras mnExtras; bool mbAsciiOnly; - DECL_DLLPRIVATE_LINK_TYPED(EditModifyHdl, Edit&, void); - DECL_DLLPRIVATE_LINK_TYPED(OKHdl, Button *, void); + DECL_DLLPRIVATE_LINK(EditModifyHdl, Edit&, void); + DECL_DLLPRIVATE_LINK(OKHdl, Button *, void); void ModifyHdl(Edit*); void SetPasswdText(); diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 4d7f96de878e..82a94ed22747 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -70,15 +70,15 @@ private: PrinterOptions maPrinterOptions; PrinterOptions maPrintFileOptions; - DECL_DLLPRIVATE_LINK_TYPED( ToggleOutputPrinterRBHdl, RadioButton&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ToggleOutputPrintFileRBHdl, RadioButton&, void); + DECL_DLLPRIVATE_LINK( ToggleOutputPrinterRBHdl, RadioButton&, void ); + DECL_DLLPRIVATE_LINK( ToggleOutputPrintFileRBHdl, RadioButton&, void); - DECL_DLLPRIVATE_LINK_TYPED( ClickReduceTransparencyCBHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ClickReduceGradientsCBHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ClickReduceBitmapsCBHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ClickReduceTransparencyCBHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ClickReduceGradientsCBHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ClickReduceBitmapsCBHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ToggleReduceGradientsStripesRBHdl, RadioButton&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ToggleReduceBitmapsResolutionRBHdl, RadioButton&, void ); + DECL_DLLPRIVATE_LINK( ToggleReduceGradientsStripesRBHdl, RadioButton&, void ); + DECL_DLLPRIVATE_LINK( ToggleReduceBitmapsResolutionRBHdl, RadioButton&, void ); SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions* pCurrentOptions ); SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions ); diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index af3ce1badb80..76c7647c4931 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -58,7 +58,7 @@ public: /// Update the information in the view. virtual void Reload() override; - DECL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, void*, void ); protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/include/sfx2/saveastemplatedlg.hxx b/include/sfx2/saveastemplatedlg.hxx index d08abf31a931..212e4578b5af 100644 --- a/include/sfx2/saveastemplatedlg.hxx +++ b/include/sfx2/saveastemplatedlg.hxx @@ -43,9 +43,9 @@ private: css::uno::Reference< css::frame::XModel > m_xModel; public: - DECL_LINK_TYPED(OkClickHdl, Button*, void); - DECL_LINK_TYPED(TemplateNameEditHdl, Edit&, void); - DECL_LINK_TYPED(SelectCategoryHdl, ListBox&, void); + DECL_LINK(OkClickHdl, Button*, void); + DECL_LINK(TemplateNameEditHdl, Edit&, void); + DECL_LINK(SelectCategoryHdl, ListBox&, void); void setDocumentModel (const css::uno::Reference<css::frame::XModel> &rModel); diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index c87f563380fb..af32849a9e9a 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -194,7 +194,7 @@ private: SAL_DLLPRIVATE SfxViewFrame& GetViewFrame_Impl() const; SAL_DLLPRIVATE void ShowInfoBars( ); - DECL_LINK_TYPED( CheckOutHandler, Button*, void ); + DECL_LINK( CheckOutHandler, Button*, void ); IMPL_SfxBaseController_DataContainer* m_pData ; diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx index 02186de0c6ba..5e7d06b0a344 100644 --- a/include/sfx2/sidebar/AsynchronousCall.hxx +++ b/include/sfx2/sidebar/AsynchronousCall.hxx @@ -46,7 +46,7 @@ private: Action maAction; ImplSVEvent * mnCallId; - DECL_LINK_TYPED(HandleUserCall, void*, void); + DECL_LINK(HandleUserCall, void*, void); }; } } // end of namespace sfx2::sidebar diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index 299e25641e30..8eb06e5b0b9c 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -91,7 +91,7 @@ private: VclPtr<vcl::Window> mpFiller; VclPtr<ScrollBar> mpVerticalScrollBar; - DECL_LINK_TYPED(HandleVerticalScrollBarChange, ScrollBar*, void); + DECL_LINK(HandleVerticalScrollBarChange, ScrollBar*, void); bool ProcessWheelEvent(CommandEvent* pCommandEvent); }; diff --git a/include/sfx2/sidebar/FocusManager.hxx b/include/sfx2/sidebar/FocusManager.hxx index 71096cbaa78b..a488852ee21e 100644 --- a/include/sfx2/sidebar/FocusManager.hxx +++ b/include/sfx2/sidebar/FocusManager.hxx @@ -96,8 +96,8 @@ private: /** Listen for key events for panels and buttons. */ - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void); - DECL_LINK_TYPED(ChildEventListener, VclWindowEvent&, void); + DECL_LINK( WindowEventListener, VclWindowEvent&, void); + DECL_LINK(ChildEventListener, VclWindowEvent&, void); void ClearPanels(); void ClearButtons(); diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 6b64fdefe750..d4cdd574191d 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -211,7 +211,7 @@ private: */ VclPtr<vcl::Window> mpCloseIndicator; - DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); + DECL_LINK(WindowEventHandler, VclWindowEvent&, void); /** Make maRequestedContext the current context. */ void UpdateConfigurations(); @@ -241,7 +241,7 @@ private: const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; VclPtr<PopupMenu> CreatePopupMenu ( const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; - DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool); + DECL_LINK(OnMenuItemSelected, Menu*, bool); void BroadcastPropertyChange(); /** The close of the deck changes the width of the child window. diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 85290a1b3c5b..dfe4eaf085e4 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -64,11 +64,11 @@ protected: ControllerContainer maControllers; bool mbAreHandlersRegistered; - DECL_LINK_TYPED(DropDownClickHandler, ToolBox*, void); - DECL_LINK_TYPED(ClickHandler, ToolBox*, void); - DECL_LINK_TYPED(DoubleClickHandler, ToolBox*, void); - DECL_LINK_TYPED(SelectHandler, ToolBox*, void); - DECL_LINK_TYPED(ChangedIconSizeHandler, LinkParamNone*, void ); + DECL_LINK(DropDownClickHandler, ToolBox*, void); + DECL_LINK(ClickHandler, ToolBox*, void); + DECL_LINK(DoubleClickHandler, ToolBox*, void); + DECL_LINK(SelectHandler, ToolBox*, void); + DECL_LINK(ChangedIconSizeHandler, LinkParamNone*, void ); css::uno::Reference<css::frame::XToolbarController> GetControllerForItemId(const sal_uInt16 nItemId) const; diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index e8982460c75a..5ea6a946e17b 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -97,7 +97,7 @@ private: class Item { public: - DECL_LINK_TYPED(HandleClick, Button*, void); + DECL_LINK(HandleClick, Button*, void); VclPtr<RadioButton> mpButton; OUString msDeckId; ::std::function<void (const OUString& rsDeckId)> maDeckActivationFunctor; @@ -115,7 +115,7 @@ private: void Layout(); void UpdateButtonIcons(); - DECL_LINK_TYPED(OnToolboxClicked, Button*, void); + DECL_LINK(OnToolboxClicked, Button*, void); SidebarController* pParentSidebarController; diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx index 612172e8e881..2a554317fb39 100644 --- a/include/sfx2/sidebar/TitleBar.hxx +++ b/include/sfx2/sidebar/TitleBar.hxx @@ -70,7 +70,7 @@ private: sidebar::Paint maBackgroundPaint; void PaintTitle(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBox); - DECL_LINK_TYPED(SelectionHandler, ToolBox*, void); + DECL_LINK(SelectionHandler, ToolBox*, void); }; } } // end of namespace sfx2::sidebar diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index 50756c0f2783..5abf6c653d22 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -31,7 +31,7 @@ class SFX2_DLLPUBLIC SfxStyleDialog: public SfxTabDialog { private: SfxStyleSheetBase* pStyle; - DECL_DLLPRIVATE_LINK_TYPED( CancelHdl, Button *, void ); + DECL_DLLPRIVATE_LINK( CancelHdl, Button *, void ); sal_uInt16 m_nOrganizerId; public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 663310f3cb7f..811a140928df 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -88,13 +88,13 @@ friend class SfxTabDialogUIObject; bool m_bItemsReset; bool m_bStandardPushed; - DECL_DLLPRIVATE_LINK_TYPED(ActivatePageHdl, TabControl*, void ); - DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl*, bool ); - DECL_DLLPRIVATE_LINK_TYPED(OkHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(ResetHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(BaseFmtHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(UserHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(CancelHdl, Button*, void); + DECL_DLLPRIVATE_LINK(ActivatePageHdl, TabControl*, void ); + DECL_DLLPRIVATE_LINK(DeactivatePageHdl, TabControl*, bool ); + DECL_DLLPRIVATE_LINK(OkHdl, Button*, void); + DECL_DLLPRIVATE_LINK(ResetHdl, Button*, void); + DECL_DLLPRIVATE_LINK(BaseFmtHdl, Button*, void); + DECL_DLLPRIVATE_LINK(UserHdl, Button*, void); + DECL_DLLPRIVATE_LINK(CancelHdl, Button*, void); SAL_DLLPRIVATE void Init_Impl(bool bFmtFlag); protected: diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 3a9d101549ba..60536f5d0c26 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -154,8 +154,8 @@ friend struct SfxTbxCtrlFactory; std::unique_ptr< SfxToolBoxControl_Impl> pImpl; protected: - DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( ClosePopupWindow, SfxPopupWindow *, void ); + DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( ClosePopupWindow, SfxPopupWindow *, void ); // old SfxToolBoxControl methods virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); diff --git a/include/sfx2/templatedefaultview.hxx b/include/sfx2/templatedefaultview.hxx index 68584eafa3a7..c29c2c9b4ea4 100644 --- a/include/sfx2/templatedefaultview.hxx +++ b/include/sfx2/templatedefaultview.hxx @@ -25,7 +25,7 @@ public: void createContextMenu(); - DECL_LINK_TYPED(ContextMenuSelectHdl, Menu*, void); + DECL_LINK(ContextMenuSelectHdl, Menu*, void); protected: long mnItemMaxSize; long mnTextHeight; diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 3054b22c532e..b1406f1b8a07 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -62,31 +62,31 @@ protected: void fillFolderComboBox(); - DECL_LINK_TYPED(TBXDropdownHdl, ToolBox*, void); + DECL_LINK(TBXDropdownHdl, ToolBox*, void); - DECL_LINK_TYPED(SelectApplicationHdl, ListBox&, void); - DECL_LINK_TYPED(SelectRegionHdl, ListBox&, void); + DECL_LINK(SelectApplicationHdl, ListBox&, void); + DECL_LINK(SelectRegionHdl, ListBox&, void); - DECL_LINK_TYPED(OkClickHdl, Button*, void); - DECL_LINK_TYPED(MoveClickHdl, Button*, void); - DECL_LINK_TYPED(ExportClickHdl, Button*, void); - DECL_LINK_TYPED(ImportClickHdl, Button*, void); - DECL_STATIC_LINK_TYPED(SfxTemplateManagerDlg, LinkClickHdl, Button*, void); + DECL_LINK(OkClickHdl, Button*, void); + DECL_LINK(MoveClickHdl, Button*, void); + DECL_LINK(ExportClickHdl, Button*, void); + DECL_LINK(ImportClickHdl, Button*, void); + DECL_STATIC_LINK(SfxTemplateManagerDlg, LinkClickHdl, Button*, void); - DECL_LINK_TYPED(TVItemStateHdl, const ThumbnailViewItem*, void); + DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*, void); - DECL_LINK_TYPED(MenuSelectHdl, Menu*, bool); - DECL_LINK_TYPED(DefaultTemplateMenuSelectHdl, Menu*, bool); + DECL_LINK(MenuSelectHdl, Menu*, bool); + DECL_LINK(DefaultTemplateMenuSelectHdl, Menu*, bool); - DECL_LINK_TYPED(OpenRegionHdl, void*, void); - DECL_LINK_TYPED(CreateContextMenuHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(EditTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(DeleteTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(DefaultTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(OpenRegionHdl, void*, void); + DECL_LINK(CreateContextMenuHdl, ThumbnailViewItem*, void); + DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(EditTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(DeleteTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(DefaultTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(SearchUpdateHdl, Edit&, void); - DECL_LINK_TYPED(GetFocusHdl, Control&, void); + DECL_LINK(SearchUpdateHdl, Edit&, void); + DECL_LINK(GetFocusHdl, Control&, void); void OnTemplateImportCategory(const OUString& sCategory); static void OnTemplateLink (); @@ -159,8 +159,8 @@ private: bool mbIsNewCategory; public: - DECL_LINK_TYPED(NewCategoryEditHdl, Edit&, void); - DECL_LINK_TYPED(SelectCategoryHdl, ListBox&, void); + DECL_LINK(NewCategoryEditHdl, Edit&, void); + DECL_LINK(SelectCategoryHdl, ListBox&, void); void SetCategoryLBEntries(std::vector<OUString> names); @@ -202,8 +202,8 @@ public: inline bool IsStartWithTemplate() const { return mpCBXHideDlg->IsChecked(); }; private: - DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(OkClickHdl, Button*, void); + DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(OkClickHdl, Button*, void); OUString msTemplatePath; }; diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 45e31a7973a6..f4e31efdf76d 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -99,7 +99,7 @@ public: void createContextMenu(const bool bIsDefault ); - DECL_LINK_TYPED(ContextMenuSelectHdl, Menu*, bool); + DECL_LINK(ContextMenuSelectHdl, Menu*, bool); TemplateContainerItem* getRegion(OUString const & sStr); diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index f761a3780b00..81cab2da57dc 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -289,7 +289,7 @@ protected: SFX2_DLLPRIVATE ThumbnailViewItem* ImplGetVisibleItem( sal_uInt16 nVisiblePos ); SFX2_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); SFX2_DLLPRIVATE bool ImplHasAccessibleListeners(); - DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar*, void ); protected: diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 2a4541b480b9..1ecf42f61d81 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -79,7 +79,7 @@ namespace sfx2 OUString impl_getTitle() const; private: - DECL_LINK_TYPED( OnToolboxItemSelected, ToolBox*, void ); + DECL_LINK( OnToolboxItemSelected, ToolBox*, void ); void impl_construct(); void impl_layout(); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 90d49a84964a..ec4e931c71b4 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -77,7 +77,7 @@ private: protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK_TYPED( SwitchReadOnlyHandler, Button*, void ); + DECL_LINK( SwitchReadOnlyHandler, Button*, void ); SAL_DLLPRIVATE void KillDispatcher_Impl(); virtual ~SfxViewFrame() override; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 25545f759c8e..9611eb6c4f3d 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -893,7 +893,7 @@ private: sal_uInt16 nPos, const OUString& rSymbol ); // link to be set at <method>SvtSysLocaleOptions::SetCurrencyChangeLink()</method> - DECL_DLLPRIVATE_STATIC_LINK_TYPED( SvNumberFormatter, CurrencyChangeLink, LinkParamNone*, void ); + DECL_DLLPRIVATE_STATIC_LINK( SvNumberFormatter, CurrencyChangeLink, LinkParamNone*, void ); // return position of a special character sal_Int32 ImpPosToken ( const OUStringBuffer & sFormat, sal_Unicode token, sal_Int32 nStartPos = 0 ); diff --git a/include/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx index 41090dd68e21..5524b96d4db3 100644 --- a/include/svtools/GraphicExportOptionsDialog.hxx +++ b/include/svtools/GraphicExportOptionsDialog.hxx @@ -56,9 +56,9 @@ private: double getViewWidthInch(); double getViewHeightInch(); - DECL_LINK_TYPED( widthModifiedHandle, Edit&, void ); - DECL_LINK_TYPED( heightModifiedHandle, Edit&, void ); - DECL_LINK_TYPED( resolutionModifiedHandle, Edit&, void ); + DECL_LINK( widthModifiedHandle, Edit&, void ); + DECL_LINK( heightModifiedHandle, Edit&, void ); + DECL_LINK( resolutionModifiedHandle, Edit&, void ); public: GraphicExportOptionsDialog( vcl::Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 975789971dee..c6ab42b05f83 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -83,13 +83,13 @@ private: void InitDetails( ); void UpdateLabel( ); - DECL_LINK_TYPED ( OKHdl, Button *, void ); - DECL_LINK_TYPED ( DelHdl, Button *, void ); - DECL_LINK_TYPED ( EditHdl, DetailsContainer*, void ); - DECL_LINK_TYPED ( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED ( SelectTypeHdl, ListBox&, void ); - DECL_LINK_TYPED ( EditLabelHdl, Edit&, void ); - DECL_LINK_TYPED ( EditUsernameHdl, Edit&, void ); + DECL_LINK ( OKHdl, Button *, void ); + DECL_LINK ( DelHdl, Button *, void ); + DECL_LINK ( EditHdl, DetailsContainer*, void ); + DECL_LINK ( ModifyHdl, Edit&, void ); + DECL_LINK ( SelectTypeHdl, ListBox&, void ); + DECL_LINK ( EditLabelHdl, Edit&, void ); + DECL_LINK ( EditUsernameHdl, Edit&, void ); }; diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index a0a20157d2c9..4631c99210dc 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -61,7 +61,7 @@ class DetailsContainer protected: void notifyChange( ); - DECL_LINK_TYPED ( ValueChangeHdl, Edit&, void ); + DECL_LINK ( ValueChangeHdl, Edit&, void ); }; class HostDetailsContainer : public DetailsContainer @@ -104,7 +104,7 @@ class DavDetailsContainer : public HostDetailsContainer virtual bool verifyScheme( const OUString& rScheme ) override; private: - DECL_LINK_TYPED( ToggledDavsHdl, CheckBox&, void ); + DECL_LINK( ToggledDavsHdl, CheckBox&, void ); }; class SmbDetailsContainer : public DetailsContainer @@ -150,8 +150,8 @@ class CmisDetailsContainer : public DetailsContainer private: void selectRepository( ); - DECL_LINK_TYPED ( RefreshReposHdl, Button*, void ); - DECL_LINK_TYPED ( SelectRepoHdl, ListBox&, void ); + DECL_LINK ( RefreshReposHdl, Button*, void ); + DECL_LINK ( SelectRepoHdl, ListBox&, void ); }; #endif diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 47e89f574291..69d3bef4bc4f 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -123,14 +123,14 @@ namespace svt // initialize the dialog from the configuration data void loadConfiguration(); - DECL_LINK_TYPED(OnFieldScroll, ScrollBar*, void); - DECL_LINK_TYPED(OnFieldSelect, ListBox&, void); - DECL_LINK_TYPED(OnAdministrateDatasources, Button*, void); - DECL_STATIC_LINK_TYPED(AddressBookSourceDialog, OnComboGetFocus, Control&, void); - DECL_LINK_TYPED(OnComboLoseFocus, Control&, void); - DECL_LINK_TYPED(OnComboSelect, ComboBox&, void); - DECL_LINK_TYPED(OnOkClicked, Button*, void); - DECL_LINK_TYPED(OnDelayedInitialize, void*, void); + DECL_LINK(OnFieldScroll, ScrollBar*, void); + DECL_LINK(OnFieldSelect, ListBox&, void); + DECL_LINK(OnAdministrateDatasources, Button*, void); + DECL_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, Control&, void); + DECL_LINK(OnComboLoseFocus, Control&, void); + DECL_LINK(OnComboSelect, ComboBox&, void); + DECL_LINK(OnOkClicked, Button*, void); + DECL_LINK(OnDelayedInitialize, void*, void); }; diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index abb3308755ec..ceee99b4bacc 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -40,8 +40,8 @@ class SVT_DLLPUBLIC AsynchronLink void* _pArg; ::osl::Mutex* _pMutex; - DECL_DLLPRIVATE_LINK_TYPED( HandleCall_Idle, Idle*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleCall_PostUserEvent, void*, void ); + DECL_DLLPRIVATE_LINK( HandleCall_Idle, Idle*, void ); + DECL_DLLPRIVATE_LINK( HandleCall_PostUserEvent, void*, void ); SVT_DLLPRIVATE void Call_Impl( void* pArg ); public: diff --git a/include/svtools/autocmpledit.hxx b/include/svtools/autocmpledit.hxx index 79e36016380e..78777a176320 100644 --- a/include/svtools/autocmpledit.hxx +++ b/include/svtools/autocmpledit.hxx @@ -23,7 +23,7 @@ private: std::vector< OUString > m_aMatching; std::vector< OUString >::size_type m_nCurrent; - DECL_DLLPRIVATE_LINK_TYPED(AutoCompleteHdl_Impl, Edit&, void); + DECL_DLLPRIVATE_LINK(AutoCompleteHdl_Impl, Edit&, void); bool Match( const OUString& rText ); bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/include/svtools/breadcrumb.hxx b/include/svtools/breadcrumb.hxx index ac23e9b427b2..87273a5a36bc 100644 --- a/include/svtools/breadcrumb.hxx +++ b/include/svtools/breadcrumb.hxx @@ -46,7 +46,7 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox void appendField(); bool showField( unsigned int nIndex, unsigned int nWidthMax ); - DECL_LINK_TYPED( ClickLinkHdl, FixedHyperlink&, void ); + DECL_LINK( ClickLinkHdl, FixedHyperlink&, void ); public: Breadcrumb( vcl::Window* pParent ); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 30cee3c8331c..cdaca6b320dd 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -292,9 +292,9 @@ private: SVT_DLLPRIVATE void ColumnInserted( sal_uInt16 nPos ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( StartDragHdl, HeaderBar*, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( StartDragHdl, HeaderBar*, void ); SVT_DLLPRIVATE long GetFrozenWidth() const; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index cb69224ba288..70e1b7f4c5a8 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -243,7 +243,7 @@ private: protected: - DECL_LINK_TYPED( ScrollHdl, Timer *, void ); + DECL_LINK( ScrollHdl, Timer *, void ); public: Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 ); @@ -344,9 +344,9 @@ private: bool mbToday; bool mbNone; - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, Calendar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplClickHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar*, void ); + DECL_DLLPRIVATE_LINK( ImplClickHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); public: CalendarField( vcl::Window* pParent, WinBits nWinStyle ); diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index a9c5b184629e..e934adfcc6bb 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -114,7 +114,7 @@ namespace svt void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); void impl_update( const VclWindowEvent& _rTriggerEvent, vcl::Window& _rWindow ); - DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); + DECL_LINK( OnWindowEvent, VclWindowEvent&, void ); private: DialogController( const DialogController& ) = delete; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 9dcba3ba6a12..8103789ac71a 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -249,7 +249,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); }; @@ -269,7 +269,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); }; @@ -302,7 +302,7 @@ namespace svt CheckBox& GetBox() {return *pBox;}; private: - DECL_LINK_TYPED( OnClick, Button*, void ); + DECL_LINK( OnClick, Button*, void ); }; @@ -321,7 +321,7 @@ namespace svt protected: virtual bool WantMouseEvent() const override; private: - DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void); + DECL_LINK(ModifyHdl, LinkParamNone*, void); }; @@ -354,7 +354,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); }; @@ -388,7 +388,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK_TYPED(ListBoxSelectHdl, ListBox&, void); + DECL_LINK(ListBoxSelectHdl, ListBox&, void); }; @@ -659,10 +659,10 @@ namespace svt SVT_DLLPRIVATE void implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp); SVT_DLLPRIVATE void impl_construct(); - DECL_DLLPRIVATE_LINK_TYPED( ModifyHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( StartEditHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( EndEditHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( CellModifiedHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ModifyHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( StartEditHdl, void*, void ); + DECL_DLLPRIVATE_LINK( EndEditHdl, void*, void ); + DECL_DLLPRIVATE_LINK( CellModifiedHdl, void*, void ); }; diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx index 480dae53c302..0a1bc42b9200 100644 --- a/include/svtools/filechangedchecker.hxx +++ b/include/svtools/filechangedchecker.hxx @@ -32,7 +32,7 @@ private: ::std::function<void ()> mpCallback; bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const; - DECL_LINK_TYPED(TimerHandler, Idle *, void); + DECL_LINK(TimerHandler, Idle *, void); public: void resetTimer(); diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 0e976bb45cbd..7108f444cbac 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -58,7 +58,7 @@ protected: SVT_DLLPRIVATE void GetFocus() override; SVT_DLLPRIVATE void StateChanged( StateChangedType nType ) override; SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - DECL_DLLPRIVATE_LINK_TYPED( ButtonHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ButtonHdl, Button*, void ); public: FileControl( vcl::Window* pParent, WinBits nStyle ); diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index e1a02465e391..70c21e1ee7c8 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -74,8 +74,8 @@ private: bool bSortColumn; css::uno::Sequence< OUString > mpBlackList; - DECL_DLLPRIVATE_LINK_TYPED( HeaderSelect_Impl, HeaderBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); + DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar*, void ); + DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar*, void ); protected: virtual void GetFocus() override; diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index e90a6b6e9a54..9014fd977c5b 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -47,7 +47,7 @@ class SVT_DLLPUBLIC GenericToolboxController : 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( GenericToolboxController, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, void*, void ); private: VclPtr<ToolBox> m_pToolbox; diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 025107bef43a..6527ebbb1661 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -138,7 +138,7 @@ namespace svt virtual void implInitialize(const css::uno::Any& _rValue); private: - DECL_LINK_TYPED( OnDialogDying, VclWindowEvent&, void ); + DECL_LINK( OnDialogDying, VclWindowEvent&, void ); /** ensures that m_pDialog is not <NULL/> diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index de273d8ae552..66cb2ff25280 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -309,7 +309,7 @@ private: bool bEnlarge ) const; - DECL_LINK_TYPED( ImplAutoSwapOutHdl, Timer*, void ); + DECL_LINK( ImplAutoSwapOutHdl, Timer*, void ); // restart SwapOut timer; this is like touching in a cache to reset to the full timeout value void SVT_DLLPRIVATE restartSwapOutTimer() const; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 5ad086592e32..46b22333bb7a 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -48,7 +48,7 @@ friend class SvtURLBox_Impl; SVT_DLLPRIVATE bool ProcessKey( const vcl::KeyCode& rCode ); SVT_DLLPRIVATE void TryAutoComplete(); SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl(); - DECL_DLLPRIVATE_LINK_TYPED( AutoCompleteHdl_Impl, Edit&, void ); + DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, Edit&, void ); SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID); protected: diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index a01e04afca70..4214c6678abe 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -111,7 +111,7 @@ namespace svt virtual void impl_setPopupMenu(); static OUString determineBaseURL( const OUString& aURL ); - DECL_STATIC_LINK_TYPED( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void ); bool m_bInitialized; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 075b1fb2885b..4a05a62947f9 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -50,9 +50,9 @@ private: SVT_DLLPRIVATE void ImplSetInfo(); - DECL_DLLPRIVATE_LINK_TYPED( ImplPropertiesHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplChangePrinterHdl, ListBox&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplStatusHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, ListBox&, void ); + DECL_DLLPRIVATE_LINK( ImplStatusHdl, Timer*, void ); public: PrinterSetupDialog( vcl::Window* pWindow ); diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index cc4ced797fd2..86d0bbd30428 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -206,7 +206,7 @@ namespace svt void updateRoadmapItemLabel( WizardState _nState ); private: - DECL_DLLPRIVATE_LINK_TYPED( OnRoadmapItemSelected, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( OnRoadmapItemSelected, LinkParamNone*, void ); /** updates the roadmap control to show the given path, as far as possible (modulo conflicts with other paths) diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 4e5571ab9421..0de9d5604d56 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -58,8 +58,8 @@ private: bVCenter:1; SVT_DLLPRIVATE void ImpInitialize( ScrollableWindowFlags nFlags ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar *, void ); - DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar *, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar *, void ); + DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar *, void ); public: ScrollableWindow( vcl::Window* pParent ); diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 051e991732ff..500d23868c89 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -66,11 +66,11 @@ private: const CollatorWrapper aCollator; - DECL_LINK_TYPED( StartDragHdl, HeaderBar*, void ); - DECL_LINK_TYPED( DragHdl, HeaderBar*, void ); - DECL_LINK_TYPED( EndDragHdl, HeaderBar*, void ); - DECL_LINK_TYPED( HeaderBarClick, HeaderBar*, void ); - DECL_LINK_TYPED( CompareHdl, const SvSortData&, sal_Int32 ); + DECL_LINK( StartDragHdl, HeaderBar*, void ); + DECL_LINK( DragHdl, HeaderBar*, void ); + DECL_LINK( EndDragHdl, HeaderBar*, void ); + DECL_LINK( HeaderBarClick, HeaderBar*, void ); + DECL_LINK( CompareHdl, const SvSortData&, sal_Int32 ); protected: diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 9406dd5743ee..b184702c1853 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -44,7 +44,7 @@ enum SvParserState class SVT_DLLPUBLIC SvParser : public SvRefBase { - DECL_LINK_TYPED( NewDataRead, LinkParamNone*, void ); + DECL_LINK( NewDataRead, LinkParamNone*, void ); protected: SvStream& rInput; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index c07aaa1b2a91..c1cd12fcd1f9 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -131,8 +131,8 @@ private: ::svt::IAccessibleTabListBox* m_pAccessible; AccessibleChildren m_aAccessibleChildren; - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl_Impl, SvTreeListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( CreateAccessibleHdl_Impl, HeaderBar*, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl_Impl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK( CreateAccessibleHdl_Impl, HeaderBar*, void ); void RecalculateAccessibleChildren(); diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index e4967ac8982b..5549825d411a 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -351,9 +351,9 @@ private: SVT_DLLPRIVATE void ImplPrePaint(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount ); - DECL_DLLPRIVATE_LINK_TYPED(ImplClickHdl, Button*, void); + DECL_DLLPRIVATE_LINK(ImplClickHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(ImplAddClickHandler, Button*, void); + DECL_DLLPRIVATE_LINK(ImplAddClickHandler, Button*, void); ImplTabBarItem* seek( size_t i ); ImplTabBarItem* prev(); diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 11486356bf5d..408b2f453ca2 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -106,7 +106,7 @@ protected: void DataChanged( const DataChangedEvent& rDCEvt ) override; private: - DECL_LINK_TYPED( HighlightHdl, ValueSet*, void ); + DECL_LINK( HighlightHdl, ValueSet*, void ); void initStatusListener(); diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 7f307679005e..75b1ab23e0fb 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -149,7 +149,7 @@ class SVT_DLLPUBLIC ToolboxController : {} }; - DECL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, void*, void ); typedef std::unordered_map< OUString, css::uno::Reference< css::frame::XDispatch >, diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 900077932ad1..5898ad7434b3 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -270,10 +270,10 @@ protected: private: void SetBaseModel(SvTreeList* pNewModel); - DECL_DLLPRIVATE_LINK_TYPED( CheckButtonClick, SvLBoxButtonData *, void ); - DECL_DLLPRIVATE_LINK_TYPED( TextEditEndedHdl_Impl, SvInplaceEdit2&, void ); + DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData *, void ); + DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, SvInplaceEdit2&, void ); // Handler that is called by TreeList to clone an Entry - DECL_DLLPRIVATE_LINK_TYPED( CloneHdl_Impl, SvTreeListEntry*, SvTreeListEntry* ); + DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvTreeListEntry*, SvTreeListEntry* ); // Handler and methods for Drag - finished handler. // The Handle retrieved by GetDragFinishedHdl can be set on the @@ -283,7 +283,7 @@ private: // called for a deleted object. SVT_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB ); SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ); - DECL_DLLPRIVATE_LINK_TYPED( DragFinishHdl_Impl, sal_Int8, void ); + DECL_DLLPRIVATE_LINK( DragFinishHdl_Impl, sal_Int8, void ); protected: @@ -751,7 +751,7 @@ public: // A Parent's Children are turned into Children of the Parent which comes next in hierarchy void RemoveParentKeepChildren( SvTreeListEntry* pParent ); - DECL_LINK_TYPED( DefaultCompare, const SvSortData&, sal_Int32 ); + DECL_LINK( DefaultCompare, const SvSortData&, sal_Int32 ); virtual void ModelNotification( SvListAction nActionId, SvTreeListEntry* pEntry1, SvTreeListEntry* pEntry2, sal_uLong nPos ) override; @@ -797,9 +797,9 @@ class SvInplaceEdit2 bool bAlreadyInCallBack; void CallCallBackHdl_Impl(); - DECL_LINK_TYPED( Timeout_Impl, Idle *, void ); - DECL_LINK_TYPED( ReturnHdl_Impl, Accelerator&, void ); - DECL_LINK_TYPED( EscapeHdl_Impl, Accelerator&, void ); + DECL_LINK( Timeout_Impl, Idle *, void ); + DECL_LINK( ReturnHdl_Impl, Accelerator&, void ); + DECL_LINK( EscapeHdl_Impl, Accelerator&, void ); public: SvInplaceEdit2( vcl::Window* pParent, const Point& rPos, const Size& rSize, diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 20fe873784ca..c4fe6b1aa497 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -268,8 +268,8 @@ private: SVT_DLLPRIVATE bool ImplHasAccessibleListeners(); SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat ); SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, bool bCancel ); - DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer*, void ); ValueSet (const ValueSet &) = delete; ValueSet & operator= (const ValueSet &) = delete; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index bc7ce509fbaa..58c20ddf16c4 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -343,9 +343,9 @@ namespace svt TabPage* GetOrCreatePage( const WizardState i_nState ); private: - DECL_DLLPRIVATE_LINK_TYPED(OnNextPage, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(OnPrevPage, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(OnFinish, Button*, void); + DECL_DLLPRIVATE_LINK(OnNextPage, Button*, void); + DECL_DLLPRIVATE_LINK(OnPrevPage, Button*, void); + DECL_DLLPRIVATE_LINK(OnFinish, Button*, void); SVT_DLLPRIVATE void implResetDefault(vcl::Window* _pWindow); SVT_DLLPRIVATE void implUpdateTitle(); diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 97564c58ef8f..91473c42ea89 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -166,14 +166,14 @@ void MyWizardDlg::ActivatePage() MyWizardDlg-Prev/Next-Handler ----------------------------- -IMPL_LINK_TYPED( MyWizardDlg, ImplPrevHdl, PushButton*, pBtn, void ) +IMPL_LINK( MyWizardDlg, ImplPrevHdl, PushButton*, pBtn, void ) { ShowPrevPage(); if ( !GetCurLevel() ) pBtn->Disable(); } -IMPL_LINK_TYPED( MyWizardDlg, ImplNextHdl, PushButton*, pBtn, void ) +IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn, void ) { ShowNextPage(); if ( GetCurLevel() < 3 ) @@ -203,7 +203,7 @@ private: sal_Int16 mnLeftAlignCount; bool mbEmptyViewMargin; - DECL_DLLPRIVATE_LINK_TYPED( ImplHandleWizardLayoutTimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplHandleWizardLayoutTimerHdl, Idle*, void ); bool hasWizardPendingLayout() const; protected: diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx index 7f1c1fc52a78..6dfa031bbce6 100644 --- a/include/svx/SvxPresetListBox.hxx +++ b/include/svx/SvxPresetListBox.hxx @@ -35,7 +35,7 @@ private: Link<SvxPresetListBox*,void> maRenameHdl; Link<SvxPresetListBox*,void> maDeleteHdl; - DECL_LINK_TYPED( OnMenuItemSelected, Menu*, bool ); + DECL_LINK( OnMenuItemSelected, Menu*, bool ); template< typename ListType, typename EntryType > void FillPresetListBoxImpl(ListType& pList, sal_uInt32 nStartIndex); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index e94dc5d2d9a8..011c2ec0bd7e 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -121,7 +121,7 @@ private: void InitSettings(vcl::RenderContext& rRenderContext); // abstraction layers are: Unicode<->MapIndex<->Pixel Point MapIndexToPixel( int) const; - DECL_LINK_TYPED(VscrollHdl, ScrollBar*, void); + DECL_LINK(VscrollHdl, ScrollBar*, void); void init(); Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize); diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index b212162feab0..aef95d3e31a3 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -56,7 +56,7 @@ protected: // DragSourceHelper virtual void StartDrag( sal_Int8 nAction, const Point& rPtPixel ) override; - DECL_LINK_TYPED(ExecDragHdl, void*, void); + DECL_LINK(ExecDragHdl, void*, void); public: SvxColorValueSet_docking( vcl::Window* pParent ); @@ -86,7 +86,7 @@ private: void FillValueSet(); void SetSize(); - DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); /** This function is called when the window gets the focus. It grabs the focus to the color value set so that it can be controlled with diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index eb863a166f55..361a7185e6c8 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -63,17 +63,17 @@ private: void Initialize(); - DECL_LINK_TYPED( EndSlideHdl, Slider*, void ); - DECL_LINK_TYPED( NewInterpolationModifiedHdl, ListBox&, void ); - DECL_LINK_TYPED( NewQualityModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( NewCompressionModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( NewWidthModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( NewHeightModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( ResolutionModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( ToggleCompressionRB, RadioButton&, void ); - DECL_LINK_TYPED( ToggleReduceResolutionRB, CheckBox&, void ); - - DECL_LINK_TYPED( CalculateClickHdl, Button*, void ); + DECL_LINK( EndSlideHdl, Slider*, void ); + DECL_LINK( NewInterpolationModifiedHdl, ListBox&, void ); + DECL_LINK( NewQualityModifiedHdl, Edit&, void ); + DECL_LINK( NewCompressionModifiedHdl, Edit&, void ); + DECL_LINK( NewWidthModifiedHdl, Edit&, void ); + DECL_LINK( NewHeightModifiedHdl, Edit&, void ); + DECL_LINK( ResolutionModifiedHdl, Edit&, void ); + DECL_LINK( ToggleCompressionRB, RadioButton&, void ); + DECL_LINK( ToggleReduceResolutionRB, CheckBox&, void ); + + DECL_LINK( CalculateClickHdl, Button*, void ); void Update(); void UpdateNewWidthMF(); diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 50aa6544fac3..de280f393da2 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -193,13 +193,13 @@ private: VclPtr<Edit> m_pEdComment; bool bModified; - DECL_LINK_TYPED( SelDateHdl, ListBox&, void ); - DECL_LINK_TYPED( RowEnableHdl, Button*, void ); - DECL_LINK_TYPED( TimeHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyDate, Edit&, void ); - DECL_LINK_TYPED( RefHandle, Button*, void ); + DECL_LINK( SelDateHdl, ListBox&, void ); + DECL_LINK( RowEnableHdl, Button*, void ); + DECL_LINK( TimeHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( ModifyListBoxHdl, ListBox&, void ); + DECL_LINK( ModifyDate, Edit&, void ); + DECL_LINK( RefHandle, Button*, void ); protected: @@ -294,7 +294,7 @@ private: bool bEnableRejectAll; bool bEnableUndo; - DECL_LINK_TYPED( PbClickHdl, Button*, void ); + DECL_LINK( PbClickHdl, Button*, void ); public: SvxTPView(vcl::Window * pParent, VclBuilderContainer *pTopLevel); diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 68d8f20c86c1..fd322199f75f 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -155,10 +155,10 @@ protected: private: void InvalidateControl(); - DECL_LINK_TYPED( LinkedFieldModifyHdl, Edit&, void ); - DECL_LINK_TYPED( LinkedFieldFocusHdl, Control&, void ); + DECL_LINK( LinkedFieldModifyHdl, Edit&, void ); + DECL_LINK( LinkedFieldFocusHdl, Control&, void ); void LinkedFieldModifyHdl(); - DECL_LINK_TYPED(SpinFieldHdl, SpinField&, void); + DECL_LINK(SpinFieldHdl, SpinField&, void); }; /** Wrapper for usage of a DialControl in item connections. */ diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 2fcdfcb31879..8e48d52090e7 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -173,10 +173,10 @@ public: protected: - DECL_LINK_TYPED( InternalInteractiveChange, Svx3DLightControl*, void); - DECL_LINK_TYPED( InternalSelectionChange, Svx3DLightControl*, void); - DECL_LINK_TYPED( ScrollBarMove, ScrollBar*, void); - DECL_LINK_TYPED( ButtonPress, Button*, void); + DECL_LINK( InternalInteractiveChange, Svx3DLightControl*, void); + DECL_LINK( InternalSelectionChange, Svx3DLightControl*, void); + DECL_LINK( ScrollBarMove, ScrollBar*, void); + DECL_LINK( ButtonPress, Button*, void); // initialize local parameters void Init(); diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index e5f447465416..c7181a8a1ab3 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -60,8 +60,8 @@ private: sal_Int32 mnLastPosHatch; sal_Int32 mnLastPosBitmap; - DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void); - DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void); + DECL_LINK(SelectFillTypeHdl, ListBox&, void); + DECL_LINK(SelectFillAttrHdl, ListBox&, void); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index d5c211ed4a13..4cd2b4979e5b 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -186,16 +186,16 @@ private: // ItemSet used to remember set 2d attributes SfxItemSet* mpRemember2DAttributes; - DECL_LINK_TYPED( ClickViewTypeHdl, Button*, void ); - DECL_LINK_TYPED( ClickUpdateHdl, Button*, void ); - DECL_LINK_TYPED( ClickAssignHdl, Button*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( ClickColorHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( ClickViewTypeHdl, Button*, void ); + DECL_LINK( ClickUpdateHdl, Button*, void ); + DECL_LINK( ClickAssignHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( ClickColorHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); void ClickLight(PushButton &rBtn); - DECL_LINK_TYPED( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void ); + DECL_LINK( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void ); SVX_DLLPRIVATE void Construct(); SVX_DLLPRIVATE void Reset(); diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 2b5f0a586aef..f2e114c50ce9 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -79,7 +79,7 @@ protected: */ void notifyColumnSelect(sal_uInt16 nColumnId); private: - DECL_LINK_TYPED( OnAsyncExecuteDrop, void*, void ); + DECL_LINK( OnAsyncExecuteDrop, void*, void ); }; diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 67f8cefbf103..fdc0131a8227 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -520,8 +520,8 @@ protected: void selectionChanged(); void columnChanged(); - DECL_LINK_TYPED(OnQueryGridSlotState, DbGridControlNavigationBarState, int); - DECL_LINK_TYPED(OnExecuteGridSlot, DbGridControlNavigationBarState, bool); + DECL_LINK(OnQueryGridSlotState, DbGridControlNavigationBarState, int); + DECL_LINK(OnExecuteGridSlot, DbGridControlNavigationBarState, bool); }; diff --git a/include/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx index fa8515102ab1..50d81cc3f11c 100644 --- a/include/svx/fmobjfac.hxx +++ b/include/svx/fmobjfac.hxx @@ -33,7 +33,7 @@ public: FmFormObjFactory(); ~FmFormObjFactory(); - DECL_STATIC_LINK_TYPED(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); + DECL_STATIC_LINK(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); }; #endif // _FM_FMOBJFAC_HXX diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index ffcb6c1346fd..f58d1f61f87b 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -348,7 +348,7 @@ private: void OnSearchTerminated(); // is used by SearchThread, after the return from this handler the thread removes itself - DECL_LINK_TYPED(OnNewRecordCount, sal_Int32, void); + DECL_LINK(OnNewRecordCount, sal_Int32, void); }; #endif // INCLUDED_SVX_FMSRCIMP_HXX diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 8ef0eb84187a..5fe6ad0f7eb3 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -143,14 +143,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow friend class SvxFontWorkChildWindow; friend class SvxFontWorkControllerItem; - DECL_LINK_TYPED( SelectStyleHdl_Impl, ToolBox *, void ); - DECL_LINK_TYPED( SelectAdjustHdl_Impl, ToolBox *, void ); - DECL_LINK_TYPED( SelectShadowHdl_Impl, ToolBox *, void ); + DECL_LINK( SelectStyleHdl_Impl, ToolBox *, void ); + DECL_LINK( SelectAdjustHdl_Impl, ToolBox *, void ); + DECL_LINK( SelectShadowHdl_Impl, ToolBox *, void ); - DECL_LINK_TYPED( ModifyInputHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( InputTimoutHdl_Impl, Idle *, void ); + DECL_LINK( ModifyInputHdl_Impl, Edit&, void ); + DECL_LINK( InputTimoutHdl_Impl, Idle *, void ); - DECL_LINK_TYPED( ColorSelectHdl_Impl, ListBox&, void ); + DECL_LINK( ColorSelectHdl_Impl, ListBox&, void ); void SetStyle_Impl(const XFormTextStyleItem*); void SetAdjust_Impl(const XFormTextAdjustItem*); diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index 0149c022c26a..3c2368cdb9c2 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -68,8 +68,8 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog SdrView* mpSdrView; - DECL_LINK_TYPED( DoubleClickFavoriteHdl, ValueSet*, void ); - DECL_LINK_TYPED( ClickOKHdl, Button*, void ); + DECL_LINK( DoubleClickFavoriteHdl, ValueSet*, void ); + DECL_LINK( ClickOKHdl, Button*, void ); SdrObject** mppSdrObject; SdrModel* mpDestModel; diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx index 1cb11c82ad20..35f79fd076fa 100644 --- a/include/svx/formatpaintbrushctrl.hxx +++ b/include/svx/formatpaintbrushctrl.hxx @@ -46,7 +46,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; private: - DECL_LINK_TYPED( WaitDoubleClickHdl, Timer*, void ); + DECL_LINK( WaitDoubleClickHdl, Timer*, void ); void impl_executePaintBrush(); private: diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 6ae29851ef5a..fd0aa8badf82 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -130,7 +130,7 @@ public: SgaUserDataFactory() { SdrObjFactory::InsertMakeUserDataHdl( LINK(this,SgaUserDataFactory,MakeUserData) ); } ~SgaUserDataFactory() { SdrObjFactory::RemoveMakeUserDataHdl( LINK(this,SgaUserDataFactory,MakeUserData) ); } - DECL_STATIC_LINK_TYPED( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); + DECL_STATIC_LINK( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); }; class GraphicFilter; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 49d2f2e263ed..b4dab163f1c8 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -54,7 +54,7 @@ class SVX_DLLPUBLIC GraphCtrl : public Control bool bAnim; bool mbInIdleUpdate; - DECL_LINK_TYPED( UpdateHdl, Idle*, void ); + DECL_LINK( UpdateHdl, Idle*, void ); rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index bc48342c9995..dc3a1d1ecfb8 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -219,7 +219,7 @@ public: virtual void StateChanged( StateChangedType nType ) override; private: - DECL_LINK_TYPED(OnClick, Button*, void); + DECL_LINK(OnClick, Button*, void); void PositionDataSource(sal_Int32 nRecord); }; @@ -589,9 +589,9 @@ protected: protected: void ImplInitWindow( const InitWindowFacet _eInitWhat ); - DECL_LINK_TYPED(OnDelete, void*, void); + DECL_LINK(OnDelete, void*, void); - DECL_LINK_TYPED(OnAsyncAdjust, void*, void); + DECL_LINK(OnAsyncAdjust, void*, void); // if the param is != NULL, AdjustRows will be called, else AdjustDataSource private: diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index f7a6b7674e64..97f6b66a4d59 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -92,12 +92,12 @@ protected: bool mbEnableDrawingLayerFillStyles : 1; void InitHandler(); - DECL_LINK_TYPED(TurnOnHdl, Button*, void); - DECL_LINK_TYPED(DistModify, Edit&, void); - DECL_LINK_TYPED(HeightModify, Edit&, void); - DECL_LINK_TYPED(BorderModify, Edit&, void); - DECL_LINK_TYPED(BackgroundHdl, Button*, void); - DECL_LINK_TYPED(RangeFocusHdl, Control&, void); + DECL_LINK(TurnOnHdl, Button*, void); + DECL_LINK(DistModify, Edit&, void); + DECL_LINK(HeightModify, Edit&, void); + DECL_LINK(BorderModify, Edit&, void); + DECL_LINK(BackgroundHdl, Button*, void); + DECL_LINK(RangeFocusHdl, Control&, void); void RangeHdl(); void UpdateExample(); diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 50dc9fed2572..6747d5afe40d 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -118,16 +118,16 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow virtual bool Close() override; - DECL_LINK_TYPED( TbxClickHdl, ToolBox*, void ); - DECL_LINK_TYPED( InfoHdl, IMapWindow&, void ); - DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( URLModifyHdl, Edit&, void ); - DECL_LINK_TYPED( URLModifyComboBoxHdl, ComboBox&, void ); - DECL_LINK_TYPED( URLLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( UpdateHdl, Idle *, void ); - DECL_LINK_TYPED( StateHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); + DECL_LINK( TbxClickHdl, ToolBox*, void ); + DECL_LINK( InfoHdl, IMapWindow&, void ); + DECL_LINK( MousePosHdl, GraphCtrl*, void ); + DECL_LINK( GraphSizeHdl, GraphCtrl*, void ); + DECL_LINK( URLModifyHdl, Edit&, void ); + DECL_LINK( URLModifyComboBoxHdl, ComboBox&, void ); + DECL_LINK( URLLoseFocusHdl, Control&, void ); + DECL_LINK( UpdateHdl, Idle *, void ); + DECL_LINK( StateHdl, GraphCtrl*, void ); + DECL_LINK( MiscHdl, LinkParamNone*, void ); void DoOpen(); bool DoSave(); diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index f6a50c3d967d..c5bc3c17a20d 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -41,7 +41,7 @@ class SvxLineBox : public LineLB SfxObjectShell* mpSh; css::uno::Reference< css::frame::XFrame > mxFrame; - DECL_LINK_TYPED(DelayHdl_Impl, Timer *, void); + DECL_LINK(DelayHdl_Impl, Timer *, void); void ReleaseFocus_Impl(); diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 474348e9a07f..a32e5f0ee452 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -181,7 +181,7 @@ private: SVX_DLLPRIVATE virtual void ImplSaveValue() override; SVX_DLLPRIVATE virtual sal_Int32 ImplGetSavedValue() const override; - DECL_LINK_TYPED( EditModifyHdl, Edit&, void ); + DECL_LINK( EditModifyHdl, Edit&, void ); }; #endif diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index e3d1b0b25584..44cc61fcf6ad 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -37,8 +37,8 @@ protected: void Impl_SetInfo( sal_Int32 nCount ); - DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index e11ef5b7b9f2..e29fe6c785aa 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -90,7 +90,7 @@ private: css::uno::Reference< css::frame::XFrame > mxFrame; - DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); void FillValueSet(); void SetSize(); void implInit(); diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx index 354d0ebae09a..d820fb21cb39 100644 --- a/include/svx/modctrl.hxx +++ b/include/svx/modctrl.hxx @@ -43,7 +43,7 @@ public: SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); private: // Links - DECL_LINK_TYPED( OnTimer, Idle *, void ); + DECL_LINK( OnTimer, Idle *, void ); private: // Functions void _repaint(); diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index 0979d2c74f39..708eeb78ef97 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet void init(); protected: - DECL_LINK_TYPED(FormatHdl_Impl, Idle *, void); + DECL_LINK(FormatHdl_Impl, Idle *, void); public: SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx index b06020c276d9..8c9761e6b6d6 100644 --- a/include/svx/objfac3d.hxx +++ b/include/svx/objfac3d.hxx @@ -40,7 +40,7 @@ public: E3dObjFactory(); ~E3dObjFactory(); - DECL_STATIC_LINK_TYPED(E3dObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); + DECL_STATIC_LINK(E3dObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); }; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index b0e2e59f92a8..ab00b9fe37b9 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -141,10 +141,10 @@ protected: private: bool bAttrModified; - DECL_LINK_TYPED( ClickRotateHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeDrawHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeGridsnapHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeDivisionHdl_Impl, Edit&, void ); + DECL_LINK( ClickRotateHdl_Impl, Button*, void ); + DECL_LINK( ChangeDrawHdl_Impl, Edit&, void ); + DECL_LINK( ChangeGridsnapHdl_Impl, Button*, void ); + DECL_LINK( ChangeDivisionHdl_Impl, Edit&, void ); }; #endif diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 434d66660125..448c78513942 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -47,8 +47,8 @@ private: bool bEmpty; - DECL_LINK_TYPED(ButtonHdl, Button*, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(ButtonHdl, Button*, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: SvxPasswordDialog( vcl::Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 3a8bfed02ea9..fb71960ffbef 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -116,16 +116,16 @@ class SvxRubyDialog : public SfxModelessDialog SfxBindings* pBindings; - DECL_LINK_TYPED(ApplyHdl_Impl, Button*, void); - DECL_LINK_TYPED(CloseHdl_Impl, Button*, void); - DECL_LINK_TYPED(StylistHdl_Impl, Button*, void); - DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void); - DECL_LINK_TYPED(PositionHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(AdjustHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(CharStyleHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(EditModifyHdl_Impl, Edit&, void); - DECL_LINK_TYPED(EditScrollHdl_Impl, sal_Int32, bool); - DECL_LINK_TYPED(EditJumpHdl_Impl, sal_Int32, void); + DECL_LINK(ApplyHdl_Impl, Button*, void); + DECL_LINK(CloseHdl_Impl, Button*, void); + DECL_LINK(StylistHdl_Impl, Button*, void); + DECL_LINK(ScrollHdl_Impl, ScrollBar*, void); + DECL_LINK(PositionHdl_Impl, ListBox&, void); + DECL_LINK(AdjustHdl_Impl, ListBox&, void); + DECL_LINK(CharStyleHdl_Impl, ListBox&, void); + DECL_LINK(EditModifyHdl_Impl, Edit&, void); + DECL_LINK(EditScrollHdl_Impl, sal_Int32, bool); + DECL_LINK(EditJumpHdl_Impl, sal_Int32, void); void SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight); void GetRubyText(); diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 7a81bbbc4c5d..d8a78516b156 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -214,8 +214,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener long GetLeftMin() const; long GetRightMax() const; - DECL_LINK_TYPED( TabMenuSelect, Menu *, bool ); - DECL_LINK_TYPED( MenuSelect, Menu *, bool ); + DECL_LINK( TabMenuSelect, Menu *, bool ); + DECL_LINK( MenuSelect, Menu *, bool ); void PrepareProportional_Impl(RulerType); enum class UpdateType diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 0ea072adafa3..b69cbd801bd5 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -159,7 +159,7 @@ private: SVX_DLLPRIVATE void findMergeOrigin( CellPos& rPos ); - DECL_LINK_TYPED( UpdateHdl, void *, void ); + DECL_LINK( UpdateHdl, void *, void ); //TableModelRef mxTable; rtl::Reference< TableModel > mxTable; diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index b3a37c068b79..18c58176bb7a 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -160,16 +160,16 @@ protected: sfx2::sidebar::SidebarController* mpSidebarController; - DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void ); - DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void ); - DECL_LINK_TYPED(ChangeGradientAngle, Edit&, void); - DECL_LINK_TYPED(ChangeTrgrTypeHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ModifyTransSliderHdl, Slider*, void); - DECL_LINK_TYPED(ClickImportBitmapHdl, Button*, void); + DECL_LINK(SelectFillTypeHdl, ListBox&, void ); + DECL_LINK(SelectFillAttrHdl, ListBox&, void ); + DECL_LINK(ChangeGradientAngle, Edit&, void); + DECL_LINK(ChangeTrgrTypeHdl_Impl, ListBox&, void); + DECL_LINK(ModifyTransparentHdl_Impl, Edit&, void); + DECL_LINK(ModifyTransSliderHdl, Slider*, void); + DECL_LINK(ClickImportBitmapHdl, Button*, void); // for transparency gradient - DECL_LINK_TYPED( ClickTrGrHdl_Impl, ToolBox*, void ); + DECL_LINK( ClickTrGrHdl_Impl, ToolBox*, void ); void Initialize(); void Update(); diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 0d173380c527..0cab1bd447bb 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -160,13 +160,13 @@ private: void Initialize(); - DECL_LINK_TYPED(ChangeLineStyleHdl, ListBox&, void); - DECL_LINK_TYPED(ToolboxWidthSelectHdl, ToolBox*, void); - DECL_LINK_TYPED(ChangeTransparentHdl, Edit&, void ); - DECL_LINK_TYPED(ChangeStartHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeEndHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeEdgeStyleHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeCapStyleHdl, ListBox&, void); + DECL_LINK(ChangeLineStyleHdl, ListBox&, void); + DECL_LINK(ToolboxWidthSelectHdl, ToolBox*, void); + DECL_LINK(ChangeTransparentHdl, Edit&, void ); + DECL_LINK(ChangeStartHdl, ListBox&, void); + DECL_LINK(ChangeEndHdl, ListBox&, void); + DECL_LINK(ChangeEdgeStyleHdl, ListBox&, void); + DECL_LINK(ChangeCapStyleHdl, ListBox&, void); }; } } // end of namespace svx::sidebar diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index bdeeebe6c50f..fd7a0ea8215b 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -57,8 +57,8 @@ private: Image m_aIMGCus; Image m_aIMGCusGray; - DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void); - DECL_LINK_TYPED(MFModifyHdl, Edit&, void); + DECL_LINK(VSSelectHdl, ValueSet*, void); + DECL_LINK(MFModifyHdl, Edit&, void); }; } } // end of namespace svx::sidebar diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index 7b1c15cdb853..d69607b89b90 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -29,7 +29,7 @@ private: bool m_bInClose; bool hasPanelPendingLayout() const; - DECL_DLLPRIVATE_LINK_TYPED(ImplHandlePanelLayoutTimerHdl, Idle*, void); + DECL_DLLPRIVATE_LINK(ImplHandlePanelLayoutTimerHdl, Idle*, void); public: PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 89a5ee728017..8a598a6ecb54 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -234,17 +234,17 @@ private: mutable sal_Int32 nTransliterationFlags; - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( FlagHdl_Impl, Button*, void ); - DECL_LINK_TYPED( CommandHdl_Impl, Button*, void ); - DECL_LINK_TYPED(TemplateHdl_Impl, Button*, void); - DECL_LINK_TYPED( FocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( LBSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED(LoseFocusHdl_Impl, Control&, void); - DECL_LINK_TYPED(FormatHdl_Impl, Button*, void); - DECL_LINK_TYPED(NoFormatHdl_Impl, Button*, void); - DECL_LINK_TYPED(AttributeHdl_Impl, Button*, void); - DECL_LINK_TYPED( TimeoutHdl_Impl, Timer*, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( FlagHdl_Impl, Button*, void ); + DECL_LINK( CommandHdl_Impl, Button*, void ); + DECL_LINK(TemplateHdl_Impl, Button*, void); + DECL_LINK( FocusHdl_Impl, Control&, void ); + DECL_LINK( LBSelectHdl_Impl, ListBox&, void ); + DECL_LINK(LoseFocusHdl_Impl, Control&, void); + DECL_LINK(FormatHdl_Impl, Button*, void); + DECL_LINK(NoFormatHdl_Impl, Button*, void); + DECL_LINK(AttributeHdl_Impl, Button*, void); + DECL_LINK( TimeoutHdl_Impl, Timer*, void ); void ClickHdl_Impl(void* pCtrl); void Construct_Impl(); diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index d293e3afb356..64abea3efdf3 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -117,7 +117,7 @@ protected: // Chaining void ImpChainingEventHdl(); - DECL_LINK_TYPED(ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void); + DECL_LINK(ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void); // Check if the whole text is selected. @@ -126,17 +126,17 @@ protected: void ImpMakeTextCursorAreaVisible(); // handler for AutoGrowing text with active Outliner - DECL_LINK_TYPED(ImpOutlinerStatusEventHdl, EditStatus&, void); - DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl, EditFieldInfo*, void); + DECL_LINK(ImpOutlinerStatusEventHdl, EditStatus&, void); + DECL_LINK(ImpOutlinerCalcFieldValueHdl, EditFieldInfo*, void); // link for EndTextEditHdl - DECL_LINK_TYPED(EndTextEditHdl, SdrUndoManager*, void); + DECL_LINK(EndTextEditHdl, SdrUndoManager*, void); void ImpMacroUp(const Point& rUpPos); void ImpMacroDown(const Point& rDownPos); - DECL_LINK_TYPED( BeginPasteOrDropHdl, PasteOrDropInfos*, void ); - DECL_LINK_TYPED( EndPasteOrDropHdl, PasteOrDropInfos*, void ); + DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos*, void ); + DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos*, void ); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index c2bcefb44431..8b3c01e3054e 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -184,7 +184,7 @@ class OLEObjCache void UnloadOnDemand(); static bool UnloadObj( SdrOle2Obj* pObj ); - DECL_LINK_TYPED( UnloadCheckHdl, Timer*, void ); + DECL_LINK( UnloadCheckHdl, Timer*, void ); public: OLEObjCache(); diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 43fc5568ee0c..0a001b065bee 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -313,7 +313,7 @@ public: void Set2ndPos(const Point& rPnt); // the link called by the color handles - DECL_LINK_TYPED(ColorChangeHdl, SdrHdlColor*, void); + DECL_LINK(ColorChangeHdl, SdrHdlColor*, void); // transformation call, create gradient from this handle void FromIAOToItem(SdrObject* pObj, bool bSetItemOnObject, bool bUndo); diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 81c7969e4bc8..caae687a7ae2 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -111,7 +111,7 @@ private: void ImpLinkAbmeldung(); bool ImpUpdateGraphicLink( bool bAsynchron = true ) const; void ImpSetLinkedGraphic( const Graphic& rGraphic ); - DECL_LINK_TYPED( ImpSwapHdl, const GraphicObject*, SvStream* ); + DECL_LINK( ImpSwapHdl, const GraphicObject*, SvStream* ); void onGraphicChanged(); public: diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 07cacf1ebfd7..cde8018d76fa 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -223,7 +223,7 @@ public: private: SVX_DLLPRIVATE void ImpClearVars(); - DECL_LINK_TYPED(ImpComeBackHdl, Idle*, void); + DECL_LINK(ImpComeBackHdl, Idle*, void); protected: sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const; diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index a1505473cc5c..6785370fb1e2 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -169,7 +169,7 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; - DECL_LINK_TYPED( VisibilityNotification, SvxStyleBox_Impl&, void ); + DECL_LINK( VisibilityNotification, SvxStyleBox_Impl&, void ); protected: // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments) @@ -236,7 +236,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl BorderColorStatus maBorderColorStatus; bool bSidebarType; ColorSelectFunction maColorSelectFunction; - DECL_LINK_TYPED(SelectedHdl, const Color&, void); + DECL_LINK(SelectedHdl, const Color&, void); public: SFX_DECL_TOOLBOX_CONTROL(); SvxColorToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox); diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx index 13cf1685fbab..628e7b754bfe 100644 --- a/include/test/bootstrapfixture.hxx +++ b/include/test/bootstrapfixture.hxx @@ -47,7 +47,7 @@ class OOO_DLLPUBLIC_TEST BootstrapFixture : public BootstrapFixtureBase bool m_bAssertOnDialog; public: - DECL_STATIC_LINK_TYPED( BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool ); + DECL_STATIC_LINK( BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool ); BootstrapFixture( bool bAssertOnDialog = true, bool bNeedUCB = true ); virtual ~BootstrapFixture() override; diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index 1c73a62b4414..1003a536e1cb 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -62,7 +62,7 @@ namespace toolkit virtual void SetScrollTop( long Top ) override; void setScrollVisibility( ScrollBarVisibility rState ); - DECL_LINK_TYPED( ScrollBarHdl, ScrollBar*, void ); + DECL_LINK( ScrollBarHdl, ScrollBar*, void ); virtual void ResetScrollBars(); // Window virtual void Resize() override; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 1fea9e5c9851..3f37fd589605 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -64,8 +64,8 @@ private: VCLExternalSolarLock* m_pSolarLock; - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); - DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); void DisconnectEvents(); protected: diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 8ca1ab2bece9..77dc70911e02 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -67,7 +67,7 @@ private: protected: ::osl::Mutex& GetMutex() { return maMutex; } - DECL_LINK_TYPED( MenuEventListener, VclMenuEvent&, void ); + DECL_LINK( MenuEventListener, VclMenuEvent&, void ); void ImplCreateMenu( bool bPopup ); diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index af10c4f0aa41..611e1dadff7e 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -82,7 +82,7 @@ private: protected: Size ImplCalcWindowSize( const Size& rOutSz ) const; - DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void ); + DECL_LINK(WindowEventListener, VclWindowEvent&, void ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); virtual css::uno::Reference< css::accessibility::XAccessibleContext > diff --git a/include/tools/link.hxx b/include/tools/link.hxx index f46e84e7c578..8b65be4755dd 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -24,42 +24,42 @@ #include <sal/types.h> -#define DECL_LINK_TYPED(Member, ArgType, RetType) \ +#define DECL_LINK(Member, ArgType, RetType) \ static RetType LinkStub##Member(void *, ArgType); \ RetType Member(ArgType) -#define DECL_STATIC_LINK_TYPED(Class, Member, ArgType, RetType) \ +#define DECL_STATIC_LINK(Class, Member, ArgType, RetType) \ static RetType LinkStub##Member(void *, ArgType); \ static RetType Member(Class *, ArgType) -#define DECL_DLLPRIVATE_LINK_TYPED(Member, ArgType, RetType) \ +#define DECL_DLLPRIVATE_LINK(Member, ArgType, RetType) \ SAL_DLLPRIVATE static RetType LinkStub##Member(void *, ArgType); \ SAL_DLLPRIVATE RetType Member(ArgType) -#define DECL_DLLPRIVATE_STATIC_LINK_TYPED(Class, Member, ArgType, RetType) \ +#define DECL_DLLPRIVATE_STATIC_LINK(Class, Member, ArgType, RetType) \ SAL_DLLPRIVATE static RetType LinkStub##Member(void *, ArgType); \ SAL_DLLPRIVATE static RetType Member(Class *, ArgType) -#define IMPL_LINK_TYPED(Class, Member, ArgType, ArgName, RetType) \ +#define IMPL_LINK(Class, Member, ArgType, ArgName, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return static_cast<Class *>(instance)->Member(data); \ } \ RetType Class::Member(ArgType ArgName) -#define IMPL_LINK_NOARG_TYPED(Class, Member, ArgType, RetType) \ +#define IMPL_LINK_NOARG(Class, Member, ArgType, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return static_cast<Class *>(instance)->Member(data); \ } \ RetType Class::Member(SAL_UNUSED_PARAMETER ArgType) -#define IMPL_STATIC_LINK_TYPED( \ +#define IMPL_STATIC_LINK( \ Class, Member, ArgType, ArgName, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return Member(static_cast<Class *>(instance), data); \ } \ RetType Class::Member(SAL_UNUSED_PARAMETER Class *, ArgType ArgName) -#define IMPL_STATIC_LINK_NOARG_TYPED( \ +#define IMPL_STATIC_LINK_NOARG( \ Class, Member, ArgType, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return Member(static_cast<Class *>(instance), data); \ diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 75503dea309d..640ae95628cd 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -183,7 +183,7 @@ private: bool mbLoopTerminated; SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout ); - DECL_DLLPRIVATE_LINK_TYPED( ImplTimeoutHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, Timer*, void ); }; diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 4d54f8efd0c5..139033b21193 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -95,7 +95,7 @@ private: SAL_DLLPRIVATE void ImplInitButtonDialogData(); SAL_DLLPRIVATE VclPtr<PushButton> ImplCreatePushButton( ButtonDialogFlags nBtnFlags ); SAL_DLLPRIVATE ImplBtnDlgItem* ImplGetItem( sal_uInt16 nId ) const; - DECL_DLLPRIVATE_LINK_TYPED( ImplClickHdl, Button* pBtn, void ); + DECL_DLLPRIVATE_LINK( ImplClickHdl, Button* pBtn, void ); SAL_DLLPRIVATE void ImplPosControls(); }; diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 8350a212b396..36103705abd9 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -101,7 +101,7 @@ public: protected: /// Handler for click, in case we want the button to handle uno commands (.uno:Something). - DECL_STATIC_LINK_TYPED(Button, dispatchCommandHandler, Button*, void); + DECL_STATIC_LINK(Button, dispatchCommandHandler, Button*, void); }; enum class PushButtonDropdownStyle diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index ab5a2e249d3e..59cac2799a9f 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -55,7 +55,7 @@ private: public: SAL_DLLPRIVATE void ImplDraw(); - DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer*, void ); SAL_DLLPRIVATE void ImplShow(); SAL_DLLPRIVATE void ImplHide(); SAL_DLLPRIVATE void ImplResume( bool bRestore = false ); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 3246574bd418..da3aa7e37a46 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -56,7 +56,7 @@ private: SAL_DLLPRIVATE Dialog (const Dialog &) = delete; SAL_DLLPRIVATE Dialog & operator= (const Dialog &) = delete; - DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncCloseHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void*, void ); protected: using Window::ImplInit; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index a3d0a7bcfce3..7fb7a89fb4df 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -109,7 +109,7 @@ private: mbStartDockingEnabled:1, mbLocked:1; - DECL_LINK_TYPED( PopupModeEnd, FloatingWindow*, void ); + DECL_LINK( PopupModeEnd, FloatingWindow*, void ); void ImplEnableStartDocking() { mbStartDockingEnabled = true; } bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } @@ -245,7 +245,7 @@ private: SAL_DLLPRIVATE void ImplInitDockingWindowData(); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox); - DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void ); DockingWindow (const DockingWindow &) = delete; DockingWindow & operator= (const DockingWindow &) = delete; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 05f56bc3afef..8bc6b2bf642d 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -97,7 +97,7 @@ private: css::uno::Reference<css::i18n::XExtendedInputSequenceChecker> mxISC; - DECL_DLLPRIVATE_LINK_TYPED(ImplUpdateDataHdl, Timer*, void); + DECL_DLLPRIVATE_LINK(ImplUpdateDataHdl, Timer*, void); SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_Int32 nSelectionLen ) const; SAL_DLLPRIVATE void ImplInitEditData(); diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx index 276c8879aed5..bbd11ce2d24d 100644 --- a/include/vcl/evntpost.hxx +++ b/include/vcl/evntpost.hxx @@ -32,7 +32,7 @@ namespace vcl ImplSVEvent * m_nId; Link<LinkParamNone*,void> m_aLink; - DECL_DLLPRIVATE_LINK_TYPED( DoEvent_Impl, void*, void ); + DECL_DLLPRIVATE_LINK( DoEvent_Impl, void*, void ); public: EventPoster( const Link<LinkParamNone*,void>& rLink ); diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index c1e0d3008565..414fcee0aac2 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -102,7 +102,7 @@ private: Link<FloatingWindow*,void> maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); - DECL_DLLPRIVATE_LINK_TYPED( ImplEndPopupModeHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void*, void ); virtual void setPosSizeOnContainee(Size aSize, Window &rBox) override; FloatingWindow (const FloatingWindow &) = delete; diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index a32b1013b4ab..2623498c29b0 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -232,7 +232,7 @@ private: sal_uLong ImplSetError( sal_uLong nError, const SvStream* pStm = nullptr ); sal_uInt16 ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat ); - DECL_LINK_TYPED( FilterCallback, ConvertData&, bool ); + DECL_LINK( FilterCallback, ConvertData&, bool ); protected: diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 6f75909dd109..862326041f91 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -391,7 +391,7 @@ private: private: friend class VclBuilder; void designate_label(vcl::Window *pWindow); - DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); + DECL_LINK(WindowEventListener, VclWindowEvent&, void); public: VclFrame(vcl::Window *pParent) : VclBin(pParent) @@ -479,7 +479,7 @@ private: bool m_bResizeTopLevel; VclPtr<DisclosureButton> m_pDisclosureButton; Link<VclExpander&,void> maExpandedHdl; - DECL_DLLPRIVATE_LINK_TYPED(ClickHdl, CheckBox&, void); + DECL_DLLPRIVATE_LINK(ClickHdl, CheckBox&, void); }; class VCL_DLLPUBLIC VclScrolledWindow : public VclBin @@ -500,7 +500,7 @@ public: protected: virtual Size calculateRequisition() const override; virtual void setAllocation(const Size &rAllocation) override; - DECL_LINK_TYPED(ScrollBarHdl, ScrollBar*, void); + DECL_LINK(ScrollBarHdl, ScrollBar*, void); void InitScrollBars(const Size &rRequest); virtual bool Notify(NotifyEvent& rNEvt) override; private: @@ -652,7 +652,7 @@ private: std::map< VclPtr<const vcl::Window>, short> m_aResponses; OUString m_sPrimaryString; OUString m_sSecondaryString; - DECL_DLLPRIVATE_LINK_TYPED(ButtonHdl, Button *, void); + DECL_DLLPRIVATE_LINK(ButtonHdl, Button *, void); void setButtonHandlers(VclButtonBox *pButtonBox); short get_response(const vcl::Window *pWindow) const; void create_owned_areas(); diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 455a82aa184b..f4ae404de91a 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -91,17 +91,17 @@ private: private: SAL_DLLPRIVATE void ImplInitListBoxData(); - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ImplListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplCancelHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplDoubleClickHdl, ImplListBoxWindow*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectionChangedHdl, sal_Int32, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplUserDrawHdl, UserDrawEvent*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplFocusHdl, sal_Int32, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplListItemSelectHdl, LinkParamNone*, void ); - - DECL_DLLPRIVATE_LINK_TYPED( ImplClickBtnHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplScrollHdl, ImplListBox*, void ); + DECL_DLLPRIVATE_LINK( ImplCancelHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, ImplListBoxWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, sal_Int32, void ); + DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent*, void ); + DECL_DLLPRIVATE_LINK( ImplFocusHdl, sal_Int32, void ); + DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl, LinkParamNone*, void ); + + DECL_DLLPRIVATE_LINK( ImplClickBtnHdl, void*, void ); protected: using Window::ImplInit; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 6504edc8befc..38681ab2a169 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -183,7 +183,7 @@ protected: SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); - DECL_DLLPRIVATE_LINK_TYPED(ImplCallSelect, void*, void ); + DECL_DLLPRIVATE_LINK(ImplCallSelect, void*, void ); SAL_DLLPRIVATE void ImplFillLayoutData() const; SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; } diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 535ad84b8bfc..6063c5a61f78 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -43,7 +43,7 @@ private: Link<MenuButton*,void> maSelectHdl; SAL_DLLPRIVATE void ImplInitMenuButtonData(); - DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, Timer*, void ); MenuButton( const MenuButton & ) = delete; MenuButton& operator=( const MenuButton & ) = delete; diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 897f13f41a95..bef8f7170fc8 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -84,7 +84,7 @@ private: SAL_DLLPRIVATE bool ImplDrawNative(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags); SAL_DLLPRIVATE void ImplDragThumb( const Point& rMousePos ); SAL_DLLPRIVATE Size getCurrentCalcSize() const; - DECL_DLLPRIVATE_LINK_TYPED( ImplAutoTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, Timer*, void ); public: explicit ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT ); diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index 140952b10b0d..430fe3af03fe 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -86,7 +86,7 @@ private: sal_uLong nUpdateInterval; sal_uInt16 nLockedMods; SelectionEngineFlags nFlags; - DECL_DLLPRIVATE_LINK_TYPED( ImpWatchDog, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImpWatchDog, Timer*, void ); inline bool ShouldDeselect( bool bModifierKey1 ) const; // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index a7e94d1a2eb7..3ab014c833b7 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -56,9 +56,9 @@ private: Link<Slider*,void> maSlideHdl; Link<Slider*,void> maEndSlideHdl; - DECL_LINK_TYPED(LinkedFieldModifyHdl, Edit&, void); - DECL_LINK_TYPED(LinkedFieldLoseFocusHdl, Control&, void); - DECL_LINK_TYPED(LinkedFieldSpinnerHdl, SpinField&, void); + DECL_LINK(LinkedFieldModifyHdl, Edit&, void); + DECL_LINK(LinkedFieldLoseFocusHdl, Control&, void); + DECL_LINK(LinkedFieldSpinnerHdl, SpinField&, void); using Control::ImplInitSettings; using Window::ImplInit; diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index b6168946d910..f88969c733b9 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -48,7 +48,7 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplTimeout, Timer*, void ); public: explicit SpinButton( vcl::Window* pParent, WinBits nStyle ); diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 552c939e6cb8..4e213e94c035 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -51,7 +51,7 @@ protected: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); private: - DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplTimeout, Timer*, void ); SAL_DLLPRIVATE void ImplInitSpinFieldData(); SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea ); diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 9476fad9739c..4ac5084bb2fe 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1400,7 +1400,7 @@ public: static void setDeInitHook(Link<LinkParamNone*,void> const & hook); private: - DECL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, void ); + DECL_STATIC_LINK( Application, PostEventHandler, void*, void ); }; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 90b42fdcd6ff..d3a44e78f63d 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -178,7 +178,7 @@ public: private: SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin ); virtual void setPosSizeOnContainee(Size aSize, Window &rBox); - DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void ); protected: // Single argument ctors shall be explicit. diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index fcb35d376684..4e2ae4fc6652 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -76,8 +76,8 @@ protected: SAL_DLLPRIVATE void ImplFreeLayoutData(); SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKeyEvent ); - DECL_DLLPRIVATE_LINK_TYPED( ImplListBoxSelectHdl, ListBox&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplWindowEventListener, VclWindowEvent&, void ); + DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, ListBox&, void ); + DECL_DLLPRIVATE_LINK( ImplWindowEventListener, VclWindowEvent&, void ); using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index f528d0bde7cf..5a13c2390f6f 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -171,7 +171,7 @@ protected: void ImpTextHeightChanged(); void ImpTextFormatted(); - DECL_LINK_TYPED( IdleFormatHdl, Idle *, void ); + DECL_LINK( IdleFormatHdl, Idle *, void ); void CheckIdleFormatter(); void IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts = 5 ); diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 2f27657aafea..67baa061e3d5 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -38,7 +38,7 @@ namespace vcl long m_nReturn; bool m_bTimeout; - DECL_DLLPRIVATE_LINK_TYPED( worker, void*, void ); + DECL_DLLPRIVATE_LINK( worker, void*, void ); public: SolarThreadExecutor(); diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index f98f891e7cba..8dfda97c5a62 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -84,7 +84,7 @@ private: AutoTimer maWaitTimer; ImageSet meImageSet; - DECL_LINK_TYPED( TimeOutHdl, Timer*, void ); + DECL_LINK( TimeOutHdl, Timer*, void ); }; #endif // INCLUDED_VCL_THROBBER_HXX diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 51053e30cd07..fe3fa39d03e9 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -206,10 +206,10 @@ private: SAL_DLLPRIVATE bool ImplHasExternalMenubutton(); SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext& rRenderContext, ImplToolItem* pItem ); - DECL_DLLPRIVATE_LINK_TYPED( ImplCallExecuteCustomMenu, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplUpdateHdl, Idle*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplCustomMenuListener, VclMenuEvent&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplDropdownLongClickHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void*, void ); + DECL_DLLPRIVATE_LINK( ImplUpdateHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent&, void ); + DECL_DLLPRIVATE_LINK( ImplDropdownLongClickHdl, Timer*, void ); ToolBox (const ToolBox &) = delete; ToolBox& operator= (const ToolBox &) = delete; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index c6436f9c7de9..f89447fc116c 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -43,7 +43,7 @@ private: protected: - DECL_LINK_TYPED( ImpUpdateDataHdl, Timer*, void ); + DECL_LINK( ImpUpdateDataHdl, Timer*, void ); void StateChanged( StateChangedType nType ) override; void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 8c82fa9d6720..7de1c77b83a0 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -541,11 +541,11 @@ private: public: - DECL_DLLPRIVATE_LINK_TYPED( ImplHandlePaintHdl, Idle*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplGenerateMouseMoveHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncFocusHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplHandleResizeTimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplHandlePaintHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplGenerateMouseMoveHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplTrackTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplAsyncFocusHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplHandleResizeTimerHdl, Idle*, void ); SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window* pWindow ); diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 8f456225bdb2..20ea193fc603 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -496,7 +496,7 @@ void LngSvcMgr::modified(const lang::EventObject&) //needs to be run in the main thread because //utl::ConfigChangeListener_Impl::changesOccurred grabs the SolarMutex and we //get notified that an extension was added from an extension manager thread -IMPL_LINK_NOARG_TYPED(LngSvcMgr, updateAndBroadcast, Idle *, void) +IMPL_LINK_NOARG(LngSvcMgr, updateAndBroadcast, Idle *, void) { osl::MutexGuard aGuard( GetLinguMutex() ); diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index f892ee17ed9a..493e6dd0fd72 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -138,7 +138,7 @@ class LngSvcMgr : void UpdateAll(); void stopListening(); - DECL_LINK_TYPED( updateAndBroadcast, Idle*, void ); + DECL_LINK( updateAndBroadcast, Idle*, void ); public: LngSvcMgr(); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index a09ba3634e57..12fbfb8e5827 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -443,12 +443,12 @@ void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEve { } -IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( OAddFieldWindow, OnSelectHdl, SvTreeListBox*, void ) { m_aActions->EnableItem(m_nInsertId, ( m_pListBox.get() && m_pListBox->GetSelectionCount() > 0 )); } -IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnDoubleClickHdl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( OAddFieldWindow, OnDoubleClickHdl, SvTreeListBox*, bool ) { m_aCreateLink.Call(*this); @@ -464,7 +464,7 @@ void OAddFieldWindow::resizeControls(const Size& _rDiff) } } -IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSortAction, ToolBox*, void ) +IMPL_LINK_NOARG( OAddFieldWindow, OnSortAction, ToolBox*, void ) { const sal_uInt16 nCurItem = m_aActions->GetCurItemId(); if (nCurItem == m_nInsertId) diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index cb445f4b0021..837fb73d377a 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -308,7 +308,7 @@ namespace rptui impl_ensureConditionVisible( nNewConditionIndex ); } - IMPL_LINK_TYPED( ConditionalFormattingDialog, OnScroll, ScrollBar*, /*_pNotInterestedIn*/, void ) + IMPL_LINK( ConditionalFormattingDialog, OnScroll, ScrollBar*, /*_pNotInterestedIn*/, void ) { size_t nFirstCondIndex( impl_getFirstVisibleConditionIndex() ); size_t nFocusCondIndex = impl_getFocusedConditionIndex( nFirstCondIndex ); diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 6a48e9dc85de..b0a67b116efe 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -66,7 +66,7 @@ ConditionField::ConditionField(Condition* pParent, Edit* pSubEdit, PushButton *p m_pFormula->SetClickHdl( LINK( this, ConditionField, OnFormula ) ); } -IMPL_LINK_TYPED( ConditionField, OnFormula, Button*, _pClickedButton, void ) +IMPL_LINK( ConditionField, OnFormula, Button*, _pClickedButton, void ) { OUString sFormula(m_pSubEdit->GetText()); const sal_Int32 nLen = sFormula.getLength(); @@ -94,7 +94,7 @@ IMPL_LINK_TYPED( ConditionField, OnFormula, Button*, _pClickedButton, void ) #define PALETTE_SIZE (PALETTE_X * PALETTE_Y) class OColorPopup : public FloatingWindow { - DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); VclPtr<Condition> m_pCondition; sal_uInt16 m_nSlotId; public: @@ -193,7 +193,7 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId) } } -IMPL_LINK_NOARG_TYPED(OColorPopup, SelectHdl, ValueSet*, void) +IMPL_LINK_NOARG(OColorPopup, SelectHdl, ValueSet*, void) { sal_uInt16 nItemId = m_aColorSet->GetSelectItemId(); Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet->GetItemColor( nItemId ) ); @@ -332,7 +332,7 @@ void Condition::dispose() VclHBox::dispose(); } -IMPL_LINK_NOARG_TYPED( Condition, DropdownClick, ToolBox*, void ) +IMPL_LINK_NOARG( Condition, DropdownClick, ToolBox*, void ) { sal_uInt16 nId( m_pActions->GetCurItemId() ); if ( !m_pColorFloat ) @@ -355,13 +355,13 @@ IMPL_LINK_NOARG_TYPED( Condition, DropdownClick, ToolBox*, void ) m_pColorFloat->StartSelection(); } -IMPL_LINK_NOARG_TYPED( Condition, OnFormatAction, ToolBox*, void ) +IMPL_LINK_NOARG( Condition, OnFormatAction, ToolBox*, void ) { Color aCol(COL_AUTO); ApplyCommand(mapToolbarItemToSlotId(m_pActions->GetCurItemId()),aCol); } -IMPL_LINK_TYPED( Condition, OnConditionAction, Button*, _pClickedButton, void ) +IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton, void ) { if ( _pClickedButton == m_pMoveUp ) m_rAction.moveConditionUp( getConditionIndex() ); @@ -398,13 +398,13 @@ void Condition::GetFocus() m_pCondLHS->GrabFocus(); } -IMPL_LINK_NOARG_TYPED( Condition, OnTypeSelected, ListBox&, void ) +IMPL_LINK_NOARG( Condition, OnTypeSelected, ListBox&, void ) { impl_layoutOperands(); } -IMPL_LINK_NOARG_TYPED( Condition, OnOperationSelected, ListBox&, void ) +IMPL_LINK_NOARG( Condition, OnOperationSelected, ListBox&, void ) { impl_layoutOperands(); } diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index d51980ca2385..ab5194ade94c 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -53,7 +53,7 @@ namespace rptui VclPtr<Edit> m_pSubEdit; VclPtr<PushButton> m_pFormula; - DECL_LINK_TYPED( OnFormula, Button*, void ); + DECL_LINK( OnFormula, Button*, void ); public: ConditionField(Condition* pParent, Edit* pSubEdit, PushButton *pFormula); void GrabFocus() { m_pSubEdit->GrabFocus(); } @@ -100,9 +100,9 @@ namespace rptui ConditionalExpressions m_aConditionalExpressions; - DECL_LINK_TYPED( OnFormatAction, ToolBox*, void ); - DECL_LINK_TYPED( DropdownClick, ToolBox*, void ); - DECL_LINK_TYPED( OnConditionAction, Button*, void ); + DECL_LINK( OnFormatAction, ToolBox*, void ); + DECL_LINK( DropdownClick, ToolBox*, void ); + DECL_LINK( OnConditionAction, Button*, void ); public: Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ); @@ -167,8 +167,8 @@ namespace rptui void impl_setCondition( const OUString& _rConditionFormula ); private: - DECL_LINK_TYPED( OnTypeSelected, ListBox&, void ); - DECL_LINK_TYPED( OnOperationSelected, ListBox&, void ); + DECL_LINK( OnTypeSelected, ListBox&, void ); + DECL_LINK( OnOperationSelected, ListBox&, void ); }; diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 86e048228630..b8d8a1fa7d0c 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -205,7 +205,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con return xPreviewer->convertNumberToPreviewString(sFormat,nValue,m_nLocale,true); } -IMPL_LINK_TYPED( ODateTimeDialog, CBClickHdl, Button*, _pBox, void ) +IMPL_LINK( ODateTimeDialog, CBClickHdl, Button*, _pBox, void ) { if ( _pBox == m_pDate || _pBox == m_pTime) { diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 1df8dbd9268e..6a720e0fdba5 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -217,7 +217,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) } -IMPL_LINK_TYPED( FormulaDialog, OnClickHdl, OAddFieldWindow& ,_rAddFieldDlg, void) +IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow& ,_rAddFieldDlg, void) { const uno::Sequence< beans::PropertyValue > aArgs = _rAddFieldDlg.getSelectedFieldDescriptors(); // we use this way to create undo actions diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 111f5afbb74d..c3a6b2b84c83 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -166,13 +166,13 @@ protected: private: - DECL_LINK_TYPED( DelayedPaste, void*, void ); - DECL_LINK_TYPED( CBChangeHdl, ComboBox&, void); + DECL_LINK( DelayedPaste, void*, void ); + DECL_LINK( CBChangeHdl, ComboBox&, void); void InsertRows( long nRow ); public: - DECL_LINK_TYPED( DelayedDelete, void*, void ); + DECL_LINK( DelayedDelete, void*, void ); }; @@ -411,7 +411,7 @@ void OFieldExpressionControl::lateInit() } -IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, CBChangeHdl, ComboBox&, void ) +IMPL_LINK_NOARG( OFieldExpressionControl, CBChangeHdl, ComboBox&, void ) { SaveModified(); @@ -846,7 +846,7 @@ void OFieldExpressionControl::paste() } } -IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedPaste, void*, void ) +IMPL_LINK_NOARG( OFieldExpressionControl, DelayedPaste, void*, void ) { m_nPasteEvent = nullptr; @@ -857,7 +857,7 @@ IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedPaste, void*, void ) GoToRow( nPastePosition ); } -IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedDelete, void*, void ) +IMPL_LINK_NOARG( OFieldExpressionControl, DelayedDelete, void*, void ) { m_nDeleteEvent = nullptr; DeleteRows(); @@ -1092,7 +1092,7 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName) return nDataType; } -IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void ) +IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void ) { if ( m_pFieldExpression && m_pFieldExpression->getExpressionControl() ) { @@ -1114,7 +1114,7 @@ IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, voi } } -IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusLost, Control&, rControl, void ) +IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control&, rControl, void ) { if (m_pFieldExpression && &rControl == m_pGroupIntervalEd) { @@ -1123,7 +1123,7 @@ IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusLost, Control&, rControl, vo } } -IMPL_LINK_NOARG_TYPED( OGroupsSortingDialog, OnFormatAction, ToolBox*, void ) +IMPL_LINK_NOARG( OGroupsSortingDialog, OnFormatAction, ToolBox*, void ) { sal_uInt16 nCommand = m_pToolBox->GetCurItemId(); @@ -1165,7 +1165,7 @@ IMPL_LINK_NOARG_TYPED( OGroupsSortingDialog, OnFormatAction, ToolBox*, void ) } } -IMPL_LINK_TYPED( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void ) +IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void ) { if ( rListBox.IsValueChangedFromSaved() ) { diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index bcb7ddd10688..2b1290c7b578 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -182,8 +182,8 @@ public: virtual ~NavigatorTree() override; virtual void dispose() override; - DECL_LINK_TYPED(OnEntrySelDesel, SvTreeListBox*, void); - DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); + DECL_LINK(OnEntrySelDesel, SvTreeListBox*, void); + DECL_LINK( OnDropActionTimer, Timer*, void ); virtual void _selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) override; @@ -422,7 +422,7 @@ void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel ) } } -IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void) +IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer, Timer *, void) { if (--m_nTimerCounter > 0) return; @@ -452,7 +452,7 @@ IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void) } -IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void) +IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void) { if ( !m_pSelectionListener->locked() ) { diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index bcc17b92b535..01461ca4949a 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -71,9 +71,9 @@ class OAddFieldWindow :public FloatingWindow ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; - DECL_LINK_TYPED( OnDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( OnSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( OnSortAction, ToolBox*, void ); + DECL_LINK( OnDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( OnSelectHdl, SvTreeListBox*, void ); + DECL_LINK( OnSortAction, ToolBox*, void ); OAddFieldWindow(const OAddFieldWindow&) = delete; void operator =(const OAddFieldWindow&) = delete; diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index da23b9ab35cf..d1002dd26b69 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -107,7 +107,7 @@ namespace rptui virtual bool PreNotify( NotifyEvent& rNEvt ) override; private: - DECL_LINK_TYPED( OnScroll, ScrollBar*, void ); + DECL_LINK( OnScroll, ScrollBar*, void ); private: /// returns the current number of conditions diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 9d38933f263c..150a80ed6744 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -70,7 +70,7 @@ class ODateTimeDialog : public ModalDialog */ sal_Int32 getFormatKey(bool _bDate) const; - DECL_LINK_TYPED( CBClickHdl, Button*, void ); + DECL_LINK( CBClickHdl, Button*, void ); ODateTimeDialog(const ODateTimeDialog&) = delete; void operator =(const ODateTimeDialog&) = delete; diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 9f3735ec7719..6f9a4d84a412 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -76,8 +76,8 @@ namespace rptui bool m_bDeleted; - DECL_LINK_TYPED(MarkTimeout, Idle *, void); - DECL_LINK_TYPED( SplitHdl, SplitWindow*, void ); + DECL_LINK(MarkTimeout, Idle *, void); + DECL_LINK( SplitHdl, SplitWindow*, void ); void ImplInitSettings(); diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 183dc5eab160..77153a0db40d 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -58,7 +58,7 @@ class FormulaDialog : public formula::FormulaModalDialog, svl::SharedStringPool& mrStringPool; - DECL_LINK_TYPED( OnClickHdl, OAddFieldWindow&, void ); + DECL_LINK( OnClickHdl, OAddFieldWindow&, void ); public: FormulaDialog( vcl::Window* pParent , const css::uno::Reference< css::lang::XMultiServiceFactory>& _xServiceFactory diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 47b0eaafe131..2da386938a4c 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -82,10 +82,10 @@ class OGroupsSortingDialog : public FloatingWindow css::uno::Reference< css::container::XNameAccess > m_xColumns; bool m_bReadOnly; private: - DECL_LINK_TYPED( OnControlFocusLost, Control&, void ); - DECL_LINK_TYPED( OnControlFocusGot, Control&, void ); - DECL_LINK_TYPED( LBChangeHdl, ListBox&, void ); - DECL_LINK_TYPED( OnFormatAction, ToolBox*, void ); + DECL_LINK( OnControlFocusLost, Control&, void ); + DECL_LINK( OnControlFocusGot, Control&, void ); + DECL_LINK( LBChangeHdl, ListBox&, void ); + DECL_LINK( OnFormatAction, ToolBox*, void ); /** returns the groups @return the groups which now have to check which one changes diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 9c89710141c2..c14cb0256995 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -314,9 +314,9 @@ namespace rptui ,const css::uno::Sequence< css::beans::PropertyValue >& _aArgs); void OnInvalidateClipboard(); - DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK_TYPED( OnExecuteReport, void*, void ); - DECL_LINK_TYPED( OnOpenHelpAgent, void*, void ); + DECL_LINK( OnClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( OnExecuteReport, void*, void ); + DECL_LINK( OnOpenHelpAgent, void*, void ); // all the features which should be handled by this class virtual void describeSupportedFeatures() override; // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. @@ -335,8 +335,8 @@ namespace rptui OReportController(const OReportController&) = delete; OReportController& operator=(const OReportController&) = delete; - DECL_LINK_TYPED( EventLstHdl, VclWindowEvent&, void ); - DECL_LINK_TYPED( OnCreateHdl, OAddFieldWindow&, void); + DECL_LINK( EventLstHdl, VclWindowEvent&, void ); + DECL_LINK( OnCreateHdl, OAddFieldWindow&, void); DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index a0665a737444..0e1f5b37953e 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -103,7 +103,7 @@ namespace rptui void switchListening( const css::uno::Reference< css::container::XIndexAccess >& _rxContainer, bool _bStartListening ); void switchListening( const css::uno::Reference< css::uno::XInterface >& _rxObject, bool _bStartListening ); - DECL_LINK_TYPED(SettingsChanged, VclSimpleEvent&, void ); + DECL_LINK(SettingsChanged, VclSimpleEvent&, void ); private: ::std::vector< css::uno::Reference< css::container::XChild> >::const_iterator getSection(const css::uno::Reference< css::container::XChild>& _xContainer) const; diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 83c39327348f..3c1d31a13cd1 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -56,7 +56,7 @@ namespace rptui ::rtl::Reference<comphelper::OPropertyChangeMultiplexer > m_pReportDefinitionMultiPlexer; // listener for property changes - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void); + DECL_LINK( ScrollHdl, ScrollBar*, void); Size ResizeScrollBars(); void ImplInitSettings(); void impl_initScrollBar( ScrollBar& _rScrollBar ) const; diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index fbe632021050..45d342775bee 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -79,10 +79,10 @@ namespace rptui bool setReportSectionTitle(const css::uno::Reference< css::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn); void ImplInitSettings(); - DECL_LINK_TYPED(Collapsed, OColorListener&, void); - DECL_LINK_TYPED(StartSplitHdl, Splitter*, void); - DECL_LINK_TYPED(SplitHdl, Splitter*, void); - DECL_LINK_TYPED(EndSplitHdl, Splitter*, void); + DECL_LINK(Collapsed, OColorListener&, void); + DECL_LINK(StartSplitHdl, Splitter*, void); + DECL_LINK(SplitHdl, Splitter*, void); + DECL_LINK(EndSplitHdl, Splitter*, void); virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx index ea529bd8d591..a75315fdd3df 100644 --- a/reportdesign/source/ui/inc/dlgedfac.hxx +++ b/reportdesign/source/ui/inc/dlgedfac.hxx @@ -35,7 +35,7 @@ public: DlgEdFactory(); ~DlgEdFactory(); - DECL_STATIC_LINK_TYPED( DlgEdFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); + DECL_STATIC_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index ec5b3c7c0cfa..ab218994a837 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -53,7 +53,7 @@ protected: bool m_bUiActive; bool m_bShowPropertyBrowser; - DECL_LINK_TYPED( ScrollTimeout, Timer *, void ); + DECL_LINK( ScrollTimeout, Timer *, void ); void ForceScroll( const Point& rPos ); /** checks that no other object is overlapped. * diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index 9e8f37047af8..e205d41e19b4 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -83,7 +83,7 @@ protected: css::uno::Reference< css::uno::XInterface> CreateComponentPair( const css::uno::Reference< css::uno::XInterface>& _xFormComponent ,const css::uno::Reference< css::uno::XInterface>& _xReportComponent); - DECL_LINK_TYPED( OnAsyncGetFocus, void*, void ); + DECL_LINK( OnAsyncGetFocus, void*, void ); public: PropBrw(const css::uno::Reference< css::uno::XComponentContext >& _xORB diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index c5d29746411b..eb4383f9a612 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -266,7 +266,7 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground) } -IMPL_LINK_NOARG_TYPED(ODesignView, MarkTimeout, Idle *, void) +IMPL_LINK_NOARG(ODesignView, MarkTimeout, Idle *, void) { if ( m_pPropWin && m_pPropWin->IsVisible() ) { @@ -399,7 +399,7 @@ void ODesignView::ImplInitSettings() SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); } -IMPL_LINK_NOARG_TYPED( ODesignView, SplitHdl, SplitWindow*, void ) +IMPL_LINK_NOARG( ODesignView, SplitHdl, SplitWindow*, void ) { const Size aOutputSize = GetOutputSizePixel(); const long nTest = aOutputSize.Width() * m_aSplitWin->GetItemSize(TASKPANE_ID) / 100; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index a2b6ec538c0d..453dce3c726a 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1725,12 +1725,12 @@ void OReportController::impl_initialize( ) } } -IMPL_LINK_NOARG_TYPED( OReportController, OnOpenHelpAgent, void*, void ) +IMPL_LINK_NOARG( OReportController, OnOpenHelpAgent, void*, void ) { doOpenHelpAgent(); } -IMPL_LINK_TYPED( OReportController, OnCreateHdl, OAddFieldWindow& ,_rAddFieldDlg, void) +IMPL_LINK( OReportController, OnCreateHdl, OAddFieldWindow& ,_rAddFieldDlg, void) { WaitObject aObj( getDesignView() ); uno::Sequence< beans::PropertyValue > aArgs = _rAddFieldDlg.getSelectedFieldDescriptors(); @@ -2317,7 +2317,7 @@ void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGr } } -IMPL_LINK_NOARG_TYPED(OReportController, OnClipboardChanged, TransferableDataHelper*, void) +IMPL_LINK_NOARG(OReportController, OnClipboardChanged, TransferableDataHelper*, void) { OnInvalidateClipboard(); } @@ -2567,7 +2567,7 @@ sal_Int32 OReportController::getGroupPosition(const uno::Reference< report::XGro } -IMPL_LINK_TYPED( OReportController, EventLstHdl, VclWindowEvent&, _rEvent, void ) +IMPL_LINK( OReportController, EventLstHdl, VclWindowEvent&, _rEvent, void ) { if ( _rEvent.GetId() == VCLEVENT_WINDOW_CLOSE ) { @@ -3120,7 +3120,7 @@ void OReportController::createNewFunction(const uno::Any& _aValue) xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(xFunction)); } -IMPL_LINK_NOARG_TYPED( OReportController, OnExecuteReport, void*, void ) +IMPL_LINK_NOARG( OReportController, OnExecuteReport, void*, void ) { executeReport(); } diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 6e3dc687ba8e..748cf10d6dbf 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -80,7 +80,7 @@ public: } - IMPL_LINK_TYPED(OXReportControllerObserver, SettingsChanged, VclSimpleEvent&, _rEvt, void) + IMPL_LINK(OXReportControllerObserver, SettingsChanged, VclSimpleEvent&, _rEvt, void) { sal_Int32 nEvent = _rEvt.GetId(); diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index bf159fb2a77b..e80990dc0d80 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -193,7 +193,7 @@ void OScrollWindowHelper::Resize() m_aReportWindow->SetPosSizePixel(Point( 0, 0 ),aTotalOutputSize); } -IMPL_LINK_TYPED( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/, void ) +IMPL_LINK( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/, void ) { m_aReportWindow->ScrollChildren( getThumbPos() ); } diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 18d3a9c8afc3..c94d04032432 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -295,7 +295,7 @@ void OSectionWindow::setMarked(bool _bMark) m_aEndMarker->setMarked(_bMark); } -IMPL_LINK_TYPED( OSectionWindow, Collapsed, OColorListener&, _rMarker, void ) +IMPL_LINK( OSectionWindow, Collapsed, OColorListener&, _rMarker, void ) { bool bShow = !_rMarker.isCollapsed(); m_aReportSection->Show(bShow); @@ -316,18 +316,18 @@ void OSectionWindow::zoom(const Fraction& _aZoom) Invalidate(); } -IMPL_LINK_NOARG_TYPED( OSectionWindow, StartSplitHdl, Splitter*, void) +IMPL_LINK_NOARG( OSectionWindow, StartSplitHdl, Splitter*, void) { const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) ); getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString(), 0, -1 ); } -IMPL_LINK_NOARG_TYPED( OSectionWindow, EndSplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( OSectionWindow, EndSplitHdl, Splitter*, void ) { getViewsWindow()->getView()->getReportView()->getController().getUndoManager().LeaveListAction(); } -IMPL_LINK_TYPED( OSectionWindow, SplitHdl, Splitter*, _pSplitter, void ) +IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter, void ) { if ( !getViewsWindow()->getView()->getReportView()->getController().isEditable() ) { diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 09ef7bcb341e..07a2e4c9c3d2 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -43,7 +43,7 @@ DlgEdFactory::~DlgEdFactory() } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { SdrObject* pNewObj = nullptr; diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 45cd2e78715a..3830ff0fd290 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -60,7 +60,7 @@ namespace rptui using namespace ::com::sun::star; -IMPL_LINK_NOARG_TYPED( DlgEdFunc, ScrollTimeout, Timer *, void ) +IMPL_LINK_NOARG( DlgEdFunc, ScrollTimeout, Timer *, void ) { ForceScroll( m_pParent->PixelToLogic( m_pParent->GetPointerPosPixel() ) ); } diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 594a27c627b8..7e3bb4529d2e 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -559,7 +559,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent) } } -IMPL_LINK_NOARG_TYPED( PropBrw, OnAsyncGetFocus, void*, void ) +IMPL_LINK_NOARG( PropBrw, OnAsyncGetFocus, void*, void ) { if (m_xBrowserComponentWindow.is()) m_xBrowserComponentWindow->setFocus(); diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 05638fbb8710..0d4452421ebe 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -298,8 +298,8 @@ private: { } - DECL_LINK_TYPED( CallBackWriteRc, const NameNode&, void ); - DECL_LINK_TYPED( CallBackWriteSrc, const NameNode&, void ); + DECL_LINK( CallBackWriteRc, const NameNode&, void ); + DECL_LINK( CallBackWriteSrc, const NameNode&, void ); void WriteRc( RscTop * pCl, ObjNode * pRoot ) { @@ -316,7 +316,7 @@ public: void WriteRcFile( RscWriteRc & rMem, FILE * fOutput ); }; -IMPL_LINK_TYPED( RscEnumerateObj, CallBackWriteRc, const NameNode&, rNode, void ) +IMPL_LINK( RscEnumerateObj, CallBackWriteRc, const NameNode&, rNode, void ) { const ObjNode& rObjNode = static_cast<const ObjNode&>(rNode); RscWriteRc aMem( pTypCont->GetByteOrder() ); @@ -330,7 +330,7 @@ IMPL_LINK_TYPED( RscEnumerateObj, CallBackWriteRc, const NameNode&, rNode, void WriteRcFile( aMem, fOutput ); } -IMPL_LINK_TYPED( RscEnumerateObj, CallBackWriteSrc, const NameNode&, rNode, void ) +IMPL_LINK( RscEnumerateObj, CallBackWriteSrc, const NameNode&, rNode, void ) { const ObjNode& rObjNode = static_cast<const ObjNode&>(rNode); if( rObjNode.GetFileKey() == lFileKey ) @@ -391,8 +391,8 @@ class RscEnumerateRef private: RscTop * pRoot; - DECL_LINK_TYPED( CallBackWriteRc, const NameNode&, void ); - DECL_LINK_TYPED( CallBackWriteSrc, const NameNode&, void ); + DECL_LINK( CallBackWriteRc, const NameNode&, void ); + DECL_LINK( CallBackWriteSrc, const NameNode&, void ); public: RscEnumerateObj aEnumObj; @@ -416,13 +416,13 @@ public: } }; -IMPL_LINK_TYPED( RscEnumerateRef, CallBackWriteRc, const NameNode&, rNode, void ) +IMPL_LINK( RscEnumerateRef, CallBackWriteRc, const NameNode&, rNode, void ) { const RscTop& rRef = static_cast<const RscTop&>(rNode); aEnumObj.WriteRc( const_cast<RscTop*>(&rRef), rRef.GetObjNode() ); } -IMPL_LINK_TYPED( RscEnumerateRef, CallBackWriteSrc, const NameNode&, rNode, void ) +IMPL_LINK( RscEnumerateRef, CallBackWriteSrc, const NameNode&, rNode, void ) { const RscTop& rRef = static_cast<const RscTop&>(rNode); aEnumObj.WriteSrc( const_cast<RscTop*>(&rRef), rRef.GetObjNode() ); @@ -473,7 +473,7 @@ void RscTypCont::WriteSrc( FILE * fOutput, RscFileTab::Index nFileKey ) class RscDel { sal_uLong lFileKey; - DECL_LINK_TYPED( Delete, const NameNode&, void ); + DECL_LINK( Delete, const NameNode&, void ); public: RscDel( RscTop * pRoot, sal_uLong lKey ); }; @@ -485,7 +485,7 @@ inline RscDel::RscDel( RscTop * pRoot, sal_uLong lKey ) pRoot->EnumNodes( LINK( this, RscDel, Delete ) ); } -IMPL_LINK_TYPED( RscDel, Delete, const NameNode&, r, void ) +IMPL_LINK( RscDel, Delete, const NameNode&, r, void ) { RscTop* pNode = const_cast<RscTop*>(static_cast<const RscTop*>(&r)); if( pNode->GetObjNode() ) diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index 59f6255b0bce..5bc668a24629 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -116,13 +116,13 @@ class ScAppCfg : public ScAppOptions ScLinkConfigItem aMiscItem; ScLinkConfigItem aCompatItem; - DECL_LINK_TYPED( LayoutCommitHdl, ScLinkConfigItem&, void ); - DECL_LINK_TYPED( InputCommitHdl, ScLinkConfigItem&, void ); - DECL_LINK_TYPED( RevisionCommitHdl, ScLinkConfigItem&, void ); - DECL_LINK_TYPED( ContentCommitHdl, ScLinkConfigItem&, void ); - DECL_LINK_TYPED( SortListCommitHdl, ScLinkConfigItem&, void ); - DECL_LINK_TYPED( MiscCommitHdl, ScLinkConfigItem&, void ); - DECL_LINK_TYPED( CompatCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( LayoutCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( InputCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( RevisionCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( ContentCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( SortListCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( MiscCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( CompatCommitHdl, ScLinkConfigItem&, void ); static css::uno::Sequence<OUString> GetLayoutPropertyNames(); static css::uno::Sequence<OUString> GetInputPropertyNames(); diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 998f21b83aad..c7e5aa3d1291 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -74,8 +74,8 @@ public: const OUString& GetSource() const { return aSourceArea; } const ScRange& GetDestArea() const { return aDestArea; } - DECL_LINK_TYPED( RefreshHdl, Timer*, void ); - DECL_LINK_TYPED( AreaEndEditHdl, Dialog&, void ); + DECL_LINK( RefreshHdl, Timer*, void ); + DECL_LINK( AreaEndEditHdl, Dialog&, void ); }; #endif diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 6619bc134c64..4b8072bfaaab 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -188,7 +188,7 @@ private: bool bGotDataChangedHint; XModifyListenerArr_Impl aValueListeners; - DECL_LINK_TYPED( ValueListenerHdl, const SfxHint&, void ); + DECL_LINK( ValueListenerHdl, const SfxHint&, void ); private: void PaintGridRanges_Impl(); diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 39c864cc1b42..1beda6cdac30 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -362,7 +362,7 @@ private: // Implementation void RefChanged(); - DECL_LINK_TYPED( ValueListenerHdl, const SfxHint&, void ); + DECL_LINK( ValueListenerHdl, const SfxHint&, void ); private: class ExternalRefListener : public ScExternalRefManager::LinkListener diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 9c11640a857c..6b982c316fc1 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -145,7 +145,7 @@ private: Idle aIdle; ScDocument* pDoc; - DECL_LINK_TYPED(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Idle *, void); ScChartListenerCollection& operator=( const ScChartListenerCollection& ) = delete; diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index e679e2c965cd..c9fd872e8414 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -63,7 +63,7 @@ private: Timer maTimer; std::unique_ptr< ScChartLockGuard > mapScChartLockGuard; - DECL_LINK_TYPED(TimeoutHdl, Timer *, void); + DECL_LINK(TimeoutHdl, Timer *, void); ScTemporaryChartLock( const ScTemporaryChartLock& ) = delete; }; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 94ecf482d1c0..51e27170deeb 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -167,8 +167,8 @@ class ScDocCfg : public ScDocOptions ScLinkConfigItem aCalcItem; ScLinkConfigItem aLayoutItem; - DECL_LINK_TYPED( CalcCommitHdl, ScLinkConfigItem&, void ); - DECL_LINK_TYPED( LayoutCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( CalcCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( LayoutCommitHdl, ScLinkConfigItem&, void ); static css::uno::Sequence<OUString> GetCalcPropertyNames(); static css::uno::Sequence<OUString> GetLayoutPropertyNames(); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 757b87884088..727e68c805f2 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -489,7 +489,7 @@ public: SC_DLLPUBLIC sal_uLong GetCellCount() const; // all cells SC_DLLPUBLIC sal_uLong GetFormulaGroupCount() const; // all cells sal_uLong GetCodeCount() const; // RPN-Code in formulas - DECL_LINK_TYPED( GetUserDefinedColor, sal_uInt16, Color* ); + DECL_LINK( GetUserDefinedColor, sal_uInt16, Color* ); // number formatter public: SC_DLLPUBLIC ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT, @@ -2022,7 +2022,7 @@ private: SCCOLROW nEndCol, SCCOLROW* pTranslate, ScProgress* pProgress, sal_uLong nProAdd ); - DECL_LINK_TYPED(TrackTimeHdl, Idle *, void); + DECL_LINK(TrackTimeHdl, Idle *, void); static ScRecursionHelper* CreateRecursionHelperInstance(); diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index e6a4cd6fe5df..4743d5e9a513 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -861,7 +861,7 @@ private: bool mbDocTimerEnabled:1; AutoTimer maSrcDocTimer; - DECL_LINK_TYPED(TimeOutHdl, Timer*, void); + DECL_LINK(TimeOutHdl, Timer*, void); }; #endif diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 07b38c8a7a3a..d7affbb57101 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -123,9 +123,9 @@ public: // moved by the application - DECL_LINK_TYPED( IdleHandler, Timer*, void ); // Timer instead of idle - DECL_LINK_TYPED( SpellTimerHdl, Idle*, void ); - DECL_LINK_TYPED( CalcFieldValueHdl, EditFieldInfo*, void ); + DECL_LINK( IdleHandler, Timer*, void ); // Timer instead of idle + DECL_LINK( SpellTimerHdl, Idle*, void ); + DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); void Execute( SfxRequest& rReq ); void GetState( SfxItemSet& rSet ); diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 4142c79b9ee9..6684a5ff3b43 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -64,8 +64,8 @@ public: bool IsUsed() const; - DECL_LINK_TYPED( RefreshHdl, Timer*, void ); - DECL_LINK_TYPED( TableEndEditHdl, ::sfx2::SvBaseLink&, void ); + DECL_LINK( RefreshHdl, Timer*, void ); + DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink&, void ); }; class ScDocument; diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index 95a9cbc570c1..ee07183811f4 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -35,7 +35,7 @@ class ScDrawObjFactory { - DECL_STATIC_LINK_TYPED( ScDrawObjFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); + DECL_STATIC_LINK( ScDrawObjFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); public: ScDrawObjFactory(); ~ScDrawObjFactory(); diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 55cb312e43ae..2627bc43b66c 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -137,9 +137,9 @@ class ScViewCfg : public ScViewOptions ScLinkConfigItem aDisplayItem; ScLinkConfigItem aGridItem; - DECL_LINK_TYPED( LayoutCommitHdl, ScLinkConfigItem&, void ); - DECL_LINK_TYPED( DisplayCommitHdl, ScLinkConfigItem&, void ); - DECL_LINK_TYPED( GridCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( LayoutCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( DisplayCommitHdl, ScLinkConfigItem&, void ); + DECL_LINK( GridCommitHdl, ScLinkConfigItem&, void ); static css::uno::Sequence<OUString> GetLayoutPropertyNames(); static css::uno::Sequence<OUString> GetDisplayPropertyNames(); diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index fa481a3421cc..de91bf751f79 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -321,7 +321,7 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) pChangeTrack = pTrack; } -IMPL_LINK_NOARG_TYPED(ScDocument, TrackTimeHdl, Idle *, void) +IMPL_LINK_NOARG(ScDocument, TrackTimeHdl, Idle *, void) { if ( ScDdeLink::IsInUpdate() ) // do not nest { diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 176b0c477304..711d0a03c532 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -230,7 +230,7 @@ bool ScDocument::IsChart( const SdrObject* pObject ) return false; } -IMPL_LINK_TYPED( ScDocument, GetUserDefinedColor, sal_uInt16, nColorIndex, Color* ) +IMPL_LINK( ScDocument, GetUserDefinedColor, sal_uInt16, nColorIndex, Color* ) { return const_cast<Color*>(&(GetColorList()->GetColor(nColorIndex)->GetColor())); } diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index 3d02e082dd31..cc5fe0d39875 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -31,7 +31,7 @@ ScDrawObjFactory::~ScDrawObjFactory() SdrObjFactory::RemoveMakeUserDataHdl( LINK ( this, ScDrawObjFactory, MakeUserData ) ); } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( ScDrawObjFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { if ( aParams.nInventor == SC_DRAWLAYER ) diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index f2f2dd03e691..b1d6e94b6546 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -545,7 +545,7 @@ ScAppCfg::ScAppCfg() : } aCompatItem.SetCommitLink( LINK(this, ScAppCfg, CompatCommitHdl) ); } - IMPL_LINK_NOARG_TYPED(ScAppCfg, LayoutCommitHdl, ScLinkConfigItem&, void) + IMPL_LINK_NOARG(ScAppCfg, LayoutCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -578,7 +578,7 @@ ScAppCfg::ScAppCfg() : aLayoutItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, InputCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, InputCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetInputPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -602,7 +602,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, InputCommitHdl, ScLinkConfigItem&, void) aInputItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, RevisionCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, RevisionCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetRevisionPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -629,7 +629,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, RevisionCommitHdl, ScLinkConfigItem&, void) aRevisionItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, ContentCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, ContentCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetContentPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -647,7 +647,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, ContentCommitHdl, ScLinkConfigItem&, void) aContentItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, SortListCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, SortListCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetSortListPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -665,7 +665,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, SortListCommitHdl, ScLinkConfigItem&, void) aSortListItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, MiscCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, MiscCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetMiscPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -689,7 +689,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, MiscCommitHdl, ScLinkConfigItem&, void) aMiscItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, CompatCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, CompatCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetCompatPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 52e761f0e64d..b23aa4b914ba 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -595,7 +595,7 @@ void ScChartListenerCollection::StartTimer() aIdle.Start(); } -IMPL_LINK_NOARG_TYPED(ScChartListenerCollection, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl, Idle *, void) { if ( Application::AnyInput( VclInputFlags::KEYBOARD ) ) { diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index 985774b952e9..8d3b59145369 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.cxx @@ -174,7 +174,7 @@ void ScTemporaryChartLock::AlsoLockThisChart( const Reference< frame::XModel >& mapScChartLockGuard->AlsoLockThisChart( xModel ); } -IMPL_LINK_NOARG_TYPED(ScTemporaryChartLock, TimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(ScTemporaryChartLock, TimeoutHdl, Timer *, void) { mapScChartLockGuard.reset(); } diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index cf5671f9e0bb..63407bfe45f1 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -318,7 +318,7 @@ ScDocCfg::ScDocCfg() : aLayoutItem.SetCommitLink( LINK( this, ScDocCfg, LayoutCommitHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScDocCfg, CalcCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScDocCfg, CalcCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetCalcPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -377,7 +377,7 @@ IMPL_LINK_NOARG_TYPED(ScDocCfg, CalcCommitHdl, ScLinkConfigItem&, void) aCalcItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScDocCfg, LayoutCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScDocCfg, LayoutCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 95491e63920f..4c2b4f5225f9 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -486,7 +486,7 @@ ScViewCfg::ScViewCfg() : aGridItem.SetCommitLink( LINK( this, ScViewCfg, GridCommitHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -531,7 +531,7 @@ IMPL_LINK_NOARG_TYPED(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void) aLayoutItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScViewCfg, DisplayCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScViewCfg, DisplayCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetDisplayPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -573,7 +573,7 @@ IMPL_LINK_NOARG_TYPED(ScViewCfg, DisplayCommitHdl, ScLinkConfigItem&, void) aDisplayItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScViewCfg, GridCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl, ScLinkConfigItem&, void) { const ScGridOptions& rGrid = GetGridOptions(); diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index a094f04512f6..11ce7137cb43 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -877,7 +877,7 @@ void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo ) NewActEntry( pActEntry ); // New free flying pActEntry } -IMPL_LINK_TYPED( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo&, rInfo, void ) +IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo&, rInfo, void ) { switch ( rInfo.eState ) { @@ -3210,7 +3210,7 @@ void ScHTMLQueryParser::ParseStyle(const OUString&) {} #endif -IMPL_LINK_TYPED( ScHTMLQueryParser, HTMLImportHdl, ImportInfo&, rInfo, void ) +IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, ImportInfo&, rInfo, void ) { switch( rInfo.eState ) { diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 61787e2f49b8..c963b99142c2 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -176,7 +176,7 @@ private: bool bInCell:1; bool bInTitle:1; - DECL_LINK_TYPED( HTMLImportHdl, ImportInfo&, void ); + DECL_LINK( HTMLImportHdl, ImportInfo&, void ); void NewActEntry( ScEEParseEntry* ); static void EntryEnd( ScEEParseEntry*, const ESelection& ); void ProcToken( ImportInfo* ); @@ -605,7 +605,7 @@ private: void ParseStyle(const OUString& rStrm); - DECL_LINK_TYPED( HTMLImportHdl, ImportInfo&, void ); + DECL_LINK( HTMLImportHdl, ImportInfo&, void ); private: typedef ::std::unique_ptr< ScHTMLGlobalTable > ScHTMLGlobalTablePtr; diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index d96b57c20259..3fe1db4c62d6 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -62,7 +62,7 @@ private: sal_uInt16 nLastWidth; bool bNewDef; - DECL_LINK_TYPED( RTFImportHdl, ImportInfo&, void ); + DECL_LINK( RTFImportHdl, ImportInfo&, void ); inline void NextRow(); void EntryEnd( ScEEParseEntry*, const ESelection& ); void ProcToken( ImportInfo* ); diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index 48a939625741..923e69d8ba9b 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -154,7 +154,7 @@ void ScRTFParser::ColAdjust() } } -IMPL_LINK_TYPED( ScRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) +IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) { switch ( rInfo.eState ) { diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index a21d4ffc9dd0..b102b976985a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1480,7 +1480,7 @@ void SAL_CALL ScAccessibleDocument::disposing( const lang::EventObject& /* Sourc //===== SfxListener ===================================================== -IMPL_LINK_TYPED( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "Window???" ); switch ( rEvent.GetId() ) diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index dc7ce4175f70..2b3fdcfa2b19 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -901,7 +901,7 @@ SvxEditViewForwarder* ScAccessibleCellTextData::GetEditViewForwarder( bool /* bC return nullptr; } -IMPL_LINK_TYPED(ScAccessibleTextData, NotifyHdl, EENotify&, aNotify, void) +IMPL_LINK(ScAccessibleTextData, NotifyHdl, EENotify&, aNotify, void) { ::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &aNotify ); @@ -1006,7 +1006,7 @@ SvxEditViewForwarder* ScAccessibleEditObjectTextData::GetEditViewForwarder( bool return mpEditViewForwarder; } -IMPL_LINK_TYPED(ScAccessibleEditObjectTextData, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify&, rNotify, void) { ::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &rNotify ); diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index 84ed14c80f64..abcc1cd7355a 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -140,7 +140,7 @@ sal_Int16 ScAnalysisOfVarianceDialog::GetUndoNameId() return STR_ANALYSIS_OF_VARIANCE_UNDO_NAME; } -IMPL_LINK_NOARG_TYPED( ScAnalysisOfVarianceDialog, FactorChanged, RadioButton&, void ) +IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, RadioButton&, void ) { FactorChanged(); } diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 7fdad4b53a5e..c59e9cc14561 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -326,23 +326,23 @@ void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const pDocShell->PostPaint( maInputRange, PaintPartFlags::Grid ); } -IMPL_LINK_NOARG_TYPED( ScRandomNumberGeneratorDialog, OkClicked, Button*, void ) +IMPL_LINK_NOARG( ScRandomNumberGeneratorDialog, OkClicked, Button*, void ) { ApplyClicked(nullptr); CloseClicked(nullptr); } -IMPL_LINK_NOARG_TYPED( ScRandomNumberGeneratorDialog, ApplyClicked, Button*, void ) +IMPL_LINK_NOARG( ScRandomNumberGeneratorDialog, ApplyClicked, Button*, void ) { SelectGeneratorAndGenerateNumbers(); } -IMPL_LINK_NOARG_TYPED( ScRandomNumberGeneratorDialog, CloseClicked, Button*, void ) +IMPL_LINK_NOARG( ScRandomNumberGeneratorDialog, CloseClicked, Button*, void ) { Close(); } -IMPL_LINK_TYPED( ScRandomNumberGeneratorDialog, GetFocusHandler, Control&, rCtrl, void ) +IMPL_LINK( ScRandomNumberGeneratorDialog, GetFocusHandler, Control&, rCtrl, void ) { Edit* pEdit = nullptr; @@ -353,12 +353,12 @@ IMPL_LINK_TYPED( ScRandomNumberGeneratorDialog, GetFocusHandler, Control&, rCtrl pEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, LoseFocusHandler, Control&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, LoseFocusHandler, Control&, void) { mbDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, InputRangeModified, Edit&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, InputRangeModified, Edit&, void) { ScRangeList aRangeList; bool bValid = ParseWithNames( aRangeList, mpInputRangeEdit->GetText(), mpDoc); @@ -379,7 +379,7 @@ IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, InputRangeModified, Edit&, } } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Edit&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Edit&, void) { sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); @@ -395,7 +395,7 @@ IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Ed } } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter2ValueModified, Edit&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter2ValueModified, Edit&, void) { sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); @@ -411,13 +411,13 @@ IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter2ValueModified, Ed } } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, CheckChanged, CheckBox&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, CheckChanged, CheckBox&, void) { mpSeed->Enable(mpEnableSeed->IsChecked()); mpDecimalPlaces->Enable(mpEnableRounding->IsChecked()); } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, void) { sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 035327d97f15..06571992f8a3 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -288,13 +288,13 @@ void ScSamplingDialog::PerformSampling() pDocShell->PostPaint(aModifiedRange, PaintPartFlags::Grid); } -IMPL_LINK_NOARG_TYPED( ScSamplingDialog, OkClicked, Button*, void ) +IMPL_LINK_NOARG( ScSamplingDialog, OkClicked, Button*, void ) { PerformSampling(); Close(); } -IMPL_LINK_TYPED( ScSamplingDialog, GetFocusHandler, Control&, rCtrl, void ) +IMPL_LINK( ScSamplingDialog, GetFocusHandler, Control&, rCtrl, void ) { mpActiveEdit = nullptr; @@ -307,19 +307,19 @@ IMPL_LINK_TYPED( ScSamplingDialog, GetFocusHandler, Control&, rCtrl, void ) mpActiveEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScSamplingDialog, LoseFocusHandler, Control&, void) +IMPL_LINK_NOARG(ScSamplingDialog, LoseFocusHandler, Control&, void) { mDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED(ScSamplingDialog, SamplingSizeValueModified, Edit&, void) +IMPL_LINK_NOARG(ScSamplingDialog, SamplingSizeValueModified, Edit&, void) { sal_Int64 aPopulationSize = mInputRange.aEnd.Row() - mInputRange.aStart.Row() + 1; if (mpSampleSize->GetValue() > aPopulationSize) mpSampleSize->SetValue(aPopulationSize); } -IMPL_LINK_NOARG_TYPED(ScSamplingDialog, ToggleSamplingMethod, RadioButton&, void) +IMPL_LINK_NOARG(ScSamplingDialog, ToggleSamplingMethod, RadioButton&, void) { ToggleSamplingMethod(); } @@ -338,7 +338,7 @@ void ScSamplingDialog::ToggleSamplingMethod() } } -IMPL_LINK_NOARG_TYPED(ScSamplingDialog, RefInputModifyHandler, Edit&, void) +IMPL_LINK_NOARG(ScSamplingDialog, RefInputModifyHandler, Edit&, void) { if ( mpActiveEdit ) { diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index 80dd45724fe3..78bc143ebaec 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -194,13 +194,13 @@ void ScStatisticsInputOutputDialog::SetReference( const ScRange& rReferenceRange mpButtonOk->Disable(); } -IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, OkClicked, Button*, void ) +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, OkClicked, Button*, void ) { CalculateInputAndWriteToOutput(); Close(); } -IMPL_LINK_TYPED( ScStatisticsInputOutputDialog, GetFocusHandler, Control&, rCtrl, void ) +IMPL_LINK( ScStatisticsInputOutputDialog, GetFocusHandler, Control&, rCtrl, void ) { mpActiveEdit = nullptr; @@ -213,12 +213,12 @@ IMPL_LINK_TYPED( ScStatisticsInputOutputDialog, GetFocusHandler, Control&, rCtrl mpActiveEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, LoseFocusHandler, Control&, void ) +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, LoseFocusHandler, Control&, void ) { mDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, GroupByChanged, RadioButton&, void ) +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, GroupByChanged, RadioButton&, void ) { if (mpGroupByColumnsRadio->IsChecked()) mGroupedBy = BY_COLUMN; @@ -226,7 +226,7 @@ IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, GroupByChanged, RadioButto mGroupedBy = BY_ROW; } -IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, RefInputModifyHandler, Edit&, void ) +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, RefInputModifyHandler, Edit&, void ) { if ( mpActiveEdit ) { diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index 1277a8e29619..d32effd4264b 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -207,13 +207,13 @@ void ScStatisticsTwoVariableDialog::SetReference( const ScRange& rReferenceRange mpButtonOk->Disable(); } -IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, OkClicked, Button*, void ) +IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, OkClicked, Button*, void ) { CalculateInputAndWriteToOutput(); Close(); } -IMPL_LINK_TYPED( ScStatisticsTwoVariableDialog, GetFocusHandler, Control&, rCtrl, void ) +IMPL_LINK( ScStatisticsTwoVariableDialog, GetFocusHandler, Control&, rCtrl, void ) { mpActiveEdit = nullptr; if( &rCtrl == mpVariable1RangeEdit @@ -236,12 +236,12 @@ IMPL_LINK_TYPED( ScStatisticsTwoVariableDialog, GetFocusHandler, Control&, rCtrl mpActiveEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, LoseFocusHandler, Control&, void ) +IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, LoseFocusHandler, Control&, void ) { mDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, GroupByChanged, RadioButton&, void ) +IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, GroupByChanged, RadioButton&, void ) { if (mpGroupByColumnsRadio->IsChecked()) mGroupedBy = BY_COLUMN; @@ -249,7 +249,7 @@ IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, GroupByChanged, RadioButto mGroupedBy = BY_ROW; } -IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, RefInputModifyHandler, Edit&, void ) +IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, RefInputModifyHandler, Edit&, void ) { if ( mpActiveEdit ) { diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index d440c691e175..43b3c5ed8210 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -855,13 +855,13 @@ void ScInputHandler::GetFormulaData() } } -IMPL_LINK_TYPED( ScInputHandler, ShowHideTipVisibleParentListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ScInputHandler, ShowHideTipVisibleParentListener, VclWindowEvent&, rEvent, void ) { if( rEvent.GetId() == VCLEVENT_OBJECT_DYING || rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) HideTip(); } -IMPL_LINK_TYPED( ScInputHandler, ShowHideTipVisibleSecParentListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ScInputHandler, ShowHideTipVisibleSecParentListener, VclWindowEvent&, rEvent, void ) { if( rEvent.GetId() == VCLEVENT_OBJECT_DYING || rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) HideTipBelow(); @@ -2229,7 +2229,7 @@ void ScInputHandler::SyncViews( EditView* pSourceView ) } } -IMPL_LINK_NOARG_TYPED(ScInputHandler, ModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ScInputHandler, ModifyHdl, LinkParamNone*, void) { if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) && pEngine && pEngine->GetUpdateMode() && pInputWin ) @@ -3770,7 +3770,7 @@ void ScInputHandler::ResetDelayTimer() } } -IMPL_LINK_TYPED( ScInputHandler, DelayTimer, Timer*, pTimer, void ) +IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer, void ) { if ( pTimer == pDelayTimer ) { diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index fae016f2e89a..7424fd3e70a0 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1034,7 +1034,7 @@ void ScInputBarGroup::DecrementVerticalSize() } } -IMPL_LINK_NOARG_TYPED(ScInputBarGroup, ClickHdl, Button*, void) +IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl, Button*, void) { vcl::Window* w = GetParent(); ScInputWindow* pParent; @@ -1112,7 +1112,7 @@ void ScInputBarGroup::TriggerToolboxLayout() } } -IMPL_LINK_NOARG_TYPED(ScInputBarGroup, Impl_ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScInputBarGroup, Impl_ScrollHdl, ScrollBar*, void) { maTextWnd->DoScroll(); } @@ -1632,7 +1632,7 @@ void ScTextWnd::UpdateAutoCorrFlag() } } -IMPL_LINK_TYPED(ScTextWnd, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(ScTextWnd, NotifyHdl, EENotify&, rNotify, void) { // need to process EE_NOTIFY_TEXTVIEWSCROLLED here // sometimes we don't seem to get EE_NOTIFY_TEXTVIEWSCROLLED e.g. when @@ -1644,7 +1644,7 @@ IMPL_LINK_TYPED(ScTextWnd, NotifyHdl, EENotify&, rNotify, void) SetScrollBarRange(); } -IMPL_LINK_NOARG_TYPED(ScTextWnd, ModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ScTextWnd, ModifyHdl, LinkParamNone*, void) { if (pEditView && !bInputMode) { diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 561ff2bfea95..af9fa54498b1 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1829,7 +1829,7 @@ static void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) } } -IMPL_LINK_NOARG_TYPED(ScModule, IdleHandler, Timer *, void) +IMPL_LINK_NOARG(ScModule, IdleHandler, Timer *, void) { if ( Application::AnyInput( VclInputFlags::MOUSE | VclInputFlags::KEYBOARD ) ) { @@ -1900,7 +1900,7 @@ IMPL_LINK_NOARG_TYPED(ScModule, IdleHandler, Timer *, void) aIdleTimer.Start(); } -IMPL_LINK_NOARG_TYPED(ScModule, SpellTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScModule, SpellTimerHdl, Idle *, void) { if ( Application::AnyInput( VclInputFlags::KEYBOARD ) ) { @@ -2126,7 +2126,7 @@ VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent return pRet; } -IMPL_LINK_TYPED( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) +IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) { //TODO: Merge with ScFieldEditEngine! if (!pInfo) diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 8c5005f60e63..bbe864d84daa 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -88,7 +88,7 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } } -IMPL_LINK_NOARG_TYPED(ScAttrDlg, OkHandler, SfxPoolItem*, void) +IMPL_LINK_NOARG(ScAttrDlg, OkHandler, SfxPoolItem*, void) { GetOKButton().GetClickHdl().Call( nullptr ); } diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 1717a610a723..3217308bafdd 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -157,7 +157,7 @@ DeactivateRC ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) return DeactivateRC::LeavePage; } -IMPL_LINK_TYPED( ScTabPageProtection, ButtonClickHdl, Button*, pBox, void ) +IMPL_LINK( ScTabPageProtection, ButtonClickHdl, Button*, pBox, void ) { TriState eState = static_cast<TriStateBox*>(pBox)->GetState(); if ( eState == TRISTATE_INDET ) diff --git a/sc/source/ui/cctrl/cbnumberformat.cxx b/sc/source/ui/cctrl/cbnumberformat.cxx index 591b2ec31d31..dede89437b7c 100644 --- a/sc/source/ui/cctrl/cbnumberformat.cxx +++ b/sc/source/ui/cctrl/cbnumberformat.cxx @@ -42,7 +42,7 @@ ScNumberFormat::ScNumberFormat(vcl::Window* pParent, WinBits nStyle) : InsertEntry(ScGlobal::GetRscString(STR_TEXT)); } -IMPL_STATIC_LINK_TYPED(ScNumberFormat, NumFormatSelectHdl, ListBox&, rBox, void) +IMPL_STATIC_LINK(ScNumberFormat, NumFormatSelectHdl, ListBox&, rBox, void) { if(SfxViewFrame::Current()) { diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 0b5174e49c54..374914be90ac 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -64,7 +64,7 @@ void ScMenuFloatingWindow::SubMenuItemData::reset() maTimer.Stop(); } -IMPL_LINK_NOARG_TYPED(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, Timer *, void) { mpParent->handleMenuTimeout(this); } @@ -1175,7 +1175,7 @@ void ScCheckListMenuWindow::selectCurrentMemberOnly(bool bSet) maChecks->CheckEntry(pEntry, bSet ); } -IMPL_LINK_TYPED( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void ) +IMPL_LINK( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void ) { if (pBtn == maBtnOk.get()) close(true); @@ -1191,7 +1191,7 @@ IMPL_LINK_TYPED( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, TriStateHdl, Button*, void) +IMPL_LINK_NOARG(ScCheckListMenuWindow, TriStateHdl, Button*, void) { switch (mePrevToggleAllState) { @@ -1213,7 +1213,7 @@ IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, TriStateHdl, Button*, void) mePrevToggleAllState = maChkToggleAll->GetState(); } -IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, EdModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl, Edit&, void) { OUString aSearchText = maEdSearch->GetText(); aSearchText = aSearchText.toAsciiLowerCase(); @@ -1289,7 +1289,7 @@ IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, EdModifyHdl, Edit&, void) maBtnOk->Enable( nSelCount != 0); } -IMPL_LINK_TYPED( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks, void ) +IMPL_LINK( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks, void ) { if (pChecks != maChecks.get()) return; diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 9a455b4bb122..ab2e08983b3f 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -255,7 +255,7 @@ ScDataBarFormatData* ScDataBarSettingsDlg::GetData() return pData; } -IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) +IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) { //check that min < max bool bWarn = false; @@ -308,7 +308,7 @@ IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) } } -IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void ) { sal_Int32 nSelectMin = mpLbTypeMin->GetSelectEntryPos(); if( nSelectMin <= COLORSCALE_MAX) @@ -341,7 +341,7 @@ IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void ) } } -IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, PosSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScDataBarSettingsDlg, PosSelectHdl, ListBox&, void ) { sal_Int32 axisPos = mpLbAxisPos->GetSelectEntryPos(); if(axisPos != 2 && axisPos != 1) // disable if axis vertical position is automatic diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 130f2670451d..98bcc4adf03d 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -237,7 +237,7 @@ void ScCondFormatList::DoScroll(long nDelta) mpScrollBar->SetPosPixel(aNewPoint); } -IMPL_LINK_TYPED(ScCondFormatList, ColFormatTypeHdl, ListBox&, rBox, void) +IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox&, rBox, void) { EntryContainer::iterator itr = maEntries.begin(); for(; itr != maEntries.end(); ++itr) @@ -287,7 +287,7 @@ IMPL_LINK_TYPED(ScCondFormatList, ColFormatTypeHdl, ListBox&, rBox, void) RecalcAll(); } -IMPL_LINK_TYPED(ScCondFormatList, TypeListHdl, ListBox&, rBox, void) +IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox&, rBox, void) { //Resolves: fdo#79021 At this point we are still inside the ListBox Select. //If we call maEntries.replace here then the pBox will be deleted before it @@ -296,7 +296,7 @@ IMPL_LINK_TYPED(ScCondFormatList, TypeListHdl, ListBox&, rBox, void) Application::PostUserEvent(LINK(this, ScCondFormatList, AfterTypeListHdl), &rBox, true); } -IMPL_LINK_TYPED(ScCondFormatList, AfterTypeListHdl, void*, p, void) +IMPL_LINK(ScCondFormatList, AfterTypeListHdl, void*, p, void) { ListBox* pBox = static_cast<ListBox*>(p); EntryContainer::iterator itr = maEntries.begin(); @@ -361,7 +361,7 @@ IMPL_LINK_TYPED(ScCondFormatList, AfterTypeListHdl, void*, p, void) RecalcAll(); } -IMPL_LINK_NOARG_TYPED( ScCondFormatList, AddBtnHdl, Button*, void ) +IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl, Button*, void ) { VclPtr<ScCondFrmtEntry> pNewEntry = VclPtr<ScConditionFrmtEntry>::Create(this, mpDoc, mpDialogParent, maPos); maEntries.push_back( pNewEntry ); @@ -374,7 +374,7 @@ IMPL_LINK_NOARG_TYPED( ScCondFormatList, AddBtnHdl, Button*, void ) RecalcAll(); } -IMPL_LINK_NOARG_TYPED( ScCondFormatList, RemoveBtnHdl, Button*, void ) +IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl, Button*, void ) { for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) { @@ -389,7 +389,7 @@ IMPL_LINK_NOARG_TYPED( ScCondFormatList, RemoveBtnHdl, Button*, void ) RecalcAll(); } -IMPL_LINK_TYPED( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry&, rEntry, void ) +IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry&, rEntry, void ) { if(rEntry.IsSelected()) return; @@ -408,7 +408,7 @@ IMPL_LINK_TYPED( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry&, rEntry, voi GrabFocus(); } -IMPL_LINK_NOARG_TYPED( ScCondFormatList, ScrollHdl, ScrollBar*, void ) +IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl, ScrollBar*, void ) { DoScroll(mpScrollBar->GetDelta()); } @@ -660,7 +660,7 @@ void ScCondFormatDlg::CancelPressed() Close(); } -IMPL_LINK_TYPED( ScCondFormatDlg, EdRangeModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit&, rEdit, void ) { OUString aRangeStr = rEdit.GetText(); ScRangeList aRange; @@ -674,12 +674,12 @@ IMPL_LINK_TYPED( ScCondFormatDlg, EdRangeModifyHdl, Edit&, rEdit, void ) updateTitle(); } -IMPL_LINK_TYPED( ScCondFormatDlg, RangeGetFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScCondFormatDlg, RangeGetFocusHdl, Control&, rControl, void ) { mpLastEdit = static_cast<formula::RefEdit*>(&rControl); } -IMPL_LINK_TYPED( ScCondFormatDlg, BtnPressedHdl, Button*, pBtn, void) +IMPL_LINK( ScCondFormatDlg, BtnPressedHdl, Button*, pBtn, void) { if (pBtn == mpBtnOk) OkPressed(); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 0343b040253c..216a0ef82f93 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -297,7 +297,7 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const return pEntry; } -IMPL_LINK_TYPED(ScConditionFrmtEntry, OnEdChanged, Edit&, rEdit, void) +IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit&, rEdit, void) { OUString aFormula = rEdit.GetText(); @@ -543,7 +543,7 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre } -IMPL_LINK_NOARG_TYPED(ScConditionFrmtEntry, StyleSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl, ListBox&, void) { mbIsInStyleCreate = true; StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() ); @@ -599,7 +599,7 @@ void ScFormulaFrmtEntry::Init(ScCondFormatDlg* pDialogParent) maLbStyle->SetSelectHdl( LINK( this, ScFormulaFrmtEntry, StyleSelectHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScFormulaFrmtEntry, StyleSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScFormulaFrmtEntry, StyleSelectHdl, ListBox&, void) { StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() ); } @@ -875,7 +875,7 @@ void ScColorScale2FrmtEntry::SetInactive() Deselect(); } -IMPL_LINK_TYPED( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) +IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) { Edit* pEd = nullptr; if (&rBox == maLbEntryTypeMin.get()) @@ -1067,7 +1067,7 @@ void ScColorScale3FrmtEntry::SetInactive() Deselect(); } -IMPL_LINK_TYPED( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) +IMPL_LINK( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) { Edit* pEd = nullptr; if(&rBox == maLbEntryTypeMin.get()) @@ -1093,7 +1093,7 @@ IMPL_LINK_TYPED( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) pEd->Disable(); } -IMPL_LINK_NOARG_TYPED( ScConditionFrmtEntry, ConditionTypeSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScConditionFrmtEntry, ConditionTypeSelectHdl, ListBox&, void ) { sal_Int32 nSelectPos = maLbCondType->GetSelectEntryPos(); ScConditionMode eMode = EntryPosToConditionMode(nSelectPos); @@ -1259,7 +1259,7 @@ void ScDataBarFrmtEntry::SetInactive() Deselect(); } -IMPL_LINK_NOARG_TYPED( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void ) { sal_Int32 nSelectPos = maLbDataBarMinType->GetSelectEntryPos(); if(nSelectPos <= COLORSCALE_MAX) @@ -1274,7 +1274,7 @@ IMPL_LINK_NOARG_TYPED( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void maEdDataBarMax->Enable(); } -IMPL_LINK_NOARG_TYPED( ScDataBarFrmtEntry, OptionBtnHdl, Button*, void ) +IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl, Button*, void ) { SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType.get(), *maEdDataBarMin.get(), mpDoc, maPos, true); SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType.get(), *maEdDataBarMax.get(), mpDoc, maPos, true); @@ -1385,7 +1385,7 @@ OUString ScDateFrmtEntry::GetExpressionString() return ScCondFormatHelper::GetExpression(DATE, 0); } -IMPL_LINK_NOARG_TYPED( ScDateFrmtEntry, StyleSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl, ListBox&, void ) { mbIsInStyleCreate = true; StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() ); @@ -1562,7 +1562,7 @@ void ScIconSetFrmtEntry::Init() maLbIconSetType->SetSelectHdl( LINK( this, ScIconSetFrmtEntry, IconSetTypeHdl ) ); } -IMPL_LINK_NOARG_TYPED( ScIconSetFrmtEntry, IconSetTypeHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl, ListBox&, void ) { ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap(); diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 9128941d5573..ba9df607709c 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -153,18 +153,18 @@ ScConditionalFormat* ScCondFormatManagerDlg::GetCondFormatSelected() return m_pCtrlManager->GetSelection(); } -IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, RemoveBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScCondFormatManagerDlg, RemoveBtnHdl, Button*, void) { m_pCtrlManager->DeleteSelection(); mbModified = true; } -IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnClickHdl, Button*, void) +IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnClickHdl, Button*, void) { mbModified = true; EditBtnHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl, SvTreeListBox*, bool) { ScConditionalFormat* pFormat = m_pCtrlManager->GetSelection(); @@ -177,7 +177,7 @@ IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnHdl, SvTreeListBox*, bool) return false; } -IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScCondFormatManagerDlg, AddBtnHdl, Button*, void) { mbModified = true; EndDialog( DLG_RET_ADD ); diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index dd8ef5d6c150..312fdd33dee7 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -662,18 +662,18 @@ bool ScPivotLayoutDialog::Close() return DoClose( ScPivotLayoutWrapper::GetChildWindowId() ); } -IMPL_LINK_NOARG_TYPED( ScPivotLayoutDialog, OKClicked, Button*, void ) +IMPL_LINK_NOARG( ScPivotLayoutDialog, OKClicked, Button*, void ) { ApplyChanges(); Close(); } -IMPL_LINK_NOARG_TYPED( ScPivotLayoutDialog, CancelClicked, Button*, void ) +IMPL_LINK_NOARG( ScPivotLayoutDialog, CancelClicked, Button*, void ) { Close(); } -IMPL_LINK_TYPED(ScPivotLayoutDialog, GetFocusHandler, Control&, rCtrl, void) +IMPL_LINK(ScPivotLayoutDialog, GetFocusHandler, Control&, rCtrl, void) { mpActiveEdit = nullptr; @@ -692,22 +692,22 @@ IMPL_LINK_TYPED(ScPivotLayoutDialog, GetFocusHandler, Control&, rCtrl, void) mpActiveEdit->SetSelection(Selection(0, SELECTION_MAX)); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, LoseFocusHandler, Control&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, LoseFocusHandler, Control&, void) { mbDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, SourceListSelected, ListBox&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceListSelected, ListBox&, void) { UpdateSourceRange(); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, SourceEditModified, Edit&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceEditModified, Edit&, void) { UpdateSourceRange(); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, ToggleSource, RadioButton&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleSource, RadioButton&, void) { ToggleSource(); } @@ -722,7 +722,7 @@ void ScPivotLayoutDialog::ToggleSource() UpdateSourceRange(); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, ToggleDestination, RadioButton&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleDestination, RadioButton&, void) { ToggleDestination(); } diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 06b663779c14..494e63020521 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -345,7 +345,7 @@ bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) // Handler: -IMPL_LINK_TYPED( ScConsolidateDlg, GetFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control&, rControl, void ) { if ( &rControl ==static_cast<Control*>(pEdDataArea) || &rControl ==static_cast<Control*>(pEdDestArea)) @@ -362,7 +362,7 @@ IMPL_LINK_TYPED( ScConsolidateDlg, GetFocusHdl, Control&, rControl, void ) } } -IMPL_LINK_NOARG_TYPED(ScConsolidateDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl, Button*, void) { const sal_Int32 nDataAreaCount = pLbConsAreas->GetEntryCount(); @@ -419,7 +419,7 @@ IMPL_LINK_NOARG_TYPED(ScConsolidateDlg, OkHdl, Button*, void) Close(); // no area defined -> Cancel } -IMPL_LINK_TYPED( ScConsolidateDlg, ClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScConsolidateDlg, ClickHdl, Button*, pBtn, void ) { if ( pBtn == pBtnCancel ) Close(); @@ -483,7 +483,7 @@ IMPL_LINK_TYPED( ScConsolidateDlg, ClickHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void ) { if ( &rLb == pLbConsAreas ) { @@ -524,7 +524,7 @@ IMPL_LINK_TYPED( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScConsolidateDlg, ModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScConsolidateDlg, ModifyHdl, Edit&, rEd, void ) { if ( &rEd == pEdDataArea ) { diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 89336fd92f46..aef45567bf95 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -251,7 +251,7 @@ void ScCsvTableBox::DataChanged( const DataChangedEvent& rDCEvt ) ScCsvControl::DataChanged( rDCEvt ); } -IMPL_LINK_TYPED( ScCsvTableBox, CsvCmdHdl, ScCsvControl&, rCtrl, void ) +IMPL_LINK( ScCsvTableBox, CsvCmdHdl, ScCsvControl&, rCtrl, void ) { const ScCsvCmd& rCmd = rCtrl.GetCmd(); ScCsvCmdType eType = rCmd.GetType(); @@ -388,7 +388,7 @@ IMPL_LINK_TYPED( ScCsvTableBox, CsvCmdHdl, ScCsvControl&, rCtrl, void ) } } -IMPL_LINK_TYPED( ScCsvTableBox, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ScCsvTableBox, ScrollHdl, ScrollBar*, pScrollBar, void ) { OSL_ENSURE( pScrollBar, "ScCsvTableBox::ScrollHdl - missing sender" ); @@ -398,7 +398,7 @@ IMPL_LINK_TYPED( ScCsvTableBox, ScrollHdl, ScrollBar*, pScrollBar, void ) Execute( CSVCMD_SETLINEOFFSET, pScrollBar->GetThumbPos() ); } -IMPL_LINK_TYPED( ScCsvTableBox, ScrollEndHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ScCsvTableBox, ScrollEndHdl, ScrollBar*, pScrollBar, void ) { OSL_ENSURE( pScrollBar, "ScCsvTableBox::ScrollEndHdl - missing sender" ); diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 84237ad8efc8..2fc447c3e314 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -114,7 +114,7 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc ) rDesc.bNative = ( nSelect == DP_TYPELIST_SQLNAT ); } -IMPL_LINK_NOARG_TYPED(ScDataPilotDatabaseDlg, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScDataPilotDatabaseDlg, SelectHdl, ListBox&, void) { FillObjects(); } diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 58af4920b9aa..a78442b32259 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -98,7 +98,7 @@ void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName) } } -IMPL_LINK_TYPED( ScDataPilotSourceTypeDlg, RadioClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, Button*, pBtn, void ) { m_pLbNamedRange->Enable(pBtn == m_pBtnNamedRange); } diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 0621fad5915c..8c917580587c 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -388,7 +388,7 @@ bool ScDbNameDlg::IsRefInputMode() const // Handler: -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl, Button*, void) { AddBtnHdl( nullptr ); @@ -404,12 +404,12 @@ IMPL_LINK_NOARG_TYPED(ScDbNameDlg, OkBtnHdl, Button*, void) Close(); } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScDbNameDlg, CancelBtnHdl, Button*, void) { Close(); } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl, Button*, void) { OUString aNewName = comphelper::string::strip(m_pEdName->GetText(), ' '); OUString aNewArea = m_pEdAssign->GetText(); @@ -508,7 +508,7 @@ public: } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, RemoveBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl, Button*, void) { OUString aStrEntry = m_pEdName->GetText(); ScDBCollection::NamedDBs& rDBs = aLocalDbCol.getNamedDBs(); @@ -559,7 +559,7 @@ IMPL_LINK_NOARG_TYPED(ScDbNameDlg, RemoveBtnHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, NameModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl, Edit&, void) { OUString theName = m_pEdName->GetText(); bool bNameFound = (COMBOBOX_ENTRY_NOTFOUND @@ -622,7 +622,7 @@ IMPL_LINK_NOARG_TYPED(ScDbNameDlg, NameModifyHdl, Edit&, void) } } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, AssModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl, Edit&, void) { // hier parsen fuer Save() etc. diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 6ade3f464178..725311e816d4 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -92,7 +92,7 @@ void ScDPGroupEditHelper::SetValue( bool bAuto, double fValue ) ImplSetValue( fValue ); } -IMPL_LINK_TYPED( ScDPGroupEditHelper, ClickHdl, Button*, pButton, void ) +IMPL_LINK( ScDPGroupEditHelper, ClickHdl, Button*, pButton, void ) { if( pButton == mpRbAuto ) { @@ -331,7 +331,7 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const return nDatePart; } -IMPL_LINK_TYPED( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void ) +IMPL_LINK( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void ) { if( pButton == mpRbNumDays ) { @@ -352,7 +352,7 @@ IMPL_LINK_TYPED( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( ScDPDateGroupDlg, CheckHdl, SvTreeListBox*, pListBox, void ) +IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvTreeListBox*, pListBox, void ) { // enable/disable OK button on modifying check list box if( pListBox == mpLbUnits ) diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 23713771e4a8..357bb05a00eb 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -667,7 +667,7 @@ bool ScFilterDlg::IsRefInputMode() const // Handler: -IMPL_LINK_TYPED( ScFilterDlg, EndDlgHdl, Button*, pBtn, void ) +IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn, void ) { if ( pBtn == pBtnOk ) { @@ -702,7 +702,7 @@ IMPL_LINK_TYPED( ScFilterDlg, EndDlgHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScFilterDlg, MoreExpandedHdl, VclExpander&, void) +IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl, VclExpander&, void) { if ( pExpander->get_expanded() ) pTimer->Start(); @@ -715,7 +715,7 @@ IMPL_LINK_NOARG_TYPED(ScFilterDlg, MoreExpandedHdl, VclExpander&, void) } } -IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void ) +IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void ) { // Check if RefInputMode is still true every 50ms @@ -726,7 +726,7 @@ IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void ) pTimer->Start(); } -IMPL_LINK_TYPED( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) { /* * Handle enable/disable logic depending on which ListBox was selected @@ -978,7 +978,7 @@ IMPL_LINK_TYPED( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) +IMPL_LINK( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) { // Column headers: // Field list: Columnxx <-> column header string @@ -1014,7 +1014,7 @@ IMPL_LINK_TYPED( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) } } -IMPL_LINK_TYPED( ScFilterDlg, ValModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScFilterDlg, ValModifyHdl, Edit&, rEd, void ) { size_t nOffset = GetSliderPos(); size_t i = 0; @@ -1097,7 +1097,7 @@ IMPL_LINK_TYPED( ScFilterDlg, ValModifyHdl, Edit&, rEd, void ) } } -IMPL_LINK_NOARG_TYPED(ScFilterDlg, ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScFilterDlg, ScrollHdl, ScrollBar*, void) { SliderMoved(); } diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 0be8764e61cb..018330b702d5 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -209,7 +209,7 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const // Handler: -IMPL_LINK_TYPED( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void ) +IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void ) { if ( &rLb == pLbCopyArea ) { @@ -223,7 +223,7 @@ IMPL_LINK_TYPED( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScFilterOptionsMgr, EdAreaModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit&, rEd, void ) { if ( &rEd == pEdCopyArea ) { @@ -249,7 +249,7 @@ IMPL_LINK_TYPED( ScFilterOptionsMgr, EdAreaModifyHdl, Edit&, rEd, void ) } } -IMPL_LINK_TYPED( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox&, rBox, void ) +IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox&, rBox, void ) { if ( &rBox == pBtnCopyResult ) { diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 0ad42d05c965..7c2b75631221 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -429,7 +429,7 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() // Handler: -IMPL_LINK_TYPED( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void ) { /* @@ -518,7 +518,7 @@ IMPL_LINK_TYPED( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void ) +IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void ) { // update the value lists when dealing with uppercase/lowercase @@ -539,7 +539,7 @@ IMPL_LINK_TYPED( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void ) } } -IMPL_LINK_TYPED( ScPivotFilterDlg, ValModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, Edit&, rEd, void ) { OUString aStrVal = rEd.GetText(); ListBox* pLb = m_pLbCond1; diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 45a503829223..d947b51d4ad9 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -361,7 +361,7 @@ sal_Int32 ScDPFunctionDlg::FindBaseItemPos( const OUString& rEntry, sal_Int32 nS return bFound ? nPos : LISTBOX_ENTRY_NOTFOUND; } -IMPL_LINK_TYPED( ScDPFunctionDlg, SelectHdl, ListBox&, rLBox, void ) +IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox&, rLBox, void ) { if( &rLBox == mpLbType ) { @@ -418,7 +418,7 @@ IMPL_LINK_TYPED( ScDPFunctionDlg, SelectHdl, ListBox&, rLBox, void ) } } -IMPL_LINK_NOARG_TYPED(ScDPFunctionDlg, DblClickHdl, ListBox&, void) +IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl, ListBox&, void) { mpBtnOk->Click(); } @@ -520,17 +520,17 @@ void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) ); } -IMPL_LINK_TYPED( ScDPSubtotalDlg, RadioClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, Button*, pBtn, void ) { mpLbFunc->Enable( pBtn == mpRbUser ); } -IMPL_LINK_NOARG_TYPED(ScDPSubtotalDlg, DblClickHdl, ListBox&, void) +IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl, ListBox&, void) { mpBtnOk->Click(); } -IMPL_LINK_TYPED( ScDPSubtotalDlg, ClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScDPSubtotalDlg, ClickHdl, Button*, pBtn, void ) { if (pBtn == mpBtnOptions) { @@ -789,12 +789,12 @@ sal_Int32 ScDPSubtotalOptDlg::FindListBoxEntry( return bFound ? nPos : LISTBOX_ENTRY_NOTFOUND; } -IMPL_LINK_TYPED( ScDPSubtotalOptDlg, RadioClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScDPSubtotalOptDlg, RadioClickHdl, Button*, pBtn, void ) { m_pLbSortBy->Enable( pBtn != m_pRbSortMan ); } -IMPL_LINK_TYPED( ScDPSubtotalOptDlg, CheckHdl, Button*, pCBox, void ) +IMPL_LINK( ScDPSubtotalOptDlg, CheckHdl, Button*, pCBox, void ) { if (pCBox == m_pCbShow) { @@ -810,7 +810,7 @@ IMPL_LINK_TYPED( ScDPSubtotalOptDlg, CheckHdl, Button*, pCBox, void ) } } -IMPL_LINK_TYPED( ScDPSubtotalOptDlg, SelectHdl, ListBox&, rLBox, void ) +IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox&, rLBox, void ) { if (&rLBox == m_pLbHierarchy) { @@ -887,7 +887,7 @@ OUString ScDPShowDetailDlg::GetDimensionName() const return mrDPObj.GetDimName(nDim, bIsDataLayout); } -IMPL_LINK_TYPED( ScDPShowDetailDlg, DblClickHdl, ListBox&, rLBox, void ) +IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox&, rLBox, void ) { if( &rLBox == mpLbDims ) mpBtnOk->Click(); diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index e775aa9e5ffa..675fdce1d82b 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -162,7 +162,7 @@ void ScNewScenarioDlg::SetScenarioData(const OUString& rName, const OUString& rC m_pCbProtect->Check ( (nFlags & ScScenarioFlags::Protected) != ScScenarioFlags::NONE ); } -IMPL_LINK_NOARG_TYPED(ScNewScenarioDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl, Button*, void) { OUString aName = comphelper::string::strip(m_pEdName->GetText(), ' '); ScDocument* pDoc = static_cast<ScTabViewShell*>(SfxViewShell::Current())->GetViewData().GetDocument(); @@ -185,7 +185,7 @@ IMPL_LINK_NOARG_TYPED(ScNewScenarioDlg, OkHdl, Button*, void) //! beim Editieren testen, ob eine andere Tabelle den Namen hat! } -IMPL_LINK_TYPED( ScNewScenarioDlg, EnableHdl, Button*, pBox, void ) +IMPL_LINK( ScNewScenarioDlg, EnableHdl, Button*, pBox, void ) { if (pBox == m_pCbShowFrame) m_pLbColor->Enable( m_pCbShowFrame->IsChecked() ); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 3d14c9524d95..2b7f7a50cd9c 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -665,7 +665,7 @@ void ScImportAsciiDlg::UpdateVertical() mpDatStream->SetStreamCharSet(meCharSet); } -IMPL_LINK_TYPED( ScImportAsciiDlg, RbSepFixHdl, Button*, pButton, void ) +IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, Button*, pButton, void ) { OSL_ENSURE( pButton, "ScImportAsciiDlg::RbSepFixHdl - missing sender" ); @@ -682,15 +682,15 @@ IMPL_LINK_TYPED( ScImportAsciiDlg, RbSepFixHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorClickHdl, Button*, pCtrl, void ) +IMPL_LINK( ScImportAsciiDlg, SeparatorClickHdl, Button*, pCtrl, void ) { SeparatorHdl(pCtrl); } -IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorComboBoxHdl, ComboBox&, rCtrl, void ) +IMPL_LINK( ScImportAsciiDlg, SeparatorComboBoxHdl, ComboBox&, rCtrl, void ) { SeparatorHdl(&rCtrl); } -IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorEditHdl, Edit&, rEdit, void ) +IMPL_LINK( ScImportAsciiDlg, SeparatorEditHdl, Edit&, rEdit, void ) { SeparatorHdl(&rEdit); } @@ -718,7 +718,7 @@ void ScImportAsciiDlg::SeparatorHdl( Control* pCtrl ) mpTableBox->Execute( CSVCMD_NEWCELLTEXTS ); } -IMPL_LINK_TYPED( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) +IMPL_LINK( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) { SvxTextEncodingBox* pCharSetBox = static_cast<SvxTextEncodingBox*>(&rListBox); if( (pCharSetBox == pLbCharSet) && (pCharSetBox->GetSelectEntryCount() == 1) ) @@ -735,19 +735,19 @@ IMPL_LINK_TYPED( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) } } -IMPL_LINK_TYPED( ScImportAsciiDlg, FirstRowHdl, Edit&, rEdit, void ) +IMPL_LINK( ScImportAsciiDlg, FirstRowHdl, Edit&, rEdit, void ) { NumericField& rNumField = static_cast<NumericField&>(rEdit); mpTableBox->Execute( CSVCMD_SETFIRSTIMPORTLINE, sal::static_int_cast<sal_Int32>( rNumField.GetValue() - 1 ) ); } -IMPL_LINK_TYPED( ScImportAsciiDlg, LbColTypeHdl, ListBox&, rListBox, void ) +IMPL_LINK( ScImportAsciiDlg, LbColTypeHdl, ListBox&, rListBox, void ) { if( &rListBox == pLbType ) mpTableBox->Execute( CSVCMD_SETCOLUMNTYPE, rListBox.GetSelectEntryPos() ); } -IMPL_LINK_NOARG_TYPED(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void) +IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void) { sal_Int32 nBaseLine = mpTableBox->GetFirstVisLine(); sal_Int32 nRead = mpTableBox->GetVisLineCount(); @@ -772,7 +772,7 @@ IMPL_LINK_NOARG_TYPED(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void) mpTableBox->SetUniStrings( maPreviewLine, maFieldSeparators, mcTextSep, bMergeSep); } -IMPL_LINK_TYPED( ScImportAsciiDlg, ColTypeHdl, ScCsvTableBox&, rTableBox, void ) +IMPL_LINK( ScImportAsciiDlg, ColTypeHdl, ScCsvTableBox&, rTableBox, void ) { sal_Int32 nType = rTableBox.GetSelColumnType(); sal_Int32 nTypeCount = pLbType->GetEntryCount(); diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 485219475081..a3ae3d41bef6 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -310,7 +310,7 @@ OString ScImportOptionsDlg::GetScreenshotId() const return (m_bIsAsciiImport) ? GetHelpId() : GetHelpId() + "?config=NonTextImport"; } -IMPL_LINK_TYPED( ScImportOptionsDlg, FixedWidthHdl, Button*, pCheckBox, void ) +IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, Button*, pCheckBox, void ) { if (pCheckBox == m_pCbFixed) { @@ -324,7 +324,7 @@ IMPL_LINK_TYPED( ScImportOptionsDlg, FixedWidthHdl, Button*, pCheckBox, void ) } } -IMPL_LINK_TYPED( ScImportOptionsDlg, DoubleClickHdl, ListBox&, rLb, void ) +IMPL_LINK( ScImportOptionsDlg, DoubleClickHdl, ListBox&, rLb, void ) { if (&rLb == m_pLbCharset) { diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 2a3e82d386fb..e49bf82a24b5 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -280,7 +280,7 @@ bool ScSpecialFilterDlg::IsRefInputMode() const // Handler: -IMPL_LINK_TYPED( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void ) +IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void ) { OSL_ENSURE( pDoc && pViewData, "Document or ViewData not found. :-/" ); @@ -396,7 +396,7 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void ) +IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void ) { // every 50ms check whether RefInputMode is still true @@ -422,7 +422,7 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void ) pIdle->Start(); } -IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void ) +IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void ) { if ( &rLb == pLbFilterArea ) { @@ -436,7 +436,7 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaModHdl, Edit&, rEd, void ) +IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, Edit&, rEd, void ) { if ( &rEd == pEdFilterArea ) { diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 86ff8096d09c..877002169a13 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -63,7 +63,7 @@ void ScSortWarningDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( ScSortWarningDlg, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScSortWarningDlg, BtnHdl, Button*, pBtn, void ) { if ( pBtn == aBtnExtSort ) { diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 6b728fa3a4af..2d11da450c9f 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -123,7 +123,7 @@ void ScSortKeyCtrl::setScrollRange() checkAutoVScroll(); } -IMPL_LINK_TYPED( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar, void ) { sal_Int32 nOffset = m_aSortWin.GetItemHeight(); nOffset *= pScrollBar->GetThumbPos(); diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index ffa0238f692a..6fa2c27113aa 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -47,7 +47,7 @@ void ScSubTotalDlg::dispose() SfxTabDialog::dispose(); } -IMPL_LINK_TYPED( ScSubTotalDlg, RemoveHdl, Button *, pBtn, void ) +IMPL_LINK( ScSubTotalDlg, RemoveHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnRemove) { diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index f6d1bdfce5ef..69d6ffc4dc71 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -88,12 +88,12 @@ void ScTextImportOptionsDlg::init() m_pLbCustomLang->Disable(); } -IMPL_LINK_NOARG_TYPED(ScTextImportOptionsDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_TYPED( ScTextImportOptionsDlg, RadioHdl, Button*, pBtn, void ) +IMPL_LINK( ScTextImportOptionsDlg, RadioHdl, Button*, pBtn, void ) { if (pBtn == m_pRbAutomatic) { diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 01bd5346928a..147a35e0020c 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -438,7 +438,7 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem ) // Handler: -IMPL_LINK_TYPED( ScTabPageSortFields, SelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox&, rLb, void ) { OUString aSelEntry = rLb.GetSelectEntry(); ScSortKeyItems::iterator pIter; @@ -841,7 +841,7 @@ void ScTabPageSortOptions::FillUserSortListBox() // Handler: -IMPL_LINK_TYPED( ScTabPageSortOptions, EnableHdl, Button*, pButton, void ) +IMPL_LINK( ScTabPageSortOptions, EnableHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if (pBox == m_pBtnCopyResult) @@ -870,7 +870,7 @@ IMPL_LINK_TYPED( ScTabPageSortOptions, EnableHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( ScTabPageSortOptions, SelOutPosHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox&, rLb, void ) { if (&rLb == m_pLbOutPos) { @@ -884,7 +884,7 @@ IMPL_LINK_TYPED( ScTabPageSortOptions, SelOutPosHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScTabPageSortOptions, SortDirHdl, Button *, pBtn, void ) +IMPL_LINK( ScTabPageSortOptions, SortDirHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnTopDown) { @@ -923,7 +923,7 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) } } -IMPL_LINK_NOARG_TYPED(ScTabPageSortOptions, FillAlgorHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl, ListBox&, void) { m_pLbAlgorithm->SetUpdateMode( false ); m_pLbAlgorithm->Clear(); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index c483f460630f..e6c8c7c33264 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -342,11 +342,11 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) // Handler: -IMPL_LINK_TYPED( ScTpSubTotalGroup, SelectTreeListBoxHdl, SvTreeListBox*, pLb, void ) +IMPL_LINK( ScTpSubTotalGroup, SelectTreeListBoxHdl, SvTreeListBox*, pLb, void ) { SelectHdl(pLb); } -IMPL_LINK_TYPED( ScTpSubTotalGroup, SelectListBoxHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTpSubTotalGroup, SelectListBoxHdl, ListBox&, rLb, void ) { SelectHdl(&rLb); } @@ -375,7 +375,7 @@ void ScTpSubTotalGroup::SelectHdl(void *pLb) } } -IMPL_LINK_TYPED( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void ) +IMPL_LINK( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void ) { if ( pLb == mpLbColumns ) { @@ -570,7 +570,7 @@ void ScTpSubTotalOptions::FillUserSortListBox() // Handler: -IMPL_LINK_TYPED( ScTpSubTotalOptions, CheckHdl, Button*, pBox, void ) +IMPL_LINK( ScTpSubTotalOptions, CheckHdl, Button*, pBox, void ) { if ( pBox == pBtnSort ) { diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 7a504b87cc06..8add8fcba032 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -581,7 +581,7 @@ void ScTPValidationValue::RemoveRefDlg() } } -IMPL_LINK_NOARG_TYPED(ScTPValidationValue, EditSetFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl, Control&, void) { const sal_Int32 nPos = m_pLbAllow->GetSelectEntryPos(); @@ -591,7 +591,7 @@ IMPL_LINK_NOARG_TYPED(ScTPValidationValue, EditSetFocusHdl, Control&, void) } } -IMPL_LINK_TYPED( ScTPValidationValue, KillFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScTPValidationValue, KillFocusHdl, Control&, rControl, void ) { vcl::Window* pWnd = static_cast<vcl::Window*>(&rControl); if( pWnd == m_pRefEdit || pWnd == m_pBtnRef ) @@ -603,7 +603,7 @@ IMPL_LINK_TYPED( ScTPValidationValue, KillFocusHdl, Control&, rControl, void ) } } -IMPL_LINK_NOARG_TYPED(ScTPValidationValue, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl, ListBox&, void) { const sal_Int32 nLbPos = m_pLbAllow->GetSelectEntryPos(); bool bEnable = (nLbPos != SC_VALIDDLG_ALLOW_ANY); @@ -665,7 +665,7 @@ IMPL_LINK_NOARG_TYPED(ScTPValidationValue, SelectHdl, ListBox&, void) m_pBtnRef->Show( bRange ); // cell range picker } -IMPL_LINK_NOARG_TYPED(ScTPValidationValue, CheckHdl, Button*, void) +IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl, Button*, void) { m_pCbSort->Enable( m_pCbShow->IsChecked() ); } @@ -830,7 +830,7 @@ bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet ) return true; } -IMPL_LINK_NOARG_TYPED(ScTPValidationError, SelectActionHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl, ListBox&, void) { ScValidErrorStyle eStyle = (ScValidErrorStyle) m_pLbAction->GetSelectEntryPos(); bool bMacro = ( eStyle == SC_VALERR_MACRO ); @@ -840,7 +840,7 @@ IMPL_LINK_NOARG_TYPED(ScTPValidationError, SelectActionHdl, ListBox&, void) m_pEdError->Enable( !bMacro ); } -IMPL_LINK_NOARG_TYPED(ScTPValidationError, ClickSearchHdl, Button*, void) +IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl, Button*, void) { // Use static SfxApplication method to bring up selector dialog for // choosing a script diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index c6e747084a6f..243fb2a61549 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -126,7 +126,7 @@ bool SearchResultsDlg::Close() return ModelessDialog::Close(); } -IMPL_LINK_NOARG_TYPED( SearchResultsDlg, ListSelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl, SvTreeListBox*, void ) { if (!mpDoc) return; diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 423c063b5047..e37a237a4eb8 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -477,12 +477,12 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, return bCanDo; } -IMPL_LINK_NOARG_TYPED(ScAreaLink, RefreshHdl, Timer *, void) +IMPL_LINK_NOARG(ScAreaLink, RefreshHdl, Timer *, void) { Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() ); } -IMPL_LINK_NOARG_TYPED(ScAreaLink, AreaEndEditHdl, Dialog&, void) +IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl, Dialog&, void) { // #i76514# can't use link argument to access the dialog, // because it's the ScLinkedAreaDlg, not AbstractScLinkedAreaDlg diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 463b88bcd314..3888dbcbcea4 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -81,7 +81,7 @@ void ScAutoStyleList::AddInitial( const ScRange& rRange, const OUString& rStyle1 aInitIdle.Start(); } -IMPL_LINK_NOARG_TYPED(ScAutoStyleList, InitHdl, Idle *, void) +IMPL_LINK_NOARG(ScAutoStyleList, InitHdl, Idle *, void) { std::vector<ScAutoStyleInitData>::iterator iter; for (iter = aInitials.begin(); iter != aInitials.end(); ++iter) @@ -184,7 +184,7 @@ void ScAutoStyleList::StartTimer( sal_uLong nNow ) // Sekunden nTimerStart = nNow; } -IMPL_LINK_NOARG_TYPED(ScAutoStyleList, TimerHdl, Timer *, void) +IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl, Timer *, void) { sal_uLong nNow = TimeNow(); AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index cd78c5394525..9c6c869a8e28 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -585,7 +585,7 @@ bool DataStream::ImportData() return mbRunning; } -IMPL_LINK_NOARG_TYPED(DataStream, ImportTimerHdl, Timer *, void) +IMPL_LINK_NOARG(DataStream, ImportTimerHdl, Timer *, void) { if (ImportData()) maImportTimer.Start(); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 833f63771880..e75dca660985 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -98,7 +98,7 @@ using namespace com::sun::star; using ::std::vector; -IMPL_LINK_TYPED( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction, void ) +IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction, void ) { // #i101118# if drawing layer collects the undo actions, add it there ScDrawLayer* pDrawLayer = rDocShell.GetDocument().GetDrawLayer(); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 050ed5c6c52d..26ac1ab2f238 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2305,7 +2305,7 @@ ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo ) // static return pFound; } -IMPL_LINK_TYPED( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { OSL_ENSURE( _pFileDlg, "ScDocShell::DialogClosedHdl(): no file dialog" ); OSL_ENSURE( pImpl->pDocInserter, "ScDocShell::DialogClosedHdl(): no document inserter" ); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index fad11592f7e4..d3437b8c5dcb 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -996,7 +996,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec return true; } -IMPL_LINK_TYPED( ScDocShell, RefreshDBDataHdl, Timer*, pRefreshTimer, void ) +IMPL_LINK( ScDocShell, RefreshDBDataHdl, Timer*, pRefreshTimer, void ) { ScDBDocFunc aFunc(*this); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 8c496a0d36cb..fdb84ef5feb2 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -3203,7 +3203,7 @@ void ScExternalRefManager::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -IMPL_LINK_TYPED(ScExternalRefManager, TimeOutHdl, Timer*, pTimer, void) +IMPL_LINK(ScExternalRefManager, TimeOutHdl, Timer*, pTimer, void) { if (pTimer == &maSrcDocTimer) purgeStaleSrcDocument(SRCDOC_LIFE_SPAN); diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index d16ae51697fc..5c2ff38af891 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -399,12 +399,12 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter, return true; } -IMPL_LINK_NOARG_TYPED(ScTableLink, RefreshHdl, Timer *, void) +IMPL_LINK_NOARG(ScTableLink, RefreshHdl, Timer *, void) { Refresh( aFileName, aFilterName, nullptr, GetRefreshDelay() ); } -IMPL_LINK_TYPED( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink&, rLink, void ) +IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink&, rLink, void ) { pImpl->m_aEndEditLink.Call( rLink ); bInEdit = false; diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index a5e1ca4f125d..cf4f4542e892 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -612,7 +612,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) } } -IMPL_LINK_TYPED( ScDrawShell, NameObjectHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) +IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) { OUString aName; rDialog.GetName( aName ); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 3e428457f632..7f74fb4c1239 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -470,7 +470,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) } } -IMPL_LINK_TYPED( ScDrawTextObjectBar, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) +IMPL_LINK( ScDrawTextObjectBar, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) { bPastePossible = ( pDataHelper->HasFormat( SotClipboardFormatId::STRING ) || pDataHelper->HasFormat( SotClipboardFormatId::RTF ) ); diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 73965e639051..94829ea52ec9 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -126,7 +126,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) |* \************************************************************************/ -IMPL_LINK_NOARG_TYPED(FuPoor, ScrollHdl, Timer *, void) +IMPL_LINK_NOARG(FuPoor, ScrollHdl, Timer *, void) { Point aPosPixel = pWindow->GetPointerPosPixel(); @@ -191,7 +191,7 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt) |* Timer-Handler fuer Drag&Drop |* \************************************************************************/ -IMPL_LINK_NOARG_TYPED(FuPoor, DragTimerHdl, Timer *, void) +IMPL_LINK_NOARG(FuPoor, DragTimerHdl, Timer *, void) { // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer // aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei @@ -203,7 +203,7 @@ IMPL_LINK_NOARG_TYPED(FuPoor, DragTimerHdl, Timer *, void) Application::PostUserEvent( LINK( this, FuPoor, DragHdl ) ); } -IMPL_LINK_NOARG_TYPED(FuPoor, DragHdl, void*, void) +IMPL_LINK_NOARG(FuPoor, DragHdl, void*, void) { SdrHdl* pHdl = pView->PickHandle(aMDPos); diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 8a36f6d64ca2..11f9ab7bf373 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -604,7 +604,7 @@ void ScFunctionWin::DoEnter() #* #************************************************************************/ -IMPL_LINK_TYPED( ScFunctionWin, SelHdl, ListBox&, rLb, void ) +IMPL_LINK( ScFunctionWin, SelHdl, ListBox&, rLb, void ) { if ( &rLb == aCatBox.get() ) { @@ -633,11 +633,11 @@ IMPL_LINK_TYPED( ScFunctionWin, SelHdl, ListBox&, rLb, void ) #* #************************************************************************/ -IMPL_LINK_NOARG_TYPED( ScFunctionWin, SetSelectionClickHdl, Button*, void ) +IMPL_LINK_NOARG( ScFunctionWin, SetSelectionClickHdl, Button*, void ) { DoEnter(); // Uebernimmt die Eingabe } -IMPL_LINK_NOARG_TYPED( ScFunctionWin, SetSelectionHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScFunctionWin, SetSelectionHdl, ListBox&, void ) { DoEnter(); // Uebernimmt die Eingabe } @@ -657,7 +657,7 @@ IMPL_LINK_NOARG_TYPED( ScFunctionWin, SetSelectionHdl, ListBox&, void ) #* #************************************************************************/ -IMPL_LINK_TYPED( ScFunctionWin, SetSplitHdl, ScPrivatSplit&, rCtrl, void ) +IMPL_LINK( ScFunctionWin, SetSplitHdl, ScPrivatSplit&, rCtrl, void ) { if (&rCtrl == aPrivatSplit.get()) { @@ -675,7 +675,7 @@ IMPL_LINK_TYPED( ScFunctionWin, SetSplitHdl, ScPrivatSplit&, rCtrl, void ) } } -IMPL_LINK_NOARG_TYPED(ScFunctionWin, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScFunctionWin, TimerHdl, Idle *, void) { OUString aString("ww"); Size aTxtSize( aFiFuncDesc->GetTextWidth(aString), aFiFuncDesc->GetTextHeight() ); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index e7e1897c21ec..9a2807d54336 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -66,7 +66,7 @@ public: virtual void Init() override; - DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); protected: virtual ~ScAccessibleDocument() override; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index b31a4da2e31e..6390df7fbedf 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -54,7 +54,7 @@ public: SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } virtual void UpdateData() = 0; - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); private: mutable SfxBroadcaster maBroadcaster; @@ -119,7 +119,7 @@ public: virtual void UpdateData() override { } - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); protected: ScEditObjectViewForwarder* mpViewForwarder; ScEditViewForwarder* mpEditViewForwarder; diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index f9a139422285..49b1efab696c 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -38,7 +38,7 @@ private: VclPtr<RadioButton> mpTwoFactorRadio; VclPtr<NumericField> mpRowsPerSampleField; - DECL_LINK_TYPED(FactorChanged, RadioButton&, void); + DECL_LINK(FactorChanged, RadioButton&, void); void FactorChanged(); AnovaFactor meFactor; diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 9a417edf1d25..e746df2d23b2 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -86,14 +86,14 @@ private: ScAddress::Details maAddressDetails; bool mbDialogLostFocus; - DECL_LINK_TYPED(CancelClicked, Button*, void); - DECL_LINK_TYPED(OKClicked, Button*, void); - DECL_LINK_TYPED(GetFocusHandler, Control&, void); - DECL_LINK_TYPED(LoseFocusHandler, Control&, void); - DECL_LINK_TYPED(ToggleSource, RadioButton&, void); - DECL_LINK_TYPED(ToggleDestination, RadioButton&, void); - DECL_LINK_TYPED(SourceListSelected, ListBox&, void); - DECL_LINK_TYPED(SourceEditModified, Edit&, void); + DECL_LINK(CancelClicked, Button*, void); + DECL_LINK(OKClicked, Button*, void); + DECL_LINK(GetFocusHandler, Control&, void); + DECL_LINK(LoseFocusHandler, Control&, void); + DECL_LINK(ToggleSource, RadioButton&, void); + DECL_LINK(ToggleDestination, RadioButton&, void); + DECL_LINK(SourceListSelected, ListBox&, void); + DECL_LINK(SourceEditModified, Edit&, void); void ToggleSource(); void ToggleDestination(); virtual bool Close() override; diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 1b7db2f3fa76..87821f4e6341 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -70,17 +70,17 @@ private: void SelectGeneratorAndGenerateNumbers(); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( CloseClicked, Button*, void ); - DECL_LINK_TYPED( ApplyClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - - DECL_LINK_TYPED( InputRangeModified, Edit&, void ); - DECL_LINK_TYPED( Parameter1ValueModified, Edit&, void ); - DECL_LINK_TYPED( Parameter2ValueModified, Edit&, void ); - DECL_LINK_TYPED( DistributionChanged, ListBox&, void ); - DECL_LINK_TYPED( CheckChanged, CheckBox&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( CloseClicked, Button*, void ); + DECL_LINK( ApplyClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + + DECL_LINK( InputRangeModified, Edit&, void ); + DECL_LINK( Parameter1ValueModified, Edit&, void ); + DECL_LINK( Parameter2ValueModified, Edit&, void ); + DECL_LINK( DistributionChanged, ListBox&, void ); + DECL_LINK( CheckChanged, CheckBox&, void ); }; diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 356477484c2d..e3f267fe62a5 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -72,12 +72,12 @@ private: ScRange PerformRandomSampling(ScDocShell* pDocShell); ScRange PerformPeriodicSampling(ScDocShell* pDocShell); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK_TYPED( SamplingSizeValueModified, Edit&, void ); - DECL_LINK_TYPED( ToggleSamplingMethod, RadioButton&, void ); - DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + DECL_LINK( SamplingSizeValueModified, Edit&, void ); + DECL_LINK( ToggleSamplingMethod, RadioButton&, void ); + DECL_LINK( RefInputModifyHandler, Edit&, void ); void ToggleSamplingMethod(); }; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 2f6a42710613..8a55f5dd9857 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -79,11 +79,11 @@ private: void Init(); void GetRangeFromSelection(); - DECL_LINK_TYPED( GroupByChanged, RadioButton&, void ); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); + DECL_LINK( GroupByChanged, RadioButton&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + DECL_LINK( RefInputModifyHandler, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 30ffdc183c51..ac15249d25c5 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -82,11 +82,11 @@ private: void Init(); void GetRangeFromSelection(); - DECL_LINK_TYPED( GroupByChanged, RadioButton&, void ); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); + DECL_LINK( GroupByChanged, RadioButton&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + DECL_LINK( RefInputModifyHandler, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 66a6e33bd4eb..8d036f7adf85 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -95,21 +95,21 @@ private: void Init(); void InitFilter(); - DECL_LINK_TYPED( FilterHandle, SvxTPFilter*, void ); - DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void ); - DECL_LINK_TYPED( RejectHandle, SvxTPView*, void ); - DECL_LINK_TYPED( AcceptHandle, SvxTPView*, void ); - DECL_LINK_TYPED( RejectAllHandle, SvxTPView*, void ); - DECL_LINK_TYPED( AcceptAllHandle, SvxTPView*, void ); - DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool ); - DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void ); - DECL_LINK_TYPED( RefInfoHandle, const OUString*, void ); - - DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); - DECL_LINK_TYPED( ChgTrackModHdl, ScChangeTrack&, void ); - DECL_LINK_TYPED( CommandHdl, SvSimpleTable*, void ); - DECL_LINK_TYPED( ReOpenTimerHdl, Idle*, void ); - DECL_LINK_TYPED( ColCompareHdl, const SvSortData*, sal_Int32 ); + DECL_LINK( FilterHandle, SvxTPFilter*, void ); + DECL_LINK( RefHandle, SvxTPFilter*, void ); + DECL_LINK( RejectHandle, SvxTPView*, void ); + DECL_LINK( AcceptHandle, SvxTPView*, void ); + DECL_LINK( RejectAllHandle, SvxTPView*, void ); + DECL_LINK( AcceptAllHandle, SvxTPView*, void ); + DECL_LINK( ExpandingHandle, SvTreeListBox*, bool ); + DECL_LINK( SelectHandle, SvTreeListBox*, void ); + DECL_LINK( RefInfoHandle, const OUString*, void ); + + DECL_LINK( UpdateSelectionHdl, Idle*, void ); + DECL_LINK( ChgTrackModHdl, ScChangeTrack&, void ); + DECL_LINK( CommandHdl, SvSimpleTable*, void ); + DECL_LINK( ReOpenTimerHdl, Idle*, void ); + DECL_LINK( ColCompareHdl, const SvSortData*, sal_Int32 ); protected: diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index cbad65a67d84..1d53ce0dfddb 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -69,7 +69,7 @@ class ScFormulaReferenceHelper bool bHighlightRef; bool bAccInserted; - DECL_LINK_TYPED( AccelSelectHdl, Accelerator&, void ); + DECL_LINK( AccelSelectHdl, Accelerator&, void ); public: ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings); @@ -121,7 +121,7 @@ private: Idle aIdle; OUString aDocName; // document on which the dialog was opened - DECL_LINK_TYPED( UpdateFocusHdl, Idle*, void ); + DECL_LINK( UpdateFocusHdl, Idle*, void ); protected: void disposeRefHandler(); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 2691571bc29b..6ad979c6243e 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -73,10 +73,10 @@ private: bool Impl_GetItem( Edit* pEd, SfxStringItem& rItem ); // Handler: - DECL_LINK_TYPED( Impl_SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( Impl_ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( Impl_BtnHdl, Button*, void ); - DECL_LINK_TYPED( Impl_GetFocusHdl, Control&, void ); + DECL_LINK( Impl_SelectHdl, ListBox&, void ); + DECL_LINK( Impl_ModifyHdl, Edit&, void ); + DECL_LINK( Impl_BtnHdl, Button*, void ); + DECL_LINK( Impl_GetFocusHdl, Control&, void ); }; #endif diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 7e60e75946be..d32ff75ddeff 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -37,7 +37,7 @@ protected: virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) override; private: - DECL_LINK_TYPED( OkHandler, SfxPoolItem*, void ); // for closing by double clicking in TabPages + DECL_LINK( OkHandler, SfxPoolItem*, void ); // for closing by double clicking in TabPages sal_uInt16 m_nNumberPageId; sal_uInt16 m_nFontPageId; }; diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index caf2d45dbea0..ff078209911b 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -63,8 +63,8 @@ private: void ExecuteEntries(); void AdjustEntries(sal_uLong nDiff); void StartTimer(sal_uLong nNow); - DECL_LINK_TYPED( TimerHdl, Timer*, void ); - DECL_LINK_TYPED( InitHdl, Idle*, void ); + DECL_LINK( TimerHdl, Timer*, void ); + DECL_LINK( InitHdl, Idle*, void ); public: ScAutoStyleList(ScDocShell* pShell); diff --git a/sc/source/ui/inc/cbnumberformat.hxx b/sc/source/ui/inc/cbnumberformat.hxx index f593ccf900e9..9773fd9b34cc 100644 --- a/sc/source/ui/inc/cbnumberformat.hxx +++ b/sc/source/ui/inc/cbnumberformat.hxx @@ -28,7 +28,7 @@ public: explicit ScNumberFormat(vcl::Window* pParent, WinBits nStyle); private: - DECL_STATIC_LINK_TYPED(ScNumberFormat, NumFormatSelectHdl, ListBox&, void); + DECL_STATIC_LINK(ScNumberFormat, NumFormatSelectHdl, ListBox&, void); }; #endif diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 8bb339ed97a5..d3fa6a0bc05a 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -64,8 +64,8 @@ private: void ExecuteFillSingleEdit(); - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK_TYPED( DialogClosed, Dialog&, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( DialogClosed, Dialog&, void ); RotateTransliteration m_aRotateCase; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 856a607f4590..44a0da483918 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -165,7 +165,7 @@ private: VclPtr<ScMenuFloatingWindow> mpSubMenu; size_t mnMenuPos; - DECL_LINK_TYPED( TimeoutHdl, Timer*, void ); + DECL_LINK( TimeoutHdl, Timer*, void ); SubMenuItemData(ScMenuFloatingWindow* pParent); void reset(); @@ -392,10 +392,10 @@ private: void selectCurrentMemberOnly(bool bSet); void updateMemberParents( SvTreeListEntry* pLeaf, size_t nIdx ); - DECL_LINK_TYPED( ButtonHdl, Button*, void ); - DECL_LINK_TYPED( TriStateHdl, Button*, void ); - DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( EdModifyHdl, Edit&, void ); + DECL_LINK( ButtonHdl, Button*, void ); + DECL_LINK( TriStateHdl, Button*, void ); + DECL_LINK( CheckHdl, SvTreeListBox*, void ); + DECL_LINK( EdModifyHdl, Edit&, void ); private: VclPtr<ScSearchEdit> maEdSearch; diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 1e2e542d5c40..682be33c87ad 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -49,9 +49,9 @@ private: ScDocument* mpDoc; ScAddress maPos; - DECL_LINK_TYPED(OkBtnHdl, Button*, void); - DECL_LINK_TYPED(TypeSelectHdl, ListBox&, void); - DECL_LINK_TYPED(PosSelectHdl, ListBox&, void); + DECL_LINK(OkBtnHdl, Button*, void); + DECL_LINK(TypeSelectHdl, ListBox&, void); + DECL_LINK(PosSelectHdl, ListBox&, void); void Init(); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 34c6f3fc2297..62f37584fe19 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -71,14 +71,14 @@ public: ScConditionalFormat* GetConditionalFormat() const; void RecalcAll(); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EntrySelectHdl, ScCondFrmtEntry&, void ); - - DECL_LINK_TYPED( TypeListHdl, ListBox&, void ); - DECL_LINK_TYPED( AfterTypeListHdl, void*, void ); - DECL_LINK_TYPED( ColFormatTypeHdl, ListBox&, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( EntrySelectHdl, ScCondFrmtEntry&, void ); + + DECL_LINK( TypeListHdl, ListBox&, void ); + DECL_LINK( AfterTypeListHdl, void*, void ); + DECL_LINK( ColFormatTypeHdl, ListBox&, void ); }; class ScCondFormatDlg : public ScAnyRefDlg @@ -105,7 +105,7 @@ private: OUString msBaseTitle; void updateTitle(); - DECL_LINK_TYPED( EdRangeModifyHdl, Edit&, void ); + DECL_LINK( EdRangeModifyHdl, Edit&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; @@ -128,8 +128,8 @@ public: void InvalidateRefData(); - DECL_LINK_TYPED( BtnPressedHdl, Button*, void ); - DECL_LINK_TYPED( RangeGetFocusHdl, Control&, void ); + DECL_LINK( BtnPressedHdl, Button*, void ); + DECL_LINK( RangeGetFocusHdl, Control&, void ); }; #endif diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 675abc99db33..d5c99b72ad9f 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -100,9 +100,9 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener virtual OUString GetExpressionString() override; void Init(ScCondFormatDlg* pDialogParent); - DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ConditionTypeSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( OnEdChanged, Edit&, void ); + DECL_LINK( StyleSelectHdl, ListBox&, void ); + DECL_LINK( ConditionTypeSelectHdl, ListBox&, void ); + DECL_LINK( OnEdChanged, Edit&, void ); // Searches the lookup table for the entry position, given condition mode static sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ); @@ -142,7 +142,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(ScCondFormatDlg* pDialogParent); - DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); + DECL_LINK( StyleSelectHdl, ListBox&, void ); public: ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* PDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = nullptr ); @@ -176,7 +176,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(); - DECL_LINK_TYPED( EntryTypeHdl, ListBox&, void ); + DECL_LINK( EntryTypeHdl, ListBox&, void ); public: ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr ); virtual ~ScColorScale2FrmtEntry() override; @@ -211,7 +211,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(); - DECL_LINK_TYPED( EntryTypeHdl, ListBox&, void ); + DECL_LINK( EntryTypeHdl, ListBox&, void ); public: ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr ); virtual ~ScColorScale3FrmtEntry() override; @@ -242,8 +242,8 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(); - DECL_LINK_TYPED( OptionBtnHdl, Button*, void ); - DECL_LINK_TYPED( DataBarTypeSelectHdl, ListBox&, void ); + DECL_LINK( OptionBtnHdl, Button*, void ); + DECL_LINK( DataBarTypeSelectHdl, ListBox&, void ); public: ScDataBarFrmtEntry( vcl::Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = nullptr ); virtual ~ScDataBarFrmtEntry() override; @@ -274,7 +274,7 @@ protected: private: void Init(); - DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); + DECL_LINK( StyleSelectHdl, ListBox&, void ); VclPtr<ListBox> maLbDateEntry; VclPtr<FixedText> maFtStyle; @@ -299,7 +299,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry void Init(); - DECL_LINK_TYPED( IconSetTypeHdl, ListBox&, void ); + DECL_LINK( IconSetTypeHdl, ListBox&, void ); public: ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = nullptr ); diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index f436ca81e7e2..fffd18f8bdc3 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -67,10 +67,10 @@ private: ScDocument* mpDoc; - DECL_LINK_TYPED(RemoveBtnHdl, Button*, void); - DECL_LINK_TYPED(EditBtnClickHdl, Button*, void); - DECL_LINK_TYPED(AddBtnHdl, Button*, void); - DECL_LINK_TYPED(EditBtnHdl, SvTreeListBox*, bool); + DECL_LINK(RemoveBtnHdl, Button*, void); + DECL_LINK(EditBtnClickHdl, Button*, void); + DECL_LINK(AddBtnHdl, Button*, void); + DECL_LINK(EditBtnHdl, SvTreeListBox*, bool); bool mbModified; }; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index a8582a1081ac..db53e0915cf2 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -149,13 +149,13 @@ private: void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); - DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void ); - DECL_LINK_TYPED( DeselectHandle, SvTreeListBox*, void ); - DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); - DECL_LINK_TYPED( KeepMineHandle, Button*, void ); - DECL_LINK_TYPED( KeepOtherHandle, Button*, void ); - DECL_LINK_TYPED( KeepAllMineHandle, Button*, void ); - DECL_LINK_TYPED( KeepAllOthersHandle, Button*, void ); + DECL_LINK( SelectHandle, SvTreeListBox*, void ); + DECL_LINK( DeselectHandle, SvTreeListBox*, void ); + DECL_LINK( UpdateSelectionHdl, Idle*, void ); + DECL_LINK( KeepMineHandle, Button*, void ); + DECL_LINK( KeepOtherHandle, Button*, void ); + DECL_LINK( KeepAllMineHandle, Button*, void ); + DECL_LINK( KeepAllOthersHandle, Button*, void ); public: ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index b3938dc49af4..ecd20847dccd 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -91,11 +91,11 @@ private: void FillAreaLists (); bool VerifyEdit ( formula::RefEdit* pEd ); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); static ScSubTotalFunc LbPosToFunc( sal_Int32 nPos ); static sal_Int32 FuncToLbPos( ScSubTotalFunc eFunc ); diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index d1fa598153e6..8e839c1ace8c 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -98,8 +98,8 @@ class ScContentTree : public SvTreeListBox ScDocument* GetSourceDocument(); - DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ExecDragHdl, void*, void ); + DECL_LINK( ContentDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( ExecDragHdl, void*, void ); public: SvTreeListEntry* pTmpEntry; diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index ab4d7d7b6932..faf4e4b11037 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -38,7 +38,7 @@ private: VclPtr<RadioButton> m_pBtnCols; VclPtr<OKButton> m_pBtnOk; - DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK(OkHdl, Button*, void); }; #endif diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 5804859bf7bf..6bffcb7d059f 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -77,17 +77,17 @@ private: void UpdateRangeData ( const ScRange& rRange, bool bColName ); void SetColRowData( const ScRange& rLabelRange, bool bRef=false); void AdjustColRowData( const ScRange& rDataRange, bool bRef=false); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK_TYPED( Range1SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( Range1DataModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ColClickHdl, Button*, void ); - DECL_LINK_TYPED( RowClickHdl, Button*, void ); - DECL_LINK_TYPED( Range2DataModifyHdl, Edit&, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( Range1SelectHdl, ListBox&, void ); + DECL_LINK( Range1DataModifyHdl, Edit&, void ); + DECL_LINK( ColClickHdl, Button*, void ); + DECL_LINK( RowClickHdl, Button*, void ); + DECL_LINK( Range2DataModifyHdl, Edit&, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_CRNRDLG_HXX diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index b75c306fdda0..abd88e133677 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -123,9 +123,9 @@ protected: virtual Size GetOptimalSize() const override; private: - DECL_DLLPRIVATE_LINK_TYPED( CsvCmdHdl, ScCsvControl&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollEndHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( CsvCmdHdl, ScCsvControl&, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( ScrollEndHdl, ScrollBar*, void ); // accessibility ---------------------------------------------------------- public: diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index a1b9a277e95e..6216d4f6fc2f 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -36,7 +36,7 @@ private: void FillObjects(); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: ScDataPilotDatabaseDlg(vcl::Window* pParent); diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 3ffaef9c5974..dce9670d757f 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -46,7 +46,7 @@ public: void AppendNamedRange(const OUString& rNames); private: - DECL_LINK_TYPED( RadioClickHdl, Button *, void ); + DECL_LINK( RadioClickHdl, Button *, void ); }; class ScDataPilotServiceDlg : public ModalDialog diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 4317ef27fbda..754289bc88d1 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -63,16 +63,16 @@ private: void SetButtonState(); // Handler: - DECL_LINK_TYPED(Impl_NewHdl, Button*, void); - DECL_LINK_TYPED(Impl_PrevHdl, Button*, void); - DECL_LINK_TYPED(Impl_NextHdl, Button*, void); + DECL_LINK(Impl_NewHdl, Button*, void); + DECL_LINK(Impl_PrevHdl, Button*, void); + DECL_LINK(Impl_NextHdl, Button*, void); - DECL_LINK_TYPED(Impl_RestoreHdl, Button*, void); - DECL_LINK_TYPED(Impl_DeleteHdl, Button*, void); - DECL_LINK_TYPED(Impl_CloseHdl, Button*, void); + DECL_LINK(Impl_RestoreHdl, Button*, void); + DECL_LINK(Impl_DeleteHdl, Button*, void); + DECL_LINK(Impl_CloseHdl, Button*, void); - DECL_LINK_TYPED(Impl_ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED(Impl_DataModifyHdl, Edit&, void); + DECL_LINK(Impl_ScrollHdl, ScrollBar*, void); + DECL_LINK(Impl_DataModifyHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_DATAFDLG_HXX diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index c60bec047ab2..5ddf9ac7a55e 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -99,7 +99,7 @@ private: void Text2Doc(); void Refresh(); - DECL_LINK_TYPED( ImportTimerHdl, Timer*, void ); + DECL_LINK( ImportTimerHdl, Timer*, void ); private: ScDocShell* mpDocShell; diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index ee0ef36b8791..74fba3ff6de4 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -47,10 +47,10 @@ class DataStreamDlg : public ModalDialog VclPtr<VclFrame> m_pVclFrameLimit; VclPtr<VclFrame> m_pVclFrameMove; - DECL_LINK_TYPED(UpdateClickHdl, Button*, void); - DECL_LINK_TYPED(UpdateHdl, Edit&, void); - DECL_LINK_TYPED(UpdateComboBoxHdl, ComboBox&, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); + DECL_LINK(UpdateClickHdl, Button*, void); + DECL_LINK(UpdateHdl, Edit&, void); + DECL_LINK(UpdateComboBoxHdl, ComboBox&, void); + DECL_LINK(BrowseHdl, Button*, void); void UpdateEnable(); ScRange GetStartRange(); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 34f831732c03..fcbc3cda24a9 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -91,12 +91,12 @@ private: void UpdateDBData( const OUString& rStrName ); void SetInfoStrings( const ScDBData* pDBData ); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK_TYPED( NameModifyHdl, Edit&, void ); - DECL_LINK_TYPED( AssModifyHdl, Edit&, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( NameModifyHdl, Edit&, void ); + DECL_LINK( AssModifyHdl, Edit&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_DBNAMDLG_HXX diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index fa6667a84a11..f2122ead7846 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -43,7 +43,7 @@ private: static InsertDeleteFlags nPreviousChecks; void DisableChecks( bool bDelAllChecked ); - DECL_LINK_TYPED( DelAllHdl, Button*, void ); + DECL_LINK( DelAllHdl, Button*, void ); public: ScDeleteContentsDlg( vcl::Window* pParent, diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index af6deb00b2db..f54893ed4613 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -68,7 +68,7 @@ protected: public: virtual ~ScDocFunc() {} - DECL_LINK_TYPED( NotifyDrawUndo, SdrUndoAction*, void ); + DECL_LINK( NotifyDrawUndo, SdrUndoAction*, void ); // for grouping multiple operations into one with a new name void EnterListAction( sal_uInt16 nNameResId ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index e7503b062e09..31adcf66ea43 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -341,7 +341,7 @@ public: void LockDocument(); void UnlockDocument(); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); virtual SfxStyleSheetBasePool* GetStyleSheetPool() override; @@ -399,7 +399,7 @@ public: static OUString GetDifFilterName(); static bool HasAutomaticTableName( const OUString& rFilter ); - DECL_LINK_TYPED( RefreshDBDataHdl, Timer*, void ); + DECL_LINK( RefreshDBDataHdl, Timer*, void ); void BeforeXMLLoading(); void AfterXMLLoading(bool bRet); diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 68c134d6d1fa..7abcea8f7136 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -46,7 +46,7 @@ private: virtual bool ImplGetValue( double& rfValue ) const = 0; virtual void ImplSetValue( double fValue ) = 0; - DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbAuto; @@ -119,8 +119,8 @@ public: sal_Int32 GetDatePart() const; private: - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( CheckHdl, SvTreeListBox*, void ); private: VclPtr<RadioButton> mpRbAutoStart; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 90c0f09d1403..0da1b1532f05 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -39,7 +39,7 @@ class ScDrawShell : public SfxShell ScViewData* pViewData; ::rtl::Reference<svx::sidebar::SelectionChangeHandler> mpSelectionChangeHandler; - DECL_LINK_TYPED( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); + DECL_LINK( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ); diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index f5333d108264..bc29dc93e528 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -38,7 +38,7 @@ class ScDrawTextObjectBar : public SfxShell rtl::Reference<TransferableClipboardListener> mxClipEvtLstnr; bool bPastePossible; - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); public: SFX_DECL_INTERFACE(SCID_DRAW_TEXT_SHELL) diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index a3e127dc35de..cea49c96b25e 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -65,11 +65,11 @@ private: void SetMyHeightLeRi(Size &aNewSize); void UseSplitterInitPos(); - DECL_LINK_TYPED( SetSelectionHdl, ListBox&, void ); - DECL_LINK_TYPED( SetSelectionClickHdl, Button*, void ); - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED( SetSplitHdl, ScPrivatSplit&, void ); - DECL_LINK_TYPED( TimerHdl, Idle*, void ); + DECL_LINK( SetSelectionHdl, ListBox&, void ); + DECL_LINK( SetSelectionClickHdl, Button*, void ); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK( SetSplitHdl, ScPrivatSplit&, void ); + DECL_LINK( TimerHdl, Idle*, void ); protected: diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx index 1638ce4b2785..eaeed421ca27 100644 --- a/sc/source/ui/inc/editsh.hxx +++ b/sc/source/ui/inc/editsh.hxx @@ -46,7 +46,7 @@ private: const SvxURLField* GetURLField(); ScInputHandler* GetMyInputHdl(); - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); public: SFX_DECL_INTERFACE(SCID_EDIT_SHELL) diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 0674b0fb45ed..1a913143c334 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -101,8 +101,8 @@ private: bool CheckIncrementVal(); bool CheckEndVal(); - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( DisableHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( DisableHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FILLDLG_HXX diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index c901bad73f05..05a80e8dcf63 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -148,15 +148,15 @@ private: ScQueryItem* GetOutputItem (); // Handler: - DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ValModifyHdl, Edit&, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( EndDlgHdl, Button*, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( MoreExpandedHdl, VclExpander&, void ); + DECL_LINK( LbSelectHdl, ListBox&, void ); + DECL_LINK( ValModifyHdl, Edit&, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( EndDlgHdl, Button*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( MoreExpandedHdl, VclExpander&, void ); // Hack: RefInput control - DECL_LINK_TYPED( TimeOutHdl, Timer*, void ); + DECL_LINK( TimeOutHdl, Timer*, void ); }; class ScSpecialFilterDlg : public ScAnyRefDlg @@ -216,12 +216,12 @@ private: const ScRange& rSource ); // Handler - DECL_LINK_TYPED( FilterAreaSelHdl, ListBox&, void ); - DECL_LINK_TYPED( FilterAreaModHdl, Edit&, void ); - DECL_LINK_TYPED( EndDlgHdl, Button*, void ); + DECL_LINK( FilterAreaSelHdl, ListBox&, void ); + DECL_LINK( FilterAreaModHdl, Edit&, void ); + DECL_LINK( EndDlgHdl, Button*, void ); // Hack: RefInput control - DECL_LINK_TYPED( TimeOutHdl, Idle*, void ); + DECL_LINK( TimeOutHdl, Idle*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 4b6a3cac0e32..bc1ef9b3ecbb 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -77,9 +77,9 @@ private: void Init(); // Handler: - DECL_LINK_TYPED( EdAreaModifyHdl, Edit&, void ); - DECL_LINK_TYPED( LbAreaSelHdl, ListBox&, void ); - DECL_LINK_TYPED( BtnCopyResultHdl, CheckBox&, void ); + DECL_LINK( EdAreaModifyHdl, Edit&, void ); + DECL_LINK( LbAreaSelHdl, ListBox&, void ); + DECL_LINK( BtnCopyResultHdl, CheckBox&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FOPTMGR_HXX diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index d54d0cc45e14..bbdfdb30250c 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -50,12 +50,12 @@ protected: VclPtr<Dialog> pDialog; Timer aScrollTimer; // for Autoscrolling - DECL_LINK_TYPED( ScrollHdl, Timer *, void ); + DECL_LINK( ScrollHdl, Timer *, void ); void ForceScroll(const Point& aPixPos); Timer aDragTimer; // for Drag&Drop - DECL_LINK_TYPED( DragTimerHdl, Timer *, void ); - DECL_LINK_TYPED( DragHdl, void *, void ); + DECL_LINK( DragTimerHdl, Timer *, void ); + DECL_LINK( DragHdl, void *, void ); bool bIsInDragMode; Point aMDPos; // Position of MouseButtonDown diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 6f3a3c94bc93..7272cc0b5803 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -192,8 +192,8 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou bool bAutoMarkVisible:1; bool bListValButton:1; - DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( PopupSpellingHdl, SpellCallbackInfo&, void ); + DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( PopupSpellingHdl, SpellCallbackInfo&, void ); bool TestMouse( const MouseEvent& rMEvt, bool bAction ); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 9a04ff9707e9..151b16ffe6ee 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -58,9 +58,9 @@ private: void Init(); - DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void ); - DECL_LINK_TYPED( HighlightHandle, Button*, void ); - DECL_LINK_TYPED( OKBtnHdl, Button*, void ); + DECL_LINK( RefHandle, SvxTPFilter*, void ); + DECL_LINK( HighlightHandle, Button*, void ); + DECL_LINK( OKBtnHdl, Button*, void ); protected: diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 7ea15d724a15..e11cfb096f06 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -134,7 +134,7 @@ private: void UpdateFormulaMode(); static void InvalidateAttribs(); void ImplCreateEditEngine(); - DECL_LINK_TYPED( DelayTimer, Timer*, void ); + DECL_LINK( DelayTimer, Timer*, void ); void GetColData(); void UseColData(); void NextAutoEntry( bool bBack ); @@ -156,9 +156,9 @@ private: void SkipClosingPar(); bool GetFuncName( OUString& aStart, OUString& aResult ); // fdo75264 void ShowArgumentsTip( OUString& rSelText ); - DECL_LINK_TYPED( ModifyHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( ShowHideTipVisibleParentListener, VclWindowEvent&, void ); - DECL_LINK_TYPED( ShowHideTipVisibleSecParentListener, VclWindowEvent&, void ); + DECL_LINK( ModifyHdl, LinkParamNone*, void ); + DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent&, void ); + DECL_LINK( ShowHideTipVisibleSecParentListener, VclWindowEvent&, void ); public: ScInputHandler(const ScInputHandler&) = delete; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index c049b385f11b..63318f20931f 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -99,8 +99,8 @@ public: void DoScroll(); - DECL_LINK_TYPED(NotifyHdl, EENotify&, void); - DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void); + DECL_LINK(NotifyHdl, EENotify&, void); + DECL_LINK(ModifyHdl, LinkParamNone*, void); protected: virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; @@ -215,8 +215,8 @@ private: VclPtr<ScrollBar> maScrollbar; long mnVertOffset; - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( Impl_ScrollHdl, ScrollBar*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( Impl_ScrollHdl, ScrollBar*, void ); }; class ScInputWindow : public ToolBox // Parent toolbox diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 8b14a994891c..24897a7e775a 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -97,9 +97,9 @@ private: void TestModes(); // Handler - DECL_LINK_TYPED( InsAllHdl, Button*, void ); - DECL_LINK_TYPED( LinkBtnHdl, Button*, void ); - DECL_LINK_TYPED( ShortCutHdl, Button*, void ); + DECL_LINK( InsAllHdl, Button*, void ); + DECL_LINK( LinkBtnHdl, Button*, void ); + DECL_LINK( ShortCutHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_INSCODLG_HXX diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index cd5cd171e252..141a92a5a8cf 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -91,13 +91,13 @@ private: void FillTables_Impl( ScDocument* pSrcDoc ); void DoEnable_Impl(); - DECL_LINK_TYPED( BrowseHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChoiceHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( CountHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( DoEnterHdl, Button*, void ); - DECL_LINK_TYPED( BrowseTimeoutHdl, Timer *, void ); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( BrowseHdl_Impl, Button*, void ); + DECL_LINK( ChoiceHdl_Impl, Button*, void ); + DECL_LINK( SelectHdl_Impl, ListBox&, void ); + DECL_LINK( CountHdl_Impl, Edit&, void ); + DECL_LINK( DoEnterHdl, Button*, void ); + DECL_LINK( BrowseTimeoutHdl, Timer *, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_INSTBDLG_HXX diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index 7b5215411944..a67e2972a5b8 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -32,7 +32,7 @@ class ScSelEntryDlg : public ModalDialog private: VclPtr<ListBox> m_pLb; - DECL_LINK_TYPED( DblClkHdl, ListBox&, void ); + DECL_LINK( DblClkHdl, ListBox&, void ); public: ScSelEntryDlg(vcl::Window* pParent, const std::vector<OUString> &rEntryList); diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index f8781b656d42..f199e42c0621 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -51,11 +51,11 @@ private: SfxObjectShellRef aSourceRef; - DECL_LINK_TYPED(FileHdl, ComboBox&, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); - DECL_LINK_TYPED(RangeHdl, ListBox&, void); - DECL_LINK_TYPED(ReloadHdl, Button*, void); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK(FileHdl, ComboBox&, void); + DECL_LINK(BrowseHdl, Button*, void); + DECL_LINK(RangeHdl, ListBox&, void); + DECL_LINK(ReloadHdl, Button*, void); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); void UpdateSourceRanges(); void UpdateEnable(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index f5f9d5e4afae..f6815065d798 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -49,8 +49,8 @@ private: long nDefaultValue; long nCurrentValue; - DECL_LINK_TYPED(SetDefValHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SetDefValHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_MTRINDLG_HXX diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 6d4f12bddbf6..0b77c8d89aa5 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -75,10 +75,10 @@ private: void Init (); void InitDocListBox (); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED( CheckBtnHdl, RadioButton&, void ); - DECL_LINK_TYPED( CheckNameHdl, Edit&, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK( CheckBtnHdl, RadioButton&, void ); + DECL_LINK( CheckNameHdl, Edit&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index be8855caba25..3a036a91a2b3 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -64,10 +64,10 @@ private: bool IsNameValid(); bool IsFormulaValid(); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( NameModifyHdl, Edit&, void ); - DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( NameModifyHdl, Edit&, void ); + DECL_LINK( AssignGetFocusHdl, Control&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 20f779fdb7f4..7101a5b50a1d 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -99,15 +99,15 @@ private: void SelectionChanged(); // Handler: - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK_TYPED( EdModifyHdl, Edit&, void ); - DECL_LINK_TYPED( EdModifyCheckBoxHdl, CheckBox&, void ); - DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void ); - DECL_LINK_TYPED( SelectionChangedHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ScopeChangedHdl, ListBox&, void ); + DECL_LINK( OkBtnHdl, Button*, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( EdModifyHdl, Edit&, void ); + DECL_LINK( EdModifyCheckBoxHdl, CheckBox&, void ); + DECL_LINK( AssignGetFocusHdl, Control&, void ); + DECL_LINK( SelectionChangedHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( ScopeChangedHdl, ListBox&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index c725ba381ed7..cb9ab35dbe2f 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -84,8 +84,8 @@ public: bool IsMultiSelection(); std::vector<ScRangeNameLine> GetSelectedEntries(); - DECL_LINK_TYPED( ScrollHdl, SvTreeListBox*, void); - DECL_LINK_TYPED( HeaderEndDragHdl, HeaderBar*, void); + DECL_LINK( ScrollHdl, SvTreeListBox*, void); + DECL_LINK( HeaderEndDragHdl, HeaderBar*, void); }; #endif diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 46d779dfe535..4ae4fa18d88a 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -36,7 +36,7 @@ class ScDocShell; class ScNamePasteDlg : public ModalDialog { - DECL_LINK_TYPED( ButtonHdl, Button *, void ); + DECL_LINK( ButtonHdl, Button *, void ); private: VclPtr<PushButton> m_pBtnPasteAll; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index f424c6d02792..0f276d089274 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -194,7 +194,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void ); + DECL_LINK( ToolBoxDropdownClickHdl, ToolBox*, void ); protected: virtual void Select() override; @@ -257,7 +257,7 @@ private: ScNavigatorControllerItem** ppBoundItems; - DECL_LINK_TYPED( TimeHdl, Idle*, void ); + DECL_LINK( TimeHdl, Idle*, void ); void DoResize(); diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index b6f8f8d70d00..2d83b8fe500e 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -49,7 +49,7 @@ private: SdrObject* pObject; bool bVisible; Point aGridOff; - DECL_LINK_TYPED( TimeHdl, Timer*, void ); + DECL_LINK( TimeHdl, Timer*, void ); public: ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* pBottom, vcl::Window* pDiagonal, diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 809f44850e0e..a46978b3c19e 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -189,16 +189,16 @@ private: bool FindTimeout( sal_Int32& rTimeout ); void ShowError( bool bCondition, formula::RefEdit* pFocus ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( DelBtnHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED( CursorUpHdl, ScCursorRefEdit&, void ); - DECL_LINK_TYPED( CursorDownHdl, ScCursorRefEdit&, void ); - DECL_LINK_TYPED( CondModifyHdl, Edit&, void ); - DECL_LINK_TYPED( TargetModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( DelBtnHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void); + DECL_LINK( CursorUpHdl, ScCursorRefEdit&, void ); + DECL_LINK( CursorDownHdl, ScCursorRefEdit&, void ); + DECL_LINK( CondModifyHdl, Edit&, void ); + DECL_LINK( TargetModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); }; class ScSolverProgressDialog : public ModelessDialog @@ -230,7 +230,7 @@ class ScSolverSuccessDialog : public ModalDialog VclPtr<PushButton> m_pBtnOk; VclPtr<PushButton> m_pBtnCancel; - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(ClickHdl, Button*, void); public: ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution ); diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index da55fc7a414b..c3fcdd64d8a1 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -90,9 +90,9 @@ private: sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler: - DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ValModifyHdl, Edit&, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); + DECL_LINK( LbSelectHdl, ListBox&, void ); + DECL_LINK( ValModifyHdl, Edit&, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index f39e6d32b053..ca5dbb461254 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -154,7 +154,7 @@ public: void CalcAll() { CalcPages(); } void SetInGetState(bool bSet) { bInGetState = bSet; } - DECL_STATIC_LINK_TYPED( ScPreview, InvalidateHdl, void*, void ); + DECL_STATIC_LINK( ScPreview, InvalidateHdl, void*, void ); static void StaticInvalidate(); FmFormView* GetDrawView() { return pDrawView; } diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 77a9589b5183..dab12bc523b1 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -55,8 +55,8 @@ class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell bool GetPageSize( Size& aPageSize ); private: void Construct( vcl::Window* pParent ); - DECL_LINK_TYPED( ScrollHandler, ScrollBar*, void ); - DECL_LINK_TYPED( CloseHdl, SystemWindow&, void); + DECL_LINK( ScrollHandler, ScrollBar*, void ); + DECL_LINK( CloseHdl, SystemWindow&, void); void DoScroll( sal_uInt16 nMode ); void ExitPreview(); diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index e995585acc5f..fb1948491b0d 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -65,9 +65,9 @@ private: OUString m_aSelectLockedCells; OUString m_aSelectUnlockedCells; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( PasswordModifyHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( PasswordModifyHdl, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index f5b6c73fe6c0..70fe3b65a375 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -74,8 +74,8 @@ private: /** Searches for a listbox entry, starts search at specified position. */ sal_Int32 FindBaseItemPos( const OUString& rEntry, sal_Int32 nStartPos ) const; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); private: VclPtr<ScDPFunctionListBox> mpLbFunc; @@ -111,9 +111,9 @@ public: private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); - DECL_LINK_TYPED( RadioClickHdl, Button*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); + DECL_LINK( RadioClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbNone; @@ -151,9 +151,9 @@ private: /** Searches for a listbox entry, starts search at specified position. */ sal_Int32 FindListBoxEntry( const ListBox& rLBox, const OUString& rEntry, sal_Int32 nStartPos ) const; - DECL_LINK_TYPED( RadioClickHdl, Button*, void ); - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( RadioClickHdl, Button*, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); private: VclPtr<ListBox> m_pLbSortBy; @@ -202,7 +202,7 @@ public: OUString GetDimensionName() const; private: - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); private: VclPtr<ListBox> mpLbDims; diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx index 35e350cfc686..d0c4a145215a 100644 --- a/sc/source/ui/inc/redcom.hxx +++ b/sc/source/ui/inc/redcom.hxx @@ -34,8 +34,8 @@ private: OUString aComment; AbstractSvxPostItDialog* pDlg; - DECL_LINK_TYPED( PrevHdl, AbstractSvxPostItDialog&, void ); - DECL_LINK_TYPED( NextHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( PrevHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( NextHdl, AbstractSvxPostItDialog&, void ); protected: diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 667b819ff7d3..bced3fbd507e 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -83,8 +83,8 @@ private: OUString maTextHashBad; OUString maTextHashGood; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( RetypeBtnHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( RetypeBtnHdl, Button*, void ); struct TableItem { @@ -127,10 +127,10 @@ private: VclPtr<RadioButton> m_pBtnRemovePassword; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( RadioBtnHdl, Button*, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( PasswordModifyHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( RadioBtnHdl, Button*, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( PasswordModifyHdl, Edit&, void ); ScPassHashProtectable* mpProtected; }; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 6e3673db711d..08bac4560f45 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -53,8 +53,8 @@ private: const OUString aDefScenarioName; bool bIsEdit; - DECL_LINK_TYPED( OkHdl, Button*, void); - DECL_LINK_TYPED( EnableHdl, Button*, void ); + DECL_LINK( OkHdl, Button*, void); + DECL_LINK( EnableHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 14719ef13c0b..65848aa1ec7c 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -114,16 +114,16 @@ private: void UpdateVertical(); inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos - DECL_LINK_TYPED( CharSetHdl, ListBox&, void ); - DECL_LINK_TYPED( FirstRowHdl, Edit&, void ); - DECL_LINK_TYPED( RbSepFixHdl, Button*, void ); - DECL_LINK_TYPED( SeparatorEditHdl, Edit&, void ); - DECL_LINK_TYPED( SeparatorClickHdl, Button*, void ); - DECL_LINK_TYPED( SeparatorComboBoxHdl, ComboBox&, void ); + DECL_LINK( CharSetHdl, ListBox&, void ); + DECL_LINK( FirstRowHdl, Edit&, void ); + DECL_LINK( RbSepFixHdl, Button*, void ); + DECL_LINK( SeparatorEditHdl, Edit&, void ); + DECL_LINK( SeparatorClickHdl, Button*, void ); + DECL_LINK( SeparatorComboBoxHdl, ComboBox&, void ); void SeparatorHdl(Control*); - DECL_LINK_TYPED( LbColTypeHdl, ListBox&, void ); - DECL_LINK_TYPED( UpdateTextHdl, ScCsvTableBox&, void ); - DECL_LINK_TYPED( ColTypeHdl, ScCsvTableBox&, void ); + DECL_LINK( LbColTypeHdl, ListBox&, void ); + DECL_LINK( UpdateTextHdl, ScCsvTableBox&, void ); + DECL_LINK( ColTypeHdl, ScCsvTableBox&, void ); }; inline bool ScImportAsciiDlg::Seek(sal_uLong nPos) diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 15feb9ca9826..1c4e4f4f1276 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -62,13 +62,13 @@ private: void Init (); void UpdateChecks (); - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( AddHdl, Button*, void ); - DECL_LINK_TYPED( RemoveHdl, Button*, void ); - DECL_LINK_TYPED( SelFmtHdl, ListBox&, void ); - DECL_LINK_TYPED( CloseHdl, Button *, void ); - DECL_LINK_TYPED( DblClkHdl, ListBox&, void ); - DECL_LINK_TYPED( RenameHdl, Button*, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( AddHdl, Button*, void ); + DECL_LINK( RemoveHdl, Button*, void ); + DECL_LINK( SelFmtHdl, ListBox&, void ); + DECL_LINK( CloseHdl, Button *, void ); + DECL_LINK( DblClkHdl, ListBox&, void ); + DECL_LINK( RenameHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 552dea78369b..91a59287444f 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -66,8 +66,8 @@ private: private: sal_uInt16 GetCodeFromCombo( const ComboBox& rEd ) const; - DECL_LINK_TYPED( FixedWidthHdl, Button*, void ); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); + DECL_LINK( FixedWidthHdl, Button*, void ); + DECL_LINK( DoubleClickHdl, ListBox&, void ); }; #endif diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 5f027fb5276b..12a93772fdc6 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -86,7 +86,7 @@ private: sal_uInt16 nWhich; - DECL_LINK_TYPED( ObjectSelectHdl, ScEditWindow&, void ); + DECL_LINK( ObjectSelectHdl, ScEditWindow&, void ); private: void InitPreDefinedList(); @@ -97,9 +97,9 @@ private: bool IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj); static bool IsDateEntry(EditTextObject* pTextObj); static bool IsExtFileNameEntry(EditTextObject* pTextObj); - DECL_LINK_TYPED( ListHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( MenuHdl, ScExtIButton&, void ); + DECL_LINK( ListHdl_Impl, ListBox&, void); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( MenuHdl, ScExtIButton&, void ); }; class ScRightHeaderEditPage : public ScHFEditPage diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index a4b3fdf4593d..bdc109e0f2e6 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -26,7 +26,7 @@ class SearchResultsDlg : public ModelessDialog SfxBindings* mpBindings; ScDocument* mpDoc; - DECL_LINK_TYPED( ListSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ListSelectHdl, SvTreeListBox*, void ); public: SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 nId ); virtual ~SearchResultsDlg() override; diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index fdbb73abf3ec..17ea38156bda 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -44,7 +44,7 @@ private: ScViewData* mpViewData; ScDocShell* mpDocShell; - DECL_LINK_TYPED( ToggleHandle, CheckBox&, void ); + DECL_LINK( ToggleHandle, CheckBox&, void ); public: SC_DLLPUBLIC ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData ); diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index b81b793992ff..60823c4c4537 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -31,7 +31,7 @@ private: VclPtr<VclFrame> m_pFrame; VclPtr<ListBox> m_pLb; - DECL_LINK_TYPED( DblClkHdl, ListBox&, void ); + DECL_LINK( DblClkHdl, ListBox&, void ); public: ScShowTabDlg( vcl::Window* pParent ); diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 2c0bd54cff8d..57548099bca6 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -56,8 +56,8 @@ private: void Init(); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); protected: diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index e8c3f7388b54..ac0102a63a92 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -45,10 +45,10 @@ class ScSolverOptionsDialog : public ModalDialog OUString maEngine; css::uno::Sequence<css::beans::PropertyValue> maProperties; - DECL_LINK_TYPED( EngineSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( SettingsSelHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SettingsDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ButtonHdl, Button*, void ); + DECL_LINK( EngineSelectHdl, ListBox&, void ); + DECL_LINK( SettingsSelHdl, SvTreeListBox*, void ); + DECL_LINK( SettingsDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( ButtonHdl, Button*, void ); void ReadFromComponent(); void FillListBox(); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 67116e575a90..3879d66a813e 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -80,9 +80,9 @@ private: bool CheckTargetValue( const OUString& rStrVal ); void RaiseError( ScSolverErr eError ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index 69175a9b970a..85b24b5de216 100644 --- a/sc/source/ui/inc/sortdlg.hxx +++ b/sc/source/ui/inc/sortdlg.hxx @@ -47,7 +47,7 @@ public: ScSortWarningDlg( vcl::Window* pParent, const OUString& rExtendText,const OUString& rCurrentText ); virtual ~ScSortWarningDlg() override; virtual void dispose() override; - DECL_LINK_TYPED( BtnHdl, Button*, void ); + DECL_LINK( BtnHdl, Button*, void ); private: VclPtr<FixedText> aFtText; VclPtr<PushButton> aBtnExtSort; diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 8ed729b2d2b6..48b93e28dafd 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -67,7 +67,7 @@ private: VclScrolledWindow& m_rScrolledWindow; ScrollBar& m_rVertScroll; - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); void checkAutoVScroll(); diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 08b85bd032bc..6077f9c6c6f9 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -32,7 +32,7 @@ public: virtual void dispose() override; private: VclPtr<PushButton> m_pBtnRemove; - DECL_LINK_TYPED( RemoveHdl, Button *, void ); + DECL_LINK( RemoveHdl, Button *, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SUBTDLG_HXX diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 0f3373a2a652..e0a5166632ed 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -62,8 +62,8 @@ private: void FillColorValueSets_Impl(); - DECL_LINK_TYPED(TabBgColorDblClickHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(TabBgColorOKHdl_Impl, Button*, void); + DECL_LINK(TabBgColorDblClickHdl_Impl, ValueSet*, void); + DECL_LINK(TabBgColorOKHdl_Impl, Button*, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TABBGCOLORDLG_HXX diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index c6dfd23e32a6..5434c7b61259 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -42,7 +42,7 @@ private: sal_uInt16 GetMaxId() const; SCTAB GetPrivatDropPos(const Point& rPos ); - DECL_LINK_TYPED(ShowPageList, const CommandEvent&, void); + DECL_LINK(ShowPageList, const CommandEvent&, void); protected: virtual void Select() override; diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 1e31559687b8..163b9d3f8a79 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -87,9 +87,9 @@ private: void Init(); void RaiseError( ScTabOpErr eError ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TABOPDLG_HXX diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index cc93e5544e09..db34edaf3636 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -59,7 +59,7 @@ private: bool bHidePrint; // Handler: - DECL_LINK_TYPED( ButtonClickHdl, Button*, void ); + DECL_LINK( ButtonClickHdl, Button*, void ); void UpdateButtons(); }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 4cd3d79fe19d..58cebc8763ba 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -167,14 +167,14 @@ private: void DoAddWin( ScGridWindow* pWin ); void InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ); - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED(EndScrollHdl, ScrollBar*, void ); + DECL_LINK(ScrollHdl, ScrollBar*, void ); + DECL_LINK(EndScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED(SplitHdl, Splitter*, void); + DECL_LINK(SplitHdl, Splitter*, void); void DoHSplit(long nSplitPos); void DoVSplit(long nSplitPos); - DECL_LINK_TYPED( TimerHdl, Timer*, void ); + DECL_LINK( TimerHdl, Timer*, void ); void UpdateVarZoom(); @@ -240,7 +240,7 @@ public: void RemoveHintWindow(); void TestHintWindow(); - DECL_LINK_TYPED( TabBarResize, ::TabBar*, void ); + DECL_LINK( TabBarResize, ::TabBar*, void ); /** Sets an absolute tab bar width (in pixels). */ void SetTabBarWidth( long nNewWidth ); /** Sets a relative tab bar width. diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 5fec291467e2..392a133a4256 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -179,11 +179,11 @@ private: void DoReadUserData( const OUString& rData ); void DoReadUserDataSequence( const css::uno::Sequence< css::beans::PropertyValue >& rSettings ); - DECL_LINK_TYPED( SimpleRefClose, const OUString*, void ); - DECL_LINK_TYPED( SimpleRefDone, const OUString&, void ); - DECL_LINK_TYPED( SimpleRefAborted, const OUString&, void ); - DECL_LINK_TYPED( SimpleRefChange, const OUString&, void ); - DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void ); + DECL_LINK( SimpleRefClose, const OUString*, void ); + DECL_LINK( SimpleRefDone, const OUString&, void ); + DECL_LINK( SimpleRefAborted, const OUString&, void ); + DECL_LINK( SimpleRefChange, const OUString&, void ); + DECL_LINK( FormControlActivated, LinkParamNone*, void ); protected: virtual void Activate(bool bMDI) override; diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 35f7d0ddc25d..934df868eb5e 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -50,9 +50,9 @@ private: VclPtr<CheckBox> m_pBtnConvertDate; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); - DECL_LINK_TYPED( RadioHdl, Button*, void ); + DECL_LINK( RadioHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 213ac740f450..f0cc0f098e50 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -77,8 +77,8 @@ private: void Init(); // Handler: - DECL_LINK_TYPED( RadioClickHdl, Button*, void ); - DECL_LINK_TYPED( CheckClickHdl, Button*, void ); + DECL_LINK( RadioClickHdl, Button*, void ); + DECL_LINK( CheckClickHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 4533a85db9e6..287d13740abf 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -35,9 +35,9 @@ private: void CheckPrefix(Edit* pEdit); void OnFocusPrefixInput(Edit* pEdit); - DECL_LINK_TYPED( NumModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( PrefixModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( PrefixEditOnFocusHdl, Control&, void ); + DECL_LINK( NumModifiedHdl, Edit&, void ); + DECL_LINK( PrefixModifiedHdl, Edit&, void ); + DECL_LINK( PrefixEditOnFocusHdl, Control&, void ); private: VclPtr<NumericField> m_pEdNSheets; diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 6eb4ff43eca4..18542e28b5de 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -53,9 +53,9 @@ private: bool IsValidSeparator(const OUString& rSep) const; bool IsValidSeparatorSet() const; - DECL_LINK_TYPED( ButtonHdl, Button*, void ); - DECL_LINK_TYPED( SepModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SepEditOnFocusHdl, Control&, void ); + DECL_LINK( ButtonHdl, Button*, void ); + DECL_LINK( SepModifyHdl, Edit&, void ); + DECL_LINK( SepEditOnFocusHdl, Control&, void ); private: VclPtr<ListBox> mpLbFormulaSyntax; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 36f9432757b6..06544a0afeda 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -53,9 +53,9 @@ private: sal_uInt16 nPageUsage; VclPtr<ScStyleDlg> pStyleDlg; - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( HFEditHdl, void*, void ); - DECL_LINK_TYPED( TurnOnHdl, Button*, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( HFEditHdl, void*, void ); + DECL_LINK( TurnOnHdl, Button*, void ); }; class ScHeaderPage : public ScHFPage diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 1a14b048544a..5ce0f55708b0 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -109,7 +109,7 @@ private: sal_uInt16 nSelected; OString aSelectedIdent; - DECL_DLLPRIVATE_LINK_TYPED( TimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( TimerHdl, Idle*, void ); protected: diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 50f20f396276..80be8041123e 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -92,7 +92,7 @@ private: void SetLastSortKey( sal_uInt16 nItem ); // Handler ------------------------ - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); }; // Sort Options @@ -162,11 +162,11 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK_TYPED( EnableHdl, Button*, void ); - DECL_LINK_TYPED( SelOutPosHdl, ListBox&, void ); + DECL_LINK( EnableHdl, Button*, void ); + DECL_LINK( SelOutPosHdl, ListBox&, void ); void EdOutPosModHdl ( Edit* pEd ); - DECL_LINK_TYPED( SortDirHdl, Button *, void ); - DECL_LINK_TYPED( FillAlgorHdl, ListBox&, void ); + DECL_LINK( SortDirHdl, Button *, void ); + DECL_LINK( FillAlgorHdl, ListBox&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPSORT_HXX diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index efc08298d326..08d2769b8d7c 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -70,9 +70,9 @@ private: sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ - DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); + DECL_LINK( SelectListBoxHdl, ListBox&, void ); + DECL_LINK( SelectTreeListBoxHdl, SvTreeListBox*, void ); + DECL_LINK( CheckHdl, SvTreeListBox*, void ); void SelectHdl(void *); }; @@ -160,7 +160,7 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK( CheckHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPSUBT_HXX diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 91cbad99f728..f3d01eef310d 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -73,9 +73,9 @@ private: private: // Handler: - DECL_LINK_TYPED(PageDirHdl, Button*, void); - DECL_LINK_TYPED( PageNoHdl, Button*, void ); - DECL_LINK_TYPED(ScaleHdl, ListBox&, void); + DECL_LINK(PageDirHdl, Button*, void); + DECL_LINK( PageNoHdl, Button*, void ); + DECL_LINK(ScaleHdl, ListBox&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPTABLE_HXX diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 3bebe5aac5d8..8e5af6e49b47 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -94,9 +94,9 @@ private: const ScRefAddress& rEndPos ); // Handler: - DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( BtnClickHdl, Button*, void ); - DECL_LINK_TYPED( EdEntriesModHdl, Edit&, void); + DECL_LINK( LbSelectHdl, ListBox&, void ); + DECL_LINK( BtnClickHdl, Button*, void ); + DECL_LINK( EdEntriesModHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPUSRLST_HXX diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index a8a73b8e99f2..b6cf36b718b0 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -61,9 +61,9 @@ class ScTpContentOptions : public SfxTabPage ScViewOptions* pLocalOptions; void InitGridOpt(); - DECL_LINK_TYPED( GridHdl, ListBox&, void ); - DECL_LINK_TYPED( SelLbObjHdl, ListBox&, void ); - DECL_LINK_TYPED( CBHdl, Button*, void ); + DECL_LINK( GridHdl, ListBox&, void ); + DECL_LINK( SelLbObjHdl, ListBox&, void ); + DECL_LINK( CBHdl, Button*, void ); ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); @@ -106,8 +106,8 @@ class ScTpLayoutOptions : public SfxTabPage SvxStringArray aUnitArr; - DECL_LINK_TYPED(MetricHdl, ListBox&, void ); - DECL_LINK_TYPED( AlignHdl, Button*, void ); + DECL_LINK(MetricHdl, ListBox&, void ); + DECL_LINK( AlignHdl, Button*, void ); ScDocument *pDoc; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 802bc30d4485..58df264167c6 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -92,8 +92,8 @@ private: void SetFirstFormula( const OUString& rFmlaStr ); void SetSecondFormula( const OUString& rFmlaStr ); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(CheckHdl, Button*, void); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(CheckHdl, Button*, void); VclPtr<ListBox> m_pLbAllow; VclPtr<CheckBox> m_pCbAllow; /// Allow blank cells. @@ -116,8 +116,8 @@ private: OUString maStrList; sal_Unicode mcFmlaSep; /// List separator in formulas. - DECL_LINK_TYPED( EditSetFocusHdl, Control&, void ); - DECL_LINK_TYPED( KillFocusHdl, Control&, void ); + DECL_LINK( EditSetFocusHdl, Control&, void ); + DECL_LINK( KillFocusHdl, Control&, void ); void OnClick( Button *pBtn ); VclPtr<formula::RefEdit> m_pRefEdit; public: @@ -282,8 +282,8 @@ private: void Init(); // Handler ------------------------ - DECL_LINK_TYPED(SelectActionHdl, ListBox&, void); - DECL_LINK_TYPED(ClickSearchHdl, Button*, void); + DECL_LINK(SelectActionHdl, ListBox&, void); + DECL_LINK(ClickSearchHdl, Button*, void); public: ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ); diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 1e717cc98668..e007a4b6f055 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -225,7 +225,7 @@ private: bool bPagebreak:1; // Page break preview mode bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click - DECL_DLLPRIVATE_LINK_TYPED( EditEngineHdl, EditStatus&, void ); + DECL_DLLPRIVATE_LINK( EditEngineHdl, EditStatus&, void ); SAL_DLLPRIVATE void CalcPPT(); SAL_DLLPRIVATE void CreateTabData( SCTAB nNewTab ); diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 6c4f64c5dce5..d5e415aee4da 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -94,10 +94,10 @@ private: void CancelPressed(); void RefEditModified(); - DECL_LINK_TYPED(GetFocusHdl, Control&, void); - DECL_LINK_TYPED(BtnPressedHdl, Button*, void); - DECL_LINK_TYPED(TreeItemSelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(RefModifiedHdl, Edit&, void); + DECL_LINK(GetFocusHdl, Control&, void); + DECL_LINK(BtnPressedHdl, Button*, void); + DECL_LINK(TreeItemSelectHdl, SvTreeListBox*, void); + DECL_LINK(RefModifiedHdl, Edit&, void); }; #endif diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 203314a06ba2..c07e7c35e3f4 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -838,7 +838,7 @@ void ScAcceptChgDlg::UpdateView() pTheView->Select(pEntry); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void) { sal_uInt16 nId =ScSimpleRefDlgWrapper::GetChildWindowId(); @@ -864,7 +864,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void) } } -IMPL_LINK_TYPED( ScAcceptChgDlg, RefInfoHandle, const OUString*, pResult, void) +IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, const OUString*, pResult, void) { sal_uInt16 nId; @@ -897,7 +897,7 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, RefInfoHandle, const OUString*, pResult, void) } } -IMPL_LINK_TYPED( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void ) +IMPL_LINK( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void ) { if(pRef!=nullptr) { @@ -908,7 +908,7 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void ) } } -IMPL_LINK_TYPED( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef, void ) +IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef, void ) { SetPointer(Pointer(PointerStyle::Wait)); @@ -945,7 +945,7 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef, void ) bIgnoreMsg=false; } -IMPL_LINK_TYPED( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef, void ) +IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef, void ) { SetPointer(Pointer(PointerStyle::Wait)); @@ -1022,7 +1022,7 @@ void ScAcceptChgDlg::AcceptFiltered() } } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RejectAllHandle, SvxTPView*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle, SvxTPView*, void) { SetPointer(Pointer(PointerStyle::Wait)); bIgnoreMsg=true; @@ -1049,7 +1049,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RejectAllHandle, SvxTPView*, void) bIgnoreMsg=false; } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) { SetPointer(Pointer(PointerStyle::Wait)); @@ -1073,7 +1073,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) SetPointer(Pointer(PointerStyle::Arrow)); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, SelectHandle, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle, SvTreeListBox*, void) { if(!bNoSelection) aSelectionIdle.Start(); @@ -1310,7 +1310,7 @@ bool ScAcceptChgDlg::Expand( return bTheTestFlag; } -IMPL_LINK_TYPED( ScAcceptChgDlg, ExpandingHandle, SvTreeListBox*, pTable, bool ) +IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvTreeListBox*, pTable, bool ) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); SetPointer(Pointer(PointerStyle::Wait)); @@ -1555,7 +1555,7 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, sal_uLong nStartActi } -IMPL_LINK_TYPED( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void) +IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void) { ScChangeTrackMsgQueue::iterator iter; ScChangeTrackMsgQueue& aMsgQueue= rChgTrack.GetMsgQueue(); @@ -1593,14 +1593,14 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void aMsgQueue.clear(); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, ReOpenTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, ReOpenTimerHdl, Idle *, void) { ScSimpleRefDlgWrapper::SetAutoReOpen(true); m_pAcceptChgCtr->ShowFilterPage(); RefHandle(nullptr); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void) { ScTabView* pTabView = pViewData->GetView(); @@ -1648,7 +1648,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void) pTPView->EnableReject( bRejectFlag && bEnable ); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, CommandHdl, SvSimpleTable*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl, SvSimpleTable*, void) { const CommandEvent aCEvt(pTheView->GetCommandEvent()); @@ -1822,7 +1822,7 @@ void ScAcceptChgDlg::InitFilter() #define CALC_DATE 3 #define CALC_POS 1 -IMPL_LINK_TYPED( ScAcceptChgDlg, ColCompareHdl, const SvSortData*, pSortData, sal_Int32 ) +IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, const SvSortData*, pSortData, sal_Int32 ) { sal_Int32 nCompare = 0; SCCOL nSortCol= static_cast<SCCOL>(pTheView->GetSortedCol()); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 4ed52bdfa44b..532cf9cc2fc3 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -338,7 +338,7 @@ void ScFormulaReferenceHelper::Init() } } -IMPL_LINK_TYPED( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator&, rSelAccel, void ) +IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator&, rSelAccel, void ) { switch ( rSelAccel.GetCurKeyCode().GetCode() ) { @@ -938,7 +938,7 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* m_aHelper.ToggleCollapsed( pEdit, pButton ); } -IMPL_LINK_NOARG_TYPED(ScRefHandler, UpdateFocusHdl, Idle *, void) +IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl, Idle *, void) { if (pActiveWin) { diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 2d4e8cfd5438..82172383c262 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -538,7 +538,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) } } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, SelectHandle, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScConflictsDlg, SelectHandle, SvTreeListBox*, void) { if ( mbInSelectHdl || mbInDeselectHdl ) { @@ -551,7 +551,7 @@ IMPL_LINK_NOARG_TYPED(ScConflictsDlg, SelectHandle, SvTreeListBox*, void) mbInSelectHdl = false; } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void) { if ( mbInDeselectHdl || mbInSelectHdl ) { @@ -563,7 +563,7 @@ IMPL_LINK_NOARG_TYPED(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void) mbInDeselectHdl = false; } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, UpdateSelectionHdl, Idle *, void) +IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl, Idle *, void) { if ( !mpViewData || !mpOwnDoc ) { @@ -650,22 +650,22 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepMineHandle, Button*, void) +IMPL_LINK_NOARG(ScConflictsDlg, KeepMineHandle, Button*, void) { KeepHandler( true ); } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepOtherHandle, Button*, void) +IMPL_LINK_NOARG(ScConflictsDlg, KeepOtherHandle, Button*, void) { KeepHandler( false ); } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllMineHandle, Button*, void) +IMPL_LINK_NOARG(ScConflictsDlg, KeepAllMineHandle, Button*, void) { KeepAllHandler( true ); } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllOthersHandle, Button*, void) +IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle, Button*, void) { KeepAllHandler( false ); } diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index deff2906e5a7..fb4dff623ec9 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -56,7 +56,7 @@ void ScColOrRowDlg::dispose() } -IMPL_LINK_NOARG_TYPED(ScColOrRowDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(ScColOrRowDlg, OkHdl, Button*, void) { EndDialog( m_pBtnCols->IsChecked() ? SCRET_COLS : SCRET_ROWS ); } diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 10d0f230cd84..d8c3beed7662 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -499,7 +499,7 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const // handler called when OK is clicked, calls the add button handler before // passing the range lists to the document -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl, Button*, void) { AddBtnHdl( nullptr ); @@ -515,13 +515,13 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, OkBtnHdl, Button*, void) Close(); } -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, CancelBtnHdl, Button*, void) { Close(); } // handler called when add button clicked: set ranges and add to listbox -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) { OUString aNewArea( pEdAssign->GetText() ); OUString aNewData( pEdAssign2->GetText() ); @@ -575,7 +575,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) { OUString aRangeStr = pLbRange->GetSelectEntry(); sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos(); @@ -635,7 +635,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) } // handler called when a row in the listbox is selected, updates form input fields -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) { sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos(); const sal_Int32 nCnt = pLbRange->GetEntryCount(); @@ -703,7 +703,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) } // handler called when the label range has changed -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1DataModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl, Edit&, void) { OUString aNewArea( pEdAssign->GetText() ); bool bValid = false; @@ -736,7 +736,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1DataModifyHdl, Edit&, void) } // handler called when the data range has changed -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range2DataModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl, Edit&, void) { OUString aNewData( pEdAssign2->GetText() ); if ( !aNewData.isEmpty() ) @@ -757,7 +757,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range2DataModifyHdl, Edit&, void) } // handler for the radio button for columns, adjust ranges -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, ColClickHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl, Button*, void) { if ( !pBtnColHead->GetSavedValue() ) { @@ -777,7 +777,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, ColClickHdl, Button*, void) } // handler for the radio button for columns, adjust range -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RowClickHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl, Button*, void) { if ( !pBtnRowHead->GetSavedValue() ) { @@ -796,7 +796,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RowClickHdl, Button*, void) } } -IMPL_LINK_TYPED( ScColRowNameRangesDlg, GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control&, rCtrl, void ) { if( (&rCtrl == static_cast<Control*>(pEdAssign)) || (&rCtrl == static_cast<Control*>(pRbAssign)) ) pEdActive = pEdAssign; @@ -809,7 +809,7 @@ IMPL_LINK_TYPED( ScColRowNameRangesDlg, GetFocusHdl, Control&, rCtrl, void ) pEdActive->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, LoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseFocusHdl, Control&, void) { bDlgLostFocus = !IsActive(); } diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index f1d8f636a18f..60adc7355b6c 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -257,13 +257,13 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/) m_pSlider->SetThumbPos(nCurrentRow-nStartRow-1); } -IMPL_LINK_TYPED( ScDataFormDlg, Impl_DataModifyHdl, Edit&, rEdit, void) +IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit&, rEdit, void) { if ( rEdit.IsModified() ) m_pBtnRestore->Enable(); } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NewHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl, Button*, void) { ScViewData& rViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -296,7 +296,7 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NewHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_PrevHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_PrevHdl, Button*, void) { if (pDoc) { @@ -308,7 +308,7 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_PrevHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NextHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_NextHdl, Button*, void) { if (pDoc) { @@ -320,7 +320,7 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NextHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_RestoreHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_RestoreHdl, Button*, void) { if (pDoc) { @@ -328,7 +328,7 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_RestoreHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_DeleteHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_DeleteHdl, Button*, void) { ScViewData& rViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -347,12 +347,12 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_DeleteHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_CloseHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_CloseHdl, Button*, void) { EndDialog( ); } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_ScrollHdl, ScrollBar*, void) { long nOffset = m_pSlider->GetThumbPos(); nCurrentRow = nStartRow + nOffset + 1; diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 432ae7ede665..b746d6051845 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -79,7 +79,7 @@ void DataStreamDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(DataStreamDlg, BrowseHdl, Button*, void) +IMPL_LINK_NOARG(DataStreamDlg, BrowseHdl, Button*, void) { sfx2::FileDialogHelper aFileDialog(0); if ( aFileDialog.Execute() != ERRCODE_NONE ) @@ -89,15 +89,15 @@ IMPL_LINK_NOARG_TYPED(DataStreamDlg, BrowseHdl, Button*, void) UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateClickHdl, Button*, void) +IMPL_LINK_NOARG(DataStreamDlg, UpdateClickHdl, Button*, void) { UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateComboBoxHdl, ComboBox&, void) +IMPL_LINK_NOARG(DataStreamDlg, UpdateComboBoxHdl, ComboBox&, void) { UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateHdl, Edit&, void) +IMPL_LINK_NOARG(DataStreamDlg, UpdateHdl, Edit&, void) { UpdateEnable(); } diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index c61a7a233d83..261041b34f6a 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -150,7 +150,7 @@ void ScDeleteContentsDlg::DisableObjects() aBtnDelObjects->Disable(); } -IMPL_LINK_NOARG_TYPED(ScDeleteContentsDlg, DelAllHdl, Button*, void) +IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl, Button*, void) { DisableChecks( aBtnDelAll->IsChecked() ); } diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index e52eaf26547c..838905b870d4 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -251,7 +251,7 @@ bool ScFillSeriesDlg::CheckEndVal() // Handler: -IMPL_LINK_TYPED( ScFillSeriesDlg, DisableHdl, Button *, pBtn, void ) +IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn, void ) { if ( pBtn == m_pBtnDate ) { @@ -286,7 +286,7 @@ IMPL_LINK_TYPED( ScFillSeriesDlg, DisableHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScFillSeriesDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl, Button*, void) { if ( m_pBtnLeft->IsChecked() ) theFillDir = FILL_TO_LEFT; else if ( m_pBtnRight->IsChecked() ) theFillDir = FILL_TO_RIGHT; diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 7be94ab129fb..028d49460592 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -174,7 +174,7 @@ bool ScHighlightChgDlg::IsRefInputMode() const return m_pEdAssign->IsVisible(); } -IMPL_LINK_TYPED( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) +IMPL_LINK( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) { if(pCb!=nullptr) { @@ -193,7 +193,7 @@ IMPL_LINK_TYPED( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) } } -IMPL_LINK_TYPED( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef, void ) +IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef, void ) { if(pRef!=nullptr) { @@ -206,7 +206,7 @@ IMPL_LINK_TYPED( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef, void ) } } -IMPL_LINK_TYPED( ScHighlightChgDlg, OKBtnHdl, Button*, pOKBtn, void ) +IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, Button*, pOKBtn, void ) { if (pOKBtn == m_pOkButton) { diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 7e8d2aad945f..4e89f7eda9ff 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -303,7 +303,7 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) } } -IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void ) +IMPL_LINK( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void ) { if ( pBtn == mpBtnShortCutPasteValuesOnly ) { @@ -332,12 +332,12 @@ IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void ) } -IMPL_LINK_NOARG_TYPED(ScInsertContentsDlg, InsAllHdl, Button*, void) +IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl, Button*, void) { DisableChecks( mpBtnInsAll->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(ScInsertContentsDlg, LinkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl, Button*, void) { TestModes(); } diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 4594b3fe2adc..5d569b0ffbd8 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -240,7 +240,7 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) // Handler: -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, CountHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl, Edit&, void) { nTableCount = static_cast<SCTAB>(m_pNfCount->GetValue()); if ( nTableCount==1) @@ -261,7 +261,7 @@ IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, CountHdl_Impl, Edit&, void) DoEnable_Impl(); } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, ChoiceHdl_Impl, Button*, void) +IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl, Button*, void) { if ( m_pBtnNew->IsChecked() ) SetNewTable_Impl(); @@ -271,7 +271,7 @@ IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, ChoiceHdl_Impl, Button*, void) DoEnable_Impl(); } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl, Button*, void) { delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( @@ -279,7 +279,7 @@ IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseHdl_Impl, Button*, void) pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg, DialogClosedHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl, ListBox&, void) { DoEnable_Impl(); } @@ -292,7 +292,7 @@ void ScInsertTableDlg::DoEnable_Impl() m_pBtnOk->Disable(); } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, DoEnterHdl, Button*, void) +IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl, Button*, void) { if(nTableCount > 1 || ScDocument::ValidTabName(m_pEdName->GetText())) { @@ -305,13 +305,13 @@ IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, DoEnterHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(ScInsertTableDlg, BrowseTimeoutHdl, Timer *, void) { bMustClose = true; BrowseHdl_Impl(m_pBtnBrowse); } -IMPL_LINK_TYPED( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { if ( ERRCODE_NONE == _pFileDlg->GetError() ) { diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 4ada1dca1adc..0720616b7f33 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -58,7 +58,7 @@ OUString ScSelEntryDlg::GetSelectEntry() const return m_pLb->GetSelectEntry(); } -IMPL_LINK_NOARG_TYPED(ScSelEntryDlg, DblClkHdl, ListBox&, void) +IMPL_LINK_NOARG(ScSelEntryDlg, DblClkHdl, ListBox&, void) { EndDialog( RET_OK ); } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 143799d52ce3..37a6020c168b 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -86,7 +86,7 @@ short ScLinkedAreaDlg::Execute() #define FILTERNAME_HTML "HTML (StarCalc)" #define FILTERNAME_QUERY "calc_HTML_WebQuery" -IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, BrowseHdl, Button*, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl, Button*, void) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( @@ -94,7 +94,7 @@ IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, BrowseHdl, Button*, void) pDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, FileHdl, ComboBox&, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl, ComboBox&, void) { OUString aEntered = m_pCbUrl->GetURL(); if (pSourceShell) @@ -187,17 +187,17 @@ void ScLinkedAreaDlg::InitFromOldLink( const OUString& rFile, const OUString& rF UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, RangeHdl, ListBox&, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl, ListBox&, void) { UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, ReloadHdl, Button*, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl, Button*, void) { UpdateEnable(); } -IMPL_LINK_TYPED( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { if ( _pFileDlg->GetError() != ERRCODE_NONE ) return; diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 869ffc8060f1..0b52193076c4 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -96,7 +96,7 @@ long ScMetricInputDlg::GetInputValue() const // Handler: -IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, SetDefValHdl, Button*, void) +IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl, Button*, void) { if ( m_pBtnDefVal->IsChecked() ) { @@ -107,7 +107,7 @@ IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, SetDefValHdl, Button*, void) m_pEdValue->SetValue( nCurrentValue ); } -IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScMetricInputDlg, ModifyHdl, Edit&, void) { m_pBtnDefVal->Check( nDefaultValue == m_pEdValue->GetValue() ); } diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 210830fa7188..1fc76699c805 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -255,13 +255,13 @@ void ScMoveTableDlg::InitDocListBox() // Handler: -IMPL_LINK_TYPED( ScMoveTableDlg, CheckBtnHdl, RadioButton&, rBtn, void ) +IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, RadioButton&, rBtn, void ) { if (&rBtn == pBtnCopy) ResetRenameInput(); } -IMPL_LINK_NOARG_TYPED(ScMoveTableDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl, Button*, void) { const sal_Int32 nDocSel = pLbDoc->GetSelectEntryPos(); const sal_Int32 nDocLast = pLbDoc->GetEntryCount()-1; @@ -294,7 +294,7 @@ IMPL_LINK_NOARG_TYPED(ScMoveTableDlg, OkHdl, Button*, void) EndDialog( RET_OK ); } -IMPL_LINK_TYPED( ScMoveTableDlg, SelHdl, ListBox&, rLb, void ) +IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox&, rLb, void ) { if ( &rLb == pLbDoc ) { @@ -319,7 +319,7 @@ IMPL_LINK_TYPED( ScMoveTableDlg, SelHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScMoveTableDlg, CheckNameHdl, Edit&, rEdt, void ) +IMPL_LINK( ScMoveTableDlg, CheckNameHdl, Edit&, rEdt, void ) { if ( &rEdt == pEdTabName ) { diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 5b15550b2492..2d62a3308b37 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -120,7 +120,7 @@ void ScSolverSuccessDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( ScSolverSuccessDialog, ClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScSolverSuccessDialog, ClickHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) EndDialog(RET_OK); @@ -589,7 +589,7 @@ bool ScOptSolverDlg::IsRefInputMode() const // Handler: -IMPL_LINK_TYPED( ScOptSolverDlg, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScOptSolverDlg, BtnHdl, Button*, pBtn, void ) { if ( pBtn == m_pBtnSolve || pBtn == m_pBtnCancel ) { @@ -631,7 +631,7 @@ IMPL_LINK_TYPED( ScOptSolverDlg, BtnHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScOptSolverDlg, GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control&, rCtrl, void ) { Edit* pEdit = nullptr; mpEdActive = nullptr; @@ -658,12 +658,12 @@ IMPL_LINK_TYPED( ScOptSolverDlg, GetFocusHdl, Control&, rCtrl, void ) pEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, LoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl, Control&, void) { mbDlgLostFocus = !IsActive(); } -IMPL_LINK_TYPED( ScOptSolverDlg, DelBtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScOptSolverDlg, DelBtnHdl, Button*, pBtn, void ) { for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) if( pBtn == mpDelButton[nRow] ) @@ -689,7 +689,7 @@ IMPL_LINK_TYPED( ScOptSolverDlg, DelBtnHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, TargetModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl, Edit&, void) { // modify handler for the target edit: // select "Value of" if something is input into the edit @@ -697,21 +697,21 @@ IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, TargetModifyHdl, Edit&, void) m_pRbValue->Check(); } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, CondModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScOptSolverDlg, CondModifyHdl, Edit&, void) { // modify handler for the condition edits, just to enable/disable "delete" buttons ReadConditions(); EnableButtons(); } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScOptSolverDlg, SelectHdl, ListBox&, void) { // select handler for operator list boxes, just to enable/disable "delete" buttons ReadConditions(); EnableButtons(); } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScOptSolverDlg, ScrollHdl, ScrollBar*, void) { ReadConditions(); nScrollPos = m_pScrollBar->GetThumbPos(); @@ -720,7 +720,7 @@ IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, ScrollHdl, ScrollBar*, void) mpEdActive->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_TYPED( ScOptSolverDlg, CursorUpHdl, ScCursorRefEdit&, rEdit, void ) +IMPL_LINK( ScOptSolverDlg, CursorUpHdl, ScCursorRefEdit&, rEdit, void ) { if ( &rEdit == mpLeftEdit[0] || &rEdit == mpRightEdit[0] ) { @@ -751,7 +751,7 @@ IMPL_LINK_TYPED( ScOptSolverDlg, CursorUpHdl, ScCursorRefEdit&, rEdit, void ) } } -IMPL_LINK_TYPED( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit&, rEdit, void ) +IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit&, rEdit, void ) { if ( &rEdit == mpLeftEdit[EDIT_ROW_COUNT-1] || &rEdit == mpRightEdit[EDIT_ROW_COUNT-1] ) { diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index b7e5e0eea0e3..9375f3301073 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -120,7 +120,7 @@ void ScTableProtectionDlg::EnableOptionalWidgets(bool bEnable) m_pOptionsListBox->Invalidate(); } -IMPL_LINK_TYPED( ScTableProtectionDlg, CheckBoxHdl, Button*, pBtn, void ) +IMPL_LINK( ScTableProtectionDlg, CheckBoxHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnProtect) { @@ -130,12 +130,12 @@ IMPL_LINK_TYPED( ScTableProtectionDlg, CheckBoxHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScTableProtectionDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScTableProtectionDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(ScTableProtectionDlg, PasswordModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScTableProtectionDlg, PasswordModifyHdl, Edit&, void) { OUString aPass1 = m_pPassword1Edit->GetText(); OUString aPass2 = m_pPassword2Edit->GetText(); diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 02d6ec9dc68f..39b8316597c7 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -149,7 +149,7 @@ void ScRedComDialog::SelectCell() } } -IMPL_LINK_TYPED(ScRedComDialog, PrevHdl, AbstractSvxPostItDialog&, rDlgP, void ) +IMPL_LINK(ScRedComDialog, PrevHdl, AbstractSvxPostItDialog&, rDlgP, void ) { if (pDocShell!=nullptr && rDlgP.GetNote() != aComment ) pDocShell->SetChangeComment( pChangeAction, rDlgP.GetNote()); @@ -158,7 +158,7 @@ IMPL_LINK_TYPED(ScRedComDialog, PrevHdl, AbstractSvxPostItDialog&, rDlgP, void ) SelectCell(); } -IMPL_LINK_TYPED(ScRedComDialog, NextHdl, AbstractSvxPostItDialog&, rDlgP, void ) +IMPL_LINK(ScRedComDialog, NextHdl, AbstractSvxPostItDialog&, rDlgP, void ) { if ( pDocShell!=nullptr && rDlgP.GetNote() != aComment ) pDocShell->SetChangeComment( pChangeAction, rDlgP.GetNote()); diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 124a4efde3e9..9f128e5c42ff 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -262,12 +262,12 @@ void ScRetypePassDlg::CheckHashStatus() mpBtnOk->Disable(); } -IMPL_LINK_NOARG_TYPED(ScRetypePassDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScRetypePassDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_TYPED( ScRetypePassDlg, RetypeBtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, Button*, pBtn, void ) { ScPassHashProtectable* pProtected = nullptr; if (pBtn == mpBtnRetypeDoc) @@ -413,12 +413,12 @@ void ScRetypePassInputDlg::CheckPasswordInput() m_pBtnOk->Enable(bPassGood); } -IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScRetypePassInputDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_TYPED( ScRetypePassInputDlg, RadioBtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScRetypePassInputDlg, RadioBtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnRetypePassword) { @@ -434,12 +434,12 @@ IMPL_LINK_TYPED( ScRetypePassInputDlg, RadioBtnHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, CheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl, Button*, void) { CheckPasswordInput(); } -IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, PasswordModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScRetypePassInputDlg, PasswordModifyHdl, Edit&, void) { CheckPasswordInput(); } diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 8b9af01b3669..bc8d9afb65ea 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -162,7 +162,7 @@ void ScAutoFormatDlg::UpdateChecks() // Handler: -IMPL_LINK_TYPED( ScAutoFormatDlg, CloseHdl, Button *, pBtn, void ) +IMPL_LINK( ScAutoFormatDlg, CloseHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnOk || pBtn == m_pBtnCancel) { @@ -173,7 +173,7 @@ IMPL_LINK_TYPED( ScAutoFormatDlg, CloseHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, DblClkHdl, ListBox&, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl, ListBox&, void) { if ( bCoreDataChanged ) ScGlobal::GetOrCreateAutoFormat()->Save(); @@ -181,7 +181,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, DblClkHdl, ListBox&, void) EndDialog( RET_OK ); } -IMPL_LINK_TYPED( ScAutoFormatDlg, CheckHdl, Button *, pBtn, void ) +IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn, void ) { ScAutoFormatData* pData = pFormat->findByIndex(nIndex); bool bCheck = static_cast<CheckBox*>(pBtn)->IsChecked(); @@ -208,7 +208,7 @@ IMPL_LINK_TYPED( ScAutoFormatDlg, CheckHdl, Button *, pBtn, void ) m_pWndPreview->NotifyChange( pData ); } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, AddHdl, Button*, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl, Button*, void) { if ( !bFmtInserted && pSelFmtData ) { @@ -276,7 +276,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, AddHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RemoveHdl, Button*, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl, Button*, void) { if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) ) { @@ -311,7 +311,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RemoveHdl, Button*, void) SelFmtHdl( *m_pLbFormat.get() ); } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RenameHdl, Button*, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, Button*, void) { bool bOk = false; while( !bOk ) @@ -392,7 +392,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RenameHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, SelFmtHdl, ListBox&, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl, ListBox&, void) { nIndex = m_pLbFormat->GetSelectEntryPos(); UpdateChecks(); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 9ac5a5c049eb..91b4de526591 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -119,7 +119,7 @@ void ScShareDocumentDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(ScShareDocumentDlg, ToggleHandle, CheckBox&, void) +IMPL_LINK_NOARG(ScShareDocumentDlg, ToggleHandle, CheckBox&, void) { m_pFtWarning->Enable( m_pCbShare->IsChecked() ); } diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index f15bf266e498..530bea636bf8 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -81,7 +81,7 @@ sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const return m_pLb->GetSelectEntryPos(nPos); } -IMPL_LINK_NOARG_TYPED(ScShowTabDlg, DblClkHdl, ListBox&, void) +IMPL_LINK_NOARG(ScShowTabDlg, DblClkHdl, ListBox&, void) { EndDialog( RET_OK ); } diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 233778601483..f9af2856c9d4 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -185,7 +185,7 @@ void ScSimpleRefDlg::RefInputDone( bool bForced) // Handler: -IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl, Button*, void) { bAutoReOpen=false; OUString aResult=m_pEdAssign->GetText(); @@ -195,7 +195,7 @@ IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, OkBtnHdl, Button*, void) aUnoLink.Call( aResult ); } -IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl, Button*, void) { bAutoReOpen=false; OUString aResult=m_pEdAssign->GetText(); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 95c8239b4a32..28aeba7e0889 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -347,19 +347,19 @@ void ScSolverOptionsDialog::EditOption() } } -IMPL_LINK_TYPED( ScSolverOptionsDialog, ButtonHdl, Button*, pBtn, void ) +IMPL_LINK( ScSolverOptionsDialog, ButtonHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnEdit) EditOption(); } -IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, bool) { EditOption(); return false; } -IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, EngineSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl, ListBox&, void) { const sal_Int32 nSelectPos = m_pLbEngine->GetSelectEntryPos(); if ( nSelectPos < maImplNames.getLength() ) @@ -374,7 +374,7 @@ IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, EngineSelectHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsSelHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl, SvTreeListBox*, void) { bool bCheckbox = false; diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 34c079ac2425..1d41b94d08f8 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -199,7 +199,7 @@ bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) // Handler: -IMPL_LINK_TYPED( ScSolverDlg, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScSolverDlg, BtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) { @@ -255,7 +255,7 @@ IMPL_LINK_TYPED( ScSolverDlg, BtnHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScSolverDlg, GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScSolverDlg, GetFocusHdl, Control&, rCtrl, void ) { Edit* pEdit = nullptr; pEdActive = nullptr; @@ -271,7 +271,7 @@ IMPL_LINK_TYPED( ScSolverDlg, GetFocusHdl, Control&, rCtrl, void ) pEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScSolverDlg, LoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl, Control&, void) { bDlgLostFocus = !IsActive(); } diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index f88ca418f68e..0f1cc1634740 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -114,7 +114,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl() } /// Handler, called when color selection is changed -IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void) { sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); @@ -123,7 +123,7 @@ IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, vo } // Handler, called when the OK button is pushed -IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorOKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl, Button*, void) { sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index ee458748f853..a796f251e3d7 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -244,7 +244,7 @@ static bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab, // Handler: -IMPL_LINK_TYPED( ScTabOpDlg, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScTabOpDlg, BtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) { @@ -322,7 +322,7 @@ IMPL_LINK_TYPED( ScTabOpDlg, BtnHdl, Button*, pBtn, void ) Close(); } -IMPL_LINK_TYPED( ScTabOpDlg, GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control&, rCtrl, void ) { if( (&rCtrl == static_cast<Control*>(m_pEdFormulaRange)) || (&rCtrl == static_cast<Control*>(m_pRBFormulaRange)) ) pEdActive = m_pEdFormulaRange; @@ -337,7 +337,7 @@ IMPL_LINK_TYPED( ScTabOpDlg, GetFocusHdl, Control&, rCtrl, void ) pEdActive->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScTabOpDlg, LoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl, Control&, void) { bDlgLostFocus = !IsActive(); } diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 7892d4977419..4584095dcc8f 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -319,22 +319,22 @@ void ScNameDefDlg::SetActive() RefInputDone(); } -IMPL_LINK_NOARG_TYPED(ScNameDefDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDefDlg, CancelBtnHdl, Button*, void) { CancelPushed(); } -IMPL_LINK_NOARG_TYPED(ScNameDefDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDefDlg, AddBtnHdl, Button*, void) { AddPushed(); }; -IMPL_LINK_NOARG_TYPED(ScNameDefDlg, NameModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScNameDefDlg, NameModifyHdl, Edit&, void) { IsNameValid(); } -IMPL_LINK_NOARG_TYPED(ScNameDefDlg, AssignGetFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScNameDefDlg, AssignGetFocusHdl, Control&, void) { IsNameValid(); } diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 23f207aa7aeb..5a7a8f9df6dc 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -483,47 +483,47 @@ void ScNameDlg::GetRangeNames(std::map<OUString, std::unique_ptr<ScRangeName>>& m_RangeMap.swap(rRangeMap); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDlg, OkBtnHdl, Button*, void) { Close(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDlg, CancelBtnHdl, Button*, void) { CancelPushed(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDlg, AddBtnHdl, Button*, void) { AddPushed(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, RemoveBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDlg, RemoveBtnHdl, Button*, void) { RemovePushed(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, EdModifyCheckBoxHdl, CheckBox&, void) +IMPL_LINK_NOARG(ScNameDlg, EdModifyCheckBoxHdl, CheckBox&, void) { NameModified(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, EdModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl, Edit&, void) { NameModified(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, AssignGetFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScNameDlg, AssignGetFocusHdl, Control&, void) { EdModifyHdl(*m_pEdAssign); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, SelectionChangedHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScNameDlg, SelectionChangedHdl_Impl, SvTreeListBox*, void) { SelectionChanged(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, ScopeChangedHdl, ListBox&, void) +IMPL_LINK_NOARG(ScNameDlg, ScopeChangedHdl, ListBox&, void) { ScopeChanged(); } diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index c15a2b7da6e2..a1ee00b1c441 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -277,7 +277,7 @@ void CalculateItemSize(long rTableSize, long& rItemNameSize, long& rItemRangeSiz } -IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void) +IMPL_LINK_NOARG(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void) { HeaderBar& rHeaderBar = GetTheHeaderBar(); @@ -300,7 +300,7 @@ IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void) SetTab(2, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width() ); } -IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, ScrollHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl, SvTreeListBox*, void) { CheckForFormulaString(); } diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index f53d761ed87e..48bb5888301a 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -79,7 +79,7 @@ void ScNamePasteDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( ScNamePasteDlg, ButtonHdl, Button *, pButton, void ) +IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton, void ) { if( pButton == m_pBtnPasteAll ) { diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 8b6768cee6e0..dfc5e1026e47 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -343,7 +343,7 @@ static OUString lcl_GetDBAreaRange( ScDocument* pDoc, const OUString& rDBName ) return aRet; } -IMPL_LINK_NOARG_TYPED(ScContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) { ScContentId nType; sal_uLong nChild; @@ -1439,7 +1439,7 @@ void ScContentTree::DoDrag() delete pDocLoader; // falls Dokument zum Draggen geladen wurde } -IMPL_LINK_NOARG_TYPED(ScContentTree, ExecDragHdl, void*, void) +IMPL_LINK_NOARG(ScContentTree, ExecDragHdl, void*, void) { // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der // Navigator geloescht werden darf diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 3099de828dfc..ef6e00bd46c2 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -381,7 +381,7 @@ void CommandToolBox::Click() { } -IMPL_LINK_NOARG_TYPED(CommandToolBox, ToolBoxDropdownClickHdl, ToolBox *, void) +IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl, ToolBox *, void) { // the popup menue of the drop modus has to be called in the // click (button down) and not in the select (button up) @@ -886,7 +886,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -IMPL_LINK_TYPED( ScNavigatorDlg, TimeHdl, Idle*, pIdle, void ) +IMPL_LINK( ScNavigatorDlg, TimeHdl, Idle*, pIdle, void ) { if ( pIdle != &aContentIdle ) return; diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 20a7788c0319..2fe6d5b7df40 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -139,23 +139,23 @@ void ScCalcOptionsDialog::CoupleEmptyAsZeroToStringConversion() } } -IMPL_LINK_TYPED(ScCalcOptionsDialog, AsZeroModifiedHdl, Button*, pCheckBox, void ) +IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, Button*, pCheckBox, void ) { maConfig.mbEmptyStringAsZero = mbSelectedEmptyStringAsZero = static_cast<CheckBox*>(pCheckBox)->IsChecked(); } -IMPL_LINK_TYPED(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox&, rConv, void ) +IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox&, rConv, void ) { maConfig.meStringConversion = (ScCalcConfig::StringConversion)rConv.GetSelectEntryPos(); CoupleEmptyAsZeroToStringConversion(); } -IMPL_LINK_TYPED(ScCalcOptionsDialog, SyntaxModifiedHdl, ListBox&, rSyntax, void) +IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, ListBox&, rSyntax, void) { maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.GetSelectEntryPos())); } -IMPL_LINK_TYPED(ScCalcOptionsDialog, CurrentDocOnlyHdl, Button*, pCheckBox, void) +IMPL_LINK(ScCalcOptionsDialog, CurrentDocOnlyHdl, Button*, pCheckBox, void) { mbWriteConfig = !(static_cast<CheckBox*>(pCheckBox)->IsChecked()); } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 161e99d86b95..85509e350eee 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -38,10 +38,10 @@ public: virtual ~ScCalcOptionsDialog() override; virtual void dispose() override; - DECL_LINK_TYPED( AsZeroModifiedHdl, Button*, void); - DECL_LINK_TYPED( ConversionModifiedHdl, ListBox&, void); - DECL_LINK_TYPED( SyntaxModifiedHdl, ListBox&, void); - DECL_LINK_TYPED( CurrentDocOnlyHdl, Button*, void); + DECL_LINK( AsZeroModifiedHdl, Button*, void); + DECL_LINK( ConversionModifiedHdl, ListBox&, void); + DECL_LINK( SyntaxModifiedHdl, ListBox&, void); + DECL_LINK( CurrentDocOnlyHdl, Button*, void); const ScCalcConfig& GetConfig() const { return maConfig;} bool GetWriteCalcConfig() const { return mbWriteConfig;} diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index adb13de41bd2..b259c3d20c4a 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -218,7 +218,7 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) // Handler: -IMPL_LINK_TYPED( ScTpCalcOptions, RadioClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScTpCalcOptions, RadioClickHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnDateStd) { @@ -234,7 +234,7 @@ IMPL_LINK_TYPED( ScTpCalcOptions, RadioClickHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScTpCalcOptions, CheckClickHdl, Button*, p, void ) +IMPL_LINK( ScTpCalcOptions, CheckClickHdl, Button*, p, void ) { CheckBox* pBtn = static_cast<CheckBox*>(p); if (pBtn == m_pBtnGeneralPrec) diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 6236853c44b4..4f9d10a7f1ad 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -122,17 +122,17 @@ void ScTpDefaultsOptions::OnFocusPrefixInput(Edit* pEdit) maOldPrefixValue = pEdit->GetText(); } -IMPL_LINK_NOARG_TYPED(ScTpDefaultsOptions, NumModifiedHdl, Edit&, void) +IMPL_LINK_NOARG(ScTpDefaultsOptions, NumModifiedHdl, Edit&, void) { CheckNumSheets(); } -IMPL_LINK_TYPED( ScTpDefaultsOptions, PrefixModifiedHdl, Edit&, rEdit, void ) +IMPL_LINK( ScTpDefaultsOptions, PrefixModifiedHdl, Edit&, rEdit, void ) { CheckPrefix(&rEdit); } -IMPL_LINK_TYPED( ScTpDefaultsOptions, PrefixEditOnFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScTpDefaultsOptions, PrefixEditOnFocusHdl, Control&, rControl, void ) { OnFocusPrefixInput(static_cast<Edit*>(&rControl)); } diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 02fdef56e578..4e5b34d7102d 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -196,7 +196,7 @@ bool ScTpFormulaOptions::IsValidSeparatorSet() const return true; } -IMPL_LINK_TYPED( ScTpFormulaOptions, ButtonHdl, Button*, pBtn, void ) +IMPL_LINK( ScTpFormulaOptions, ButtonHdl, Button*, pBtn, void ) { if (pBtn == mpBtnSepReset) ResetSeparators(); @@ -208,7 +208,7 @@ IMPL_LINK_TYPED( ScTpFormulaOptions, ButtonHdl, Button*, pBtn, void ) LaunchCustomCalcSettings(); } -IMPL_LINK_TYPED( ScTpFormulaOptions, SepModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, Edit&, rEdit, void ) { OUString aStr = rEdit.GetText(); if (aStr.getLength() > 1) @@ -226,7 +226,7 @@ IMPL_LINK_TYPED( ScTpFormulaOptions, SepModifyHdl, Edit&, rEdit, void ) OnFocusSeparatorInput(&rEdit); } -IMPL_LINK_TYPED( ScTpFormulaOptions, SepEditOnFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Control&, rControl, void ) { OnFocusSeparatorInput(static_cast<Edit*>(&rControl)); } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index a6b9edd1b996..da2987118ea8 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -451,7 +451,7 @@ void ScTpUserLists::RemoveList( size_t nList ) // Handler: -IMPL_LINK_TYPED( ScTpUserLists, LbSelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox&, rLb, void ) { if ( &rLb == mpLbLists ) { @@ -472,7 +472,7 @@ IMPL_LINK_TYPED( ScTpUserLists, LbSelectHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) { if ( pBtn == mpBtnNew || pBtn == mpBtnDiscard ) { @@ -701,7 +701,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScTpUserLists, EdEntriesModHdl, Edit&, rEd, void ) +IMPL_LINK( ScTpUserLists, EdEntriesModHdl, Edit&, rEd, void ) { if ( &rEd != mpEdEntries ) return; diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 4b4aa46f6ba1..4db904780c82 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -242,7 +242,7 @@ DeactivateRC ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) return DeactivateRC::LeavePage; } -IMPL_LINK_TYPED( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void ) { const sal_Int32 nSelPos = rLb.GetSelectEntryPos(); ScVObjMode eMode = ScVObjMode(nSelPos); @@ -256,7 +256,7 @@ IMPL_LINK_TYPED( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void ) pLocalOptions->SetObjMode( eType, eMode ); } -IMPL_LINK_TYPED( ScTpContentOptions, CBHdl, Button*, pBtn, void ) +IMPL_LINK( ScTpContentOptions, CBHdl, Button*, pBtn, void ) { ScViewOption eOption = VOPT_FORMULAS; bool bChecked = static_cast<CheckBox*>(pBtn)->IsChecked(); @@ -356,7 +356,7 @@ void ScTpContentOptions::InitGridOpt() pColorLB->SelectEntryPos( pColorLB->InsertEntry( aCol, aName ) ); } -IMPL_LINK_TYPED( ScTpContentOptions, GridHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTpContentOptions, GridHdl, ListBox&, rLb, void ) { sal_Int32 nSelPos = rLb.GetSelectEntryPos(); bool bGrid = ( nSelPos <= 1 ); @@ -678,7 +678,7 @@ DeactivateRC ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) return DeactivateRC::LeavePage; } -IMPL_LINK_NOARG_TYPED(ScTpLayoutOptions, MetricHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl, ListBox&, void) { const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); if(nMPos != LISTBOX_ENTRY_NOTFOUND) @@ -691,7 +691,7 @@ IMPL_LINK_NOARG_TYPED(ScTpLayoutOptions, MetricHdl, ListBox&, void) } } -IMPL_LINK_TYPED( ScTpLayoutOptions, AlignHdl, Button*, pBox, void ) +IMPL_LINK( ScTpLayoutOptions, AlignHdl, Button*, pBox, void ) { m_pAlignLB->Enable(static_cast<CheckBox*>(pBox)->IsChecked()); } diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index de2a9e28d5a1..d2bc314226b4 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -468,7 +468,7 @@ void ScPrintAreasDlg::Impl_FillLists() // Handler: -IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void ) { if ( pBtnOk == pBtn ) { @@ -516,7 +516,7 @@ IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void ) Close(); } -IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control&, rCtrl, void ) { if ( &rCtrl ==static_cast<Control *>(pEdPrintArea) || &rCtrl ==static_cast<Control *>(pEdRepeatRow) || @@ -538,7 +538,7 @@ IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_GetFocusHdl, Control&, rCtrl, void ) } } -IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void ) { ListBox* pLb = &rLb; const sal_Int32 nSelPos = pLb->GetSelectEntryPos(); @@ -573,7 +573,7 @@ IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void ) pEd->SetText( *static_cast< OUString* >( pLb->GetEntryData( nSelPos ) ) ); } -IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_ModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, Edit&, rEd, void ) { ListBox* pLb = nullptr; diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index e27cd12800de..b1e2bdd6b534 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -154,7 +154,7 @@ ScHFEditPage::ScHFEditPage( vcl::Window* pParent, } -IMPL_LINK_NOARG_TYPED( ScHFEditPage, ObjectSelectHdl, ScEditWindow&, void ) +IMPL_LINK_NOARG( ScHFEditPage, ObjectSelectHdl, ScEditWindow&, void ) { m_pBtnText->GrabFocus(); } @@ -755,7 +755,7 @@ void ScHFEditPage::ClearTextAreas() // Handler: -IMPL_LINK_TYPED( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void ) +IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void ) { if ( &rList == m_pLbDefined ) { @@ -775,7 +775,7 @@ IMPL_LINK_TYPED( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void ) } } -IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScHFEditPage, ClickHdl, Button*, pBtn, void ) { if (!m_pEditFocus) return; @@ -805,7 +805,7 @@ IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void ) m_pEditFocus->GrabFocus(); } -IMPL_LINK_TYPED( ScHFEditPage, MenuHdl, ScExtIButton&, rBtn, void ) +IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton&, rBtn, void ) { if (!m_pEditFocus) return; diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 1b4e5ecd89c8..a5cb7116a982 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -147,7 +147,7 @@ void ScHFPage::DeactivatePage() // Handler: -IMPL_LINK_NOARG_TYPED(ScHFPage, TurnOnHdl, Button*, void) +IMPL_LINK_NOARG(ScHFPage, TurnOnHdl, Button*, void) { SvxHFPage::TurnOnHdl( m_pTurnOnBox ); @@ -157,7 +157,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, TurnOnHdl, Button*, void) m_pBtnEdit->Disable(); } -IMPL_LINK_NOARG_TYPED(ScHFPage, BtnHdl, Button*, void) +IMPL_LINK_NOARG(ScHFPage, BtnHdl, Button*, void) { // When the Edit-Dialog is directly called from the Button's Click-Handler, // the GrabFocus from the Edit-Dialog under OS/2 doesn't work.(Bug #41805#). @@ -166,7 +166,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, BtnHdl, Button*, void) Application::PostUserEvent( LINK( this, ScHFPage, HFEditHdl ), nullptr, true ); } -IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void) +IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void) { SfxViewShell* pViewSh = SfxViewShell::Current(); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index cb6335229a67..248fae39f890 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -423,7 +423,7 @@ bool ScExtIButton::PreNotify( NotifyEvent& rNEvt ) return ImageButton::PreNotify(rNEvt ); } -IMPL_LINK_NOARG_TYPED(ScExtIButton, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScExtIButton, TimerHdl, Idle *, void) { StartPopup(); } diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 27eecb86d29f..1ea9e0f8160a 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -358,12 +358,12 @@ void ScTablePage::DataChanged( const DataChangedEvent& rDCEvt ) // Handler: -IMPL_LINK_NOARG_TYPED(ScTablePage, PageDirHdl, Button*, void) +IMPL_LINK_NOARG(ScTablePage, PageDirHdl, Button*, void) { ShowImage(); } -IMPL_LINK_TYPED( ScTablePage, PageNoHdl, Button*, pBtn, void ) +IMPL_LINK( ScTablePage, PageNoHdl, Button*, pBtn, void ) { if ( m_pBtnPageNo->IsChecked() ) { @@ -375,7 +375,7 @@ IMPL_LINK_TYPED( ScTablePage, PageNoHdl, Button*, pBtn, void ) m_pEdPageNo->Disable(); } -IMPL_LINK_NOARG_TYPED(ScTablePage, ScaleHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTablePage, ScaleHdl, ListBox&, void) { // controls for Box "Reduce/enlarge" m_pBxScaleAll->Show(m_pLbScaleMode->GetSelectEntryPos() == SC_TPTABLE_SCALE_PERCENT); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index c093237f07d3..e1b0993ab03f 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -133,7 +133,7 @@ void AlignmentPropertyPanel::Initialize() mpMtrAngle->SetDropDownLineCount(mpMtrAngle->GetEntryCount()); } -IMPL_LINK_TYPED( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, void ) +IMPL_LINK( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, void ) { SvxRotateMode eMode; if(pControl == mpRefEdgeBottom) @@ -147,7 +147,7 @@ IMPL_LINK_TYPED( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, vo SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, AngleModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl, Edit&, void ) { OUString sTmp = mpMtrAngle->GetText(); if (sTmp.isEmpty()) @@ -184,14 +184,14 @@ IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, AngleModifiedHdl, Edit&, void ) GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, { &aAngleItem }); } -IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, ClickStackHdl, Button*, void ) +IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl, Button*, void ) { bool bVertical = mpCBStacked->IsChecked(); SfxBoolItem aStackItem( SID_ATTR_ALIGN_STACKED, bVertical ); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_ALIGN_STACKED, SfxCallMode::RECORD, { &aStackItem }); } -IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, MFLeftIndentMdyHdl, Edit&, void) +IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl, Edit&, void) { mpCBXWrapText->EnableTriState(false); sal_uInt16 nVal = (sal_uInt16)mpMFLeftIndent->GetValue(); @@ -201,7 +201,7 @@ IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, MFLeftIndentMdyHdl, Edit&, void) SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, CBOXMergnCellClkHdl, Button*, void) +IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl, Button*, void) { bool bState = mpCBXMergeCell->IsChecked(); @@ -216,7 +216,7 @@ IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, CBOXMergnCellClkHdl, Button*, void //modified end } -IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, CBOXWrapTextClkHdl, Button*, void) +IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl, Button*, void) { bool bState = mpCBXWrapText->IsChecked(); SfxBoolItem aItem( SID_ATTR_ALIGN_LINEBREAK , bState); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index fa90bd944a23..a635a241ef51 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -95,12 +95,12 @@ private: vcl::EnumContext maContext; SfxBindings* mpBindings; - DECL_LINK_TYPED( MFLeftIndentMdyHdl, Edit&, void ); - DECL_LINK_TYPED( CBOXMergnCellClkHdl, Button*, void ); - DECL_LINK_TYPED( CBOXWrapTextClkHdl, Button*, void ); - DECL_LINK_TYPED( AngleModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( ClickStackHdl, Button*, void ); - DECL_LINK_TYPED( ReferenceEdgeHdl, Button*, void ); + DECL_LINK( MFLeftIndentMdyHdl, Edit&, void ); + DECL_LINK( CBOXMergnCellClkHdl, Button*, void ); + DECL_LINK( CBOXWrapTextClkHdl, Button*, void ); + DECL_LINK( AngleModifiedHdl, Edit&, void ); + DECL_LINK( ClickStackHdl, Button*, void ); + DECL_LINK( ReferenceEdgeHdl, Button*, void ); void Initialize(); static void FormatDegrees(double& dTmp); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index be8a6f2e8471..84c07426973f 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -151,7 +151,7 @@ void CellAppearancePropertyPanel::Initialize() mpTBLineColor->Disable(); } -IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox, void) +IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox, void) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -164,7 +164,7 @@ IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, p } } -IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox, void) +IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox, void) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 20347c2eef5e..d7d36ec78ddd 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -181,8 +181,8 @@ private: vcl::EnumContext maContext; SfxBindings* mpBindings; - DECL_LINK_TYPED(TbxCellBorderSelectHdl, ToolBox*, void); - DECL_LINK_TYPED(TbxLineStyleSelectHdl, ToolBox*, void); + DECL_LINK(TbxCellBorderSelectHdl, ToolBox*, void); + DECL_LINK(TbxLineStyleSelectHdl, ToolBox*, void); void Initialize(); void SetStyleIcon(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 1c505d957fea..6e0409ab0842 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -147,7 +147,7 @@ void CellBorderStyleControl::Initialize() maTBBorder3->SetSelectHdl ( LINK(this, CellBorderStyleControl, TB3SelectHdl) ); } -IMPL_LINK_TYPED(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void) +IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void) { sal_uInt16 nId = pToolBox->GetCurItemId(); SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER ); @@ -206,7 +206,7 @@ IMPL_LINK_TYPED(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void) mxFloatParent->EndPopupMode(); } -IMPL_LINK_TYPED(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void) +IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void) { sal_uInt16 nId = pToolBox->GetCurItemId(); @@ -293,7 +293,7 @@ IMPL_LINK_TYPED(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void) mxFloatParent->EndPopupMode(); } -IMPL_LINK_TYPED(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox, void) +IMPL_LINK(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox, void) { sal_uInt16 nId = pToolBox->GetCurItemId(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index bc37be4880e2..ea8c7619872e 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -42,9 +42,9 @@ private: void Initialize(); - DECL_LINK_TYPED(TB1SelectHdl, ToolBox *, void); - DECL_LINK_TYPED(TB2SelectHdl, ToolBox *, void); - DECL_LINK_TYPED(TB3SelectHdl, ToolBox *, void); + DECL_LINK(TB1SelectHdl, ToolBox *, void); + DECL_LINK(TB2SelectHdl, ToolBox *, void); + DECL_LINK(TB3SelectHdl, ToolBox *, void); public: CellBorderStyleControl(FloatingWindow* pParent, SfxDispatcher* pDispatcher); diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 6de614d9c736..e9e68a335a32 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -113,7 +113,7 @@ void CellLineStyleControl::SetAllNoSel() maCellLineStyleValueSet->StartSelection(); } -IMPL_LINK_TYPED(CellLineStyleControl, VSSelectHdl, ValueSet*, pControl, void) +IMPL_LINK(CellLineStyleControl, VSSelectHdl, ValueSet*, pControl, void) { if(pControl == maCellLineStyleValueSet.get()) { @@ -185,7 +185,7 @@ IMPL_LINK_TYPED(CellLineStyleControl, VSSelectHdl, ValueSet*, pControl, void) } } -IMPL_LINK_TYPED(CellLineStyleControl, PBClickHdl, Button *, pPBtn, void) +IMPL_LINK(CellLineStyleControl, PBClickHdl, Button *, pPBtn, void) { if (pPBtn == maPushButtonMoreOptions.get()) { diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index bad5780810a7..93548495d4d6 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -41,8 +41,8 @@ private: void Initialize(); void SetAllNoSel(); - DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void); - DECL_LINK_TYPED(PBClickHdl, Button*, void); + DECL_LINK(VSSelectHdl, ValueSet*, void); + DECL_LINK(PBClickHdl, Button*, void); public: CellLineStyleControl(FloatingWindow* pParent, SfxDispatcher* pDispatcher); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 550ba6f34754..8fdc1772fd0d 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -104,7 +104,7 @@ void NumberFormatPropertyPanel::Initialize() mpBtnEngineering->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) ); } -IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, void ) +IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, void ) { const sal_Int32 nVal = rBox.GetSelectEntryPos(); if( nVal != mnCategorySelected ) @@ -116,11 +116,11 @@ IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, } } -IMPL_LINK_NOARG_TYPED( NumberFormatPropertyPanel, NumFormatValueClickHdl, Button*, void ) +IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueClickHdl, Button*, void ) { NumFormatValueHdl(*mpEdDecimals); } -IMPL_LINK_NOARG_TYPED( NumberFormatPropertyPanel, NumFormatValueHdl, Edit&, void ) +IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueHdl, Edit&, void ) { OUString aFormat; OUString sBreak = ","; diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index fb0f57b10509..2a3bffa5114f 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -84,9 +84,9 @@ private: vcl::EnumContext maContext; SfxBindings* mpBindings; - DECL_LINK_TYPED(NumFormatSelectHdl, ListBox&, void); - DECL_LINK_TYPED(NumFormatValueHdl, Edit&, void); - DECL_LINK_TYPED(NumFormatValueClickHdl, Button*, void); + DECL_LINK(NumFormatSelectHdl, ListBox&, void); + DECL_LINK(NumFormatValueHdl, Edit&, void); + DECL_LINK(NumFormatValueClickHdl, Button*, void); void Initialize(); void DisableControls(); diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 39f82fefb391..96ab146a85d5 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2803,7 +2803,7 @@ void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< OSL_FAIL("not implemented"); } -IMPL_LINK_TYPED( ScCellRangesBase, ValueListenerHdl, const SfxHint&, rHint, void ) +IMPL_LINK( ScCellRangesBase, ValueListenerHdl, const SfxHint&, rHint, void ) { if ( pDocShell && (rHint.GetId() & SC_HINT_DATACHANGED)) { diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 2fce34a9c611..c77fa56a6311 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2916,7 +2916,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint } } -IMPL_LINK_TYPED( ScChart2DataSequence, ValueListenerHdl, const SfxHint&, rHint, void ) +IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, const SfxHint&, rHint, void ) { if ( m_pDocument && (rHint.GetId() & SC_HINT_DATACHANGED) ) { diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 431fe640987b..050d41052fa2 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -161,7 +161,7 @@ private: /** Posts a Workbook_WindowResize user event. */ void postWindowResizeEvent( vcl::Window* pWindow ); /** Callback link for Application::PostUserEvent(). */ - DECL_LINK_TYPED( processWindowResizeEvent, void*, void ); + DECL_LINK( processWindowResizeEvent, void*, void ); private: typedef ::std::map< VclPtr<vcl::Window>, uno::Reference< frame::XController > > WindowControllerMap; @@ -478,7 +478,7 @@ void ScVbaEventListener::postWindowResizeEvent( vcl::Window* pWindow ) } } -IMPL_LINK_TYPED( ScVbaEventListener, processWindowResizeEvent, void*, p, void ) +IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, void*, p, void ) { vcl::Window* pWindow = static_cast<vcl::Window*>(p); ::osl::MutexGuard aGuard( maMutex ); diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index a6318211acef..b29beaeba461 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -487,7 +487,7 @@ static bool lcl_IsCellPastePossible( const TransferableDataHelper& rData ) return bPossible; } -IMPL_LINK_TYPED( ScCellShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) +IMPL_LINK( ScCellShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) { bPastePossible = lcl_IsCellPastePossible( *pDataHelper ); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index af92bf76aa84..777bcd76ea00 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2908,7 +2908,7 @@ void ScCellShell::ExecuteFillSingleEdit() SC_MOD()->SetInputMode(SC_INPUT_TABLE, &aInit); } -IMPL_LINK_NOARG_TYPED(ScCellShell, DialogClosed, Dialog&, void) +IMPL_LINK_NOARG(ScCellShell, DialogClosed, Dialog&, void) { assert(pImpl->m_pLinkedDlg && "ScCellShell::DialogClosed(): invalid request"); assert(pImpl->m_pRequest && "ScCellShell::DialogClosed(): invalid request"); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 5782387e0787..fc0c29bd10e4 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -797,7 +797,7 @@ const SvxURLField* ScEditShell::GetURLField() return nullptr; } -IMPL_LINK_TYPED( ScEditShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) +IMPL_LINK( ScEditShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) { bPastePossible = ( pDataHelper->HasFormat( SotClipboardFormatId::STRING ) || pDataHelper->HasFormat( SotClipboardFormatId::RTF ) ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index f58f500e666a..5ffad27f03ec 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -549,14 +549,14 @@ void ScGridWindow::ClickExtern() } } -IMPL_LINK_NOARG_TYPED(ScGridWindow, PopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(ScGridWindow, PopupModeEndHdl, FloatingWindow*, void) { if (mpFilterBox) mpFilterBox->SetCancelled(); // cancel select GrabFocus(); } -IMPL_LINK_TYPED( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo&, rInfo, void ) +IMPL_LINK( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo&, rInfo, void ) { if( rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG ) pViewData->GetDispatcher().Execute( SID_SPELL_DIALOG, SfxCallMode::ASYNCHRON ); @@ -5484,10 +5484,10 @@ struct SpellCheckStatus SpellCheckStatus() : mbModified(false) {}; - DECL_LINK_TYPED( EventHdl, EditStatus&, void ); + DECL_LINK( EventHdl, EditStatus&, void ); }; -IMPL_LINK_TYPED(SpellCheckStatus, EventHdl, EditStatus&, rStatus, void) +IMPL_LINK(SpellCheckStatus, EventHdl, EditStatus&, rStatus, void) { EditStatusFlags nStatus = rStatus.GetStatusWord(); if (nStatus & EditStatusFlags::WRONGWORDCHANGED) diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 6b05c2bf4556..818f9fc76a12 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -71,7 +71,7 @@ ScNoteMarker::~ScNoteMarker() delete pModel; } -IMPL_LINK_NOARG_TYPED(ScNoteMarker, TimeHdl, Timer *, void) +IMPL_LINK_NOARG(ScNoteMarker, TimeHdl, Timer *, void) { if (!bVisible) { diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index d4ee167a72f1..1e916697ae2f 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -929,7 +929,7 @@ void ScPreview::StaticInvalidate() rBindings.Invalidate(SID_ATTR_ZOOMSLIDER); } -IMPL_STATIC_LINK_NOARG_TYPED( ScPreview, InvalidateHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( ScPreview, InvalidateHdl, void*, void ) { StaticInvalidate(); } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index eb80b302b0c1..b1c0089ff11c 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -404,7 +404,7 @@ void ScPreviewShell::UpdateScrollBars() } } -IMPL_LINK_TYPED( ScPreviewShell, ScrollHandler, ScrollBar*, pScroll, void ) +IMPL_LINK( ScPreviewShell, ScrollHandler, ScrollBar*, pScroll, void ) { long nPos = pScroll->GetThumbPos(); long nDelta = pScroll->GetDelta(); @@ -475,7 +475,7 @@ IMPL_LINK_TYPED( ScPreviewShell, ScrollHandler, ScrollBar*, pScroll, void ) } } -IMPL_LINK_NOARG_TYPED(ScPreviewShell, CloseHdl, SystemWindow&, void) +IMPL_LINK_NOARG(ScPreviewShell, CloseHdl, SystemWindow&, void) { ExitPreview(); } diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 24e96633b76d..50cbec9d4ca0 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -84,7 +84,7 @@ ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData ) SetScrollAreaContextHdl( LINK( this, ScTabControl, ShowPageList ) ); } -IMPL_LINK_TYPED(ScTabControl, ShowPageList, const CommandEvent &, rEvent, void) +IMPL_LINK(ScTabControl, ShowPageList, const CommandEvent &, rEvent, void) { ScopedVclPtrInstance<PopupMenu> aPopup; diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 1686e3b18b40..c6b1673a0464 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -266,7 +266,7 @@ void ScTabView::ResetTimer() pTimerWindow = nullptr; } -IMPL_LINK_NOARG_TYPED(ScTabView, TimerHdl, Timer *, void) +IMPL_LINK_NOARG(ScTabView, TimerHdl, Timer *, void) { if (pTimerWindow) pTimerWindow->MouseMove( aTimerMEvt ); @@ -837,7 +837,7 @@ void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ ) ::std::swap( rBorder.Left(), rBorder.Right() ); } -IMPL_LINK_NOARG_TYPED(ScTabView, TabBarResize, TabBar*, void) +IMPL_LINK_NOARG(ScTabView, TabBarResize, TabBar*, void) { if (aViewData.IsHScrollMode()) { @@ -1014,7 +1014,7 @@ bool ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ) return bDone; } -IMPL_LINK_NOARG_TYPED(ScTabView, EndScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScTabView, EndScrollHdl, ScrollBar*, void) { if ( bDragging ) { @@ -1023,7 +1023,7 @@ IMPL_LINK_NOARG_TYPED(ScTabView, EndScrollHdl, ScrollBar*, void) } } -IMPL_LINK_TYPED( ScTabView, ScrollHdl, ScrollBar*, pScroll, void ) +IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll, void ) { bool bHoriz = ( pScroll == aHScrollLeft.get() || pScroll == aHScrollRight.get() ); long nViewPos; @@ -1527,7 +1527,7 @@ bool ScTabView::UpdateVisibleRange() // --- Splitter -------------------------------------------------------- -IMPL_LINK_TYPED( ScTabView, SplitHdl, Splitter*, pSplitter, void ) +IMPL_LINK( ScTabView, SplitHdl, Splitter*, pSplitter, void ) { if ( pSplitter == pHSplitter ) DoHSplit( pHSplitter->GetSplitPosPixel() ); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index c82210680f0a..160dc436c9d5 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -983,7 +983,7 @@ void ScTabViewShell::SetFormShellAtTop( bool bSet ) } } -IMPL_LINK_NOARG_TYPED(ScTabViewShell, FormControlActivated, LinkParamNone*, void) +IMPL_LINK_NOARG(ScTabViewShell, FormControlActivated, LinkParamNone*, void) { // a form control got the focus, so the form shell has to be on top SetFormShellAtTop( true ); @@ -1082,7 +1082,7 @@ void ScTabViewShell::StopEditShell() // close handler to ensure function of dialog: -IMPL_LINK_NOARG_TYPED(ScTabViewShell, SimpleRefClose, const OUString*, void) +IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose, const OUString*, void) { SfxInPlaceClient* pClient = GetIPClient(); if ( pClient && pClient->IsObjectInPlaceActive() ) @@ -1112,21 +1112,21 @@ static ScTabViewObj* lcl_GetViewObj( ScTabViewShell& rShell ) return pRet; } -IMPL_LINK_TYPED( ScTabViewShell, SimpleRefDone, const OUString&, aResult, void ) +IMPL_LINK( ScTabViewShell, SimpleRefDone, const OUString&, aResult, void ) { ScTabViewObj* pImpObj = lcl_GetViewObj( *this ); if ( pImpObj ) pImpObj->RangeSelDone( aResult ); } -IMPL_LINK_TYPED( ScTabViewShell, SimpleRefAborted, const OUString&, rResult, void ) +IMPL_LINK( ScTabViewShell, SimpleRefAborted, const OUString&, rResult, void ) { ScTabViewObj* pImpObj = lcl_GetViewObj( *this ); if ( pImpObj ) pImpObj->RangeSelAborted( rResult ); } -IMPL_LINK_TYPED( ScTabViewShell, SimpleRefChange, const OUString&, rResult, void ) +IMPL_LINK( ScTabViewShell, SimpleRefChange, const OUString&, rResult, void ) { ScTabViewObj* pImpObj = lcl_GetViewObj( *this ); if ( pImpObj ) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 77d9f42df304..8e2dd1592d00 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1175,7 +1175,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, } -IMPL_LINK_TYPED( ScViewData, EditEngineHdl, EditStatus&, rStatus, void ) +IMPL_LINK( ScViewData, EditEngineHdl, EditStatus&, rStatus, void ) { EditStatusFlags nStatus = rStatus.GetStatusWord(); if (nStatus & (EditStatusFlags::HSCROLL | EditStatusFlags::TEXTHEIGHTCHANGED | EditStatusFlags::TEXTWIDTHCHANGED | EditStatusFlags::CURSOROUT)) diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 879f41c40ba7..435e81b58254 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -662,12 +662,12 @@ void ScXMLSourceDlg::RefEditModified() mpBtnOk->Enable(bHasLink); } -IMPL_LINK_TYPED(ScXMLSourceDlg, GetFocusHdl, Control&, rCtrl, void) +IMPL_LINK(ScXMLSourceDlg, GetFocusHdl, Control&, rCtrl, void) { HandleGetFocus(&rCtrl); } -IMPL_LINK_TYPED(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn, void) +IMPL_LINK(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn, void) { if (pBtn == mpBtnSelectSource) SelectSourceFile(); @@ -677,12 +677,12 @@ IMPL_LINK_TYPED(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn, void) CancelPressed(); } -IMPL_LINK_NOARG_TYPED(ScXMLSourceDlg, TreeItemSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScXMLSourceDlg, TreeItemSelectHdl, SvTreeListBox*, void) { TreeItemSelected(); } -IMPL_LINK_NOARG_TYPED(ScXMLSourceDlg, RefModifiedHdl, Edit&, void) +IMPL_LINK_NOARG(ScXMLSourceDlg, RefModifiedHdl, Edit&, void) { RefEditModified(); } diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index 3fd9f5538e6b..dbe30db24e91 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -47,7 +47,7 @@ void ScAddInResult::NewValue() m_Listeners[n]->modified( aEvent ); } -IMPL_LINK_TYPED( ScAddInResult, TimeoutHdl, Timer*, pT, void ) +IMPL_LINK( ScAddInResult, TimeoutHdl, Timer*, pT, void ) { NewValue(); pT->Start(); diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index a97442b182de..32581bdd8860 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -76,11 +76,11 @@ private: public: explicit MyWindow( vcl::Window *pParent ); - DECL_LINK_TYPED(CountHdl, PushButton*, void); - DECL_LINK_TYPED(TextHdl, PushButton*, void); - DECL_LINK_TYPED(BlaHdl, PushButton*, void); - DECL_LINK_TYPED(TabHdl, PushButton*, void); - DECL_LINK_TYPED(ViewHdl, PushButton*, void); + DECL_LINK(CountHdl, PushButton*, void); + DECL_LINK(TextHdl, PushButton*, void); + DECL_LINK(BlaHdl, PushButton*, void); + DECL_LINK(TabHdl, PushButton*, void); + DECL_LINK(ViewHdl, PushButton*, void); }; class ScTestListener : public XSelectionChangeListener, public UsrObject @@ -1501,7 +1501,7 @@ void lcl_Pivot( FixedText& aTimeText ) // 30 } } -IMPL_LINK_NOARG_TYPED(MyWindow, CountHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, CountHdl, PushButton*, void) { long nCount = aCountField.GetValue(); @@ -1608,7 +1608,7 @@ IMPL_LINK_NOARG_TYPED(MyWindow, CountHdl, PushButton*, void) } } -IMPL_LINK_NOARG_TYPED(MyWindow, TextHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, TextHdl, PushButton*, void) { sal_uInt16 nCol = (sal_uInt16)aColField.GetValue(); sal_uInt16 nRow = (sal_uInt16)aRowField.GetValue(); @@ -1653,7 +1653,7 @@ IMPL_LINK_NOARG_TYPED(MyWindow, TextHdl, PushButton*, void) } } -IMPL_LINK_NOARG_TYPED(MyWindow, BlaHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, BlaHdl, PushButton*, void) { aTimeText.SetText("..."); @@ -1723,7 +1723,7 @@ IMPL_LINK_NOARG_TYPED(MyWindow, BlaHdl, PushButton*, void) } } -IMPL_LINK_NOARG_TYPED(MyWindow, TabHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, TabHdl, PushButton*, void) { String aResult; @@ -1812,7 +1812,7 @@ void lcl_FillCells(XCellCollectionRef xColl) } } -IMPL_LINK_NOARG_TYPED(MyWindow, ViewHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, ViewHdl, PushButton*, void) { XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model XInterfaceRef xInt = lcl_GetView(); diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 91c08dca1edf..bc6adda756a6 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -410,7 +410,7 @@ protected: void lockRebuilds(); void unlockRebuilds(); - DECL_LINK_TYPED(onTimerHdl, Timer *, void); + DECL_LINK(onTimerHdl, Timer *, void); virtual void implRebuild() override; diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index d23977dbb794..cc88e286562e 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -184,9 +184,9 @@ private: SAL_DLLPRIVATE void FillOnlineSpellingList(SdPage* pPage); SAL_DLLPRIVATE void SpellObject(SdrTextObj* pObj); - DECL_DLLPRIVATE_LINK_TYPED(WorkStartupHdl, Timer *, void); - DECL_DLLPRIVATE_LINK_TYPED(OnlineSpellingHdl, Idle *, void); - DECL_DLLPRIVATE_LINK_TYPED(OnlineSpellEventHdl, EditStatus&, void); + DECL_DLLPRIVATE_LINK(WorkStartupHdl, Timer *, void); + DECL_DLLPRIVATE_LINK(OnlineSpellingHdl, Idle *, void); + DECL_DLLPRIVATE_LINK(OnlineSpellEventHdl, EditStatus&, void); std::vector< OUString > maAnnotationAuthors; std::vector<css::uno::Reference< css::xml::dom::XNode> > maLayoutInfo; diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 74023c512ea4..ed4435d47dca 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -78,7 +78,7 @@ class SdModule : public SfxModule, public SfxListener { public: SFX_DECL_INTERFACE(SD_IF_SDAPP) - DECL_LINK_TYPED( CalcFieldValueHdl, EditFieldInfo*, void ); + DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); private: /// SfxInterface initializer. @@ -174,7 +174,7 @@ private: @VclSimpleEvent * a pointer to a VCLSimpleEvent (see vcl/vclevent.hxx ) */ - DECL_STATIC_LINK_TYPED( SdModule, EventListenerHdl, VclSimpleEvent&, void ); + DECL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent&, void ); }; diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx index de130a2c4c2a..56c96baf3442 100644 --- a/sd/inc/sdobjfac.hxx +++ b/sd/inc/sdobjfac.hxx @@ -29,7 +29,7 @@ class SdObjectFactory public: SdObjectFactory() {} - DECL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); + DECL_STATIC_LINK( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); }; extern SdObjectFactory aSdObjectFactory; diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index b7e9bead245e..804bda8569e1 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -3408,7 +3408,7 @@ bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const cs } -IMPL_LINK_NOARG_TYPED(MainSequence, onTimerHdl, Timer *, void) +IMPL_LINK_NOARG(MainSequence, onTimerHdl, Timer *, void) { if( mbTimerMode ) { diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 9e3672570e21..601b4bb90939 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -882,7 +882,7 @@ LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const } // Initiate WorkStartup -IMPL_LINK_NOARG_TYPED(SdDrawDocument, WorkStartupHdl, Timer *, void) +IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl, Timer *, void) { if (IsTransportContainer()) return; diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index d92c0c7989fd..c9b7ef855439 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -821,7 +821,7 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage) } // OnlineSpelling in the background -IMPL_LINK_NOARG_TYPED(SdDrawDocument, OnlineSpellingHdl, Idle *, void) +IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl, Idle *, void) { if (mpOnlineSpellingList!=nullptr && ( !mbOnlineSpell || mpOnlineSpellingList->hasMore())) @@ -953,7 +953,7 @@ void SdDrawDocument::RemoveObject(SdrObject* pObj, SdPage* /*pPage*/) } // Callback for ExecuteSpellPopup() -IMPL_LINK_TYPED(SdDrawDocument, OnlineSpellEventHdl, EditStatus&, rEditStat, void) +IMPL_LINK(SdDrawDocument, OnlineSpellEventHdl, EditStatus&, rEditStat, void) { EditStatusFlags nStat = rEditStat.GetStatusWord(); mbHasOnlineSpellErrors = bool(nStat & EditStatusFlags::WRONGWORDCHANGED); diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx index 193a15bfb09d..a3fc3dc06f29 100644 --- a/sd/source/core/sdobjfac.cxx +++ b/sd/source/core/sdobjfac.cxx @@ -35,7 +35,7 @@ SdObjectFactory aSdObjectFactory; |* \************************************************************************/ -IMPL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) +IMPL_STATIC_LINK( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { if ( aParams.nInventor == SdUDInventor ) { diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 1f9ffad68546..cb7dbd6d5e93 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -347,7 +347,7 @@ public: virtual ~SdDesignNameDlg() override; virtual void dispose() override; OUString GetDesignName(); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); }; // SdPublishingDlg Methods @@ -931,7 +931,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) } // Clickhandler for the radiobuttons of the design-selection -IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void ) +IMPL_LINK( SdPublishingDlg, DesignHdl, Button *, pButton, void ) { if(pButton == pPage1_NewDesign) { @@ -963,7 +963,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void ) } // Clickhandler for the choice of one design -IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl, ListBox&, void) { const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos(); m_pDesign = &m_aDesignList[nPos]; @@ -976,7 +976,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignSelectHdl, ListBox&, void) } // Clickhandler for the delete of one design -IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void) +IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl, Button*, void) { const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos(); @@ -997,7 +997,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void) } // Clickhandler for the other servertypess -IMPL_LINK_TYPED( SdPublishingDlg, WebServerHdl, Button *, pButton, void ) +IMPL_LINK( SdPublishingDlg, WebServerHdl, Button *, pButton, void ) { bool bASP = pButton == pPage2_ASP; @@ -1007,7 +1007,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, WebServerHdl, Button *, pButton, void ) } // Clickhandler for the Radiobuttons of the graphicformat choice -IMPL_LINK_TYPED( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void ) +IMPL_LINK( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void ) { pPage3_Png->Check( pButton == pPage3_Png ); pPage3_Gif->Check( pButton == pPage3_Gif ); @@ -1016,13 +1016,13 @@ IMPL_LINK_TYPED( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void ) } // Clickhandler for the Radiobuttons Standard/Frames -IMPL_LINK_NOARG_TYPED(SdPublishingDlg, BaseHdl, Button*, void) +IMPL_LINK_NOARG(SdPublishingDlg, BaseHdl, Button*, void) { UpdatePage(); } // Clickhandler for the Checkbox of the Title page -IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ContentHdl, Button*, void) +IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl, Button*, void) { if(pPage2_Content->IsChecked()) { @@ -1043,7 +1043,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ContentHdl, Button*, void) } // Clickhandler for the Resolution Radiobuttons -IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void ) +IMPL_LINK( SdPublishingDlg, ResolutionHdl, Button *, pButton, void ) { pPage3_Resolution_1->Check(pButton == pPage3_Resolution_1); pPage3_Resolution_2->Check(pButton == pPage3_Resolution_2); @@ -1051,14 +1051,14 @@ IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void ) } // Clickhandler for the ValueSet with the bitmap-buttons -IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ButtonsHdl, ValueSet*, void) +IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl, ValueSet*, void) { // if one bitmap-button is chosen, then disable TextOnly pPage5_TextOnly->Check(false); } // Fill the SfxItemSet with the settings of the dialog -IMPL_LINK_TYPED( SdPublishingDlg, ColorHdl, Button *, pButton, void) +IMPL_LINK( SdPublishingDlg, ColorHdl, Button *, pButton, void) { SvColorDialog aDlg(this); @@ -1099,13 +1099,13 @@ IMPL_LINK_TYPED( SdPublishingDlg, ColorHdl, Button *, pButton, void) pPage6_Preview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SdPublishingDlg, SlideChgHdl, Button*, void) +IMPL_LINK_NOARG(SdPublishingDlg, SlideChgHdl, Button*, void) { UpdatePage(); } // Clickhandler for the Ok Button -IMPL_LINK_NOARG_TYPED(SdPublishingDlg, FinishHdl, Button*, void) +IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl, Button*, void) { //End SdPublishingDesign aDesign; @@ -1352,7 +1352,7 @@ void SdPublishingDlg::LoadPreviewButtons() } // Clickhandler for the Forward Button -IMPL_LINK_NOARG_TYPED(SdPublishingDlg, NextPageHdl, Button*, void) +IMPL_LINK_NOARG(SdPublishingDlg, NextPageHdl, Button*, void) { aAssistentFunc.NextPage(); ChangePage(); @@ -1497,7 +1497,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) } // Clickhandler for the back Button -IMPL_LINK_NOARG_TYPED(SdPublishingDlg, LastPageHdl, Button*, void) +IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl, Button*, void) { aAssistentFunc.PreviousPage(); ChangePage(); @@ -1641,7 +1641,7 @@ OUString SdDesignNameDlg::GetDesignName() return m_pEdit->GetText(); } -IMPL_LINK_NOARG_TYPED(SdDesignNameDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SdDesignNameDlg, ModifyHdl, Edit&, void) { m_pBtnOK->Enable(!m_pEdit->GetText().isEmpty()); } diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 2dbceddf663d..bff0e125a8e4 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -159,7 +159,7 @@ void AccessibleDocumentViewBase::Init() SetState(AccessibleStateType::EDITABLE); } -IMPL_LINK_TYPED(AccessibleDocumentViewBase, WindowChildEventListener, +IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, VclWindowEvent&, rEvent, void) { // DBG_ASSERT( pVclEvent->GetWindow(), "Window???" ); diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index d4c517726379..d7f0dc03ab3c 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -202,7 +202,7 @@ namespace accessibility } } - IMPL_LINK_TYPED(AccessibleOutlineEditSource, NotifyHdl, EENotify&, rNotify, void) + IMPL_LINK(AccessibleOutlineEditSource, NotifyHdl, EENotify&, rNotify, void) { ::std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( &rNotify) ); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 08c0ec8538de..6e64e3f2d664 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -80,12 +80,12 @@ public: void ConnectListeners(); void ReleaseListeners(); void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) override; - DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); - DECL_LINK_TYPED(SelectionChangeListener, LinkParamNone*, void); - DECL_LINK_TYPED(BroadcastSelectionChange, void*, void); - DECL_LINK_TYPED(FocusChangeListener, LinkParamNone*, void); - DECL_LINK_TYPED(VisibilityChangeListener, LinkParamNone*, void); - DECL_LINK_TYPED(UpdateChildrenCallback, void*, void); + DECL_LINK(WindowEventListener, VclWindowEvent&, void); + DECL_LINK(SelectionChangeListener, LinkParamNone*, void); + DECL_LINK(BroadcastSelectionChange, void*, void); + DECL_LINK(FocusChangeListener, LinkParamNone*, void); + DECL_LINK(VisibilityChangeListener, LinkParamNone*, void); + DECL_LINK(UpdateChildrenCallback, void*, void); void Activated(); private: @@ -895,7 +895,7 @@ void AccessibleSlideSorterView::Implementation::Activated() } -IMPL_LINK_TYPED(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { @@ -916,14 +916,14 @@ IMPL_LINK_TYPED(AccessibleSlideSorterView::Implementation, WindowEventListener, } } -IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, SelectionChangeListener, LinkParamNone*, void) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, SelectionChangeListener, LinkParamNone*, void) { if (mnSelectionChangeUserEventId == nullptr) mnSelectionChangeUserEventId = Application::PostUserEvent( LINK(this, AccessibleSlideSorterView::Implementation, BroadcastSelectionChange)); } -IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange, void*, void) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange, void*, void) { mnSelectionChangeUserEventId = nullptr; mrAccessibleSlideSorter.FireAccessibleEvent( @@ -932,7 +932,7 @@ IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, BroadcastSelect Any()); } -IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, FocusChangeListener, LinkParamNone*, void) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener, LinkParamNone*, void) { sal_Int32 nNewFocusedIndex ( mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex()); @@ -974,13 +974,13 @@ IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, FocusChangeList } } -IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, void*, void) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, void*, void) { mnUpdateChildrenUserEventId = nullptr; UpdateChildren(); } -IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, LinkParamNone*, void) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, LinkParamNone*, void) { UpdateChildren(); } diff --git a/sd/source/ui/animations/CategoryListBox.cxx b/sd/source/ui/animations/CategoryListBox.cxx index 4f66a379b963..ff1b28c5b7ba 100644 --- a/sd/source/ui/animations/CategoryListBox.cxx +++ b/sd/source/ui/animations/CategoryListBox.cxx @@ -73,7 +73,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) } } -IMPL_LINK_NOARG_TYPED(CategoryListBox, implDoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(CategoryListBox, implDoubleClickHdl, ListBox&, void) { CaptureMouse(); } diff --git a/sd/source/ui/animations/CategoryListBox.hxx b/sd/source/ui/animations/CategoryListBox.hxx index 25edc35e4b8a..37f6d3883f7b 100644 --- a/sd/source/ui/animations/CategoryListBox.hxx +++ b/sd/source/ui/animations/CategoryListBox.hxx @@ -35,7 +35,7 @@ public: void InsertCategory( const OUString& rStr ); - DECL_LINK_TYPED(implDoubleClickHdl, ListBox&, void); + DECL_LINK(implDoubleClickHdl, ListBox&, void); private: virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index d912f6d5ec05..31d98f2d191b 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -110,7 +110,7 @@ public: private: std::map< sal_uInt16, OUString > maPropertyValues; VclPtr<ListBox> mpControl; - DECL_LINK_TYPED(OnSelect, ListBox&, void); + DECL_LINK(OnSelect, ListBox&, void); Link<LinkParamNone*,void> maModifyLink; }; @@ -125,7 +125,7 @@ PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pPare setValue( rValue, aPresetId ); } -IMPL_LINK_NOARG_TYPED(PresetPropertyBox, OnSelect, ListBox&, void) +IMPL_LINK_NOARG(PresetPropertyBox, OnSelect, ListBox&, void) { maModifyLink.Call(nullptr); } @@ -192,7 +192,7 @@ public: private: VclPtr<ColorListBox> mpControl; - DECL_LINK_TYPED(OnSelect, ListBox&, void); + DECL_LINK(OnSelect, ListBox&, void); Link<LinkParamNone*,void> maModifyLink; }; @@ -227,7 +227,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent } } -IMPL_LINK_NOARG_TYPED(ColorPropertyBox, OnSelect, ListBox&, void) +IMPL_LINK_NOARG(ColorPropertyBox, OnSelect, ListBox&, void) { maModifyLink.Call(nullptr); } @@ -273,7 +273,7 @@ public: private: VclPtr<FontNameBox> mpControl; Link<LinkParamNone*,void> maModifyHdl; - DECL_LINK_TYPED(ControlSelectHdl, ComboBox&, void); + DECL_LINK(ControlSelectHdl, ComboBox&, void); }; FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl ) @@ -308,7 +308,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, setValue( rValue, aPresetId ); } -IMPL_LINK_NOARG_TYPED(FontPropertyBox, ControlSelectHdl, ComboBox&, void) +IMPL_LINK_NOARG(FontPropertyBox, ControlSelectHdl, ComboBox&, void) { maModifyHdl.Call(nullptr); } @@ -431,10 +431,10 @@ public: virtual Control* getControl() override; - DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); + DECL_LINK( implMenuSelectHdl, MenuButton*, void ); private: - DECL_LINK_TYPED( EditModifyHdl, Edit&, void ); + DECL_LINK( EditModifyHdl, Edit&, void ); VclPtr<DropdownMenuBox> mpControl; VclPtr<PopupMenu> mpMenu; VclPtr<MetricField> mpMetric; @@ -464,12 +464,12 @@ CharHeightPropertyBox::~CharHeightPropertyBox() mpControl.disposeAndClear(); } -IMPL_LINK_NOARG_TYPED( CharHeightPropertyBox, EditModifyHdl, Edit&, void ) +IMPL_LINK_NOARG( CharHeightPropertyBox, EditModifyHdl, Edit&, void ) { maModifyHdl.Call(nullptr); } -IMPL_LINK_TYPED( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) +IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) { long nValue = 100; switch( pPb->GetCurItemId() ) @@ -514,8 +514,8 @@ public: virtual Control* getControl() override; - DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); - DECL_LINK_TYPED( implModifyHdl, Edit&, void ); + DECL_LINK( implMenuSelectHdl, MenuButton*, void ); + DECL_LINK( implModifyHdl, Edit&, void ); void updateMenu(); @@ -566,13 +566,13 @@ void TransparencyPropertyBox::updateMenu() mpMenu->CheckItem( i, nValue == i ); } -IMPL_LINK_NOARG_TYPED(TransparencyPropertyBox, implModifyHdl, Edit&, void) +IMPL_LINK_NOARG(TransparencyPropertyBox, implModifyHdl, Edit&, void) { updateMenu(); maModifyHdl.Call(nullptr); } -IMPL_LINK_TYPED( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) +IMPL_LINK( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) { if( pPb->GetCurItemId() != mpMetric->GetValue() ) { @@ -614,8 +614,8 @@ public: virtual Control* getControl() override; - DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); - DECL_LINK_TYPED( implModifyHdl, Edit&, void ); + DECL_LINK( implMenuSelectHdl, MenuButton*, void ); + DECL_LINK( implModifyHdl, Edit&, void ); void updateMenu(); @@ -668,13 +668,13 @@ void RotationPropertyBox::updateMenu() mpMenu->CheckItem( CM_COUNTERCLOCKWISE, !bDirection ); } -IMPL_LINK_NOARG_TYPED(RotationPropertyBox, implModifyHdl, Edit&, void) +IMPL_LINK_NOARG(RotationPropertyBox, implModifyHdl, Edit&, void) { updateMenu(); maModifyHdl.Call(nullptr); } -IMPL_LINK_TYPED( RotationPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) +IMPL_LINK( RotationPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) { sal_Int64 nValue = mpMetric->GetValue(); bool bDirection = nValue >= 0; @@ -735,8 +735,8 @@ public: virtual Control* getControl() override; - DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); - DECL_LINK_TYPED( implModifyHdl, Edit&, void ); + DECL_LINK( implMenuSelectHdl, MenuButton*, void ); + DECL_LINK( implModifyHdl, Edit&, void ); void updateMenu(); @@ -788,13 +788,13 @@ void ScalePropertyBox::updateMenu() mpMenu->CheckItem( CM_BOTH, mnDirection == 3 ); } -IMPL_LINK_NOARG_TYPED(ScalePropertyBox, implModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScalePropertyBox, implModifyHdl, Edit&, void) { updateMenu(); maModifyHdl.Call(nullptr); } -IMPL_LINK_TYPED( ScalePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) +IMPL_LINK( ScalePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) { sal_Int64 nValue = mpMetric->GetValue(); @@ -894,7 +894,7 @@ public: virtual Control* getControl() override; - DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); + DECL_LINK( implMenuSelectHdl, MenuButton*, void ); void update(); @@ -946,7 +946,7 @@ void FontStylePropertyBox::update() mpEdit->Invalidate(); } -IMPL_LINK_TYPED( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) +IMPL_LINK( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void ) { switch( pPb->GetCurItemId() ) { @@ -1010,8 +1010,8 @@ public: virtual void dispose() override; void update( STLPropertySet* pSet ); - DECL_LINK_TYPED( implSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( implClickHdl, Button*, void ); + DECL_LINK( implSelectHdl, ListBox&, void ); + DECL_LINK( implClickHdl, Button*, void ); void implHdl(Control*); private: @@ -1321,11 +1321,11 @@ void CustomAnimationEffectTabPage::updateControlStates() mpPBSoundPreview->Enable( nPos >= 2 ); } -IMPL_LINK_TYPED( CustomAnimationEffectTabPage, implClickHdl, Button*, pBtn, void ) +IMPL_LINK( CustomAnimationEffectTabPage, implClickHdl, Button*, pBtn, void ) { implHdl(pBtn); } -IMPL_LINK_TYPED( CustomAnimationEffectTabPage, implSelectHdl, ListBox&, rListBox, void ) +IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, ListBox&, rListBox, void ) { implHdl(&rListBox); } @@ -1615,9 +1615,9 @@ public: void update( STLPropertySet* pSet ); - DECL_LINK_TYPED( implControlHdl, ListBox&, void ); - DECL_LINK_TYPED( implClickHdl, Button*, void ); - DECL_LINK_TYPED( DurationModifiedHdl, Edit&, void ); + DECL_LINK( implControlHdl, ListBox&, void ); + DECL_LINK( implClickHdl, Button*, void ); + DECL_LINK( DurationModifiedHdl, Edit&, void ); void implHdl(Control*); private: @@ -1824,17 +1824,17 @@ void CustomAnimationDurationTabPage::dispose() TabPage::dispose(); } -IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implClickHdl, Button*, pBtn, void ) +IMPL_LINK( CustomAnimationDurationTabPage, implClickHdl, Button*, pBtn, void ) { implHdl(pBtn); } -IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implControlHdl, ListBox&, rListBox, void ) +IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, ListBox&, rListBox, void ) { implHdl(&rListBox); } -IMPL_LINK_NOARG_TYPED(CustomAnimationDurationTabPage, DurationModifiedHdl, Edit&, void) +IMPL_LINK_NOARG(CustomAnimationDurationTabPage, DurationModifiedHdl, Edit&, void) { if(!(mpCBXDuration->GetText()).isEmpty() ) { @@ -2012,7 +2012,7 @@ public: void update( STLPropertySet* pSet ); void updateControlStates(); - DECL_LINK_TYPED(implSelectHdl, ListBox&, void); + DECL_LINK(implSelectHdl, ListBox&, void); private: VclPtr<FixedText> maFTGroupText; @@ -2196,7 +2196,7 @@ void CustomAnimationTextAnimTabPage::updateControlStates() } } -IMPL_LINK_NOARG_TYPED(CustomAnimationTextAnimTabPage, implSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl, ListBox&, void) { updateControlStates(); } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 1b958ad52a0b..2f4cab1b2648 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -324,7 +324,7 @@ void CustomAnimationPane::removeListener() mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); } -IMPL_LINK_TYPED(CustomAnimationPane,EventMultiplexerListener, +IMPL_LINK(CustomAnimationPane,EventMultiplexerListener, tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) @@ -2048,24 +2048,24 @@ double CustomAnimationPane::getDuration() } /// this link is called when the property box is modified by the user -IMPL_LINK_NOARG_TYPED(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void) { onChangeProperty(); } -IMPL_LINK_NOARG_TYPED(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) { animationChange(); } -IMPL_LINK_NOARG_TYPED(CustomAnimationPane, UpdateAnimationLB, ListBox&, void) +IMPL_LINK_NOARG(CustomAnimationPane, UpdateAnimationLB, ListBox&, void) { //FIXME: first effect only? what if there is more? CustomAnimationEffectPtr pEffect = maListSelection.front(); fillAnimationLB( pEffect->hasText() ); } -IMPL_LINK_NOARG_TYPED(CustomAnimationPane, DurationModifiedHdl, Edit&, void) +IMPL_LINK_NOARG(CustomAnimationPane, DurationModifiedHdl, Edit&, void) { if(!(mpCBXDuration->GetText()).isEmpty() ) { @@ -2137,11 +2137,11 @@ sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText ) } -IMPL_LINK_TYPED( CustomAnimationPane, implClickHdl, Button*, pBtn, void ) +IMPL_LINK( CustomAnimationPane, implClickHdl, Button*, pBtn, void ) { implControlHdl(pBtn); } -IMPL_LINK_TYPED( CustomAnimationPane, implControlListBoxHdl, ListBox&, rListBox, void ) +IMPL_LINK( CustomAnimationPane, implControlListBoxHdl, ListBox&, rListBox, void ) { implControlHdl(&rListBox); } @@ -2170,7 +2170,7 @@ void CustomAnimationPane::implControlHdl(Control* pControl ) } } -IMPL_LINK_NOARG_TYPED(CustomAnimationPane, lateInitCallback, Timer *, void) +IMPL_LINK_NOARG(CustomAnimationPane, lateInitCallback, Timer *, void) { // Call getPresets() to initiate the (expensive) construction of the // presets list. diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 6fb2e3a2aacd..aabe68c2ffbb 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -122,14 +122,14 @@ private: void UpdateLook(); sal_uInt32 fillAnimationLB( bool bHasText ); - DECL_LINK_TYPED( implControlListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( implClickHdl, Button*, void ); - DECL_LINK_TYPED( implPropertyHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( EventMultiplexerListener, tools::EventMultiplexerEvent&, void ); - DECL_LINK_TYPED( lateInitCallback, Timer *, void ); - DECL_LINK_TYPED( DurationModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( UpdateAnimationLB, ListBox&, void ); - DECL_LINK_TYPED( AnimationSelectHdl, ListBox&, void ); + DECL_LINK( implControlListBoxHdl, ListBox&, void ); + DECL_LINK( implClickHdl, Button*, void ); + DECL_LINK( implPropertyHdl, LinkParamNone*, void ); + DECL_LINK( EventMultiplexerListener, tools::EventMultiplexerEvent&, void ); + DECL_LINK( lateInitCallback, Timer *, void ); + DECL_LINK( DurationModifiedHdl, Edit&, void ); + DECL_LINK( UpdateAnimationLB, ListBox&, void ); + DECL_LINK( AnimationSelectHdl, ListBox&, void ); void implControlHdl(Control*); private: diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 3d42e552a2d2..8da6e5a3e2a8 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -971,7 +971,7 @@ void SlideTransitionPane::removeListener() mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); } -IMPL_LINK_TYPED(SlideTransitionPane,EventMultiplexerListener, +IMPL_LINK(SlideTransitionPane,EventMultiplexerListener, tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) @@ -1022,7 +1022,7 @@ IMPL_LINK_TYPED(SlideTransitionPane,EventMultiplexerListener, } } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, ApplyToAllButtonClicked, Button*, void) +IMPL_LINK_NOARG(SlideTransitionPane, ApplyToAllButtonClicked, Button*, void) { DBG_ASSERT( mpDrawDoc, "Invalid Draw Document!" ); if( !mpDrawDoc ) @@ -1047,12 +1047,12 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, ApplyToAllButtonClicked, Button*, voi } } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, PlayButtonClicked, Button*, void) +IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked, Button*, void) { playCurrentEffect(); } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, TransitionSelected, ValueSet *, void) +IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected, ValueSet *, void) { updateVariants( mpVS_TRANSITION_ICONS->GetSelectItemId() - 1 ); applyToSelectedPages(); @@ -1102,23 +1102,23 @@ void SlideTransitionPane::updateVariants( size_t nPresetOffset ) } } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AdvanceSlideRadioButtonToggled, RadioButton&, void) +IMPL_LINK_NOARG(SlideTransitionPane, AdvanceSlideRadioButtonToggled, RadioButton&, void) { updateControlState(); applyToSelectedPages(false); } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AdvanceTimeModified, Edit&, void) +IMPL_LINK_NOARG(SlideTransitionPane, AdvanceTimeModified, Edit&, void) { applyToSelectedPages(false); } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, VariantListBoxSelected, ListBox&, void) +IMPL_LINK_NOARG(SlideTransitionPane, VariantListBoxSelected, ListBox&, void) { applyToSelectedPages(); } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, DurationModifiedHdl, Edit&, void) +IMPL_LINK_NOARG(SlideTransitionPane, DurationModifiedHdl, Edit&, void) { double duration_value = static_cast<double>(mpCBX_duration->GetValue()); if(duration_value <= 0.0) @@ -1127,12 +1127,12 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, DurationModifiedHdl, Edit&, void) mpCBX_duration->SetValue(duration_value); } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, DurationLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(SlideTransitionPane, DurationLoseFocusHdl, Control&, void) { applyToSelectedPages(); } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, SoundListBoxSelected, ListBox&, void) +IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected, ListBox&, void) { if( mpLB_SOUND->GetSelectEntryCount() ) { @@ -1147,18 +1147,18 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, SoundListBoxSelected, ListBox&, void) applyToSelectedPages(); } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LoopSoundBoxChecked, Button*, void) +IMPL_LINK_NOARG(SlideTransitionPane, LoopSoundBoxChecked, Button*, void) { applyToSelectedPages(); } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AutoPreviewClicked, Button*, void) +IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked, Button*, void) { SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); pOptions->SetPreviewTransitions( mpCB_AUTO_PREVIEW->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LateInitCallback, Timer *, void) +IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback, Timer *, void) { const TransitionPresetList& rPresetList = TransitionPreset::getTransitionPresetList(); diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index a8faea0ece7c..748402b40fe9 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -793,7 +793,7 @@ void AnnotationManagerImpl::UpdateTags( bool bSynchron ) } } -IMPL_LINK_NOARG_TYPED(AnnotationManagerImpl, UpdateTagsHdl, void*, void) +IMPL_LINK_NOARG(AnnotationManagerImpl, UpdateTagsHdl, void*, void) { mnUpdateTagsEvent = nullptr; DisposeTags(); @@ -880,7 +880,7 @@ void AnnotationManagerImpl::removeListener() mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); } -IMPL_LINK_TYPED(AnnotationManagerImpl,EventMultiplexerListener, +IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener, tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 623631c6e428..920111e38fb5 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -95,8 +95,8 @@ public: void invalidateSlots(); - DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void); - DECL_LINK_TYPED(UpdateTagsHdl, void *, void); + DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void); + DECL_LINK(UpdateTagsHdl, void *, void); void UpdateTags(bool bSynchron = false); void CreateTags(); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 80dcf37b580a..647f155c028f 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -610,7 +610,7 @@ void AnnotationTag::ClosePopup() } } -IMPL_LINK_TYPED(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void) { vcl::Window* pWindow = rEvent.GetWindow(); @@ -672,7 +672,7 @@ IMPL_LINK_TYPED(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void } } -IMPL_LINK_NOARG_TYPED(AnnotationTag, ClosePopupHdl, void*, void) +IMPL_LINK_NOARG(AnnotationTag, ClosePopupHdl, void*, void) { mnClosePopupEvent = nullptr; ClosePopup(); diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 36eb57424ff1..2e8f63ccc49a 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -73,8 +73,8 @@ protected: virtual void select() override; virtual void deselect() override; - DECL_LINK_TYPED( WindowEventHandler, VclWindowEvent&, void ); - DECL_LINK_TYPED( ClosePopupHdl, void*, void ); + DECL_LINK( WindowEventHandler, VclWindowEvent&, void ); + DECL_LINK( ClosePopupHdl, void*, void ); private: AnnotationManagerImpl& mrManager; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 8e2c8657963a..90e5b78d6fc7 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -488,7 +488,7 @@ long AnnotationWindow::GetPostItTextHeight() return mpOutliner ? LogicToPixel(mpOutliner->CalcTextSize()).Height() : 0; } -IMPL_LINK_TYPED(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll, void) +IMPL_LINK(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll, void) { long nDiff = getView()->GetEditView().GetVisArea().Top() - pScroll->GetThumbPos(); getView()->Scroll( 0, nDiff ); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 11d01c021564..f99a6f02cedf 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -91,7 +91,7 @@ class AnnotationWindow : public FloatingWindow basegfx::B2DPolygon maPopupTriangle; protected: - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); public: AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, vcl::Window* pParent ); diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 147a1caf5d7a..a838c8bbf785 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -416,7 +416,7 @@ void SdModule::GetState(SfxItemSet& rItemSet) } } -IMPL_STATIC_LINK_TYPED( SdModule, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void ) +IMPL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void ) { if( (rSimpleEvent.GetId() == VCLEVENT_WINDOW_COMMAND) && static_cast<VclWindowEvent*>(&rSimpleEvent)->GetData() ) { diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 1fcc5ef76b71..c61ebf90874c 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -142,7 +142,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo /** * Link for CalcFieldValue of Outliners */ -IMPL_LINK_TYPED(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) +IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) { if (!pInfo) return; diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index ba04c52bdc48..91b35a8b28ed 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -58,8 +58,8 @@ public: virtual void dispose() override; protected: - DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void ); - DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void ); + DECL_LINK( SelectValueSetHdl, ValueSet*, void ); void SelectHdl(void*); private: @@ -192,11 +192,11 @@ void DisplayModeToolbarMenu::dispose() svtools::ToolbarMenu::dispose(); } -IMPL_LINK_TYPED( DisplayModeToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void ) +IMPL_LINK( DisplayModeToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); } -IMPL_LINK_TYPED( DisplayModeToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void ) +IMPL_LINK( DisplayModeToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void ) { SelectHdl(pControl); } diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index b85e0c3dfced..8191e7b79793 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -70,8 +70,8 @@ public: virtual void dispose() override; protected: - DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void ); - DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void ); + DECL_LINK( SelectValueSetHdl, ValueSet*, void ); void SelectHdl(void*); private: SlideLayoutController& mrController; @@ -267,11 +267,11 @@ void LayoutToolbarMenu::dispose() svtools::ToolbarMenu::dispose(); } -IMPL_LINK_TYPED( LayoutToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void ) +IMPL_LINK( LayoutToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); } -IMPL_LINK_TYPED( LayoutToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void ) +IMPL_LINK( LayoutToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void ) { SelectHdl(pControl); } diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index e764048fb54b..94a8632397b5 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -101,12 +101,12 @@ void SdPhotoAlbumDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, CancelHdl, Button*, void) { Close(); } -IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void) { if (pImagesLst->GetEntryCount() == 0) { @@ -500,7 +500,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, FileHdl, Button*, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_PREVIEW, @@ -541,7 +541,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, FileHdl, Button*, void) EnableDisableButtons(); } -IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl, Button*, void) { if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND && pImagesLst->GetSelectEntryPos() != 0) @@ -572,7 +572,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void) EnableDisableButtons(); } -IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, DownHdl, Button*, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void) { const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos(); if (!pImagesLst->GetEntry(nActPos + 1).isEmpty()) @@ -600,7 +600,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, DownHdl, Button*, void) EnableDisableButtons(); } -IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, RemoveHdl, Button*, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl, Button*, void) { pImagesLst->RemoveEntry( pImagesLst->GetSelectEntryPos() ); pImg->SetImage(Image()); @@ -608,7 +608,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, RemoveHdl, Button*, void) EnableDisableButtons(); } -IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, ListBox&, void) { OUString* pData = static_cast<OUString*>(pImagesLst->GetSelectEntryData()); OUString sImgUrl = pData ? OUString(*pData) : ""; @@ -667,7 +667,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, SelectHdl, ListBox&, void) EnableDisableButtons(); } -IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, TypeSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, TypeSelectHdl, ListBox&, void) { // Enable "Fill Slide" only for one image // If we want to have it for other images too, we need to implement the actual cropping. diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index cfcb96c8cfd5..19f8e95868ac 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -72,16 +72,16 @@ private: SdDrawDocument* pDoc; GraphicFilter* mpGraphicFilter; - DECL_LINK_TYPED(CancelHdl, Button*, void); - DECL_LINK_TYPED(CreateHdl, Button*, void); + DECL_LINK(CancelHdl, Button*, void); + DECL_LINK(CreateHdl, Button*, void); - DECL_LINK_TYPED(FileHdl, Button*, void); - DECL_LINK_TYPED(UpHdl, Button*, void); - DECL_LINK_TYPED(DownHdl, Button*, void); - DECL_LINK_TYPED(RemoveHdl, Button*, void); + DECL_LINK(FileHdl, Button*, void); + DECL_LINK(UpHdl, Button*, void); + DECL_LINK(DownHdl, Button*, void); + DECL_LINK(RemoveHdl, Button*, void); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(TypeSelectHdl, ListBox&, void); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(TypeSelectHdl, ListBox&, void); Reference< drawing::XDrawPage > appendNewSlide(AutoLayout aLayout, const Reference< drawing::XDrawPages >& xDrawPages); diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index ef1878f0b1b8..7ce3f50da537 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -43,7 +43,7 @@ void RemoteDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(RemoteDialog, HandleConnectButton, Button*, void) +IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton, Button*, void) { // setBusy( true ); // Fixme: Try and connect @@ -62,11 +62,11 @@ IMPL_LINK_NOARG_TYPED(RemoteDialog, HandleConnectButton, Button*, void) #endif } -IMPL_LINK_NOARG_TYPED( RemoteDialog, CloseClickHdl, Button*, void ) +IMPL_LINK_NOARG( RemoteDialog, CloseClickHdl, Button*, void ) { CloseHdl(*this); } -IMPL_LINK_NOARG_TYPED( RemoteDialog, CloseHdl, SystemWindow&, void ) +IMPL_LINK_NOARG( RemoteDialog, CloseHdl, SystemWindow&, void ) { #ifdef ENABLE_SDREMOTE RemoteServer::restoreDiscoverable(); diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx index 27f5cb1bd550..c9ea8f51b6cd 100644 --- a/sd/source/ui/dlg/RemoteDialog.hxx +++ b/sd/source/ui/dlg/RemoteDialog.hxx @@ -28,9 +28,9 @@ private: VclPtr<CloseButton> m_pButtonClose; VclPtr<ClientBox> m_pClientBox; - DECL_LINK_TYPED( HandleConnectButton, Button*, void ); - DECL_LINK_TYPED( CloseHdl, SystemWindow&, void ); - DECL_LINK_TYPED( CloseClickHdl, Button*, void ); + DECL_LINK( HandleConnectButton, Button*, void ); + DECL_LINK( CloseHdl, SystemWindow&, void ); + DECL_LINK( CloseClickHdl, Button*, void ); public: explicit RemoteDialog( vcl::Window* pWindow ); virtual ~RemoteDialog() override; diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index a0861fd0d461..e20fdec12faa 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -716,12 +716,12 @@ void ClientBox::DoScroll( long nDelta ) m_aScrollBar->SetPosPixel( aNewSBPt ); } -IMPL_LINK_TYPED( ClientBox, ScrollHdl, ScrollBar*, pScrBar, void ) +IMPL_LINK( ClientBox, ScrollHdl, ScrollBar*, pScrBar, void ) { DoScroll( pScrBar->GetDelta() ); } -IMPL_LINK_NOARG_TYPED( ClientBox, DeauthoriseHdl, Button*, void ) +IMPL_LINK_NOARG( ClientBox, DeauthoriseHdl, Button*, void ) { long aSelected = GetActiveEntryIndex(); if ( aSelected < 0 ) diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index b625ad8e50b2..f953a0f87c4a 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -125,8 +125,8 @@ class ClientBox : public Control bool HandleCursorKey( sal_uInt16 nKeyCode ); void DeleteRemoved(); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( DeauthoriseHdl, Button*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( DeauthoriseHdl, Button*, void ); public: ClientBox( vcl::Window* pParent, WinBits nStyle ); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index a2cded4fef15..e7f2a837b49d 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -244,18 +244,18 @@ void AnimationWindow::dispose() SfxDockingWindow::dispose(); } -IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickFirstHdl, Button*, void) +IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl, Button*, void) { m_nCurrentFrame = (m_FrameList.empty()) ? EMPTY_FRAMELIST : 0; UpdateControl(); } -IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickStopHdl, Button*, void) +IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl, Button*, void) { bMovie = false; } -IMPL_LINK_TYPED( AnimationWindow, ClickPlayHdl, Button *, p, void ) +IMPL_LINK( AnimationWindow, ClickPlayHdl, Button *, p, void ) { ScopeLockGuard aGuard( maPlayLock ); @@ -372,14 +372,14 @@ IMPL_LINK_TYPED( AnimationWindow, ClickPlayHdl, Button *, p, void ) m_pBtnGetOneObject->Enable( bBtnGetOneObjectEnabled ); } -IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickLastHdl, Button*, void) +IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl, Button*, void) { m_nCurrentFrame = (m_FrameList.empty()) ? EMPTY_FRAMELIST : m_FrameList.size() - 1 ; UpdateControl(); } -IMPL_LINK_TYPED( AnimationWindow, ClickRbtHdl, Button*, p, void ) +IMPL_LINK( AnimationWindow, ClickRbtHdl, Button*, p, void ) { if (m_FrameList.empty() || p == m_pRbtGroup || m_pRbtGroup->IsChecked()) { @@ -401,7 +401,7 @@ IMPL_LINK_TYPED( AnimationWindow, ClickRbtHdl, Button*, p, void ) } } -IMPL_LINK_TYPED( AnimationWindow, ClickGetObjectHdl, Button*, pBtn, void ) +IMPL_LINK( AnimationWindow, ClickGetObjectHdl, Button*, pBtn, void ) { bAllObjects = pBtn == m_pBtnGetAllObjects; @@ -412,7 +412,7 @@ IMPL_LINK_TYPED( AnimationWindow, ClickGetObjectHdl, Button*, pBtn, void ) SID_ANIMATOR_ADD, SfxCallMode::SLOT | SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_TYPED( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void ) +IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void ) { SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); SdrObject* pObject; @@ -486,7 +486,7 @@ IMPL_LINK_TYPED( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void ) UpdateControl(); } -IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickCreateGroupHdl, Button*, void) +IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl, Button*, void) { // Code now in CreatePresObj() SfxBoolItem aItem( SID_ANIMATOR_CREATE, true ); @@ -495,7 +495,7 @@ IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickCreateGroupHdl, Button*, void) SfxCallMode::SLOT | SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(AnimationWindow, ModifyBitmapHdl, Edit&, void) +IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl, Edit&, void) { sal_uLong nBmp = static_cast<sal_uLong>(m_pNumFldBitmap->GetValue()); @@ -509,7 +509,7 @@ IMPL_LINK_NOARG_TYPED(AnimationWindow, ModifyBitmapHdl, Edit&, void) UpdateControl(); } -IMPL_LINK_NOARG_TYPED(AnimationWindow, ModifyTimeHdl, Edit&, void) +IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl, Edit&, void) { sal_uLong nPos = static_cast<sal_uLong>(m_pNumFldBitmap->GetValue() - 1); diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index bf8709923872..be0c2d579812 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -84,7 +84,7 @@ void BreakDlg::dispose() } // Control-Handler for cancel button -IMPL_LINK_NOARG_TYPED(BreakDlg, CancelButtonHdl, Button*, void) +IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl, Button*, void) { bCancel = true; m_pBtnCancel->Disable(); @@ -96,7 +96,7 @@ IMPL_LINK_NOARG_TYPED(BreakDlg, CancelButtonHdl, Button*, void) * Every following call should contain the finished actions since the * last call of UpDate. */ -IMPL_LINK_TYPED( BreakDlg, UpDate, void*, nInit, bool ) +IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool ) { if(pProgrInfo == nullptr) return true; @@ -165,7 +165,7 @@ short BreakDlg::Execute() /** * link-method which starts the working function */ -IMPL_LINK_NOARG_TYPED(BreakDlg, InitialUpdate, Idle *, void) +IMPL_LINK_NOARG(BreakDlg, InitialUpdate, Idle *, void) { pDrView->DoImportMarkedMtf(pProgrInfo); EndDialog(RET_OK); diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index f062b1f674ed..e4ed8df8241d 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -218,7 +218,7 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) /** * enables and selects end color LB */ -IMPL_LINK_NOARG_TYPED(CopyDlg, SelectColorHdl, ListBox&, void) +IMPL_LINK_NOARG(CopyDlg, SelectColorHdl, ListBox&, void) { sal_Int32 nPos = m_pLbStartColor->GetSelectEntryPos(); @@ -234,7 +234,7 @@ IMPL_LINK_NOARG_TYPED(CopyDlg, SelectColorHdl, ListBox&, void) /** * sets values of selection */ -IMPL_LINK_NOARG_TYPED(CopyDlg, SetViewData, Button*, void) +IMPL_LINK_NOARG(CopyDlg, SetViewData, Button*, void) { Rectangle aRect = mpView->GetAllMarkedRect(); @@ -255,7 +255,7 @@ IMPL_LINK_NOARG_TYPED(CopyDlg, SetViewData, Button*, void) /** * resets values to default */ -IMPL_LINK_NOARG_TYPED(CopyDlg, SetDefault, Button*, void) +IMPL_LINK_NOARG(CopyDlg, SetDefault, Button*, void) { m_pNumFldCopies->SetValue( 1L ); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index ea6efb81f1bc..3e3c5d5c4811 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -117,11 +117,11 @@ void SdCustomShowDlg::CheckState() pCustomShowList->Seek( nPos ); } -IMPL_LINK_TYPED( SdCustomShowDlg, ClickButtonHdl, Button *, p, void ) +IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, Button *, p, void ) { SelectHdl(p); } -IMPL_LINK_TYPED( SdCustomShowDlg, SelectListBoxHdl, ListBox&, rListBox, void ) +IMPL_LINK( SdCustomShowDlg, SelectListBoxHdl, ListBox&, rListBox, void ) { SelectHdl(&rListBox); } @@ -266,7 +266,7 @@ void SdCustomShowDlg::SelectHdl(void *p) } // StartShow-Hdl -IMPL_LINK_NOARG_TYPED(SdCustomShowDlg, StartShowHdl, Button*, void) +IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl, Button*, void) { EndDialog( RET_YES ); } @@ -382,19 +382,19 @@ void SdDefineCustomShowDlg::CheckState() m_pBtnRemove->Enable( bCSPages ); } -IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl, Button*, p, void ) +IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, Button*, p, void ) { ClickButtonHdl2(p); } -IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl3, SvTreeListBox*, p, void ) +IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl3, SvTreeListBox*, p, void ) { ClickButtonHdl2(p); } -IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl4, ListBox&, rListBox, void ) +IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl4, ListBox&, rListBox, void ) { ClickButtonHdl2(&rListBox); } -IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonEditHdl, Edit&, rEdit, void ) +IMPL_LINK( SdDefineCustomShowDlg, ClickButtonEditHdl, Edit&, rEdit, void ) { ClickButtonHdl2(&rEdit); } @@ -502,7 +502,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() } // OK-Hdl -IMPL_LINK_NOARG_TYPED(SdDefineCustomShowDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl, Button*, void) { // check name... bool bDifferent = true; diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 2e33540da81a..57ccd00d0f81 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -312,7 +312,7 @@ void SdModifyFieldDlg::FillControls() m_pLbFormat->SaveValue(); } -IMPL_LINK_NOARG_TYPED(SdModifyFieldDlg, LanguageChangeHdl, ListBox&, void) +IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl, ListBox&, void) { FillFormatList(); } diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 7d945dd91e0e..aa0d30375cde 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -133,7 +133,7 @@ void SdSnapLineDlg::dispose() /** * fills provided item sets with dialog box attributes */ -IMPL_LINK_TYPED( SdSnapLineDlg, ClickHdl, Button *, pBtn, void ) +IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn, void ) { if ( pBtn == m_pRbPoint ) SetInputFields(true, true); else if ( pBtn == m_pRbHorz ) SetInputFields(false, true); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index c808dbfea8fd..0f0c87d6e04e 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -58,8 +58,8 @@ private: void CheckSelectionState(); - DECL_LINK_TYPED( PlayMusicHdl, void *, void ); - DECL_LINK_TYPED( IsMusicStoppedHdl, Idle *, void ); + DECL_LINK( PlayMusicHdl, void *, void ); + DECL_LINK( IsMusicStoppedHdl, Idle *, void ); public: explicit SdFileDialog_Imp(); @@ -93,7 +93,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil } } -IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, PlayMusicHdl, void*, void) +IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void) { maUpdateIdle.Stop(); mnPlaySoundEvent = nullptr; @@ -156,7 +156,7 @@ IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, PlayMusicHdl, void*, void) } } -IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, IsMusicStoppedHdl, Idle *, void) +IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Idle *, void) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 75580215f7e4..e021b59a16e7 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -144,8 +144,8 @@ private: bool mbHandoutMode; - DECL_LINK_TYPED( UpdateOnClickHdl, Button*, void ); - DECL_LINK_TYPED( LanguageChangeHdl, ListBox&, void ); + DECL_LINK( UpdateOnClickHdl, Button*, void ); + DECL_LINK( LanguageChangeHdl, ListBox&, void ); void FillFormatList(int eFormat); void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet ); @@ -253,7 +253,7 @@ void HeaderFooterDialog::dispose() TabDialog::dispose(); } -IMPL_LINK_TYPED( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) +IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) { const sal_uInt16 nId = pTabCtrl->GetCurPageId(); TabPage* pTabPage = pTabCtrl->GetTabPage( nId ); @@ -262,17 +262,17 @@ IMPL_LINK_TYPED( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl, vo maPBApply->Enable( mpCurrentPage != nullptr ); } -IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyToAllHdl, Button*, void) +IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl, Button*, void) { ApplyToAll(); } -IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyHdl, Button*, void) +IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl, Button*, void) { Apply(); } -IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickCancelHdl, Button*, void) +IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl, Button*, void) { Cancel(); } @@ -475,7 +475,7 @@ void HeaderFooterTabPage::dispose() TabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(HeaderFooterTabPage, LanguageChangeHdl, ListBox&, void) +IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl, ListBox&, void) { FillFormatList( (int)reinterpret_cast<sal_IntPtr>(mpCBDateTimeFormat->GetSelectEntryData()) ); } @@ -579,7 +579,7 @@ void HeaderFooterTabPage::update() mpCTPreview->update( aSettings ); } -IMPL_LINK_NOARG_TYPED(HeaderFooterTabPage, UpdateOnClickHdl, Button*, void) +IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl, Button*, void) { update(); } diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 5e9ca9680b20..c3a72380845d 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -128,7 +128,7 @@ bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const /** * Enabled and selects end-color-LB */ -IMPL_LINK_NOARG_TYPED(SdInsertPagesObjsDlg, SelectObjectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl, SvTreeListBox*, void) { if( m_pLbTree->IsLinkableSelected() ) m_pCbxLink->Enable(); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 764645493c2f..be2887bb74e3 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -263,7 +263,7 @@ sd::DrawDocShell* SdNavigatorWin::GetDrawDocShell( const SdDrawDocument* pDoc ) return pDocShell; } -IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void) +IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void) { sal_uInt16 nId = maToolbox->GetCurItemId(); PageJump ePage = PAGE_NONE; @@ -285,7 +285,7 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void) } } -IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) +IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) { sal_uInt16 nId = maToolbox->GetCurItemId(); @@ -358,7 +358,7 @@ IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) } } -IMPL_LINK_NOARG_TYPED(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool) { if( !mbDocImported || maLbDocs->GetSelectEntryPos() != 0 ) { @@ -395,7 +395,7 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool) return false; } -IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectDocumentHdl, ListBox&, void) +IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, ListBox&, void) { OUString aStrLb = maLbDocs->GetSelectEntry(); long nPos = maLbDocs->GetSelectEntryPos(); @@ -441,7 +441,7 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectDocumentHdl, ListBox&, void) * Set DrageType and set image accordingly to it. * If the handler is called with NULL, the default (URL) is set. */ -IMPL_LINK_TYPED( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu, bool ) { sal_uInt16 nMenuId; if( pMenu ) @@ -472,7 +472,7 @@ IMPL_LINK_TYPED( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu, bool ) return false; } -IMPL_LINK_TYPED( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu, bool ) +IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu, bool ) { if (pMenu != nullptr) { diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index ca06d386936f..df9f29096e2d 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -53,7 +53,7 @@ private: VclPtr<NumericField> m_pNewStartNF; bool mbModified; - DECL_LINK_TYPED( ImplNewStartHdl, Button*, void ); + DECL_LINK( ImplNewStartHdl, Button*, void ); }; SdParagraphNumTabPage::SdParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rAttr ) @@ -155,7 +155,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet ) mbModified = false; } -IMPL_LINK_NOARG_TYPED(SdParagraphNumTabPage, ImplNewStartHdl, Button*, void) +IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl, Button*, void) { bool bEnable = m_pNewStartCB->IsChecked(); m_pNewStartNumberCB->Enable(bEnable); diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 14ee529a1085..58ff4cafb6c8 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -318,7 +318,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) /** * Handler: Enabled/Disabled Listbox "Dias" */ -IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ChangeRangeHdl, Button*, void) +IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl, Button*, void) { aLbDias->Enable( aRbtAtDia->IsChecked() ); aLbCustomshow->Enable( aRbtCustomshow->IsChecked() ); @@ -327,7 +327,7 @@ IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ChangeRangeHdl, Button*, void) /** * Handler: Enabled/Disabled Checkbox "AlwaysOnTop" */ -IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ClickWindowPresentationHdl, Button*, void) +IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl, Button*, void) { const bool bAuto = aRbtAuto->IsChecked(); const bool bWindow = aRbtWindow->IsChecked(); @@ -352,7 +352,7 @@ IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ClickWindowPresentationHdl, Button /** * Handler: Enabled/Disabled Checkbox "AlwaysOnTop" */ -IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ChangePauseHdl, Edit&, void) +IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl, Edit&, void) { aCbxAutoLogo->Enable( aRbtAuto->IsChecked() && ( aTmfPause->GetTime().GetMSFromTime() > 0 ) ); } diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 4a8f1246be64..dbb4314be83d 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -209,7 +209,7 @@ VclPtr<SfxTabPage> SdPrintOptions::Create( vcl::Window* pWindow, return VclPtr<SdPrintOptions>::Create( pWindow, *rOutAttrs ); } -IMPL_LINK_TYPED( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void ) +IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void ) { // there must be at least one of them checked if( !m_pCbxDraw->IsChecked() && !m_pCbxNotes->IsChecked() && !m_pCbxOutline->IsChecked() && !m_pCbxHandout->IsChecked() ) @@ -218,7 +218,7 @@ IMPL_LINK_TYPED( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void ) updateControls(); } -IMPL_LINK_NOARG_TYPED(SdPrintOptions, ClickBookletHdl, Button*, void) +IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl, Button*, void) { updateControls(); } diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 8986b719f800..a39c9fdc9fd9 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -168,7 +168,7 @@ void SdPresLayoutDlg::FillValueSet() /** * DoubleClick handler */ -IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void) +IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void) { EndDialog(RET_OK); } @@ -176,7 +176,7 @@ IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void) /** * Click handler for load button */ -IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLoadHdl, Button*, void) +IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void) { VclPtrInstance< SfxNewFileDialog > pDlg(this, SFXWB_PREVIEW); pDlg->SetText(SD_RESSTR(STR_LOAD_PRESENTATION_LAYOUT)); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 0f6303506eb5..56419250aff8 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1364,7 +1364,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) /** * Handler for Dragging */ -IMPL_LINK_NOARG_TYPED(SdPageObjsTLB, ExecDragHdl, void*, void) +IMPL_LINK_NOARG(SdPageObjsTLB, ExecDragHdl, void*, void) { // as link, then it is allowed to asynchronous, without ImpMouseMoveMsg on // the stack, delete the Navigator diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 8579ce9f4f4b..df252fbcc333 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -466,12 +466,12 @@ void SdTPAction::OpenFileDialog() } } -IMPL_LINK_NOARG_TYPED(SdTPAction, ClickSearchHdl, Button*, void) +IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl, Button*, void) { OpenFileDialog(); } -IMPL_LINK_NOARG_TYPED(SdTPAction, ClickActionHdl, ListBox&, void) +IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void) { presentation::ClickAction eCA = GetActualClickAction(); @@ -643,12 +643,12 @@ IMPL_LINK_NOARG_TYPED(SdTPAction, ClickActionHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(SdTPAction, SelectTreeHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl, SvTreeListBox*, void) { m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() ); } -IMPL_LINK_NOARG_TYPED(SdTPAction, CheckFileHdl, Control&, void) +IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void) { OUString aFile( GetEditText() ); diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 2c57bca14966..8ba8d68cf107 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -535,7 +535,7 @@ VclPtr<SfxTabPage> SdTpOptionsMisc::Create( vcl::Window* pWindow, return VclPtr<SdTpOptionsMisc>::Create( pWindow, *rAttrs ); } -IMPL_LINK_NOARG_TYPED(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void) { sal_Int32 nPos = m_pLbMetric->GetSelectEntryPos(); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 6ef2bae2c17d..685658ae26db 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -260,19 +260,19 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, rMtf.AddAction( new MetaRectAction( aRect ) ); } -IMPL_LINK_TYPED( SdVectorizeDlg, ProgressHdl, long, nData, void ) +IMPL_LINK( SdVectorizeDlg, ProgressHdl, long, nData, void ) { m_pPrgs->SetValue( (sal_uInt16)nData ); } -IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickPreviewHdl, Button*, void) +IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl, Button*, void) { Calculate( aBmp, aMtf ); m_pMtfWin->SetGraphic( aMtf ); m_pBtnPreview->Disable(); } -IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickOKHdl, Button*, void) +IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl, Button*, void) { if( m_pBtnPreview->IsEnabled() ) Calculate( aBmp, aMtf ); @@ -281,7 +281,7 @@ IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickOKHdl, Button*, void) EndDialog( RET_OK ); } -IMPL_LINK_TYPED( SdVectorizeDlg, ToggleHdl, CheckBox&, rCb, void ) +IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox&, rCb, void ) { if( rCb.IsChecked() ) { @@ -297,7 +297,7 @@ IMPL_LINK_TYPED( SdVectorizeDlg, ToggleHdl, CheckBox&, rCb, void ) m_pBtnPreview->Enable(); } -IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl, Edit&, void) { m_pBtnPreview->Enable(); } diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 310f30ff4ac4..c10dbc1c2b34 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -411,7 +411,7 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr return bCanUseNewName; } -IMPL_LINK_TYPED( DrawDocShell, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool ) +IMPL_LINK( DrawDocShell, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool ) { OUString aNewName; rDialog.GetName( aNewName ); diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index c9ee2b62c7c9..f07eb0fbac75 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -438,7 +438,7 @@ void DrawDocShell::SetModified( bool bSet /* = true */ ) */ // ExecuteSpellPopup now handled by DrawDocShell. This is necessary // to get hands on the outliner and the text object. -IMPL_LINK_TYPED(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void) +IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void) { SdrObject* pObj = nullptr; SdrOutliner* pOutl = nullptr; diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 9e116b8b046e..ea8171ac6575 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -110,7 +110,7 @@ void ChangeRequestQueueProcessor::StartProcessing() } } -IMPL_LINK_NOARG_TYPED(ChangeRequestQueueProcessor, ProcessEvent, void*, void) +IMPL_LINK_NOARG(ChangeRequestQueueProcessor, ProcessEvent, void*, void) { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index 725b799ab0be..9acb58fdf25e 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -115,7 +115,7 @@ private: /** Callback function for the PostUserEvent() call. */ - DECL_LINK_TYPED(ProcessEvent, void*, void); + DECL_LINK(ProcessEvent, void*, void); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index df1d5670001f..ecfee501b282 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -364,7 +364,7 @@ void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue) mbUpdateBeingProcessed = bValue; } -IMPL_LINK_NOARG_TYPED(ConfigurationUpdater, TimeoutHandler, Timer *, void) +IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler, Timer *, void) { OSL_TRACE("configuration update timer"); if ( ! mbUpdateBeingProcessed diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index 7542cfbe6741..308d00b33ff5 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -197,7 +197,7 @@ private: */ void UnlockUpdates(); - DECL_LINK_TYPED(TimeoutHandler, Timer *, void); + DECL_LINK(TimeoutHandler, Timer *, void); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 4003f0a7ba4a..941d938282a3 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -173,7 +173,7 @@ void SAL_CALL FullScreenPane::setAccessible ( } } -IMPL_LINK_TYPED(FullScreenPane, WindowEventHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index e8911503c907..c299e3f97c9f 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -71,7 +71,7 @@ public: const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) throw (css::uno::RuntimeException, std::exception) override; - DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); + DECL_LINK(WindowEventHandler, VclWindowEvent&, void); protected: virtual css::uno::Reference<css::rendering::XCanvas> diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index a37cf5faafb2..cf4fe2d907e5 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -118,7 +118,7 @@ void SAL_CALL ShellStackGuard::disposing ( } } -IMPL_LINK_TYPED(ShellStackGuard, TimeoutHandler, Idle*, pIdle, void) +IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle, void) { #ifdef DEBUG OSL_ASSERT(pIdle==&maPrinterPollingIdle); diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 07bef965e3a3..3dc138afaebc 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -87,7 +87,7 @@ private: std::unique_ptr<ConfigurationController::Lock> mpUpdateLock; Idle maPrinterPollingIdle; - DECL_LINK_TYPED(TimeoutHandler, Idle*, void); + DECL_LINK(TimeoutHandler, Idle*, void); /** Return <TRUE/> when the printer is printing. Return <FALSE/> when the printer is not printing, or there is no printer, or something diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index d7de0b6cfab4..4f58e0fb87a7 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -175,7 +175,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) /** * timer handler for window scrolling */ -IMPL_LINK_NOARG_TYPED(FuPoor, ScrollHdl, Timer *, void) +IMPL_LINK_NOARG(FuPoor, ScrollHdl, Timer *, void) { Point aPnt(mpWindow->GetPointerPosPixel()); @@ -948,7 +948,7 @@ void FuPoor::DoPasteUnformatted() /** * Timer handler for Drag&Drop */ -IMPL_LINK_NOARG_TYPED(FuPoor, DragHdl, Timer *, void) +IMPL_LINK_NOARG(FuPoor, DragHdl, Timer *, void) { if( mpView ) { @@ -973,7 +973,7 @@ bool FuPoor::Command(const CommandEvent& rCEvt) /** * Timer handler for window scrolling */ -IMPL_LINK_NOARG_TYPED(FuPoor, DelayHdl, Timer *, void) +IMPL_LINK_NOARG(FuPoor, DelayHdl, Timer *, void) { aDelayToScrollTimer.Stop (); bScrollable = true; diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index cbd1f747ad65..521957d81081 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -125,7 +125,7 @@ public: /** Define callback for listening to window child events of VCL. Listen for creation or destruction of OLE objects. */ - DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); //===== IAccessibleViewForwarderListener ================================ diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index f22937128b85..a4afdc8a21f8 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -76,7 +76,7 @@ namespace accessibility AccessibleOutlineEditSource( const AccessibleOutlineEditSource& ) = delete; AccessibleOutlineEditSource& operator=( const AccessibleOutlineEditSource& ) = delete; - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); SdrView& mrView; const vcl::Window& mrWindow; diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index 6c4c93dc243a..7028e4aececb 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -71,9 +71,9 @@ private: SvdProgressInfo *pProgrInfo; SfxProgress *mpProgress; - DECL_LINK_TYPED( CancelButtonHdl, Button*, void ); - DECL_LINK_TYPED( UpDate, void*, bool ); - DECL_LINK_TYPED( InitialUpdate, Idle*, void ); + DECL_LINK( CancelButtonHdl, Button*, void ); + DECL_LINK( UpDate, void*, bool ); + DECL_LINK( InitialUpdate, Idle*, void ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 8ae7b8347c5a..fef687086961 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -194,10 +194,10 @@ public: */ virtual OutputDevice* GetDocumentRefDev() override; - DECL_LINK_TYPED( RenameSlideHdl, AbstractSvxNameDialog&, bool ); + DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog&, bool ); // ExecuteSpellPopup now handled by DrawDocShell - DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void ); + DECL_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); void ClearUndoBuffer(); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 76c12b5df5f2..784c211588ff 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -384,10 +384,10 @@ protected: bool mbReadOnly; static bool mbPipette; - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK_TYPED( TabSplitHdl, TabBar *, void ); - DECL_LINK_TYPED( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); - DECL_LINK_TYPED( RenameSlideHdl, AbstractSvxNameDialog&, bool ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( TabSplitHdl, TabBar *, void ); + DECL_LINK( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); + DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog&, bool ); void DeleteActualPage(); void DeleteActualLayer(); diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index c63773bcb871..83c9871aedf4 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -108,18 +108,18 @@ private: when the window gets the focus. In this case the form shell is moved to the bottom of the shell stack. */ - DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); + DECL_LINK(WindowEventHandler, VclWindowEvent&, void); /** This call back is called when view in the center pane is replaced. When this happens then we unregister at the window of the old and register at the window of the new shell. */ - DECL_LINK_TYPED(ConfigurationUpdateHandler, ::sd::tools::EventMultiplexerEvent&, void); + DECL_LINK(ConfigurationUpdateHandler, ::sd::tools::EventMultiplexerEvent&, void); /** This call back is called by the form shell when it gets the focus. In this case the form shell is moved to the top of the shell stack. */ - DECL_LINK_TYPED(FormControlActivated, LinkParamNone*, void); + DECL_LINK(FormControlActivated, LinkParamNone*, void); /** This method is called by the form shell when that is destroyed. It acts as a last resort against referencing a dead form shell. With diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index af61c547f18d..ddbf768d8192 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -95,17 +95,17 @@ public: void Paint (const Rectangle& rRect, ::sd::Window* pWin); // Callbacks fuer LINKs - DECL_LINK_TYPED( ParagraphInsertedHdl, ::Outliner *, void ); - DECL_LINK_TYPED( ParagraphRemovingHdl, ::Outliner *, void ); - DECL_LINK_TYPED( DepthChangedHdl, ::Outliner *, void ); - DECL_LINK_TYPED( StatusEventHdl, EditStatus&, void ); - DECL_LINK_TYPED( BeginMovingHdl, ::Outliner *, void ); - DECL_LINK_TYPED( EndMovingHdl, ::Outliner *, void ); - DECL_LINK_TYPED( RemovingPagesHdl, OutlinerView *, bool ); - DECL_LINK_TYPED( IndentingPagesHdl, OutlinerView *, bool ); - DECL_LINK_TYPED( BeginDropHdl, EditView*, void ); - DECL_LINK_TYPED( EndDropHdl, EditView*, void ); - DECL_LINK_TYPED( PaintingFirstLineHdl, PaintFirstLineInfo*, void ); + DECL_LINK( ParagraphInsertedHdl, ::Outliner *, void ); + DECL_LINK( ParagraphRemovingHdl, ::Outliner *, void ); + DECL_LINK( DepthChangedHdl, ::Outliner *, void ); + DECL_LINK( StatusEventHdl, EditStatus&, void ); + DECL_LINK( BeginMovingHdl, ::Outliner *, void ); + DECL_LINK( EndMovingHdl, ::Outliner *, void ); + DECL_LINK( RemovingPagesHdl, OutlinerView *, bool ); + DECL_LINK( IndentingPagesHdl, OutlinerView *, bool ); + DECL_LINK( BeginDropHdl, EditView*, void ); + DECL_LINK( EndDropHdl, EditView*, void ); + DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo*, void ); sal_uLong GetPaperWidth() { return mnPaperWidth;} @@ -198,9 +198,9 @@ private: /** this link is called from the vcl application when the stylesettings change. Its only purpose is to call onUpdateStyleSettings() then. */ - DECL_LINK_TYPED( AppEventListenerHdl, VclSimpleEvent&, void ); + DECL_LINK( AppEventListenerHdl, VclSimpleEvent&, void ); - DECL_LINK_TYPED(EventMultiplexerListener, sd::tools::EventMultiplexerEvent&, void); + DECL_LINK(EventMultiplexerListener, sd::tools::EventMultiplexerEvent&, void); /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */ std::unique_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index b5cb1266e823..6da882f29d99 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -157,7 +157,7 @@ private: bool mbInitialized; void Construct (DrawDocShell* pDocSh); - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index 2fd437959063..221eade120ca 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -96,20 +96,20 @@ private: void Initialize(SdDrawDocument* pDoc); - DECL_LINK_TYPED( ApplyToAllButtonClicked, Button*, void ); - DECL_LINK_TYPED( PlayButtonClicked, Button*, void ); - DECL_LINK_TYPED( AutoPreviewClicked, Button*, void ); - - DECL_LINK_TYPED( TransitionSelected, ValueSet *, void ); - DECL_LINK_TYPED( AdvanceSlideRadioButtonToggled, RadioButton&, void ); - DECL_LINK_TYPED( AdvanceTimeModified, Edit&, void ); - DECL_LINK_TYPED( VariantListBoxSelected, ListBox&, void ); - DECL_LINK_TYPED( DurationModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( DurationLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( SoundListBoxSelected, ListBox&, void ); - DECL_LINK_TYPED( LoopSoundBoxChecked, Button*, void ); - DECL_LINK_TYPED( EventMultiplexerListener, tools::EventMultiplexerEvent&, void ); - DECL_LINK_TYPED(LateInitCallback, Timer *, void); + DECL_LINK( ApplyToAllButtonClicked, Button*, void ); + DECL_LINK( PlayButtonClicked, Button*, void ); + DECL_LINK( AutoPreviewClicked, Button*, void ); + + DECL_LINK( TransitionSelected, ValueSet *, void ); + DECL_LINK( AdvanceSlideRadioButtonToggled, RadioButton&, void ); + DECL_LINK( AdvanceTimeModified, Edit&, void ); + DECL_LINK( VariantListBoxSelected, ListBox&, void ); + DECL_LINK( DurationModifiedHdl, Edit&, void ); + DECL_LINK( DurationLoseFocusHdl, Control&, void ); + DECL_LINK( SoundListBoxSelected, ListBox&, void ); + DECL_LINK( LoopSoundBoxChecked, Button*, void ); + DECL_LINK( EventMultiplexerListener, tools::EventMultiplexerEvent&, void ); + DECL_LINK(LateInitCallback, Timer *, void); ViewShellBase & mrBase; SdDrawDocument * mpDrawDoc; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 8c44cb83d185..015548d44c92 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -236,8 +236,8 @@ public: SdrObject* GetSelectedSingleObject(SdPage* pPage); protected: - DECL_LINK_TYPED( OnParagraphInsertedHdl, ::Outliner *, void ); - DECL_LINK_TYPED( OnParagraphRemovingHdl, ::Outliner *, void ); + DECL_LINK( OnParagraphInsertedHdl, ::Outliner *, void ); + DECL_LINK( OnParagraphRemovingHdl, ::Outliner *, void ); virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ) override; virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) override; @@ -257,9 +257,9 @@ protected: sal_uInt16 mnLockRedrawSmph; bool mbIsDropAllowed; - DECL_LINK_TYPED( DropErrorHdl, Idle*, void ); - DECL_LINK_TYPED( DropInsertFileHdl, Idle*, void ); - DECL_LINK_TYPED( ExecuteNavigatorDrop, void*, void ); + DECL_LINK( DropErrorHdl, Idle*, void ); + DECL_LINK( DropInsertFileHdl, Idle*, void ); + DECL_LINK( ExecuteNavigatorDrop, void*, void ); void ImplClearDrawDropMarker(); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index ef06d29524b8..5d899f8e56b4 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -505,8 +505,8 @@ protected: void ImpSidUndo(bool bDrawViewShell, SfxRequest& rReq); void ImpSidRedo(bool bDrawViewShell, SfxRequest& rReq); - DECL_LINK_TYPED( HScrollHdl, ScrollBar *, void ); - DECL_LINK_TYPED( VScrollHdl, ScrollBar *, void ); + DECL_LINK( HScrollHdl, ScrollBar *, void ); + DECL_LINK( VScrollHdl, ScrollBar *, void ); // virtual scroll handler, here, derivative classes can add themselves here virtual void VirtHScrollHdl(ScrollBar* pHScroll); diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index 291fb201698d..cdcf95bf6444 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -72,7 +72,7 @@ public: when IsUICaptured() returns <TRUE/>. */ void Release (bool bForce = false); - DECL_LINK_TYPED(TimeoutCallback, Timer *, void); + DECL_LINK(TimeoutCallback, Timer *, void); private: ::std::unique_ptr<ToolBarManager::UpdateLock> mpLock; /** The timer is used both as a safe guard to unlock the update lock diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index f49c418274ca..c74a2a19ac4f 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -133,16 +133,16 @@ private: ScopeLock maPlayLock; - DECL_LINK_TYPED( ClickFirstHdl, Button*, void ); - DECL_LINK_TYPED( ClickStopHdl, Button*, void ); - DECL_LINK_TYPED( ClickPlayHdl, Button*, void ); - DECL_LINK_TYPED( ClickLastHdl, Button*, void ); - DECL_LINK_TYPED( ClickGetObjectHdl, Button*, void ); - DECL_LINK_TYPED( ClickRemoveBitmapHdl, Button*, void ); - DECL_LINK_TYPED( ClickRbtHdl, Button*, void ); - DECL_LINK_TYPED( ClickCreateGroupHdl, Button*, void ); - DECL_LINK_TYPED( ModifyBitmapHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyTimeHdl, Edit&, void ); + DECL_LINK( ClickFirstHdl, Button*, void ); + DECL_LINK( ClickStopHdl, Button*, void ); + DECL_LINK( ClickPlayHdl, Button*, void ); + DECL_LINK( ClickLastHdl, Button*, void ); + DECL_LINK( ClickGetObjectHdl, Button*, void ); + DECL_LINK( ClickRemoveBitmapHdl, Button*, void ); + DECL_LINK( ClickRbtHdl, Button*, void ); + DECL_LINK( ClickCreateGroupHdl, Button*, void ); + DECL_LINK( ModifyBitmapHdl, Edit&, void ); + DECL_LINK( ModifyTimeHdl, Edit&, void ); void UpdateControl(bool bDisableCtrls = false); void ResetAttrs(); diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index 8c979b836ad4..98ac00ab7318 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -69,9 +69,9 @@ private: Fraction maUIScale; ::sd::View* mpView; - DECL_LINK_TYPED( SelectColorHdl, ListBox&, void ); - DECL_LINK_TYPED( SetViewData, Button*, void ); - DECL_LINK_TYPED( SetDefault, Button*, void ); + DECL_LINK( SelectColorHdl, ListBox&, void ); + DECL_LINK( SetViewData, Button*, void ); + DECL_LINK( SetDefault, Button*, void ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index ca49b4c0142a..068d5d1e4bcc 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -51,9 +51,9 @@ private: void CheckState(); - DECL_LINK_TYPED( ClickButtonHdl, Button*, void ); - DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( StartShowHdl, Button*, void ); + DECL_LINK( ClickButtonHdl, Button*, void ); + DECL_LINK( SelectListBoxHdl, ListBox&, void ); + DECL_LINK( StartShowHdl, Button*, void ); void SelectHdl(void*); public: @@ -84,11 +84,11 @@ private: void CheckState(); void CheckCustomShow(); - DECL_LINK_TYPED( ClickButtonHdl, Button*, void ); - DECL_LINK_TYPED( ClickButtonEditHdl, Edit&, void ); - DECL_LINK_TYPED( ClickButtonHdl3, SvTreeListBox*, void ); - DECL_LINK_TYPED( ClickButtonHdl4, ListBox&, void ); - DECL_LINK_TYPED( OKHdl, Button*, void ); + DECL_LINK( ClickButtonHdl, Button*, void ); + DECL_LINK( ClickButtonEditHdl, Edit&, void ); + DECL_LINK( ClickButtonHdl3, SvTreeListBox*, void ); + DECL_LINK( ClickButtonHdl4, ListBox&, void ); + DECL_LINK( OKHdl, Button*, void ); void ClickButtonHdl2(void*); public: diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index e36869ae49ea..69e194f8ba55 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -45,7 +45,7 @@ private: void FillFormatList(); void FillControls(); - DECL_LINK_TYPED( LanguageChangeHdl, ListBox&, void ); + DECL_LINK( LanguageChangeHdl, ListBox&, void ); public: SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index 138d4e331f53..a297795a5ae7 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -55,7 +55,7 @@ private: FieldUnit eUIUnit; Fraction aUIScale; - DECL_LINK_TYPED( ClickHdl, Button *, void ); + DECL_LINK( ClickHdl, Button *, void ); public: SdSnapLineDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index b4534ef7f3d5..ffa4655545bb 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -119,7 +119,7 @@ protected: SfxRequest& rReq); virtual ~FuPoor() override; - DECL_LINK_TYPED( DelayHdl, Timer *, void ); + DECL_LINK( DelayHdl, Timer *, void ); static void ImpForceQuadratic(Rectangle& rRect); @@ -153,11 +153,11 @@ protected: VclPtr<Dialog> pDialog; Timer aScrollTimer; ///< for auto-scrolling - DECL_LINK_TYPED( ScrollHdl, Timer *, void ); + DECL_LINK( ScrollHdl, Timer *, void ); void ForceScroll(const Point& aPixPos); Timer aDragTimer; ///< for Drag&Drop - DECL_LINK_TYPED(DragHdl, Timer *, void); + DECL_LINK(DragHdl, Timer *, void); bool bIsInDragMode; Point aMDPos; ///< position of MouseButtonDown diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 5a2872e625e2..77a932fca101 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -37,10 +37,10 @@ class HeaderFooterTabPage; class HeaderFooterDialog : public TabDialog { private: - DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void ); - DECL_LINK_TYPED( ClickApplyToAllHdl, Button*, void ); - DECL_LINK_TYPED( ClickApplyHdl, Button*, void ); - DECL_LINK_TYPED( ClickCancelHdl, Button*, void ); + DECL_LINK( ActivatePageHdl, TabControl*, void ); + DECL_LINK( ClickApplyToAllHdl, Button*, void ); + DECL_LINK( ClickApplyHdl, Button*, void ); + DECL_LINK( ClickCancelHdl, Button*, void ); VclPtr<TabControl> mpTabCtrl; diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index cbe108de5891..af2c47ca14bf 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -38,7 +38,7 @@ private: const OUString& rName; void Reset(); - DECL_LINK_TYPED( SelectObjectHdl, SvTreeListBox*, void ); + DECL_LINK( SelectObjectHdl, SvTreeListBox*, void ); public: SdInsertPagesObjsDlg( vcl::Window* pParent, diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 9474ac632dbe..c3df8361462c 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -138,12 +138,12 @@ private: static sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage ); NavDocInfo* GetDocInfo(); - DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void ); - DECL_LINK_TYPED( DropdownClickToolBoxHdl, ToolBox *, void ); - DECL_LINK_TYPED( ClickObjectHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( SelectDocumentHdl, ListBox&, void ); - DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); - DECL_LINK_TYPED( ShapeFilterCallback, Menu *, bool ); + DECL_LINK( SelectToolboxHdl, ToolBox *, void ); + DECL_LINK( DropdownClickToolBoxHdl, ToolBox *, void ); + DECL_LINK( ClickObjectHdl, SvTreeListBox*, bool ); + DECL_LINK( SelectDocumentHdl, ListBox&, void ); + DECL_LINK( MenuSelectHdl, Menu *, bool ); + DECL_LINK( ShapeFilterCallback, Menu *, bool ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void SetDragImage(); diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index 99bf183f10b2..f627bcf419ea 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -68,9 +68,9 @@ private: VclPtr<FixedText> msMonitorExternal; VclPtr<FixedText> msExternal; - DECL_LINK_TYPED( ChangeRangeHdl, Button*, void ); - DECL_LINK_TYPED( ClickWindowPresentationHdl, Button*, void ); - DECL_LINK_TYPED( ChangePauseHdl, Edit&, void ); + DECL_LINK( ChangeRangeHdl, Button*, void ); + DECL_LINK( ClickWindowPresentationHdl, Button*, void ); + DECL_LINK( ChangePauseHdl, Edit&, void ); void InitMonitorSettings(); enum DisplayType { diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 005715ecb1ae..3b64109e1dc5 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -52,8 +52,8 @@ private: VclPtr<CheckBox> m_pCbxBack; VclPtr<CheckBox> m_pCbxPaperbin; - DECL_LINK_TYPED( ClickCheckboxHdl, Button*, void ); - DECL_LINK_TYPED( ClickBookletHdl, Button*, void ); + DECL_LINK( ClickCheckboxHdl, Button*, void ); + DECL_LINK( ClickBookletHdl, Button*, void ); void updateControls(); diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 0ae10d96758f..a3dd272c59e1 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -177,21 +177,21 @@ private: void LoadPreviewButtons(); - DECL_LINK_TYPED( FinishHdl, Button*, void ); - DECL_LINK_TYPED( NextPageHdl, Button*, void ); - DECL_LINK_TYPED( LastPageHdl, Button*, void ); - - DECL_LINK_TYPED( DesignHdl, Button*, void ); - DECL_LINK_TYPED( DesignSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DesignDeleteHdl, Button*, void ); - DECL_LINK_TYPED( BaseHdl, Button*, void ); - DECL_LINK_TYPED( ContentHdl, Button*, void ); - DECL_LINK_TYPED( GfxFormatHdl, Button *, void ); - DECL_LINK_TYPED( ResolutionHdl, Button*, void ); - DECL_LINK_TYPED( ButtonsHdl, ValueSet*, void ); - DECL_LINK_TYPED( ColorHdl, Button*, void ); - DECL_LINK_TYPED( WebServerHdl, Button *, void ); - DECL_LINK_TYPED( SlideChgHdl, Button*, void ); + DECL_LINK( FinishHdl, Button*, void ); + DECL_LINK( NextPageHdl, Button*, void ); + DECL_LINK( LastPageHdl, Button*, void ); + + DECL_LINK( DesignHdl, Button*, void ); + DECL_LINK( DesignSelectHdl, ListBox&, void ); + DECL_LINK( DesignDeleteHdl, Button*, void ); + DECL_LINK( BaseHdl, Button*, void ); + DECL_LINK( ContentHdl, Button*, void ); + DECL_LINK( GfxFormatHdl, Button *, void ); + DECL_LINK( ResolutionHdl, Button*, void ); + DECL_LINK( ButtonsHdl, ValueSet*, void ); + DECL_LINK( ColorHdl, Button*, void ); + DECL_LINK( WebServerHdl, Button *, void ); + DECL_LINK( SlideChgHdl, Button*, void ); public: diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index 6f76c9f2113a..a36351e41961 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -46,8 +46,8 @@ public: void GetAttr(SfxItemSet& rOutAttrs); - DECL_LINK_TYPED(ClickLayoutHdl, ValueSet*, void); - DECL_LINK_TYPED(ClickLoadHdl, Button*, void); + DECL_LINK(ClickLayoutHdl, ValueSet*, void); + DECL_LINK(ClickLoadHdl, Button*, void); private: ::sd::DrawDocShell* mpDocSh; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index af9459673975..ee00a4a8c677 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -163,7 +163,7 @@ protected: const SdrObject* pObject, const bool bCreate = true) const; void CloseBookmarkDoc(); - DECL_LINK_TYPED(ExecDragHdl, void*, void); + DECL_LINK(ExecDragHdl, void*, void); /** Handle the reordering of entries in the navigator. This method reorders both the involved shapes in their page as well as the diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 6ed9dcace102..2a10e3470e81 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -182,7 +182,7 @@ public: private: SlideShow( SdDrawDocument* pDoc ); - DECL_LINK_TYPED( StartInPlacePresentationConfigurationHdl, void *, void ); + DECL_LINK( StartInPlacePresentationConfigurationHdl, void *, void ); void StartInPlacePresentationConfigurationCallback(); void StartInPlacePresentation(); diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx index 6320db7037d7..25d4cae9c34a 100644 --- a/sd/source/ui/inc/tools/AsynchronousCall.hxx +++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx @@ -71,7 +71,7 @@ private: function is called the next time. This pointer may be NULL. */ ::std::unique_ptr<AsynchronousFunction> mpFunction; - DECL_LINK_TYPED(TimerCallback,Timer*,void); + DECL_LINK(TimerCallback,Timer*,void); }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index d08a084df04a..26207772b40b 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -83,7 +83,7 @@ private: class Deleter; friend class Deleter; - DECL_LINK_TYPED(TimerCallback, Timer *, void); + DECL_LINK(TimerCallback, Timer *, void); }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 253660e0f501..f461eca4f0ba 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -78,10 +78,10 @@ private: OUString aLastFile; ::std::vector< long > aVerbVector; - DECL_LINK_TYPED( ClickSearchHdl, Button*, void ); - DECL_LINK_TYPED( ClickActionHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectTreeHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( CheckFileHdl, Control&, void ); + DECL_LINK( ClickSearchHdl, Button*, void ); + DECL_LINK( ClickActionHdl, ListBox&, void ); + DECL_LINK( SelectTreeHdl, SvTreeListBox*, void ); + DECL_LINK( CheckFileHdl, Control&, void ); void UpdateTree(); void OpenFileDialog(); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 428f5f173477..0c4e906185c1 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -117,7 +117,7 @@ private: static OUString GetScale( sal_Int32 nX, sal_Int32 nY ); static bool SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ); - DECL_LINK_TYPED( SelectMetricHdl_Impl, ListBox&, void ); + DECL_LINK( SelectMetricHdl_Impl, ListBox&, void ); /** Enable or disable the controls in the compatibility section of the 'general' tab page depending on whether there is at least one diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 8b63d42ccc15..4422687d1934 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -71,11 +71,11 @@ class SdVectorizeDlg : public ModalDialog void AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ); - DECL_LINK_TYPED( ProgressHdl, long, void ); - DECL_LINK_TYPED( ClickPreviewHdl, Button*, void ); - DECL_LINK_TYPED( ClickOKHdl, Button*, void ); - DECL_LINK_TYPED( ToggleHdl, CheckBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( ProgressHdl, long, void ); + DECL_LINK( ClickPreviewHdl, Button*, void ); + DECL_LINK( ClickOKHdl, Button*, void ); + DECL_LINK( ToggleHdl, CheckBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); public: diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index aa77b261e61c..29b796857e36 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -40,8 +40,8 @@ public: void onZoomChanged(); void UpdateTags(); - DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void); - DECL_LINK_TYPED(UpdateTagsHdl, void *, void); + DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void); + DECL_LINK(UpdateTagsHdl, void *, void); bool CreateTags(); bool DisposeTags(); diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index ca56effd9f68..90202e8138b4 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -87,7 +87,7 @@ void CanvasUpdateRequester::RequestUpdate (const bool bUpdateAll) } } -IMPL_LINK_NOARG_TYPED(CanvasUpdateRequester, Callback, void*, void) +IMPL_LINK_NOARG(CanvasUpdateRequester, Callback, void*, void) { mnUserEventId = nullptr; if (mxCanvas.is()) diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index c9662b7d2a14..a712cc502200 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -64,7 +64,7 @@ private: css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas; ImplSVEvent * mnUserEventId; bool mbUpdateFlag; - DECL_LINK_TYPED(Callback, void*, void); + DECL_LINK(Callback, void*, void); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 232aedbce1e4..71f4bd069bb7 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -250,7 +250,7 @@ void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu) MasterPagesSelector::ProcessPopupMenu(rMenu); } -IMPL_LINK_TYPED(CurrentMasterPagesSelector,EventMultiplexerListener, +IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener, sd::tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index a2a3687035ba..8f3daac12267 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -71,7 +71,7 @@ private: virtual void LateInit() override; - DECL_LINK_TYPED(EventMultiplexerListener,sd::tools::EventMultiplexerEvent&, void); + DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent&, void); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index df4767b34813..0db30c761f61 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -369,7 +369,7 @@ int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount) return nRowCount; } -IMPL_LINK_NOARG_TYPED(LayoutMenu, ClickHandler, ValueSet*, void) +IMPL_LINK_NOARG(LayoutMenu, ClickHandler, ValueSet*, void) { AssignLayoutToSelectedSlides( GetSelectedAutoLayout() ); } @@ -637,12 +637,12 @@ void LayoutMenu::Command (const CommandEvent& rEvent) } } -IMPL_LINK_NOARG_TYPED(LayoutMenu, StateChangeHandler, const OUString&, void) +IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler, const OUString&, void) { InvalidateContent(); } -IMPL_LINK_TYPED(LayoutMenu, OnMenuItemSelected, Menu*, pMenu, bool) +IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu, bool) { if (pMenu == nullptr) { @@ -706,7 +706,7 @@ void LayoutMenu::UpdateSelection() SetNoSelection(); } -IMPL_LINK_TYPED(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, rEvent, void) +IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) { @@ -738,7 +738,7 @@ IMPL_LINK_TYPED(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiple } } -IMPL_LINK_TYPED(LayoutMenu, WindowEventHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(LayoutMenu, WindowEventHandler, VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 93e5bb082ab9..ef168ed55579 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -187,11 +187,11 @@ private: /** When clicked then set the current page of the view in the center pane. */ - DECL_LINK_TYPED(ClickHandler, ValueSet*, void); - DECL_LINK_TYPED(StateChangeHandler, const OUString&, void); - DECL_LINK_TYPED(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, void); - DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); - DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool); + DECL_LINK(ClickHandler, ValueSet*, void); + DECL_LINK(StateChangeHandler, const OUString&, void); + DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, void); + DECL_LINK(WindowEventHandler, VclWindowEvent&, void); + DECL_LINK(OnMenuItemSelected, Menu*, bool); }; } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 924a0e64a0ea..8b56bbd9224b 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -176,7 +176,7 @@ sal_Int32 MasterPageContainerQueue::CalculatePriority ( return nPriority; } -IMPL_LINK_TYPED(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer, void) +IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer, void) { bool bIsShowingFullScreenShow (false); bool bWaitForMoreRequests (false); diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx index 516c3d4f5e01..99d8e4726c23 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx @@ -122,7 +122,7 @@ private: */ static sal_Int32 CalculatePriority (const SharedMasterPageDescriptor& rDescriptor); - DECL_LINK_TYPED(DelayedPreviewCreation, Timer *, void); + DECL_LINK(DelayedPreviewCreation, Timer *, void); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 2c3c2d3b1bca..52b2153f221f 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -169,7 +169,7 @@ ResId MasterPagesSelector::GetContextMenuResId() const return SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP); } -IMPL_LINK_NOARG_TYPED(MasterPagesSelector, ClickHandler, ValueSet*, void) +IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler, ValueSet*, void) { // We use the framework to assign the clicked-on master page because we // so use the same mechanism as the context menu does (where we do not @@ -177,7 +177,7 @@ IMPL_LINK_NOARG_TYPED(MasterPagesSelector, ClickHandler, ValueSet*, void) ExecuteCommand(mnDefaultClickAction); } -IMPL_LINK_TYPED(MasterPagesSelector, RightClickHandler, const MouseEvent&, rEvent, void) +IMPL_LINK(MasterPagesSelector, RightClickHandler, const MouseEvent&, rEvent, void) { // Here we only prepare the display of the context menu: the item under // the mouse is selected. The actual display of the context menu is @@ -248,7 +248,7 @@ void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu) rMenu.EnableItem(SID_TP_SHOW_LARGE_PREVIEW, false); } -IMPL_LINK_TYPED(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu, bool) +IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu, bool) { if (pMenu == nullptr) { @@ -328,7 +328,7 @@ void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) } } -IMPL_LINK_TYPED(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChangeEvent&, rEvent, void) +IMPL_LINK(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChangeEvent&, rEvent, void) { NotifyContainerChangeEvent(rEvent); } diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index e89af913771c..f8aa0822a7a7 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -185,10 +185,10 @@ private: last seen. This value is used heuristically to speed up the lookup of an index for a token. */ - DECL_LINK_TYPED(ClickHandler, ValueSet*, void); - DECL_LINK_TYPED(RightClickHandler, const MouseEvent&, void); - DECL_LINK_TYPED(ContainerChangeListener, MasterPageContainerChangeEvent&, void); - DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool); + DECL_LINK(ClickHandler, ValueSet*, void); + DECL_LINK(RightClickHandler, const MouseEvent&, void); + DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent&, void); + DECL_LINK(OnMenuItemSelected, Menu*, bool); void SetItem ( sal_uInt16 nIndex, diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index f9a23f115aab..12d6486b609b 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -86,7 +86,7 @@ void RecentMasterPagesSelector::LateInit() LINK(this,RecentMasterPagesSelector,MasterPageListListener)); } -IMPL_LINK_NOARG_TYPED(RecentMasterPagesSelector, MasterPageListListener, LinkParamNone*, void) +IMPL_LINK_NOARG(RecentMasterPagesSelector, MasterPageListListener, LinkParamNone*, void) { MasterPagesSelector::Fill(); } diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index 1801242d48c8..44cff1de9e88 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -37,7 +37,7 @@ public: const css::uno::Reference<css::ui::XSidebar>& rxSidebar); protected: - DECL_LINK_TYPED(MasterPageListListener, LinkParamNone*, void); + DECL_LINK(MasterPageListListener, LinkParamNone*, void); virtual void Fill (ItemList& rItemList) override; using sd::sidebar::MasterPagesSelector::Fill; diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index 789f5874f53a..1622353915b2 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -278,7 +278,7 @@ void RecentlyUsedMasterPages::SendEvent() } } -IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageChangeListener, +IMPL_LINK(RecentlyUsedMasterPages, MasterPageChangeListener, MasterPageObserverEvent&, rEvent, void) { switch (rEvent.meType) @@ -298,7 +298,7 @@ IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageChangeListener, } } -IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageContainerChangeListener, +IMPL_LINK(RecentlyUsedMasterPages, MasterPageContainerChangeListener, MasterPageContainerChangeEvent&, rEvent, void) { switch (rEvent.meEventType) diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx index ab0d033b474d..c37f8090c1bd 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx @@ -103,8 +103,8 @@ private: RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) = delete; void SendEvent(); - DECL_LINK_TYPED(MasterPageChangeListener, MasterPageObserverEvent&, void); - DECL_LINK_TYPED(MasterPageContainerChangeListener, MasterPageContainerChangeEvent&, void); + DECL_LINK(MasterPageChangeListener, MasterPageObserverEvent&, void); + DECL_LINK(MasterPageContainerChangeListener, MasterPageContainerChangeEvent&, void); /** Add a descriptor for the specified master page to the end of the list of most recently used master pages. When the page is already a diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 225849505413..ab7c1fb68fc1 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -348,7 +348,7 @@ void SlideBackground::removeListener() mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); } -IMPL_LINK_TYPED(SlideBackground, EventMultiplexerListener, +IMPL_LINK(SlideBackground, EventMultiplexerListener, tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) @@ -769,7 +769,7 @@ void SlideBackground::NotifyItemUpdate( } } -IMPL_LINK_NOARG_TYPED(SlideBackground, FillStyleModifyHdl, ListBox&, void) +IMPL_LINK_NOARG(SlideBackground, FillStyleModifyHdl, ListBox&, void) { const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectEntryPos(); Update(); @@ -818,7 +818,7 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, FillStyleModifyHdl, ListBox&, void) mpFillStyle->Selected(); } -IMPL_LINK_NOARG_TYPED(SlideBackground, PaperSizeModifyHdl, ListBox&, void) +IMPL_LINK_NOARG(SlideBackground, PaperSizeModifyHdl, ListBox&, void) { Paper ePaper = mpPaperSizeBox->GetSelection(); Size aSize(SvxPaperInfo::GetPaperSize(ePaper, (MapUnit)(meUnit))); @@ -831,7 +831,7 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, PaperSizeModifyHdl, ListBox&, void) GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem, mpPageItem.get() }); } -IMPL_LINK_NOARG_TYPED(SlideBackground, FillColorHdl, ListBox&, void) +IMPL_LINK_NOARG(SlideBackground, FillColorHdl, ListBox&, void) { const drawing::FillStyle eXFS = (drawing::FillStyle)mpFillStyle->GetSelectEntryPos(); switch(eXFS) @@ -857,7 +857,7 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, FillColorHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(SlideBackground, FillBackgroundHdl, ListBox&, void) +IMPL_LINK_NOARG(SlideBackground, FillBackgroundHdl, ListBox&, void) { const eFillStyle nFillPos = (eFillStyle)mpFillStyle->GetSelectEntryPos(); SfxObjectShell* pSh = SfxObjectShell::Current(); @@ -904,7 +904,7 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, FillBackgroundHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(SlideBackground, AssignMasterPage, ListBox&, void) +IMPL_LINK_NOARG(SlideBackground, AssignMasterPage, ListBox&, void) { ::sd::DrawDocShell* pDocSh = dynamic_cast<::sd::DrawDocShell*>( SfxObjectShell::Current() ); SdDrawDocument* pDoc = pDocSh ? pDocSh->GetDoc() : nullptr; @@ -923,19 +923,19 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, AssignMasterPage, ListBox&, void) pDoc->SetMasterPage(nSelectedPage, aLayoutName, pDoc, false, false); } -IMPL_LINK_NOARG_TYPED(SlideBackground, CloseMasterHdl, Button*, void) +IMPL_LINK_NOARG(SlideBackground, CloseMasterHdl, Button*, void) { GetBindings()->GetDispatcher()->Execute( SID_CLOSE_MASTER_VIEW, SfxCallMode::RECORD ); } -IMPL_LINK_NOARG_TYPED(SlideBackground, DspBackground, Button*, void) +IMPL_LINK_NOARG(SlideBackground, DspBackground, Button*, void) { bool IsChecked = mpDspMasterBackground->IsChecked(); const SfxBoolItem aBoolItem(SID_DISPLAY_MASTER_BACKGROUND, IsChecked); GetBindings()->GetDispatcher()->ExecuteList(SID_DISPLAY_MASTER_BACKGROUND, SfxCallMode::RECORD, { &aBoolItem }); } -IMPL_LINK_NOARG_TYPED(SlideBackground, DspObjects, Button*, void) +IMPL_LINK_NOARG(SlideBackground, DspObjects, Button*, void) { bool IsChecked = mpDspMasterObjects->IsChecked(); const SfxBoolItem aBoolItem(SID_DISPLAY_MASTER_OBJECTS,IsChecked); diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index ed41aa08004d..deb9a3b8118a 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -117,15 +117,15 @@ private: MapUnit meUnit; - DECL_LINK_TYPED(FillBackgroundHdl, ListBox&, void); - DECL_LINK_TYPED(FillStyleModifyHdl, ListBox&, void); - DECL_LINK_TYPED(PaperSizeModifyHdl, ListBox&, void); - DECL_LINK_TYPED(FillColorHdl, ListBox&, void); - DECL_LINK_TYPED(AssignMasterPage, ListBox&, void); - DECL_LINK_TYPED(DspBackground, Button*, void); - DECL_LINK_TYPED(DspObjects, Button*, void); - DECL_LINK_TYPED(CloseMasterHdl, Button*, void); - DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void ); + DECL_LINK(FillBackgroundHdl, ListBox&, void); + DECL_LINK(FillStyleModifyHdl, ListBox&, void); + DECL_LINK(PaperSizeModifyHdl, ListBox&, void); + DECL_LINK(FillColorHdl, ListBox&, void); + DECL_LINK(AssignMasterPage, ListBox&, void); + DECL_LINK(DspBackground, Button*, void); + DECL_LINK(DspObjects, Button*, void); + DECL_LINK(CloseMasterHdl, Button*, void); + DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void ); void Initialize(); void Update(); diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index 4db7f62e7d57..2eec9f302522 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -77,7 +77,7 @@ void SlideShowRestarter::Restart (bool bForce) LINK(this, SlideShowRestarter, EndPresentation)); } -IMPL_LINK_NOARG_TYPED(SlideShowRestarter, EndPresentation, void*, void) +IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation, void*, void) { mnEventId = nullptr; if (mpSlideShow.is()) diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx index 46a8563efea9..f25c9fcb98af 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.hxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx @@ -69,7 +69,7 @@ private: SfxDispatcher* mpDispatcher; sal_Int32 mnCurrentSlideNumber; - DECL_LINK_TYPED(EndPresentation, void*, void); + DECL_LINK(EndPresentation, void*, void); /** Restart the presentation on the slide last shown before the restart was initiated. diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 8b8f8c313167..ba757dc4b0a8 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -548,7 +548,7 @@ void ShowWindow::DrawEndScene() SetFont( aOldFont ); } -IMPL_LINK_TYPED( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void ) +IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void ) { if( !( --mnPauseTimeout ) ) RestartShow(); @@ -559,7 +559,7 @@ IMPL_LINK_TYPED( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void ) } } -IMPL_LINK_NOARG_TYPED(ShowWindow, MouseTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl, Timer *, void) { if( mbMouseCursorHidden ) { @@ -575,7 +575,7 @@ IMPL_LINK_NOARG_TYPED(ShowWindow, MouseTimeoutHdl, Timer *, void) } } -IMPL_LINK_TYPED( ShowWindow, EventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ShowWindow, EventHdl, VclWindowEvent&, rEvent, void ) { if( mbMouseAutoHide ) { diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 97c03da90271..229332e6a3c6 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -105,9 +105,9 @@ private: bool mbMouseCursorHidden; sal_uInt64 mnFirstMouseMove; - DECL_LINK_TYPED( PauseTimeoutHdl, Timer*, void ); - DECL_LINK_TYPED(MouseTimeoutHdl, Timer *, void); - DECL_LINK_TYPED( EventHdl, VclWindowEvent&, void ); + DECL_LINK( PauseTimeoutHdl, Timer*, void ); + DECL_LINK(MouseTimeoutHdl, Timer *, void); + DECL_LINK( EventHdl, VclWindowEvent&, void ); ::rtl::Reference< SlideshowImpl > mxController; }; diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 7330d79b4fd7..700129f491a3 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1028,7 +1028,7 @@ void SlideShow::StartInPlacePresentationConfigurationCallback() mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) ); } -IMPL_LINK_NOARG_TYPED(SlideShow, StartInPlacePresentationConfigurationHdl, void*, void) +IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl, void*, void) { mnInPlaceConfigEvent = nullptr; StartInPlacePresentation(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index c9f0adb6cc93..ebcb61eee36e 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1385,7 +1385,7 @@ void SlideshowImpl::endPresentation() mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) ); } -IMPL_LINK_NOARG_TYPED(SlideshowImpl, endPresentationHdl, void*, void) +IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl, void*, void) { mnEndShowEvent = nullptr; @@ -1692,7 +1692,7 @@ void SlideshowImpl::startUpdateTimer() This is used to unfreeze user input that was disabled after slide change to skip input that was buffered during slide transition preparation */ -IMPL_LINK_NOARG_TYPED(SlideshowImpl, ReadyForNextInputHdl, Timer *, void) +IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl, Timer *, void) { mbInputFreeze = false; } @@ -1701,7 +1701,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, ReadyForNextInputHdl, Timer *, void) and not by using the timer, I will personally punish this person seriously, even if this person is me. */ -IMPL_LINK_NOARG_TYPED(SlideshowImpl, updateHdl, Timer *, void) +IMPL_LINK_NOARG(SlideshowImpl, updateHdl, Timer *, void) { updateSlideShow(); } @@ -1888,7 +1888,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) return bRet; } -IMPL_LINK_TYPED( SlideshowImpl, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void ) +IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void ) { if( !mxShow.is() || mbInputFreeze ) return; @@ -1974,7 +1974,7 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) } } -IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void) +IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) { mnContextMenuEvent = nullptr; @@ -2107,7 +2107,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void) resume(); } -IMPL_LINK_TYPED( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool ) { if( pMenu ) { @@ -2549,7 +2549,7 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exceptio } } -IMPL_LINK_NOARG_TYPED(SlideshowImpl, deactivateHdl, Timer *, void) +IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl, Timer *, void) { if( mbActive && mxShow.is() ) { diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index f990f8d96e7e..3234f9ad724f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -273,13 +273,13 @@ private: void setActiveXToolbarsVisible( bool bVisible ); - DECL_LINK_TYPED( updateHdl, Timer *, void ); - DECL_LINK_TYPED( ReadyForNextInputHdl, Timer *, void ); - DECL_LINK_TYPED( endPresentationHdl, void*, void ); - DECL_LINK_TYPED( ContextMenuSelectHdl, Menu *, bool ); - DECL_LINK_TYPED( ContextMenuHdl, void*, void ); - DECL_LINK_TYPED( deactivateHdl, Timer *, void ); - DECL_LINK_TYPED( EventListenerHdl, VclSimpleEvent&, void ); + DECL_LINK( updateHdl, Timer *, void ); + DECL_LINK( ReadyForNextInputHdl, Timer *, void ); + DECL_LINK( endPresentationHdl, void*, void ); + DECL_LINK( ContextMenuSelectHdl, Menu *, bool ); + DECL_LINK( ContextMenuHdl, void*, void ); + DECL_LINK( deactivateHdl, Timer *, void ); + DECL_LINK( EventListenerHdl, VclSimpleEvent&, void ); /** called only by the slideshow view when the first paint event occurs. This actually starts the slideshow. */ diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index d2e4b651ce9f..694da4fc5b62 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -132,7 +132,7 @@ CacheCompactor::CacheCompactor( } -IMPL_LINK_NOARG_TYPED(CacheCompactor, CompactionCallback, Timer *, void) +IMPL_LINK_NOARG(CacheCompactor, CompactionCallback, Timer *, void) { mbIsCompactionRunning = true; diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index 783afecba1a0..4da9ca05f92d 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -80,7 +80,7 @@ private: */ Timer maCompactionTimer; bool mbIsCompactionRunning; - DECL_LINK_TYPED(CompactionCallback, Timer *, void); + DECL_LINK(CompactionCallback, Timer *, void); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 3f7207d754cd..31a8a52b64d5 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -135,7 +135,7 @@ Any CacheConfiguration::GetValue (const OUString& rName) return aResult; } -IMPL_STATIC_LINK_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void) +IMPL_STATIC_LINK_NOARG(CacheConfiguration, TimerCallback, Timer *, void) { CacheConfigSharedPtr &rInstancePtr = theInstance::get(); // Release our reference to the instance. diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 27ff28ef01d3..74a8097f02db 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -55,7 +55,7 @@ private: CacheConfiguration(); - DECL_STATIC_LINK_TYPED(CacheConfiguration, TimerCallback, Timer *, void); + DECL_STATIC_LINK(CacheConfiguration, TimerCallback, Timer *, void); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index cf291038a7a0..67ab7e2f82f9 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -106,7 +106,7 @@ void QueueProcessor::SetPreviewSize ( mbDoSuperSampling = bDoSuperSampling; } -IMPL_LINK_NOARG_TYPED(QueueProcessor, ProcessRequestHdl, Timer *, void) +IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl, Timer *, void) { ProcessRequests(); } diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index c5c15808656a..73779abb0a22 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -92,7 +92,7 @@ private: ::osl::Mutex maMutex; Timer maTimer; - DECL_LINK_TYPED(ProcessRequestHdl, Timer *, void); + DECL_LINK(ProcessRequestHdl, Timer *, void); sal_uInt32 mnTimeBetweenHighPriorityRequests; sal_uInt32 mnTimeBetweenLowPriorityRequests; sal_uInt32 mnTimeBetweenRequestsWhenNotIdle; diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 7f46fa296119..b762a68cd172 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -517,14 +517,14 @@ void SlideSorterController::HandleModelChange() } } -IMPL_LINK_TYPED(SlideSorterController, ApplicationEventHandler, VclSimpleEvent&, rEvent, void) +IMPL_LINK(SlideSorterController, ApplicationEventHandler, VclSimpleEvent&, rEvent, void) { auto windowEvent = dynamic_cast<VclWindowEvent *>(&rEvent); if (windowEvent != nullptr) { WindowEventHandler(*windowEvent); } } -IMPL_LINK_TYPED(SlideSorterController, WindowEventHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent&, rEvent, void) { vcl::Window* pWindow = rEvent.GetWindow(); sd::Window *pActiveWindow (mrSlideSorter.GetContentWindow()); diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 12af47a320cb..f0fd68890d0f 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -211,7 +211,7 @@ void Animator::RequestNextFrame () } } -IMPL_LINK_NOARG_TYPED(Animator, TimeoutHandler, Idle *, void) +IMPL_LINK_NOARG(Animator, TimeoutHandler, Idle *, void) { if (mbIsDisposed) return; diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 6928baa682de..a926f04434d8 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -578,7 +578,7 @@ void Clipboard::DragFinished (sal_Int8 nDropAction) } } -IMPL_LINK_TYPED(Clipboard, ProcessDragFinished, void*, pUserData, void) +IMPL_LINK(Clipboard, ProcessDragFinished, void*, pUserData, void) { const sal_Int8 nDropAction (static_cast<sal_Int8>(reinterpret_cast<sal_IntPtr>(pUserData))); diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index da5e6e086fd7..ca8144484356 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -236,7 +236,7 @@ void CurrentSlideManager::HandleModelChange() } } -IMPL_LINK_NOARG_TYPED(CurrentSlideManager, SwitchPageCallback, Timer *, void) +IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback, Timer *, void) { if (mpCurrentSlide) { diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index c85ea076aa60..03206dc3d715 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -344,7 +344,7 @@ void Listener::Notify ( } } -IMPL_LINK_TYPED(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent&, rEvent, void) +IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) { diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 7776248f59db..c57b6336a79a 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -176,7 +176,7 @@ private: void ThrowIfDisposed() throw (css::lang::DisposedException); - DECL_LINK_TYPED(EventMultiplexerCallback, tools::EventMultiplexerEvent&, void); + DECL_LINK(EventMultiplexerCallback, tools::EventMultiplexerEvent&, void); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index b3cf776755f1..171b61226b75 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -238,7 +238,7 @@ void ScrollBarManager::UpdateScrollBars(bool bUseScrolling) } } -IMPL_LINK_TYPED(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar, void) +IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar, void) { if (pScrollBar!=nullptr && pScrollBar==mpVerticalScrollBar.get() @@ -253,7 +253,7 @@ IMPL_LINK_TYPED(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollB } } -IMPL_LINK_TYPED(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar, void) +IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar, void) { if (pScrollBar!=nullptr && pScrollBar==mpHorizontalScrollBar.get() @@ -533,7 +533,7 @@ void ScrollBarManager::clearAutoScrollFunctor() maAutoScrollFunctor = ::std::function<void ()>(); } -IMPL_LINK_NOARG_TYPED(ScrollBarManager, AutoScrollTimeoutHandler, Timer *, void) +IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler, Timer *, void) { RepeatAutoScroll(); } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 7d25663460b5..b297daad4693 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -913,7 +913,7 @@ void SlotManager::RenameSlide() } } -IMPL_LINK_TYPED(SlotManager, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool) +IMPL_LINK(SlotManager, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool) { OUString aNewName; rDialog.GetName( aNewName ); diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 766058f923c8..58d22cf727e9 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -160,8 +160,8 @@ public: */ void HandleModelChange(); - DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); - DECL_LINK_TYPED(ApplicationEventHandler, VclSimpleEvent&, void); + DECL_LINK(WindowEventHandler, VclWindowEvent&, void); + DECL_LINK(ApplicationEventHandler, VclSimpleEvent&, void); /** Update the display of all pages. This involves a redraw and releasing previews and caches. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 70041b4ac43a..ff127eace895 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -100,7 +100,7 @@ private: AnimationId mnNextAnimationId; - DECL_LINK_TYPED(TimeoutHandler, Idle *, void); + DECL_LINK(TimeoutHandler, Idle *, void); /** Execute one step of every active animation. @param nTime diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 6ec289447414..2a5aceed4cee 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -226,7 +226,7 @@ private: /** Asynchronous part of DragFinished. The argument is the sal_Int8 nDropAction, disguised as void*. */ - DECL_LINK_TYPED(ProcessDragFinished, void*, void); + DECL_LINK(ProcessDragFinished, void*, void); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 803918705b88..571374d98d93 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -107,7 +107,7 @@ private: */ void AcquireCurrentSlide (const sal_Int32 nSlideIndex); - DECL_LINK_TYPED(SwitchPageCallback, Timer*, void); + DECL_LINK(SwitchPageCallback, Timer*, void); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 44aab4d5af37..698ab95702ba 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -238,9 +238,9 @@ private: void CalcAutoScrollOffset (const Point& rMouseWindowPosition); bool RepeatAutoScroll(); - DECL_LINK_TYPED(HorizontalScrollBarHandler, ScrollBar*, void); - DECL_LINK_TYPED(VerticalScrollBarHandler, ScrollBar*, void); - DECL_LINK_TYPED(AutoScrollTimeoutHandler, Timer *, void); + DECL_LINK(HorizontalScrollBarHandler, ScrollBar*, void); + DECL_LINK(VerticalScrollBarHandler, ScrollBar*, void); + DECL_LINK(AutoScrollTimeoutHandler, Timer *, void); void PlaceHorizontalScrollBar (const Rectangle& aArea); void PlaceVerticalScrollBar (const Rectangle& aArea); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index e6aed91ccb48..0f74f23fed20 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -86,7 +86,7 @@ private: drviews2.cxx. */ void RenameSlide(); - DECL_LINK_TYPED(RenameSlideHdl, AbstractSvxNameDialog&, bool); + DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog&, bool); bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString& rName); /** Handle SID_INSERTPAGE slot calls. diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index de1086c2755b..d49481a679db 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -68,7 +68,7 @@ private: void Show (const bool bForce); void DoShow(); - DECL_LINK_TYPED(DelayTrigger, Timer*, void); + DECL_LINK(DelayTrigger, Timer*, void); }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 64f7dd0836d8..1c86c933bde4 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -155,7 +155,7 @@ bool ToolTip::Hide() return false; } -IMPL_LINK_NOARG_TYPED(ToolTip, DelayTrigger, Timer *, void) +IMPL_LINK_NOARG(ToolTip, DelayTrigger, Timer *, void) { DoShow(); } diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index c78d4d325543..9233453be888 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -156,7 +156,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) return nullptr; } -IMPL_LINK_NOARG_TYPED(TableDesignWidget, implValueSetHdl, ValueSet*, void) +IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, ValueSet*, void) { mbStyleSelected = true; if( !mbModal ) @@ -213,7 +213,7 @@ void TableDesignWidget::ApplyStyle() } } -IMPL_LINK_NOARG_TYPED(TableDesignWidget, implCheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, Button*, void) { mbOptionsChanged = true; @@ -437,7 +437,7 @@ void TableDesignWidget::removeListener() mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); } -IMPL_LINK_TYPED(TableDesignWidget,EventMultiplexerListener, +IMPL_LINK(TableDesignWidget,EventMultiplexerListener, tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 13b45af85b12..90dc69fba976 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -85,9 +85,9 @@ private: void FillDesignPreviewControl(); - DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void); - DECL_LINK_TYPED(implValueSetHdl, ValueSet*, void); - DECL_LINK_TYPED(implCheckBoxHdl, Button*, void); + DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void); + DECL_LINK(implValueSetHdl, ValueSet*, void); + DECL_LINK(implCheckBoxHdl, Button*, void); private: ViewShellBase& mrBase; diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx index 47ba8bb5aed8..7208db4f2129 100644 --- a/sd/source/ui/tools/AsynchronousCall.cxx +++ b/sd/source/ui/tools/AsynchronousCall.cxx @@ -44,7 +44,7 @@ void AsynchronousCall::Post (const AsynchronousFunction& rFunction) maTimer.Start(); } -IMPL_LINK_TYPED(AsynchronousCall,TimerCallback,Timer*,pTimer,void) +IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer,void) { if (pTimer == &maTimer) { diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index a208144a93ee..d51d5b9e0c0f 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -148,7 +148,7 @@ private: void ThrowIfDisposed() throw (css::lang::DisposedException); - DECL_LINK_TYPED(SlideSorterSelectionChangeListener, LinkParamNone*, void); + DECL_LINK(SlideSorterSelectionChangeListener, LinkParamNone*, void); }; const char aCurrentPagePropertyName[] = "CurrentPage"; @@ -694,7 +694,7 @@ void EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent& rEv } } -IMPL_LINK_NOARG_TYPED(EventMultiplexer::Implementation, SlideSorterSelectionChangeListener, LinkParamNone*, void) +IMPL_LINK_NOARG(EventMultiplexer::Implementation, SlideSorterSelectionChangeListener, LinkParamNone*, void) { CallListeners(EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION); } diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index bafd904290a2..8d99a259a7e3 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -106,7 +106,7 @@ void TimerBasedTaskExecution::SetSelf ( mpSelf = rpSelf; } -IMPL_LINK_NOARG_TYPED(TimerBasedTaskExecution, TimerCallback, Timer *, void) +IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback, Timer *, void) { if (mpTask.get() != nullptr) { diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 62c69b622095..613d8b2562fd 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -183,7 +183,7 @@ void FormShellManager::UnregisterAtCenterPane() mpSubShellFactory.reset(); } -IMPL_LINK_NOARG_TYPED(FormShellManager, FormControlActivated, LinkParamNone*, void) +IMPL_LINK_NOARG(FormShellManager, FormControlActivated, LinkParamNone*, void) { // The form shell has been activated. To give it priority in reacting to // slot calls the form shell is moved to the top of the object bar shell @@ -198,7 +198,7 @@ IMPL_LINK_NOARG_TYPED(FormShellManager, FormControlActivated, LinkParamNone*, vo } } -IMPL_LINK_TYPED(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMultiplexerEvent&, rEvent, void) +IMPL_LINK(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) { @@ -223,7 +223,7 @@ IMPL_LINK_TYPED(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMu } } -IMPL_LINK_TYPED(FormShellManager, WindowEventHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 1b05892fb2f6..a0b2e4370970 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -323,9 +323,9 @@ private: static OUString GetToolBarResourceName (const OUString& rsBaseName); bool CheckPlugInMode (const OUString& rsName) const; - DECL_LINK_TYPED(UpdateCallback, void *, void); - DECL_LINK_TYPED(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent&, void); - DECL_LINK_TYPED(SetValidCallback, void*, void); + DECL_LINK(UpdateCallback, void *, void); + DECL_LINK(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent&, void); + DECL_LINK(SetValidCallback, void*, void); }; //===== ToolBarManager ======================================================== @@ -847,7 +847,7 @@ void ToolBarManager::Implementation::Update ( } } -IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, UpdateCallback, void*, void) +IMPL_LINK_NOARG(ToolBarManager::Implementation, UpdateCallback, void*, void) { mnPendingUpdateCall = nullptr; if (mnLockCount == 0) @@ -861,7 +861,7 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, UpdateCallback, void*, voi } } -IMPL_LINK_TYPED(ToolBarManager::Implementation,EventMultiplexerCallback, +IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback, sd::tools::EventMultiplexerEvent&, rEvent, void) { SolarMutexGuard g; @@ -883,7 +883,7 @@ IMPL_LINK_TYPED(ToolBarManager::Implementation,EventMultiplexerCallback, } } -IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, SetValidCallback, void*, void) +IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback, void*, void) { mnPendingSetValidCall = nullptr; SetValid(true); diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 3c2e87c591c2..edb4a730b2a5 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -348,7 +348,7 @@ ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock ( maTimer.Start(); } -IMPL_LINK_NOARG_TYPED(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback, Timer *, void) +IMPL_LINK_NOARG(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback, Timer *, void) { // If possible then release the lock now. Otherwise start the timer // and try again later. diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 66a589cdcd68..a95e27d872a8 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -204,7 +204,7 @@ private: */ void CreateTargetStack (ShellStack& rStack) const; - DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); + DECL_LINK(WindowEventHandler, VclWindowEvent&, void); #if OSL_DEBUG_LEVEL >= 2 void DumpShellStack (const ShellStack& rStack); @@ -982,7 +982,7 @@ void ViewShellManager::Implementation::CreateTargetStack (ShellStack& rStack) co } } -IMPL_LINK_TYPED(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent&, rEvent, void) { vcl::Window* pEventWindow = rEvent.GetWindow(); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index f1e46bc66097..56897272a816 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -613,7 +613,7 @@ void DrawViewShell::SetUIUnit(FieldUnit eUnit) * Refresh TabControl on splitter change */ -IMPL_LINK_TYPED( DrawViewShell, TabSplitHdl, TabBar *, pTab, void ) +IMPL_LINK( DrawViewShell, TabSplitHdl, TabBar *, pTab, void ) { const long int nMax = maViewSize.Width() - maScrBarWH.Width() - maTabControl->GetPosPixel().X() ; diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index c821eef43d40..be17178b3b43 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -185,7 +185,7 @@ using namespace ::com::sun::star::linguistic2; namespace sd { -IMPL_LINK_TYPED( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) +IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) { mbPastePossible = ( pDataHelper->GetFormatCount() != 0 ); diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 3369ee40ca55..0c4c7f05d05a 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -138,7 +138,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) return bSuccess; } -IMPL_LINK_TYPED( DrawViewShell, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool ) +IMPL_LINK( DrawViewShell, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool ) { OUString aNewName; rDialog.GetName( aNewName ); diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 320992494893..3bbb3a7ef9ce 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -83,7 +83,7 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj ) } } -IMPL_LINK_TYPED( DrawViewShell, NameObjectHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) +IMPL_LINK( DrawViewShell, NameObjectHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) { OUString aName; rDialog.GetName( aName ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 093649972c3a..349a70ccffd5 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -702,7 +702,7 @@ void OutlineViewShell::FuPermanent(SfxRequest &rReq) } } -IMPL_LINK_TYPED( OutlineViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) +IMPL_LINK( OutlineViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) { bPastePossible = pDataHelper->GetFormatCount() != 0 && ( pDataHelper->HasFormat( SotClipboardFormatId::STRING ) || diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 91931c1db4ff..f9a5c5f5dc39 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -358,7 +358,7 @@ Paragraph* OutlineView::GetNextTitle(const Paragraph* pPara) /** * Handler for inserting pages (paragraphs) */ -IMPL_LINK_TYPED( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner, void ) +IMPL_LINK( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner, void ) { // we get calls to this handler during binary insert of drag and drop contents but // we ignore it here and handle it later in OnEndPasteOrDrop() @@ -498,7 +498,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) /** * Handler for deleting pages (paragraphs) */ -IMPL_LINK_TYPED( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner, void ) +IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner, void ) { DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::ParagraphRemovingHdl(), model change without undo?!" ); @@ -555,7 +555,7 @@ IMPL_LINK_TYPED( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner, voi * Handler for changing the indentation depth of paragraphs (requires inserting * or deleting of pages in some cases) */ -IMPL_LINK_TYPED( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner, void ) +IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner, void ) { DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::DepthChangedHdl(), no undo for model change?!" ); @@ -769,7 +769,7 @@ IMPL_LINK_TYPED( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner, void ) /** * Handler for StatusEvents */ -IMPL_LINK_NOARG_TYPED(OutlineView, StatusEventHdl, EditStatus&, void) +IMPL_LINK_NOARG(OutlineView, StatusEventHdl, EditStatus&, void) { ::sd::Window* pWin = mrOutlineViewShell.GetActiveWindow(); OutlinerView* pOutlinerView = GetViewByWindow(pWin); @@ -791,14 +791,14 @@ IMPL_LINK_NOARG_TYPED(OutlineView, StatusEventHdl, EditStatus&, void) } } -IMPL_LINK_NOARG_TYPED(OutlineView, BeginDropHdl, EditView*, void) +IMPL_LINK_NOARG(OutlineView, BeginDropHdl, EditView*, void) { DBG_ASSERT(maDragAndDropModelGuard.get() == nullptr, "sd::OutlineView::BeginDropHdl(), prior drag operation not finished correctly!" ); maDragAndDropModelGuard.reset( new OutlineViewModelChangeGuard( *this ) ); } -IMPL_LINK_NOARG_TYPED(OutlineView, EndDropHdl, EditView*, void) +IMPL_LINK_NOARG(OutlineView, EndDropHdl, EditView*, void) { maDragAndDropModelGuard.reset(nullptr); } @@ -806,7 +806,7 @@ IMPL_LINK_NOARG_TYPED(OutlineView, EndDropHdl, EditView*, void) /** * Handler for the start of a paragraph movement */ -IMPL_LINK_TYPED( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner, void ) +IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner, void ) { OutlineViewPageChangesGuard aGuard(this); @@ -847,7 +847,7 @@ IMPL_LINK_TYPED( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner, void ) /** * Handler for the end of a paragraph movement */ -IMPL_LINK_TYPED( OutlineView, EndMovingHdl, ::Outliner *, pOutliner, void ) +IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner, void ) { OutlineViewPageChangesGuard aGuard(this); @@ -1161,7 +1161,7 @@ void OutlineView::FillOutliner() /** * Handler for deleting of level 0 paragraphs (pages): Warning */ -IMPL_LINK_NOARG_TYPED(OutlineView, RemovingPagesHdl, OutlinerView*, bool) +IMPL_LINK_NOARG(OutlineView, RemovingPagesHdl, OutlinerView*, bool) { sal_Int32 nNumOfPages = mrOutliner.GetSelPageCount(); @@ -1184,7 +1184,7 @@ IMPL_LINK_NOARG_TYPED(OutlineView, RemovingPagesHdl, OutlinerView*, bool) /** * Handler for indenting level 0 paragraphs (pages): Warning */ -IMPL_LINK_TYPED( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView, bool ) +IMPL_LINK( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView, bool ) { return RemovingPagesHdl(pOutlinerView); } @@ -1418,12 +1418,12 @@ void OutlineView::onUpdateStyleSettings( bool bForceUpdate /* = false */ ) } } -IMPL_LINK_NOARG_TYPED(OutlineView, AppEventListenerHdl, VclSimpleEvent&, void) +IMPL_LINK_NOARG(OutlineView, AppEventListenerHdl, VclSimpleEvent&, void) { onUpdateStyleSettings(false); } -IMPL_LINK_TYPED(OutlineView, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, rEvent, void) +IMPL_LINK(OutlineView, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) { @@ -1592,7 +1592,7 @@ void OutlineView::TryToMergeUndoActions() } } -IMPL_LINK_TYPED(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo, void) +IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo, void) { if( !pInfo ) return; diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index ebb545b3c1c5..061b28aecb2e 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -1083,7 +1083,7 @@ void View::onAccessibilityOptionsChanged() } } -IMPL_LINK_TYPED( View, OnParagraphInsertedHdl, ::Outliner *, pOutliner, void ) +IMPL_LINK( View, OnParagraphInsertedHdl, ::Outliner *, pOutliner, void ) { Paragraph* pPara = pOutliner->GetHdlParagraph(); SdrObject* pObj = GetTextEditObject(); @@ -1099,7 +1099,7 @@ IMPL_LINK_TYPED( View, OnParagraphInsertedHdl, ::Outliner *, pOutliner, void ) /** * Handler for the deletion of the pages (paragraphs). */ -IMPL_LINK_TYPED( View, OnParagraphRemovingHdl, ::Outliner *, pOutliner, void ) +IMPL_LINK( View, OnParagraphRemovingHdl, ::Outliner *, pOutliner, void ) { Paragraph* pPara = pOutliner->GetHdlParagraph(); SdrObject* pObj = GetTextEditObject(); diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 8c178c2dec9a..b5670998f0b4 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -799,7 +799,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, return nRet; } -IMPL_LINK_TYPED( View, ExecuteNavigatorDrop, void*, p, void ) +IMPL_LINK( View, ExecuteNavigatorDrop, void*, p, void ) { SdNavigatorDropEvent* pSdNavigatorDropEvent = static_cast<SdNavigatorDropEvent*>(p); TransferableDataHelper aDataHelper( pSdNavigatorDropEvent->maDropEvent.Transferable ); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index d9147c711cd8..6ad4b1d7901c 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -391,7 +391,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM /** * Timer handler for InsertFile at Drop() */ -IMPL_LINK_NOARG_TYPED(View, DropInsertFileHdl, Idle *, void) +IMPL_LINK_NOARG(View, DropInsertFileHdl, Idle *, void) { DBG_ASSERT( mpViewSh, "sd::View::DropInsertFileHdl(), I need a view shell to work!" ); if( !mpViewSh ) @@ -582,7 +582,7 @@ IMPL_LINK_NOARG_TYPED(View, DropInsertFileHdl, Idle *, void) /** * Timer handler for Errorhandling at Drop() */ -IMPL_LINK_NOARG_TYPED(View, DropErrorHdl, Idle *, void) +IMPL_LINK_NOARG(View, DropErrorHdl, Idle *, void) { ScopedVclPtrInstance<InfoBox>( mpViewSh ? mpViewSh->GetActiveWindow() : nullptr, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute(); } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 86f87872af04..14d6bfff8ae9 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -444,7 +444,7 @@ void ViewOverlayManager::UpdateTags() mnUpdateTagsEvent = Application::PostUserEvent( LINK( this, ViewOverlayManager, UpdateTagsHdl ) ); } -IMPL_LINK_NOARG_TYPED(ViewOverlayManager, UpdateTagsHdl, void*, void) +IMPL_LINK_NOARG(ViewOverlayManager, UpdateTagsHdl, void*, void) { OSL_TRACE("ViewOverlayManager::UpdateTagsHdl"); @@ -501,7 +501,7 @@ bool ViewOverlayManager::DisposeTags() return false; } -IMPL_LINK_TYPED(ViewOverlayManager,EventMultiplexerListener, +IMPL_LINK(ViewOverlayManager,EventMultiplexerListener, tools::EventMultiplexerEvent&, rEvent, void) { switch (rEvent.meEventId) diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 917daa212afa..3e30e82fb2bf 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -134,7 +134,7 @@ void ViewShell::UpdateScrollBars() /** * Handling for horizontal Scrollbars */ -IMPL_LINK_TYPED(ViewShell, HScrollHdl, ScrollBar *, pHScroll, void ) +IMPL_LINK(ViewShell, HScrollHdl, ScrollBar *, pHScroll, void ) { VirtHScrollHdl(pHScroll); } @@ -188,7 +188,7 @@ void ViewShell::VirtHScrollHdl(ScrollBar* pHScroll) /** * handling for vertical Scrollbars */ -IMPL_LINK_TYPED(ViewShell, VScrollHdl, ScrollBar *, pVScroll, void ) +IMPL_LINK(ViewShell, VScrollHdl, ScrollBar *, pVScroll, void ) { VirtVScrollHdl(pVScroll); } diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index d96b33e882d5..71c3e5b1b67b 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -34,8 +34,8 @@ private: SvtURLBox* GetURLBox() const; void OpenURL( const OUString& rName, bool bNew ) const; - DECL_LINK_TYPED( OpenHdl, SvtURLBox*, void ); - DECL_LINK_TYPED( SelectHdl, ComboBox&, void ); + DECL_LINK( OpenHdl, SvtURLBox*, void ); + DECL_LINK( SelectHdl, ComboBox&, void ); struct ExecuteInfo { @@ -44,7 +44,7 @@ private: css::uno::Sequence< css::beans::PropertyValue > aArgs; }; - DECL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, void ); public: diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 5152b8e2d952..0210ed23436b 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -53,7 +53,7 @@ private: void LoadConfig(); void SaveConfig(); - DECL_LINK_TYPED(FindHdl, Button *, void); + DECL_LINK(FindHdl, Button *, void); public: SearchDialog( vcl::Window* pWindow, const OUString& rConfigName ); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index be3bd16731dc..0b65b948abdd 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -467,7 +467,7 @@ extern "C" void basicide_macro_organizer(sal_Int16); #endif -IMPL_LINK_TYPED( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic, bool ) +IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic, bool ) { #if !HAVE_FEATURE_SCRIPTING (void) pStarBasic; diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 7b47221cfec4..4b4a394c2bc2 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -89,7 +89,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; explicit SfxEventAsyncer_Impl(const SfxEventHint& rHint); virtual ~SfxEventAsyncer_Impl() override; - DECL_LINK_TYPED( IdleHdl, Idle*, void ); + DECL_LINK( IdleHdl, Idle*, void ); }; @@ -121,7 +121,7 @@ SfxEventAsyncer_Impl::~SfxEventAsyncer_Impl() } -IMPL_LINK_TYPED(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void) +IMPL_LINK(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void) { SfxObjectShellRef xRef( aHint.GetObjShell() ); pAsyncIdle->Stop(); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 14b9aa8b8cf9..5adbc7cad70e 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -275,7 +275,7 @@ namespace class LicenseDialog : public ModalDialog { private: - DECL_LINK_TYPED(ShowHdl, Button*, void); + DECL_LINK(ShowHdl, Button*, void); public: explicit LicenseDialog(); }; @@ -286,7 +286,7 @@ namespace get<PushButton>("show")->SetClickHdl(LINK(this, LicenseDialog, ShowHdl)); } - IMPL_LINK_NOARG_TYPED(LicenseDialog, ShowHdl, Button*, void) + IMPL_LINK_NOARG(LicenseDialog, ShowHdl, Button*, void) { EndDialog(RET_OK); showDocument("LICENSE"); diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 9d3bb975cab4..e7ced1bfa4f9 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -455,7 +455,7 @@ void SvFileObject::Edit( vcl::Window* /*pParent*/, sfx2::SvBaseLink* pLink, cons } } -IMPL_LINK_NOARG_TYPED( SvFileObject, LoadGrfReady_Impl, void*, void ) +IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl, void*, void ) { // When we come form here there it can not be an error no more. bLoadError = false; @@ -486,13 +486,13 @@ IMPL_LINK_NOARG_TYPED( SvFileObject, LoadGrfReady_Impl, void*, void ) } } -IMPL_LINK_NOARG_TYPED( SvFileObject, DelMedium_Impl, void*, void ) +IMPL_LINK_NOARG( SvFileObject, DelMedium_Impl, void*, void ) { nPostUserEventId = nullptr; mxDelMed.Clear(); } -IMPL_LINK_TYPED( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { OUString sFile; diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index 8d8810a0dc4f..1b735e0c4414 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -53,9 +53,9 @@ class SvFileObject : public sfx2::SvLinkSource bool LoadFile_Impl(); void SendStateChg_Impl( sfx2::LinkManager::LinkState nState ); - DECL_LINK_TYPED( DelMedium_Impl, void*, void ); - DECL_LINK_TYPED( LoadGrfReady_Impl, void*, void ); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( DelMedium_Impl, void*, void ); + DECL_LINK( LoadGrfReady_Impl, void*, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); protected: virtual ~SvFileObject() override; diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 52727441489c..2fe0d7e30e05 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -59,7 +59,7 @@ class SvDDELinkEditDialog : public ModalDialog VclPtr<Edit> m_pEdDdeItem; VclPtr<OKButton> m_pOKButton; - DECL_LINK_TYPED( EditHdl_Impl, Edit&, void ); + DECL_LINK( EditHdl_Impl, Edit&, void ); public: SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* ); virtual ~SvDDELinkEditDialog() override; @@ -110,7 +110,7 @@ OUString SvDDELinkEditDialog::GetCmd() const return sRet; } -IMPL_LINK_NOARG_TYPED( SvDDELinkEditDialog, EditHdl_Impl, Edit&, void) +IMPL_LINK_NOARG( SvDDELinkEditDialog, EditHdl_Impl, Edit&, void) { m_pOKButton->Enable( !m_pEdDdeApp->GetText().isEmpty() && !m_pEdDdeTopic->GetText().isEmpty() && @@ -313,7 +313,7 @@ bool SvDDEObject::IsDataComplete() const return bWaitForData; } -IMPL_LINK_TYPED( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void ) +IMPL_LINK( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void ) { SotClipboardFormatId nFmt = pData->GetFormat(); switch( nFmt ) @@ -347,7 +347,7 @@ IMPL_LINK_TYPED( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void ) } } -IMPL_LINK_TYPED( SvDDEObject, ImplDoneDDEData, bool, bValid, void ) +IMPL_LINK( SvDDEObject, ImplDoneDDEData, bool, bValid, void ) { if( !bValid && ( pRequest || pLink )) { diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index 1888246c4194..5c2bc3a014c4 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -44,8 +44,8 @@ class SvDDEObject : public SvLinkSource static bool ImplHasOtherFormat( DdeTransaction& ); - DECL_LINK_TYPED( ImplGetDDEData, const DdeData*, void ); - DECL_LINK_TYPED( ImplDoneDDEData, bool, void ); + DECL_LINK( ImplGetDDEData, const DdeData*, void ); + DECL_LINK( ImplDoneDDEData, bool, void ); protected: virtual ~SvDDEObject() override; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 2d4907d58bdd..d09823a74625 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -235,7 +235,7 @@ SvBaseLink::~SvBaseLink() delete pImplData; } -IMPL_LINK_TYPED( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void ) +IMPL_LINK( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void ) { OUString sNewName = _rNewName; if ( !ExecuteEdit( sNewName ) ) diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 575ea7174d93..0242633f5658 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -720,18 +720,18 @@ void IndexTabPage_Impl::ClearIndex() m_pIndexCB->Clear(); } -IMPL_LINK_NOARG_TYPED(IndexTabPage_Impl, OpenHdl, Button*, void) +IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl, Button*, void) { m_pIndexCB->GetDoubleClickHdl().Call(*m_pIndexCB); } -IMPL_LINK_TYPED( IndexTabPage_Impl, IdleHdl, Idle*, pIdle, void ) +IMPL_LINK( IndexTabPage_Impl, IdleHdl, Idle*, pIdle, void ) { if ( &aFactoryIdle == pIdle ) InitializeIndex(); } -IMPL_LINK_TYPED( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer, void) +IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer, void) { if(&aKeywordTimer == pTimer && !sKeyword.isEmpty()) aKeywordLink.Call(*this); @@ -1016,12 +1016,12 @@ void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText ) } -IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, ClickHdl, Button*, void) +IMPL_LINK_NOARG(SearchTabPage_Impl, ClickHdl, Button*, void) { SearchHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, SearchHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl, LinkParamNone*, void) { OUString aSearchText = comphelper::string::strip(m_pSearchED->GetText(), ' '); if ( !aSearchText.isEmpty() ) @@ -1058,12 +1058,12 @@ IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, SearchHdl, LinkParamNone*, void) } } -IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, OpenHdl, Button*, void) +IMPL_LINK_NOARG(SearchTabPage_Impl, OpenHdl, Button*, void) { m_pResultsLB->GetDoubleClickHdl().Call(*m_pResultsLB); } -IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl, Edit&, void) { OUString aSearchText = comphelper::string::strip(m_pSearchED->GetText(), ' '); m_pSearchBtn->Enable(!aSearchText.isEmpty()); @@ -1302,7 +1302,7 @@ void BookmarksTabPage_Impl::dispose() } -IMPL_LINK_NOARG_TYPED(BookmarksTabPage_Impl, OpenHdl, Button*, void) +IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl, Button*, void) { m_pBookmarksBox->GetDoubleClickHdl().Call(*m_pBookmarksBox); } @@ -1544,19 +1544,19 @@ HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId ) return pPage; } -IMPL_LINK_TYPED( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl, void ) +IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl, void ) { sal_uInt16 nId = 0; TabPage* pPage = GetCurrentPage( nId ); pTabCtrl->SetTabPage( nId, pPage ); } -IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl, ListBox&, void) { aIdle.Start(); } -IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, InitHdl, Idle *, void) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl, Idle *, void) { bIsInitDone = true; Initialize(); @@ -1566,7 +1566,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, InitHdl, Idle *, void) aIdle.SetPriority( SchedulerPriority::LOWEST ); } -IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Idle *, void) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Idle *, void) { OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetSelectEntryData()); if ( pFactory ) @@ -1576,7 +1576,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl&, void) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl&, void) { // keyword found on index? bool bIndex = pIPage->HasKeyword(); @@ -1598,7 +1598,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl&, v pParentWin->ShowStartPage(); } -IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, IndexTabPageDoubleClickHdl, ComboBox&, rBox, void) +IMPL_LINK(SfxHelpIndexWindow_Impl, IndexTabPageDoubleClickHdl, ComboBox&, rBox, void) { aPageDoubleClickLink.Call(&rBox); } @@ -1689,12 +1689,12 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<Control*,bool>& rLin aPageDoubleClickLink = rLink; } -IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl, SvTreeListBox*, p, bool) +IMPL_LINK(SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl, SvTreeListBox*, p, bool) { return aPageDoubleClickLink.Call(p); } -IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, TabPageDoubleClickHdl, ListBox&, r, void) +IMPL_LINK(SfxHelpIndexWindow_Impl, TabPageDoubleClickHdl, ListBox&, r, void) { aPageDoubleClickLink.Call(&r); } @@ -2154,7 +2154,7 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const vcl::KeyCode& _rKeyCode ) } -IMPL_LINK_NOARG_TYPED(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) +IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) { try { @@ -2192,7 +2192,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) } -IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) { InitToolBoxImages(); Resize(); @@ -2200,7 +2200,7 @@ IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) } -IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog&, rDlg, void ) +IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog&, rDlg, void ) { FindHdl(&rDlg); } @@ -2283,13 +2283,13 @@ void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg) } -IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, void ) +IMPL_LINK_NOARG( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, void ) { pSrchDlg.clear(); } -IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, CheckHdl, Button*, pButton, void ) +IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if ( xConfiguration.is() ) @@ -2804,7 +2804,7 @@ void SfxHelpWindow_Impl::ShowStartPage() } -IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) +IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) { if ( pToolBox ) { @@ -2814,7 +2814,7 @@ IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) } -IMPL_LINK_NOARG_TYPED(SfxHelpWindow_Impl, OpenHdl, Control*, bool) +IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl, Control*, bool) { pIndexWin->SelectExecutableEntry(); OUString aEntry = pIndexWin->GetSelectEntry(); @@ -2854,7 +2854,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpWindow_Impl, OpenHdl, Control*, bool) } -IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin, void ) +IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin, void ) { if ( sTitle.isEmpty() ) sTitle = GetParent()->GetText(); @@ -2871,7 +2871,7 @@ IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* } -IMPL_LINK_TYPED( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl&, rListener, void ) +IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl&, rListener, void ) { SetFactory( rListener.GetFactory() ); } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 29efc2113de4..a5d7e67dd574 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -137,9 +137,9 @@ private: void InitializeIndex(); void ClearIndex(); - DECL_LINK_TYPED(OpenHdl, Button*, void); - DECL_LINK_TYPED(IdleHdl, Idle*, void); - DECL_LINK_TYPED(TimeoutHdl, Timer*, void); + DECL_LINK(OpenHdl, Button*, void); + DECL_LINK(IdleHdl, Idle*, void); + DECL_LINK(TimeoutHdl, Timer*, void); public: IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); @@ -214,10 +214,10 @@ private: void ClearSearchResults(); void RememberSearchText( const OUString& rSearchText ); - DECL_LINK_TYPED(SearchHdl, LinkParamNone*, void); - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(OpenHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SearchHdl, LinkParamNone*, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(OpenHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SearchTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); @@ -259,7 +259,7 @@ private: VclPtr<BookmarksBox_Impl> m_pBookmarksBox; VclPtr<PushButton> m_pBookmarksPB; - DECL_LINK_TYPED(OpenHdl, Button*, void); + DECL_LINK(OpenHdl, Button*, void); public: BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); @@ -312,14 +312,14 @@ private: inline SearchTabPage_Impl* GetSearchPage(); inline BookmarksTabPage_Impl* GetBookmarksPage(); - DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void ); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(InitHdl, Idle *, void); - DECL_LINK_TYPED(SelectFactoryHdl, Idle *, void); - DECL_LINK_TYPED(KeywordHdl, IndexTabPage_Impl&, void); - DECL_LINK_TYPED(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED(TabPageDoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(IndexTabPageDoubleClickHdl, ComboBox&, void); + DECL_LINK(ActivatePageHdl, TabControl*, void ); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(InitHdl, Idle *, void); + DECL_LINK(SelectFactoryHdl, Idle *, void); + DECL_LINK(KeywordHdl, IndexTabPage_Impl&, void); + DECL_LINK(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool); + DECL_LINK(TabPageDoubleClickHdl, ListBox&, void); + DECL_LINK(IndexTabPageDoubleClickHdl, ComboBox&, void); public: explicit SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent ); @@ -453,11 +453,11 @@ private: getCursor() const; bool isHandledKey( const vcl::KeyCode& _rKeyCode ); - DECL_LINK_TYPED( SelectHdl, Idle *, void); - DECL_LINK_TYPED( NotifyHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( FindHdl, sfx2::SearchDialog&, void ); - DECL_LINK_TYPED( CloseHdl, sfx2::SearchDialog*, void ); - DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK( SelectHdl, Idle *, void); + DECL_LINK( NotifyHdl, LinkParamNone*, void ); + DECL_LINK( FindHdl, sfx2::SearchDialog&, void ); + DECL_LINK( CloseHdl, sfx2::SearchDialog*, void ); + DECL_LINK( CheckHdl, Button*, void ); void FindHdl(sfx2::SearchDialog*); public: @@ -521,10 +521,10 @@ friend class SfxHelpIndexWindow_Impl; void SaveConfig(); void ShowStartPage(); - DECL_LINK_TYPED( SelectHdl, ToolBox*, void ); - DECL_LINK_TYPED( OpenHdl, Control*, bool ); - DECL_LINK_TYPED( SelectFactoryHdl, SfxHelpIndexWindow_Impl*, void ); - DECL_LINK_TYPED( ChangeHdl, HelpListener_Impl&, void ); + DECL_LINK( SelectHdl, ToolBox*, void ); + DECL_LINK( OpenHdl, Control*, bool ); + DECL_LINK( SelectFactoryHdl, SfxHelpIndexWindow_Impl*, void ); + DECL_LINK( ChangeHdl, HelpListener_Impl&, void ); public: SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >& rFrame, diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index a0acb4984961..86aa57c74d7a 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -351,7 +351,7 @@ void ShutdownIcon::StartFileDialog() } -IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, void ) +IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, void ) { DBG_ASSERT( m_pFileDlg, "ShutdownIcon, DialogClosedHdl_Impl(): no file dialog" ); diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index cefeebb4b98f..d90792751716 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -114,7 +114,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase void SetVeto( bool bVeto ) { m_bVeto = bVeto;} void StartFileDialog(); - DECL_LINK_TYPED(DialogClosedHdl_Impl, sfx2::FileDialogHelper*, void); + DECL_LINK(DialogClosedHdl_Impl, sfx2::FileDialogHelper*, void); static bool IsQuickstarterInstalled(); diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index e58ac1090a4a..a85c95fcf596 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -816,7 +816,7 @@ std::shared_ptr<const SfxFilter> SfxFilterMatcher::GetFilter4FilterName( const O return nullptr; } -IMPL_LINK_TYPED( SfxFilterMatcher, MaybeFileHdl_Impl, OUString*, pString, bool ) +IMPL_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, OUString*, pString, bool ) { std::shared_ptr<const SfxFilter> pFilter = GetFilter4Extension( *pString ); if (pFilter && !pFilter->GetWildcard().Matches( OUString() ) && diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 61d1630ccca2..c418d0795445 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1436,7 +1436,7 @@ void SfxBindings::UpdateControllers_Impl } } -IMPL_LINK_TYPED( SfxBindings, NextJob, Timer *, pTimer, void ) +IMPL_LINK( SfxBindings, NextJob, Timer *, pTimer, void ) { NextJob_Impl(pTimer); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 4b57f14956fe..9aee901870cd 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -611,7 +611,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode) It flushes the Stack, if it is dirty, thus it actually executes the pending Push and Pop commands. */ -IMPL_LINK_NOARG_TYPED( SfxDispatcher, EventHdl_Impl, Idle *, void ) +IMPL_LINK_NOARG( SfxDispatcher, EventHdl_Impl, Idle *, void ) { Flush(); Update_Impl(); @@ -1174,7 +1174,7 @@ const SfxPoolItem* SfxDispatcher::ExecuteList(sal_uInt16 nSlot, SfxCallMode eCal /** Helper method to receive the asynchronously executed <SfxRequest>s. */ -IMPL_LINK_TYPED(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq, void) +IMPL_LINK(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq, void) { DBG_ASSERT( !xImp->bFlushing, "recursive call to dispatcher" ); SFX_STACK(SfxDispatcher::PostMsgHandler); diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx index 79bda2b639d3..dc66b1fbecd7 100644 --- a/sfx2/source/control/emojicontrol.cxx +++ b/sfx2/source/control/emojicontrol.cxx @@ -148,12 +148,12 @@ FILTER_CATEGORY SfxEmojiControl::getCurrentFilter() return FILTER_CATEGORY::PEOPLE; } -IMPL_LINK_NOARG_TYPED(SfxEmojiControl, ActivatePageHdl, TabControl*, void) +IMPL_LINK_NOARG(SfxEmojiControl, ActivatePageHdl, TabControl*, void) { mpEmojiView->filterItems(ViewFilter_Category(getCurrentFilter())); } -IMPL_STATIC_LINK_TYPED(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void) +IMPL_STATIC_LINK(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void) { OUStringBuffer sHexText = ""; sHexText.appendUtf32(OUString(pItem->getTitle()).toUInt32(16)); diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx index 096ab3752864..a1d6478a45fd 100644 --- a/sfx2/source/control/itemdel.cxx +++ b/sfx2/source/control/itemdel.cxx @@ -30,7 +30,7 @@ class SfxItemDisruptor_Impl Idle m_Idle; private: - DECL_LINK_TYPED( Delete, Idle*, void ); + DECL_LINK( Delete, Idle*, void ); public: explicit SfxItemDisruptor_Impl(SfxPoolItem *pItemToDesrupt); @@ -66,7 +66,7 @@ SfxItemDisruptor_Impl::~SfxItemDisruptor_Impl() delete pItem; } -IMPL_LINK_NOARG_TYPED(SfxItemDisruptor_Impl, Delete, Idle*, void) +IMPL_LINK_NOARG(SfxItemDisruptor_Impl, Delete, Idle*, void) { delete this; } diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 8dfa4e545669..e58003efb844 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -324,7 +324,7 @@ void RecentDocsView::Clear() ThumbnailView::Clear(); } -IMPL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, void*, p, void ) { LoadRecentFile* pLoadRecentFile = static_cast< LoadRecentFile*>(p); try diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx index 1f6917735d56..5e2d0fcf00eb 100644 --- a/sfx2/source/control/templatedefaultview.cxx +++ b/sfx2/source/control/templatedefaultview.cxx @@ -73,7 +73,7 @@ void TemplateDefaultView::createContextMenu() Invalidate(); } -IMPL_LINK_TYPED(TemplateDefaultView, ContextMenuSelectHdl, Menu*, pMenu, void) +IMPL_LINK(TemplateDefaultView, ContextMenuSelectHdl, Menu*, pMenu, void) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 758ce118bac2..f60a4803a78c 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -254,7 +254,7 @@ void TemplateLocalView::createContextMenu(const bool bIsDefault) Invalidate(); } -IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index 1f3fc76ee469..e1db4e53c65f 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -144,7 +144,7 @@ void TemplateSearchView::createContextMenu( const bool bIsDefault) Invalidate(); } -IMPL_LINK_TYPED(TemplateSearchView, ContextMenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(TemplateSearchView, ContextMenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 716883c47825..68e88bae79cc 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -493,7 +493,7 @@ bool ThumbnailView::ImplHasAccessibleListeners() return( pAcc && pAcc->HasAccessibleListeners() ); } -IMPL_LINK_TYPED( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar, void ) { if ( pScrollBar->GetDelta() ) { diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index dfa98d72c443..d022c2e02e55 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -522,7 +522,7 @@ void BackingWindow::Resize() Invalidate(); } -IMPL_LINK_TYPED(BackingWindow, ExtLinkClickHdl, Button*, pButton, void) +IMPL_LINK(BackingWindow, ExtLinkClickHdl, Button*, pButton, void) { OUString aNode; @@ -561,7 +561,7 @@ IMPL_LINK_TYPED(BackingWindow, ExtLinkClickHdl, Button*, pButton, void) } } -IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void ) +IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton, void ) { // dispatch the appropriate URL and end the dialog if( pButton == mpWriterAllButton ) @@ -618,7 +618,7 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void ) +IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void ) { if(pButton == mpRecentButton) { @@ -663,7 +663,7 @@ IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void ) } } -IMPL_LINK_TYPED(BackingWindow, CreateContextMenuHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(BackingWindow, CreateContextMenuHdl, ThumbnailViewItem*, pItem, void) { const TemplateViewItem *pViewItem = dynamic_cast<TemplateViewItem*>(pItem); @@ -671,7 +671,7 @@ IMPL_LINK_TYPED(BackingWindow, CreateContextMenuHdl, ThumbnailViewItem*, pItem, mpLocalView->createContextMenu(); } -IMPL_LINK_TYPED(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) { uno::Sequence< PropertyValue > aArgs(4); aArgs[0].Name = "AsTemplate"; @@ -696,7 +696,7 @@ IMPL_LINK_TYPED(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) } } -IMPL_LINK_TYPED(BackingWindow, EditTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(BackingWindow, EditTemplateHdl, ThumbnailViewItem*, pItem, void) { uno::Sequence< PropertyValue > aArgs(3); aArgs[0].Name = "AsTemplate"; diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 7fe9369e8c43..2469409cc483 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -100,12 +100,12 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer const css::uno::Reference<css::frame::XDispatchProvider >& i_xProv = css::uno::Reference<css::frame::XDispatchProvider>(), const css::uno::Sequence<css::beans::PropertyValue >& = css::uno::Sequence<css::beans::PropertyValue>()); - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(MenuSelectHdl, MenuButton*, void); - DECL_LINK_TYPED(ExtLinkClickHdl, Button*, void); - DECL_LINK_TYPED(CreateContextMenuHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(EditTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(MenuSelectHdl, MenuButton*, void); + DECL_LINK(ExtLinkClickHdl, Button*, void); + DECL_LINK(CreateContextMenuHdl, ThumbnailViewItem*, void); + DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(EditTemplateHdl, ThumbnailViewItem*, void); void initControls(); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 953e8da4d6eb..971c7502f4bb 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -281,7 +281,7 @@ void SfxModelessDialog::Move() Implements a timer event that is triggered by a move or resize of the window This will save config information to Views.xcu with a small delay */ -IMPL_LINK_NOARG_TYPED(SfxModelessDialog, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl, Idle *, void) { pImpl->aMoveIdle.Stop(); if ( pImpl->bConstructed && pImpl->pMgr ) @@ -534,7 +534,7 @@ void SfxFloatingWindow::Move() Implements a timer event that is triggered by a move or resize of the window This will save config information to Views.xcu with a small delay */ -IMPL_LINK_NOARG_TYPED(SfxFloatingWindow, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl, Idle *, void) { pImpl->aMoveIdle.Stop(); if ( pImpl->bConstructed && pImpl->pMgr ) @@ -598,7 +598,7 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const // SfxSingleTabDialog ---------------------------------------------------- -IMPL_LINK_NOARG_TYPED(SfxSingleTabDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl, Button*, void) /* [Description] diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx index c6e10ccec20e..7998ea9a6819 100644 --- a/sfx2/source/dialog/checkin.cxx +++ b/sfx2/source/dialog/checkin.cxx @@ -43,7 +43,7 @@ bool SfxCheckinDialog::IsMajor( ) return m_pMajorCB->IsChecked( ); } -IMPL_LINK_NOARG_TYPED( SfxCheckinDialog, OKHdl, Button*, void ) +IMPL_LINK_NOARG( SfxCheckinDialog, OKHdl, Button*, void ) { EndDialog( RET_OK ); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index b074dc05e17d..6164b5edbb83 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -828,7 +828,7 @@ void SfxDocumentPage::dispose() } -IMPL_LINK_NOARG_TYPED(SfxDocumentPage, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl, Button*, void) { OUString aName; if ( bEnableUseUserData && m_pUseUserDataCB->IsChecked() ) @@ -845,7 +845,7 @@ IMPL_LINK_NOARG_TYPED(SfxDocumentPage, DeleteHdl, Button*, void) bHandleDelete = true; } -IMPL_LINK_NOARG_TYPED(SfxDocumentPage, SignatureHdl, Button*, void) +IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl, Button*, void) { SfxObjectShell* pDoc = SfxObjectShell::Current(); if( pDoc ) @@ -856,7 +856,7 @@ IMPL_LINK_NOARG_TYPED(SfxDocumentPage, SignatureHdl, Button*, void) } } -IMPL_STATIC_LINK_NOARG_TYPED(SfxDocumentPage, ChangePassHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SfxDocumentPage, ChangePassHdl, Button*, void) { SfxObjectShell* pShell = SfxObjectShell::Current(); do @@ -1377,7 +1377,7 @@ CustomPropertiesEditButton::CustomPropertiesEditButton(vcl::Window* pParent, Win SetClickHdl( LINK( this, CustomPropertiesEditButton, ClickHdl )); } -IMPL_LINK_NOARG_TYPED(CustomPropertiesEditButton, ClickHdl, Button*, void) +IMPL_LINK_NOARG(CustomPropertiesEditButton, ClickHdl, Button*, void) { VclPtrInstance< DurationDialog_Impl > pDurationDlg( this, m_pLine->m_aDurationField->GetDuration() ); if ( RET_OK == pDurationDlg->Execute() ) @@ -1525,7 +1525,7 @@ void CustomPropertiesWindow::dispose() vcl::Window::dispose(); } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( CustomPropertiesWindow, TypeHdl, ListBox&, rListBox, void ) { CustomPropertiesTypeBox* pBox = static_cast<CustomPropertiesTypeBox*>(&rListBox); @@ -1553,7 +1553,7 @@ IMPL_STATIC_LINK_TYPED( } } -IMPL_LINK_TYPED( CustomPropertiesWindow, RemoveHdl, Button*, pBtn, void ) +IMPL_LINK( CustomPropertiesWindow, RemoveHdl, Button*, pBtn, void ) { CustomPropertiesRemoveButton* pButton = static_cast<CustomPropertiesRemoveButton*>(pBtn); CustomPropertyLine* pLine = pButton->GetLine(); @@ -1589,7 +1589,7 @@ IMPL_LINK_TYPED( CustomPropertiesWindow, RemoveHdl, Button*, pBtn, void ) m_aRemovedHdl.Call(nullptr); } -IMPL_LINK_TYPED( CustomPropertiesWindow, EditLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( CustomPropertiesWindow, EditLoseFocusHdl, Control&, rControl, void ) { CustomPropertiesEdit* pEdit = static_cast<CustomPropertiesEdit*>(&rControl); CustomPropertyLine* pLine = pEdit->GetLine(); @@ -1602,18 +1602,18 @@ IMPL_LINK_TYPED( CustomPropertiesWindow, EditLoseFocusHdl, Control&, rControl, v pLine->m_bTypeLostFocus = false; } -IMPL_LINK_TYPED( CustomPropertiesWindow, BoxLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( CustomPropertiesWindow, BoxLoseFocusHdl, Control&, rControl, void ) { m_pCurrentLine = static_cast<CustomPropertiesTypeBox*>(&rControl)->GetLine(); m_aBoxLoseFocusIdle.Start(); } -IMPL_LINK_NOARG_TYPED(CustomPropertiesWindow, EditTimeoutHdl, Idle *, void) +IMPL_LINK_NOARG(CustomPropertiesWindow, EditTimeoutHdl, Idle *, void) { ValidateLine( m_pCurrentLine, false ); } -IMPL_LINK_NOARG_TYPED(CustomPropertiesWindow, BoxTimeoutHdl, Idle *, void) +IMPL_LINK_NOARG(CustomPropertiesWindow, BoxTimeoutHdl, Idle *, void) { ValidateLine( m_pCurrentLine, true ); } @@ -2148,7 +2148,7 @@ void CustomPropertiesControl::dispose() vcl::Window::dispose(); } -IMPL_LINK_TYPED( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) { sal_Int32 nOffset = m_pPropertiesWin->GetLineHeight(); nOffset *= ( m_nThumbPos - pScrollBar->GetThumbPos() ); @@ -2156,7 +2156,7 @@ IMPL_LINK_TYPED( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, voi m_pPropertiesWin->DoScroll( nOffset ); } -IMPL_LINK_NOARG_TYPED(CustomPropertiesControl, RemovedHdl, void*, void) +IMPL_LINK_NOARG(CustomPropertiesControl, RemovedHdl, void*, void) { long nLineCount = m_pPropertiesWin->GetVisibleLineCount(); m_pVertScroll->SetRangeMax(nLineCount + 1); @@ -2193,7 +2193,7 @@ void SfxCustomPropertiesPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SfxCustomPropertiesPage, AddHdl, Button*, void) +IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl, Button*, void) { Any aAny; m_pPropertiesCtrl->AddLine( OUString(), aAny, true ); @@ -2607,7 +2607,7 @@ void CmisPropertiesControl::ClearAllLines() m_pPropertiesWin.ClearAllLines(); } -IMPL_LINK_TYPED( CmisPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( CmisPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) { sal_Int32 nOffset = m_pPropertiesWin.GetItemHeight(); nOffset *= ( pScrollBar->GetThumbPos() ); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 9fe7b04f0f2d..f74494f1ed7c 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1725,7 +1725,7 @@ void SfxDockingWindow::Move() pImpl->aMoveIdle.Start(); } -IMPL_LINK_NOARG_TYPED(SfxDockingWindow, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(SfxDockingWindow, TimerHdl, Idle *, void) { pImpl->aMoveIdle.Stop(); if ( IsReallyVisible() && IsFloatingMode() ) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index cf5866e90551..7f379f58cc1d 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -662,7 +662,7 @@ void FileDialogHelper_Impl::updateVersions() } } -IMPL_LINK_NOARG_TYPED(FileDialogHelper_Impl, TimeOutHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl, Idle *, void) { if ( !mbHasPreview ) return; @@ -1178,7 +1178,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con } } -IMPL_LINK_NOARG_TYPED( FileDialogHelper_Impl, InitControls, void*, void ) +IMPL_LINK_NOARG( FileDialogHelper_Impl, InitControls, void*, void ) { mnPostUserEventId = nullptr; enablePasswordBox( true ); @@ -2312,7 +2312,7 @@ void FileDialogHelper::SetContext( Context _eNewContext ) mpImpl->SetContext( _eNewContext ); } -IMPL_LINK_NOARG_TYPED(FileDialogHelper, ExecuteSystemFilePicker, void*, void) +IMPL_LINK_NOARG(FileDialogHelper, ExecuteSystemFilePicker, void*, void) { m_nError = mpImpl->execute(); m_aDialogClosedLink.Call( this ); diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index d3f0a3c793ea..3ddfe25d20ef 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -145,8 +145,8 @@ namespace sfx2 std::vector<OUString>& rpURLList, const std::shared_ptr<const SfxFilter>& pFilter ); - DECL_LINK_TYPED( TimeOutHdl_Impl, Idle *, void); - DECL_LINK_TYPED( InitControls, void*, void ); + DECL_LINK( TimeOutHdl_Impl, Idle *, void); + DECL_LINK( InitControls, void*, void ); public: // XFilePickerListener methods diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index df620f809334..331952ef5cfc 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -256,7 +256,7 @@ void SfxInfoBarWindow::Resize() m_pMessage->SetPosSizePixel(aMessagePosition, aMessageSize); } -IMPL_LINK_NOARG_TYPED(SfxInfoBarWindow, CloseHandler, Button*, void) +IMPL_LINK_NOARG(SfxInfoBarWindow, CloseHandler, Button*, void) { static_cast<SfxInfoBarContainerWindow*>(GetParent())->removeInfoBar(this); } diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index 427f2862ed5b..cbcbe2d0b98e 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -58,7 +58,7 @@ void InputDialog::SetEntryText( OUString const & sStr) m_pEntry->SetCursorAtLast(); } -IMPL_LINK_TYPED(InputDialog,ClickHdl, Button*, pButton, void) +IMPL_LINK(InputDialog,ClickHdl, Button*, pButton, void) { EndDialog(pButton == m_pOK ? RET_OK : RET_CANCEL); } diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 60476b8ca155..6c8a29f9069c 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -339,7 +339,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() m_pDescFt->SetText( pStyle->GetDescription( eUnit ) ); } -IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, void ) { OUString aTemplName(m_pFollowLb->GetSelectEntry()); OUString aEditTemplName(m_pNameRo->GetText()); @@ -349,7 +349,7 @@ IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox m_pEditStyleBtn->Disable(); } -IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void ) { OUString aTemplName(m_pFollowLb->GetSelectEntry()); if (Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() )) @@ -357,7 +357,7 @@ IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void } } -IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, ListBox&, void ) { sal_Int32 linkSelectPos = m_pBaseLb->GetSelectEntryPos(); if ( linkSelectPos == 0 ) @@ -366,7 +366,7 @@ IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, Lis m_pEditLinkStyleBtn->Enable(); } -IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl, Button*, void ) { OUString aTemplName(m_pBaseLb->GetSelectEntry()); if (aTemplName != SfxResId(STR_NONE)) @@ -408,7 +408,7 @@ bool SfxManageStyleSheetPage::Execute_Impl( } -IMPL_LINK_TYPED( SfxManageStyleSheetPage, GetFocusHdl, Control&, rControl, void ) +IMPL_LINK( SfxManageStyleSheetPage, GetFocusHdl, Control&, rControl, void ) /* [Description] @@ -420,7 +420,7 @@ IMPL_LINK_TYPED( SfxManageStyleSheetPage, GetFocusHdl, Control&, rControl, void aBuf = comphelper::string::stripStart(pEdit->GetText(), ' '); } -IMPL_LINK_TYPED( SfxManageStyleSheetPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SfxManageStyleSheetPage, LoseFocusHdl, Control&, rControl, void ) /* [Description] diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index fc0d4f973a80..903a9342e9a0 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -28,11 +28,11 @@ // PRIVATE METHODES ------------------------------------------------------ -IMPL_LINK_NOARG_TYPED( SfxNewStyleDlg, OKClickHdl, Button*, void ) +IMPL_LINK_NOARG( SfxNewStyleDlg, OKClickHdl, Button*, void ) { OKHdl(*m_pColBox); } -IMPL_LINK_NOARG_TYPED( SfxNewStyleDlg, OKHdl, ComboBox&, void ) +IMPL_LINK_NOARG( SfxNewStyleDlg, OKHdl, ComboBox&, void ) { const OUString aName( m_pColBox->GetText() ); SfxStyleSheetBase* pStyle = rPool.Find( aName, rPool.GetSearchFamily() ); @@ -51,7 +51,7 @@ IMPL_LINK_NOARG_TYPED( SfxNewStyleDlg, OKHdl, ComboBox&, void ) EndDialog( RET_OK ); } -IMPL_LINK_TYPED( SfxNewStyleDlg, ModifyHdl, Edit&, rBox, void ) +IMPL_LINK( SfxNewStyleDlg, ModifyHdl, Edit&, rBox, void ) { m_pOKBtn->Enable( !rBox.GetText().replaceAll(" ", "").isEmpty() ); } diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 97e0e259a4da..5bf8fc44875d 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -28,7 +28,7 @@ #include "dialog.hrc" -IMPL_LINK_TYPED( SfxPasswordDialog, EditModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SfxPasswordDialog, EditModifyHdl, Edit&, rEdit, void ) { ModifyHdl(&rEdit); } @@ -63,7 +63,7 @@ void SfxPasswordDialog::ModifyHdl(Edit* pEdit) mpOKBtn->Enable( bEnable ); } -IMPL_LINK_NOARG_TYPED(SfxPasswordDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl, Button*, void) { bool bConfirmFailed = bool( mnExtras & SfxShowExtras::CONFIRM ) && ( GetConfirm() != GetPassword() ); diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 0b72c3478f14..61b2a260cadd 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -271,7 +271,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt } } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, Button*, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, Button*, void ) { const bool bReduceTransparency = m_pReduceTransparencyCB->IsChecked(); @@ -281,7 +281,7 @@ IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHd m_pTransparencyCB->Enable( !bReduceTransparency ); } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, Button*, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, Button*, void ) { const bool bEnable = m_pReduceGradientsCB->IsChecked(); @@ -292,7 +292,7 @@ IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, ToggleReduceGradientsStripesRBHdl(*m_pReduceGradientsStripesRB); } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, Button*, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, Button*, void ) { const bool bEnable = m_pReduceBitmapsCB->IsChecked(); @@ -305,21 +305,21 @@ IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, Bu ToggleReduceBitmapsResolutionRBHdl(*m_pReduceBitmapsResolutionRB); } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton&, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton&, void ) { const bool bEnable = m_pReduceGradientsCB->IsChecked() && m_pReduceGradientsStripesRB->IsChecked(); m_pReduceGradientsStepCountNF->Enable( bEnable ); } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton&, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton&, void ) { const bool bEnable = m_pReduceBitmapsCB->IsChecked() && m_pReduceBitmapsResolutionRB->IsChecked(); m_pReduceBitmapsResolutionLB->Enable( bEnable ); } -IMPL_LINK_TYPED( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton&, rButton, void ) +IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton&, rButton, void ) { if( rButton.IsChecked() ) { @@ -330,7 +330,7 @@ IMPL_LINK_TYPED( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioBu ImplSaveControls( &maPrinterOptions ); } -IMPL_LINK_TYPED( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton&, rButton, void ) +IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton&, rButton, void ) { if( rButton.IsChecked() ) { diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index e5151e470961..293f33f6d13a 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -147,8 +147,8 @@ struct SfxSecurityPage_Impl OUString m_aEndRedliningWarning; bool m_bEndRedliningWarningDone; - DECL_LINK_TYPED( RecordChangesCBToggleHdl, CheckBox&, void ); - DECL_LINK_TYPED( ChangeProtectionPBHdl, Button*, void ); + DECL_LINK( RecordChangesCBToggleHdl, CheckBox&, void ); + DECL_LINK( ChangeProtectionPBHdl, Button*, void ); SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet ); ~SfxSecurityPage_Impl(); @@ -325,7 +325,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & ) } -IMPL_LINK_NOARG_TYPED(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, CheckBox&, void) +IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, CheckBox&, void) { // when change recording gets disabled protection must be disabled as well if (!m_pRecordChangesCB->IsChecked()) // the new check state is already present, thus the '!' @@ -373,7 +373,7 @@ IMPL_LINK_NOARG_TYPED(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, CheckBox&, } -IMPL_LINK_NOARG_TYPED(SfxSecurityPage_Impl, ChangeProtectionPBHdl, Button*, void) +IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl, Button*, void) { if (m_eRedlingMode == RL_NONE) return; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 1fbeab0a80dd..a31e3563766a 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -934,7 +934,7 @@ void SfxSplitWindow::Command( const CommandEvent& rCEvt ) } -IMPL_LINK_TYPED( SfxSplitWindow, TimerHdl, Timer*, pTimer, void) +IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer, void) { if ( pTimer ) pTimer->Stop(); diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index d108cf500194..7b1d69105566 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -130,7 +130,7 @@ void SearchDialog::SaveConfig() aViewOpt.SetUserItem( "UserItem", aUserItem ); } -IMPL_LINK_NOARG_TYPED(SearchDialog, FindHdl, Button*, void) +IMPL_LINK_NOARG(SearchDialog, FindHdl, Button*, void) { OUString sSrchTxt = m_pSearchEdit->GetText(); sal_Int32 nPos = m_pSearchEdit->GetEntryPos( sSrchTxt ); diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 197a55e4fd5e..038f01b241c7 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -101,7 +101,7 @@ short SfxStyleDialog::Ok() } -IMPL_LINK_NOARG_TYPED( SfxStyleDialog, CancelHdl, Button *, void ) +IMPL_LINK_NOARG( SfxStyleDialog, CancelHdl, Button *, void ) /* [Description] diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 6d00f035a72a..ffc821d53baf 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -803,7 +803,7 @@ short SfxTabDialog::Ok() return bModified ? RET_OK : RET_CANCEL; } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, CancelHdl, Button*, void) { EndDialog( RET_USER_CANCEL ); } @@ -837,7 +837,7 @@ void SfxTabDialog::RefreshInputSet() } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, OkHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, OkHdl, Button*, void) /* [Description] @@ -914,7 +914,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, UserHdl, Button*, void) /* [Description] @@ -938,7 +938,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, ResetHdl, Button*, void) /* [Description] @@ -956,7 +956,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl, Button*, void) /* [Description] @@ -1032,7 +1032,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) } -IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) +IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) /* [Description] @@ -1132,7 +1132,7 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) } -IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) +IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) /* [Description] diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index cc4119459bf7..6c98695988c1 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -283,7 +283,7 @@ sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -IMPL_LINK_NOARG_TYPED(DropListBox_Impl, OnAsyncExecuteDrop, void*, void) +IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop, void*, void) { pDialog->ActionSelect( SID_STYLE_NEW_BY_EXAMPLE ); } @@ -1436,7 +1436,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl() EnableNew( bCanNew ); } -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, TimeOut, Idle *, void ) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, TimeOut, Idle *, void ) { if(!bDontUpdate) { @@ -1685,7 +1685,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) } } -IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox&, rBox, void ) { if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString() == rBox.GetSelectEntry()) { @@ -1851,7 +1851,7 @@ SfxObjectShell* SfxCommonTemplateDialog_Impl::SaveSelection() return pDocShell; } -IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl&, rBox, bool ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl&, rBox, bool ) { bDontUpdate = true; const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl(); @@ -2056,14 +2056,14 @@ void SfxCommonTemplateDialog_Impl::ResetFocus() } } -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, TreeListApplyHdl, SvTreeListBox *, bool ) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, TreeListApplyHdl, SvTreeListBox *, bool ) { ApplyHdl(nullptr); return false; } // Double-click on a style sheet in the ListBox is applied. -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, ApplyHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, ApplyHdl, LinkParamNone*, void ) { // only if that region is allowed if ( IsInitialized() && nullptr != pFamilyState[nActFamily-1] && @@ -2078,7 +2078,7 @@ IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, ApplyHdl, LinkParamNone*, v ResetFocus(); } -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, PreviewHdl, Button*, void) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, PreviewHdl, Button*, void) { std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create() ); officecfg::Office::Common::StylesAndFormatting::Preview::set( aPreviewCheckbox->IsChecked(), batch ); @@ -2103,7 +2103,7 @@ IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, PreviewHdl, Button*, void) } // Selection of a template during the Watercan-Status -IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox, void ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox, void ) { // Trigger Help PI, if this is permitted of call handlers and field if( !pListBox || pListBox->IsSelected( pListBox->GetHdlEntry() ) ) @@ -2146,7 +2146,7 @@ IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pL } } -IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool ) { nLastItemId = pMenu->GetCurItemId(); Application::PostUserEvent( @@ -2154,7 +2154,7 @@ IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool return true; } -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl, void*, void ) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl, void*, void ) { switch(nLastItemId) { case ID_NEW: NewHdl(); break; @@ -2492,13 +2492,13 @@ bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId) } } -IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox, void ) +IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox, void ) { const sal_uInt16 nEntry = pBox->GetCurItemId(); FamilySelect(nEntry); } -IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox, void ) +IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox, void ) { const sal_uInt16 nEntry = pBox->GetCurItemId(); if(nEntry != SID_STYLE_NEW_BY_EXAMPLE || @@ -2506,7 +2506,7 @@ IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox, void ) ActionSelect(nEntry); } -IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void ) +IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void ) { const sal_uInt16 nEntry = pBox->GetCurItemId(); if(nEntry == SID_STYLE_NEW_BY_EXAMPLE && @@ -2557,7 +2557,7 @@ IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void ) } } -IMPL_LINK_TYPED( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); ActionSelect(nMenuId); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 27f292be0249..58057ac13f48 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -225,7 +225,7 @@ namespace sfx2 } - IMPL_LINK_TYPED( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox, void ) + IMPL_LINK( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox, void ) { const sal_uInt16 nId = pToolBox->GetCurItemId(); diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index bf66c33b88fe..97e7623307f3 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -156,7 +156,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta } } -IMPL_LINK_NOARG_TYPED(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl, void*, void) +IMPL_LINK_NOARG(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl, void*, void) { nUserEventId = nullptr; SfxBoolItem* pState = nullptr; diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 985dd1de93e6..cb4dd57062a0 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -374,13 +374,13 @@ void SfxVersionDialog::Open_Impl() Close(); } -IMPL_LINK_NOARG_TYPED(SfxVersionDialog, DClickHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl, SvTreeListBox*, bool) { Open_Impl(); return false; } -IMPL_LINK_NOARG_TYPED(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) { bool bEnable = ( m_pVersionBox->FirstSelected() != nullptr ); SfxObjectShell* pObjShell = pViewFrame->GetObjectShell(); @@ -394,7 +394,7 @@ IMPL_LINK_NOARG_TYPED(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) m_pCompareButton->Enable(bEnable && eState >= SfxItemState::DEFAULT); } -IMPL_LINK_TYPED( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton, void ) +IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton, void ) { SfxObjectShell *pObjShell = pViewFrame->GetObjectShell(); SvTreeListEntry *pEntry = m_pVersionBox->FirstSelected(); @@ -520,7 +520,7 @@ void SfxViewVersionDialog_Impl::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton, void) +IMPL_LINK(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton, void) { assert(pButton == m_pOKButton); (void)pButton; diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 1706d1bd992e..4ef731a89dca 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -161,7 +161,7 @@ void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, std::vector<OUString>& } } -IMPL_LINK_NOARG_TYPED(DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, void) +IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, void) { DBG_ASSERT( m_pFileDlg, "DocumentInserter::DialogClosedHdl(): no file dialog" ); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 9b90f80af06c..085421d81cf4 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -145,13 +145,13 @@ class SfxNewFileDialog_Impl SfxObjectShellLock xDocShell; VclPtr<SfxNewFileDialog> pAntiImpl; - DECL_LINK_TYPED( Update, Idle *, void ); + DECL_LINK( Update, Idle *, void ); - DECL_LINK_TYPED(RegionSelect, ListBox&, void); - DECL_LINK_TYPED(TemplateSelect, ListBox&, void); - DECL_LINK_TYPED(DoubleClick, ListBox&, void); - DECL_LINK_TYPED(Expand, VclExpander&, void); - DECL_LINK_TYPED(LoadFile, Button*, void); + DECL_LINK(RegionSelect, ListBox&, void); + DECL_LINK(TemplateSelect, ListBox&, void); + DECL_LINK(DoubleClick, ListBox&, void); + DECL_LINK(Expand, VclExpander&, void); + DECL_LINK(LoadFile, Button*, void); sal_uInt16 GetSelectedTemplatePos() const; public: @@ -169,7 +169,7 @@ public: void SetTemplateFlags(SfxTemplateFlags nSet); }; -IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, Update, Idle*, void) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update, Idle*, void) { if (xDocShell.Is()) { @@ -235,7 +235,7 @@ IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, Update, Idle*, void) } } -IMPL_LINK_TYPED( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void ) +IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void ) { if (xDocShell.Is() && xDocShell->GetProgress()) return; @@ -259,12 +259,12 @@ IMPL_LINK_TYPED( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void ) TemplateSelect(*m_pTemplateLb); } -IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, Expand, VclExpander&, void) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Expand, VclExpander&, void) { TemplateSelect(*m_pTemplateLb); } -IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, TemplateSelect, ListBox&, void) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect, ListBox&, void) { // Still loading if ( xDocShell && xDocShell->GetProgress() ) @@ -277,14 +277,14 @@ IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, TemplateSelect, ListBox&, void) aPrevIdle.Start(); } -IMPL_LINK_NOARG_TYPED( SfxNewFileDialog_Impl, DoubleClick, ListBox&, void ) +IMPL_LINK_NOARG( SfxNewFileDialog_Impl, DoubleClick, ListBox&, void ) { // Still loading if ( !xDocShell.Is() || !xDocShell->GetProgress() ) pAntiImpl->EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, LoadFile, Button*, void) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, LoadFile, Button*, void) { pAntiImpl->EndDialog(RET_TEMPLATE_LOAD); } diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index e2d103cf89c4..a4c0db6f0628 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -76,7 +76,7 @@ void SfxSaveAsTemplateDialog::setDocumentModel(const uno::Reference<frame::XMode m_xModel = rModel; } -IMPL_LINK_NOARG_TYPED(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void) { ScopedVclPtrInstance< MessageDialog > aQueryDlg(this, OUString(), VclMessageType::Question, VCL_BUTTONS_YES_NO); @@ -99,13 +99,13 @@ IMPL_LINK_NOARG_TYPED(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SfxSaveAsTemplateDialog, TemplateNameEditHdl, Edit&, void) +IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, TemplateNameEditHdl, Edit&, void) { msTemplateName = comphelper::string::strip(mpTemplateNameEdit->GetText(), ' '); SelectCategoryHdl(*mpLBCategory); } -IMPL_LINK_NOARG_TYPED(SfxSaveAsTemplateDialog, SelectCategoryHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, SelectCategoryHdl, ListBox&, void) { if(mpLBCategory->GetSelectEntryPos() == 0) { diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index fae62da8a5d1..22ed084d32e6 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -447,7 +447,7 @@ void SfxTemplateManagerDlg::writeSettings () aViewSettings.SetUserData(aSettings); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SelectApplicationHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectApplicationHdl, ListBox&, void) { if(mpLocalView->IsVisible()) { @@ -461,7 +461,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SelectApplicationHdl, ListBox&, voi SearchUpdateHdl(*mpSearchFilter); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void) { const OUString sSelectedRegion = mpCBFolder->GetSelectEntry(); @@ -480,7 +480,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void) SearchUpdateHdl(*mpSearchFilter); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, void) { const sal_uInt16 nCurItemId = mpActionBar->GetCurItemId(); mpActionBar->SetItemDown( nCurItemId, true ); @@ -493,7 +493,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, void) mpActionBar->Invalidate(); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, pItem, void) { const TemplateViewItem *pViewItem = dynamic_cast<const TemplateViewItem*>(pItem); @@ -501,7 +501,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, OnTemplateState(pItem); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); @@ -526,7 +526,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu, bool) return false; } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, DefaultTemplateMenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(SfxTemplateManagerDlg, DefaultTemplateMenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nId = pMenu->GetCurItemId(); @@ -543,13 +543,13 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, DefaultTemplateMenuSelectHdl, Menu*, pMen return false; } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, OkClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, OkClickHdl, Button*, void) { OnTemplateOpen(); EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, MoveClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, MoveClickHdl, Button*, void) { // modal dialog to select templates category ScopedVclPtrInstance<SfxTemplateCategoryDialog> aDlg; @@ -585,12 +585,12 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, MoveClickHdl, Button*, void) mpLocalView->reload(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, ExportClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, ExportClickHdl, Button*, void) { OnTemplateExport(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, ImportClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, ImportClickHdl, Button*, void) { //Modal Dialog to select Category ScopedVclPtrInstance<SfxTemplateCategoryDialog> aDlg; @@ -625,19 +625,19 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, ImportClickHdl, Button*, void) mpActionMenu->HideItem(MNI_ACTION_RENAME_FOLDER); } -IMPL_STATIC_LINK_NOARG_TYPED(SfxTemplateManagerDlg, LinkClickHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SfxTemplateManagerDlg, LinkClickHdl, Button*, void) { OnTemplateLink(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, OpenRegionHdl, void*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, OpenRegionHdl, void*, void) { maSelTemplates.clear(); mpOKButton->Disable(); mpActionBar->Show(); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, CreateContextMenuHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, CreateContextMenuHdl, ThumbnailViewItem*, pItem, void) { const TemplateViewItem *pViewItem = dynamic_cast<TemplateViewItem*>(pItem); @@ -651,7 +651,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, CreateContextMenuHdl, ThumbnailViewItem*, } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) { uno::Sequence< PropertyValue > aArgs(4); aArgs[0].Name = "AsTemplate"; @@ -676,7 +676,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pIte Close(); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, EditTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, EditTemplateHdl, ThumbnailViewItem*, pItem, void) { uno::Sequence< PropertyValue > aArgs(3); aArgs[0].Name = "AsTemplate"; @@ -701,7 +701,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, EditTemplateHdl, ThumbnailViewItem*, pIte Close(); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, DeleteTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, DeleteTemplateHdl, ThumbnailViewItem*, pItem, void) { OUString aDeletedTemplate; @@ -732,7 +732,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, DeleteTemplateHdl, ThumbnailViewItem*, pI } } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, DefaultTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, DefaultTemplateHdl, ThumbnailViewItem*, pItem, void) { TemplateViewItem *pViewItem = static_cast<TemplateViewItem*>(pItem); OUString aServiceName; @@ -761,7 +761,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, DefaultTemplateHdl, ThumbnailViewItem*, p createDefaultTemplateMenu(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SearchUpdateHdl, Edit&, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl, Edit&, void) { OUString aKeyword = mpSearchFilter->GetText(); @@ -809,7 +809,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SearchUpdateHdl, Edit&, void) } } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, GetFocusHdl, Control&, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, GetFocusHdl, Control&, void) { mpLocalView->deselectItems(); mpSearchView->deselectItems(); @@ -1322,7 +1322,7 @@ void SfxTemplateCategoryDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateCategoryDialog, NewCategoryEditHdl, Edit&, void) +IMPL_LINK_NOARG(SfxTemplateCategoryDialog, NewCategoryEditHdl, Edit&, void) { OUString sParam = comphelper::string::strip(mpNewCategoryEdit->GetText(), ' '); mpLBCategory->Enable(sParam.isEmpty()); @@ -1339,7 +1339,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateCategoryDialog, NewCategoryEditHdl, Edit&, void } } -IMPL_LINK_NOARG_TYPED(SfxTemplateCategoryDialog, SelectCategoryHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxTemplateCategoryDialog, SelectCategoryHdl, ListBox&, void) { if(mpLBCategory->GetSelectEntryPos() == 0) { @@ -1421,7 +1421,7 @@ short SfxTemplateSelectionDlg::Execute() return ModalDialog::Execute(); } -IMPL_LINK_TYPED(SfxTemplateSelectionDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateSelectionDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) { TemplateViewItem *pViewItem = static_cast<TemplateViewItem*>(pItem); msTemplatePath = pViewItem->getPath(); @@ -1429,7 +1429,7 @@ IMPL_LINK_TYPED(SfxTemplateSelectionDlg, OpenTemplateHdl, ThumbnailViewItem*, pI EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SfxTemplateSelectionDlg, OkClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateSelectionDlg, OkClickHdl, Button*, void) { TemplateViewItem *pViewItem = static_cast<TemplateViewItem*>(const_cast<ThumbnailViewItem*>(*maSelTemplates.begin())); msTemplatePath = pViewItem->getPath(); diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 2ef9c1f9582d..3b917f9ee6c6 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -59,7 +59,7 @@ private: sal_uInt16 nPos, bool bNewLine ); - DECL_LINK_TYPED( TimerHdl, Timer*, void ); + DECL_LINK( TimerHdl, Timer*, void ); bool CursorIsOverRect() const; void SetPinned_Impl( bool ); void SetFadeIn_Impl( bool ); diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx index c7d3fb7997b4..8c2a24c3fb4c 100644 --- a/sfx2/source/inc/templatesearchview.hxx +++ b/sfx2/source/inc/templatesearchview.hxx @@ -23,7 +23,7 @@ public: void setOpenTemplateHdl (const Link<ThumbnailViewItem*, void> &rLink); - DECL_LINK_TYPED(ContextMenuSelectHdl, Menu*, bool); + DECL_LINK(ContextMenuSelectHdl, Menu*, bool); void setCreateContextMenuHdl(const Link<ThumbnailViewItem*,void> &rLink); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index f9f55e79207e..937e2a3f9e7e 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace frame { class DropListBox_Impl : public SvTreeListBox { private: - DECL_LINK_TYPED(OnAsyncExecuteDrop, void *, void); + DECL_LINK(OnAsyncExecuteDrop, void *, void); protected: SfxCommonTemplateDialog_Impl* pDialog; @@ -209,13 +209,13 @@ protected: bool m_bWantHierarchical :1; bool bBindingUpdate :1; - DECL_LINK_TYPED( FilterSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( FmtSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ApplyHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( TreeListApplyHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( DropHdl, StyleTreeListBox_Impl&, bool ); - DECL_LINK_TYPED( TimeOut, Idle*, void ); - DECL_LINK_TYPED( PreviewHdl, Button*, void); + DECL_LINK( FilterSelectHdl, ListBox&, void ); + DECL_LINK( FmtSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ApplyHdl, LinkParamNone*, void ); + DECL_LINK( TreeListApplyHdl, SvTreeListBox*, bool ); + DECL_LINK( DropHdl, StyleTreeListBox_Impl&, bool ); + DECL_LINK( TimeOut, Idle*, void ); + DECL_LINK( PreviewHdl, Button*, void); virtual void EnableItem(sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true) {} @@ -286,8 +286,8 @@ public: SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window* ); virtual ~SfxCommonTemplateDialog_Impl() override; - DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); - DECL_LINK_TYPED( MenuSelectAsyncHdl, void*, void ); + DECL_LINK( MenuSelectHdl, Menu*, bool ); + DECL_LINK( MenuSelectAsyncHdl, void*, void ); virtual void EnableEdit( bool b ) { @@ -350,10 +350,10 @@ private: VclPtr<DropToolBox_Impl> m_aActionTbL; VclPtr<ToolBox> m_aActionTbR; - DECL_LINK_TYPED( ToolBoxLSelect, ToolBox*, void ); - DECL_LINK_TYPED( ToolBoxRSelect, ToolBox*, void ); - DECL_LINK_TYPED( ToolBoxRClick, ToolBox*, void ); - DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); + DECL_LINK( ToolBoxLSelect, ToolBox*, void ); + DECL_LINK( ToolBoxRSelect, ToolBox*, void ); + DECL_LINK( ToolBoxRClick, ToolBox*, void ); + DECL_LINK( MenuSelectHdl, Menu*, bool ); protected: virtual void EnableEdit( bool ) override; diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx index 01f62f6e7682..50572d7da5b1 100644 --- a/sfx2/source/inc/tplcitem.hxx +++ b/sfx2/source/inc/tplcitem.hxx @@ -29,7 +29,7 @@ class SfxTemplateControllerItem : public SfxControllerItem { sal_uInt8 nWaterCanState; ImplSVEvent* nUserEventId; - DECL_LINK_TYPED(SetWaterCanStateHdl_Impl, void*, void); + DECL_LINK(SetWaterCanStateHdl_Impl, void*, void); protected: virtual void StateChanged(sal_uInt16, SfxItemState, const SfxPoolItem* pState) override; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 0d99c641e20e..3fe32e8e065b 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -57,9 +57,9 @@ class SfxVersionDialog : public SfxModalDialog SfxVersionTableDtor* m_pTable; bool m_bIsSaveVersionOnClose; - DECL_LINK_TYPED( DClickHdl_Impl, SvTreeListBox*, bool); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( ButtonHdl_Impl, Button*, void ); + DECL_LINK( DClickHdl_Impl, SvTreeListBox*, bool); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK( ButtonHdl_Impl, Button*, void ); void Init_Impl(); void Open_Impl(); @@ -80,7 +80,7 @@ class SfxViewVersionDialog_Impl : public SfxModalDialog VclPtr<CloseButton> m_pCloseButton; SfxVersionInfo& m_rInfo; - DECL_LINK_TYPED(ButtonHdl, Button*, void); + DECL_LINK(ButtonHdl, Button*, void); public: SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 31c4a02a4a04..dbd3a513a87b 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -131,7 +131,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) } -IMPL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, p, void ) { ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); try @@ -157,7 +157,7 @@ VclPtr<vcl::Window> SfxURLToolBoxControl_Impl::CreateItemWindow( vcl::Window* pP return pURLBox.get(); } -IMPL_LINK_NOARG_TYPED(SfxURLToolBoxControl_Impl, SelectHdl, ComboBox&, void) +IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, SelectHdl, ComboBox&, void) { SvtURLBox* pURLBox = GetURLBox(); OUString aName( pURLBox->GetURL() ); @@ -166,7 +166,7 @@ IMPL_LINK_NOARG_TYPED(SfxURLToolBoxControl_Impl, SelectHdl, ComboBox&, void) OpenURL( aName, false ); } -IMPL_LINK_NOARG_TYPED(SfxURLToolBoxControl_Impl, OpenHdl, SvtURLBox*, void) +IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl, SvtURLBox*, void) { SvtURLBox* pURLBox = GetURLBox(); OpenURL( pURLBox->GetURL(), pURLBox->IsCtrlOpen() ); diff --git a/sfx2/source/notebookbar/DropdownBox.cxx b/sfx2/source/notebookbar/DropdownBox.cxx index dd162cdf9f39..705103af7f06 100644 --- a/sfx2/source/notebookbar/DropdownBox.cxx +++ b/sfx2/source/notebookbar/DropdownBox.cxx @@ -132,7 +132,7 @@ void DropdownBox::ShowContent() } } -IMPL_LINK_TYPED(DropdownBox, PBClickHdl, Button*, /*pButton*/, void) +IMPL_LINK(DropdownBox, PBClickHdl, Button*, /*pButton*/, void) { if (m_pPopup) m_pPopup.disposeAndClear(); diff --git a/sfx2/source/notebookbar/DropdownBox.hxx b/sfx2/source/notebookbar/DropdownBox.hxx index d0794b327872..cabd38f5183b 100644 --- a/sfx2/source/notebookbar/DropdownBox.hxx +++ b/sfx2/source/notebookbar/DropdownBox.hxx @@ -46,7 +46,7 @@ public: void ShowContent(); private: - DECL_LINK_TYPED(PBClickHdl, Button*, void); + DECL_LINK(PBClickHdl, Button*, void); }; #endif diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx b/sfx2/source/notebookbar/PriorityHBox.cxx index 307bad56293d..fd8243f3f4ea 100644 --- a/sfx2/source/notebookbar/PriorityHBox.cxx +++ b/sfx2/source/notebookbar/PriorityHBox.cxx @@ -136,10 +136,10 @@ public: } private: - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); }; -IMPL_LINK_TYPED( PriorityHBox, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( PriorityHBox, WindowEventListener, VclWindowEvent&, rEvent, void ) { if (rEvent.GetId() == VCLEVENT_WINDOW_RESIZE) { diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index dd3bb66f0e18..94f75116278b 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -327,7 +327,7 @@ void SfxNotebookBar::RemoveListeners(SystemWindow* pSysWindow) } } -IMPL_STATIC_LINK_TYPED(SfxNotebookBar, OpenNotebookbarPopupMenu, NotebookBar*, pNotebookbar, void) +IMPL_STATIC_LINK(SfxNotebookBar, OpenNotebookbarPopupMenu, NotebookBar*, pNotebookbar, void) { if (pNotebookbar) { diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx index 81c68d50e11a..5c6ae4c77f1b 100644 --- a/sfx2/source/notify/hintpost.cxx +++ b/sfx2/source/notify/hintpost.cxx @@ -39,7 +39,7 @@ void SfxHintPoster::Post( SfxRequest* pHintToPost ) AddFirstRef(); } -IMPL_LINK_TYPED( SfxHintPoster, DoEvent_Impl, void *, pPostedHint, void ) +IMPL_LINK( SfxHintPoster, DoEvent_Impl, void *, pPostedHint, void ) { m_Link.Call( static_cast<SfxRequest*>(pPostedHint) ); ReleaseRef(); diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index af3f9b60b406..495d62f8eb7b 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -57,7 +57,7 @@ void AsynchronousCall::CancelRequest() } } -IMPL_LINK_NOARG_TYPED(AsynchronousCall, HandleUserCall, void*, void ) +IMPL_LINK_NOARG(AsynchronousCall, HandleUserCall, void*, void ) { mnCallId = nullptr; if (maAction) diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 989c9ae9b94e..15a9c3a87119 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -296,7 +296,7 @@ void Deck::PrintWindowSubTree(vcl::Window* pRoot, int nIndentation) PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation + 1); } -IMPL_LINK_NOARG_TYPED(Deck, HandleVerticalScrollBarChange, ScrollBar*, void) +IMPL_LINK_NOARG(Deck, HandleVerticalScrollBarChange, ScrollBar*, void) { const sal_Int32 nYOffset (-mpVerticalScrollBar->GetThumbPos()); mpScrollContainer->SetPosPixel(Point(mpScrollContainer->GetPosPixel().X(), diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index b12995b0abba..1a4350830bb3 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -506,7 +506,7 @@ void FocusManager::HandleKeyEvent ( } } -IMPL_LINK_TYPED(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent, void) +IMPL_LINK(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent, void) { vcl::Window* pSource = rWindowEvent.GetWindow(); if (pSource == nullptr) @@ -535,7 +535,7 @@ IMPL_LINK_TYPED(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent } } -IMPL_LINK_TYPED(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void) { vcl::Window* pSource = rEvent.GetWindow(); if (pSource == nullptr) diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index efb0911563f3..56e888851929 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -859,7 +859,7 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement ( } } -IMPL_LINK_TYPED(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) { if (rEvent.GetWindow() == mpParentWindow) { @@ -993,7 +993,7 @@ VclPtr<PopupMenu> SidebarController::CreatePopupMenu ( return pMenu; } -IMPL_LINK_TYPED(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool) +IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool) { if (pMenu == nullptr) { diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 02d91653a8da..150e9d33eaba 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -218,7 +218,7 @@ void SidebarToolBox::RegisterHandlers() } } -IMPL_LINK_TYPED(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void) { if (pToolBox != nullptr) { @@ -232,7 +232,7 @@ IMPL_LINK_TYPED(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void) } } -IMPL_LINK_TYPED(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void) { if (pToolBox == nullptr) return; @@ -242,7 +242,7 @@ IMPL_LINK_TYPED(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void) xController->click(); } -IMPL_LINK_TYPED(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void) { if (pToolBox == nullptr) return; @@ -252,7 +252,7 @@ IMPL_LINK_TYPED(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void) xController->doubleClick(); } -IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) { if (pToolBox == nullptr) return; @@ -262,7 +262,7 @@ IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) xController->execute((sal_Int16)pToolBox->GetModifier()); } -IMPL_LINK_NOARG_TYPED(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, void) +IMPL_LINK_NOARG(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, void) { SolarMutexGuard g; diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index c16f9d190a14..0471cacf21e1 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -309,7 +309,7 @@ Image TabBar::GetItemImage(const DeckDescriptor& rDeckDescriptor) const mxFrame); } -IMPL_LINK_NOARG_TYPED(TabBar::Item, HandleClick, Button*, void) +IMPL_LINK_NOARG(TabBar::Item, HandleClick, Button*, void) { try { @@ -386,7 +386,7 @@ void TabBar::UpdateFocusManager(FocusManager& rFocusManager) rFocusManager.SetButtons(aButtons); } -IMPL_LINK_NOARG_TYPED(TabBar, OnToolboxClicked, Button*, void) +IMPL_LINK_NOARG(TabBar, OnToolboxClicked, Button*, void) { if (!mpMenuButton) return; diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index caf606b2a66a..820764330184 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -164,7 +164,7 @@ void TitleBar::PaintFocus(vcl::RenderContext& rRenderContext, const Rectangle& r rRenderContext.Pop(); } -IMPL_LINK_TYPED(TitleBar, SelectionHandler, ToolBox*, pToolBox, void) +IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox, void) { (void)pToolBox; OSL_ASSERT(maToolBox.get()==pToolBox); diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 1c883a90f209..79386a821884 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -62,8 +62,8 @@ public: Image GetImage( sal_uInt16 nId, bool bBig ); void SetSymbolsSize_Impl( sal_Int16 ); - DECL_LINK_TYPED( OptionsChanged_Impl, LinkParamNone*, void ); - DECL_LINK_TYPED( SettingsChanged_Impl, VclSimpleEvent&, void ); + DECL_LINK( OptionsChanged_Impl, LinkParamNone*, void ); + DECL_LINK( SettingsChanged_Impl, VclSimpleEvent&, void ); explicit SfxImageManager_Impl(SfxModule& rModule); ~SfxImageManager_Impl(); @@ -194,13 +194,13 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) } -IMPL_LINK_NOARG_TYPED(SfxImageManager_Impl, OptionsChanged_Impl, LinkParamNone*, void) +IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl, LinkParamNone*, void) { SetSymbolsSize_Impl( m_aOpt.GetCurrentSymbolsSize() ); } -IMPL_LINK_TYPED( SfxImageManager_Impl, SettingsChanged_Impl, VclSimpleEvent&, rEvent, void) +IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) { diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index b76167087b0f..ba6da54dd466 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -189,10 +189,10 @@ struct SfxToolBoxControl_Impl sal_uInt16 nSlotId; VclPtr<SfxPopupWindow> mpFloatingWindow; VclPtr<SfxPopupWindow> mpPopupWindow; - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); }; -IMPL_LINK_TYPED( SfxToolBoxControl_Impl, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclWindowEvent&, rEvent, void ) { if ( ( rEvent.GetId() == VCLEVENT_WINDOW_MOVE ) || ( rEvent.GetId() == VCLEVENT_WINDOW_ACTIVATE )) @@ -608,7 +608,7 @@ void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow ) } -IMPL_LINK_NOARG_TYPED(SfxToolBoxControl, PopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl, FloatingWindow*, void) { if ( pImpl->mpPopupWindow->IsVisible() ) { @@ -630,7 +630,7 @@ IMPL_LINK_NOARG_TYPED(SfxToolBoxControl, PopupModeEndHdl, FloatingWindow*, void) } -IMPL_LINK_TYPED( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow, void ) +IMPL_LINK( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow, void ) { if ( pWindow == pImpl->mpFloatingWindow ) pImpl->mpFloatingWindow = nullptr; diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index eaa94b752738..01ada5970bbb 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -58,7 +58,7 @@ class ClassificationCategoriesController : public ClassificationCategoriesContro rtl::Reference<comphelper::ConfigurationListener> m_xListener; ClassificationPropertyListener m_aPropertyListener; - DECL_LINK_TYPED(SelectHdl, ListBox&, void); + DECL_LINK(SelectHdl, ListBox&, void); public: explicit ClassificationCategoriesController(const uno::Reference<uno::XComponentContext>& rContext); @@ -170,7 +170,7 @@ uno::Reference<awt::XWindow> ClassificationCategoriesController::createItemWindo return uno::Reference<awt::XWindow>(VCLUnoHelper::GetInterface(m_pClassification)); } -IMPL_LINK_TYPED(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, void) +IMPL_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, void) { OUString aEntry = rCategory.GetSelectEntry(); diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 4954e4ddd745..bc98810fe4c1 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -123,7 +123,7 @@ public: virtual ~SfxInPlaceClient_Impl() override; void SizeHasChanged(); - DECL_LINK_TYPED(TimerHdl, Timer *, void); + DECL_LINK(TimerHdl, Timer *, void); uno::Reference < frame::XFrame > GetFrame() const; // XEmbeddedClient @@ -591,7 +591,7 @@ void SfxInPlaceClient_Impl::SizeHasChanged() } -IMPL_LINK_NOARG_TYPED(SfxInPlaceClient_Impl, TimerHdl, Timer *, void) +IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl, Timer *, void) { if ( m_pClient && m_xObject.is() ) { diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 55403850a63a..b2c58bed31ad 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1477,7 +1477,7 @@ void SfxBaseController::ShowInfoBars( ) } } -IMPL_LINK_NOARG_TYPED ( SfxBaseController, CheckOutHandler, Button*, void ) +IMPL_LINK_NOARG ( SfxBaseController, CheckOutHandler, Button*, void ) { if ( m_pData->m_pViewShell ) m_pData->m_pViewShell->GetObjectShell()->CheckOut( ); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index b9e6280fcd25..f84b8b2cd2d6 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1316,7 +1316,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } -IMPL_LINK_NOARG_TYPED(SfxViewFrame, SwitchReadOnlyHandler, Button*, void) +IMPL_LINK_NOARG(SfxViewFrame, SwitchReadOnlyHandler, Button*, void) { GetDispatcher()->Execute(SID_EDITDOC); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 94ac3dcc413b..616af3e99c28 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -412,7 +412,7 @@ private: SfxItemSet* _pOptions; bool _bHelpDisabled; - DECL_LINK_TYPED( Execute, Button*, void ); + DECL_LINK( Execute, Button*, void ); public: SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent ); @@ -433,7 +433,7 @@ SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSe { } -IMPL_LINK_NOARG_TYPED(SfxDialogExecutor_Impl, Execute, Button*, void) +IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute, Button*, void) { // Options noted locally if ( !_pOptions ) diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index d03878c8b39c..757741169e77 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -138,7 +138,7 @@ private: uno::Reference< datatransfer::clipboard::XClipboardNotifier > m_xClpbrdNtfr; uno::Reference< lang::XComponent > m_xCtrl; - DECL_STATIC_LINK_TYPED( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, void ); }; SfxClipboardChangeListener::SfxClipboardChangeListener( SfxViewShell* pView, const uno::Reference< datatransfer::clipboard::XClipboardNotifier >& xClpbrdNtfr ) @@ -173,7 +173,7 @@ void SfxClipboardChangeListener::ChangedContents() } } -IMPL_STATIC_LINK_TYPED( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, p, void ) { AsyncExecuteInfo* pAsyncExecuteInfo = static_cast<AsyncExecuteInfo*>(p); if ( pAsyncExecuteInfo ) diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index e187d78eb8ba..b478daf4c523 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -390,7 +390,7 @@ public: private: void init(); - DECL_LINK_TYPED( updateHdl, Timer*, void ); + DECL_LINK( updateHdl, Timer*, void ); ChildWindow maLeftChild; ChildWindow maRightTopChild; @@ -463,7 +463,7 @@ void DemoWindow::init() } } -IMPL_LINK_NOARG_TYPED(DemoWindow, updateHdl, Timer*, void) +IMPL_LINK_NOARG(DemoWindow, updateHdl, Timer*, void) { init(); diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index 9bef86d3a562..15ca546b9e37 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -125,7 +125,7 @@ public: Size GetOptimalSize() const override; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); void DoScroll(long nDelta); void SetSelectHdl(const Link<SmElement&,void>& rLink) { maSelectHdlLink = rLink; } @@ -143,8 +143,8 @@ class SmElementsDockingWindow : public SfxDockingWindow virtual void Resize() override; SmViewShell* GetView(); - DECL_LINK_TYPED(SelectClickHandler, SmElement&, void); - DECL_LINK_TYPED(ElementSelectedHandle, ListBox&, void); + DECL_LINK(SelectClickHandler, SmElement&, void); + DECL_LINK(ElementSelectedHandle, ListBox&, void); public: diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 4c15ed3d8399..f5a5621980dc 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -63,7 +63,7 @@ class SmPrintOptionsTabPage : public SfxTabPage VclPtr<CheckBox> m_pSaveOnlyUsedSymbols; VclPtr<CheckBox> m_pAutoCloseBrackets; - DECL_LINK_TYPED(SizeButtonClickHdl, Button *, void); + DECL_LINK(SizeButtonClickHdl, Button *, void); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -103,9 +103,9 @@ class SmFontDialog : public ModalDialog vcl::Font maFont; - DECL_LINK_TYPED(FontSelectHdl, ComboBox&, void); - DECL_LINK_TYPED(FontModifyHdl, Edit&, void); - DECL_LINK_TYPED(AttrChangeHdl, Button *, void); + DECL_LINK(FontSelectHdl, ComboBox&, void); + DECL_LINK(FontModifyHdl, Edit&, void); + DECL_LINK(AttrChangeHdl, Button *, void); virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; @@ -133,7 +133,7 @@ class SmFontSizeDialog : public ModalDialog VclPtr<MetricField> m_pBorderSize; VclPtr<PushButton> m_pDefaultButton; - DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); + DECL_LINK(DefaultButtonClickHdl, Button *, void); public: SmFontSizeDialog(vcl::Window *pParent); @@ -160,8 +160,8 @@ class SmFontTypeDialog : public ModalDialog VclPtr<OutputDevice> pFontListDev; - DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool); - DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); + DECL_LINK(MenuSelectHdl, Menu *, bool); + DECL_LINK(DefaultButtonClickHdl, Button *, void); public: SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice); @@ -223,10 +223,10 @@ class SmDistanceDialog : public ModalDialog sal_uInt16 nActiveCategory; bool bScaleAllBrackets; - DECL_LINK_TYPED(GetFocusHdl, Control&, void); - DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool); - DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); - DECL_LINK_TYPED(CheckBoxClickHdl, Button *, void); + DECL_LINK(GetFocusHdl, Control&, void); + DECL_LINK(MenuSelectHdl, Menu *, bool); + DECL_LINK(DefaultButtonClickHdl, Button *, void); + DECL_LINK(CheckBoxClickHdl, Button *, void); using Window::SetHelpId; static void SetHelpId(MetricField &rField, const OString& sHelpId); @@ -255,7 +255,7 @@ class SmAlignDialog : public ModalDialog VclPtr<RadioButton> m_pRight; VclPtr<PushButton> m_pDefaultButton; - DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); + DECL_LINK(DefaultButtonClickHdl, Button *, void); public: SmAlignDialog(vcl::Window *pParent); @@ -288,7 +288,7 @@ class SmShowSymbolSetWindow : public Control virtual void Resize() override; virtual Size GetOptimalSize() const override; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); public: SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle); virtual ~SmShowSymbolSetWindow() override; @@ -361,12 +361,12 @@ class SmSymbolDialog : public ModalDialog VclPtr<OutputDevice> pFontListDev; - DECL_LINK_TYPED(SymbolSetChangeHdl, ListBox&, void); - DECL_LINK_TYPED(SymbolChangeHdl, SmShowSymbolSetWindow&, void); - DECL_LINK_TYPED(SymbolDblClickHdl, SmShowSymbol&, void); - DECL_LINK_TYPED(SymbolDblClickHdl2, SmShowSymbolSetWindow&, void); - DECL_LINK_TYPED(EditClickHdl, Button*, void); - DECL_LINK_TYPED(GetClickHdl, Button*, void); + DECL_LINK(SymbolSetChangeHdl, ListBox&, void); + DECL_LINK(SymbolChangeHdl, SmShowSymbolSetWindow&, void); + DECL_LINK(SymbolDblClickHdl, SmShowSymbol&, void); + DECL_LINK(SymbolDblClickHdl2, SmShowSymbolSetWindow&, void); + DECL_LINK(EditClickHdl, Button*, void); + DECL_LINK(GetClickHdl, Button*, void); void SymbolDblClickHdl(); void FillSymbolSets(); @@ -429,16 +429,16 @@ class SmSymDefineDialog : public ModalDialog std::unique_ptr<SubsetMap> pSubsetMap; FontList *pFontList; - DECL_LINK_TYPED(OldSymbolChangeHdl, ComboBox&, void); - DECL_LINK_TYPED(OldSymbolSetChangeHdl, ComboBox&, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(FontChangeHdl, ListBox&, void); - DECL_LINK_TYPED(SubsetChangeHdl, ListBox&, void); - DECL_LINK_TYPED(StyleChangeHdl, ComboBox&, void); - DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(AddClickHdl, Button *, void); - DECL_LINK_TYPED(ChangeClickHdl, Button *, void); - DECL_LINK_TYPED(DeleteClickHdl, Button *, void); + DECL_LINK(OldSymbolChangeHdl, ComboBox&, void); + DECL_LINK(OldSymbolSetChangeHdl, ComboBox&, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(FontChangeHdl, ListBox&, void); + DECL_LINK(SubsetChangeHdl, ListBox&, void); + DECL_LINK(StyleChangeHdl, ComboBox&, void); + DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void); + DECL_LINK(AddClickHdl, Button *, void); + DECL_LINK(ChangeClickHdl, Button *, void); + DECL_LINK(DeleteClickHdl, Button *, void); void FillSymbols(ComboBox &rComboBox, bool bDeleteText = true); void FillSymbolSets(ComboBox &rComboBox, bool bDeleteText = true); diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 8c17451eac64..450c310ad8b3 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -58,9 +58,9 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper virtual void KeyInput(const KeyEvent& rKEvt) override; virtual void Command(const CommandEvent& rCEvt) override; - DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool); - DECL_LINK_TYPED(ModifyTimerHdl, Idle *, void); - DECL_LINK_TYPED(CursorMoveTimerHdl, Idle *, void); + DECL_LINK(MenuSelectHdl, Menu *, bool); + DECL_LINK(ModifyTimerHdl, Idle *, void); + DECL_LINK(CursorMoveTimerHdl, Idle *, void); virtual void DataChanged( const DataChangedEvent& ) override; virtual void Resize() override; @@ -72,8 +72,8 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; - DECL_LINK_TYPED(EditStatusHdl, EditStatus&, void); - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); + DECL_LINK(EditStatusHdl, EditStatus&, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); void CreateEditView(); Rectangle AdjustScrollBars(); diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index c0524ed391fd..be4c84db6062 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -140,7 +140,7 @@ public: class SmFontPickListBox : public SmFontPickList, public ListBox { protected: - DECL_LINK_TYPED(SelectHdl, ListBox&, void); + DECL_LINK(SelectHdl, ListBox&, void); public: SmFontPickListBox(vcl::Window* pParent, WinBits nBits); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 7c1af55e35d0..d17919eddc38 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -92,7 +92,7 @@ protected: private: void RepaintViewShellDoc(); - DECL_LINK_TYPED(CaretBlinkTimerHdl, Timer *, void); + DECL_LINK(CaretBlinkTimerHdl, Timer *, void); void CaretBlinkInit(); void CaretBlinkStart(); void CaretBlinkStop(); @@ -171,7 +171,7 @@ class SmCmdBoxWindow : public SfxDockingWindow Timer aInitialFocusTimer; - DECL_LINK_TYPED(InitialFocusTimerHdl, Timer *, void); + DECL_LINK(InitialFocusTimerHdl, Timer *, void); protected: @@ -232,7 +232,7 @@ class SmViewShell: public SfxViewShell bool bPasteState; - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /** Used to determine whether insertions using SID_INSERTSYMBOL and SID_INSERTCOMMAND diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index adba7e19fbcb..1f4ef1f39c08 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -486,7 +486,7 @@ void SmElementsControl::MouseButtonDown(const MouseEvent& rMouseEvent) } } -IMPL_LINK_NOARG_TYPED( SmElementsControl, ScrollHdl, ScrollBar*, void ) +IMPL_LINK_NOARG( SmElementsControl, ScrollHdl, ScrollBar*, void ) { DoScroll(mxScroll->GetDelta()); } @@ -760,7 +760,7 @@ void SmElementsDockingWindow::EndDocking( const Rectangle& rReactangle, bool bFl mpElementsControl->setVerticalMode(bVertical); } -IMPL_LINK_TYPED(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, void) +IMPL_LINK(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, void) { SmViewShell* pViewSh = GetView(); @@ -772,7 +772,7 @@ IMPL_LINK_TYPED(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElemen } } -IMPL_LINK_TYPED( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void) +IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void) { for (sal_uInt16 aCurrentCategory : aCategories) { diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index fc3a9444b85a..5883f3c594df 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -937,7 +937,7 @@ SmTextForwarder::~SmTextForwarder() pEditEngine->SetNotifyHdl( Link<EENotify&,void>() ); } -IMPL_LINK_TYPED(SmTextForwarder, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(SmTextForwarder, NotifyHdl, EENotify&, rNotify, void) { ::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &rNotify ); if (aHint.get()) diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index de257aa004cb..657838fd0767 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -181,7 +181,7 @@ class SmTextForwarder : /* analog to SvxEditEngineForwarder */ SmEditAccessible & rEditAcc; SmEditSource & rEditSource; - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); SmTextForwarder( const SmTextForwarder & ) = delete; SmTextForwarder & operator = ( const SmTextForwarder & ) = delete; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 4b999962aff7..73bc61fb074f 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -159,7 +159,7 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont) rFont.SetWeight((nIndex & 0x2) ? WEIGHT_BOLD : WEIGHT_NORMAL); } -IMPL_LINK_NOARG_TYPED( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void ) { m_pZoom->Enable(m_pSizeZoomed->IsChecked()); } @@ -299,13 +299,13 @@ void SmShowFont::SetFont(const vcl::Font& rFont) Invalidate(); } -IMPL_LINK_TYPED( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void ) +IMPL_LINK( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void ) { maFont.SetFamilyName(rComboBox.GetText()); m_pShowFont->SetFont(maFont); } -IMPL_LINK_TYPED( SmFontDialog, FontModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SmFontDialog, FontModifyHdl, Edit&, rEdit, void ) { ComboBox& rComboBox = static_cast<ComboBox&>(rEdit); // if font is available in list then use it @@ -316,7 +316,7 @@ IMPL_LINK_TYPED( SmFontDialog, FontModifyHdl, Edit&, rEdit, void ) } } -IMPL_LINK_NOARG_TYPED( SmFontDialog, AttrChangeHdl, Button*, void ) +IMPL_LINK_NOARG( SmFontDialog, AttrChangeHdl, Button*, void ) { if (m_pBoldCheckBox->IsChecked()) maFont.SetWeight(FontWeight(WEIGHT_BOLD)); @@ -421,7 +421,7 @@ public: } }; -IMPL_LINK_NOARG_TYPED( SmFontSizeDialog, DefaultButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG( SmFontSizeDialog, DefaultButtonClickHdl, Button *, void ) { if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES) { @@ -495,7 +495,7 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const rFormat.RequestApplyChanges(); } -IMPL_LINK_TYPED( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool ) { SmFontPickListBox *pActiveListBox; @@ -523,7 +523,7 @@ IMPL_LINK_TYPED( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool ) return false; } -IMPL_LINK_NOARG_TYPED( SmFontTypeDialog, DefaultButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG( SmFontTypeDialog, DefaultButtonClickHdl, Button *, void ) { if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES) { @@ -692,7 +692,7 @@ SmCategoryDesc::~SmCategoryDesc() /**************************************************************************/ -IMPL_LINK_TYPED( SmDistanceDialog, GetFocusHdl, Control&, rControl, void ) +IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control&, rControl, void ) { if (Categories[nActiveCategory]) { @@ -712,14 +712,14 @@ IMPL_LINK_TYPED( SmDistanceDialog, GetFocusHdl, Control&, rControl, void ) } } -IMPL_LINK_TYPED( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu, bool ) { SetCategory(pMenu->GetCurItemId() - 1); return false; } -IMPL_LINK_NOARG_TYPED( SmDistanceDialog, DefaultButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG( SmDistanceDialog, DefaultButtonClickHdl, Button *, void ) { if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES) { @@ -730,7 +730,7 @@ IMPL_LINK_NOARG_TYPED( SmDistanceDialog, DefaultButtonClickHdl, Button *, void ) } } -IMPL_LINK_TYPED( SmDistanceDialog, CheckBoxClickHdl, Button *, pCheckBox, void ) +IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, Button *, pCheckBox, void ) { if (pCheckBox == m_pCheckBox1) { @@ -1018,7 +1018,7 @@ void SmDistanceDialog::WriteTo(SmFormat &rFormat) /*const*/ rFormat.RequestApplyChanges(); } -IMPL_LINK_NOARG_TYPED( SmAlignDialog, DefaultButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG( SmAlignDialog, DefaultButtonClickHdl, Button *, void ) { if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES) { @@ -1351,7 +1351,7 @@ void SmShowSymbolSetWindow::Resize() calccols(); } -IMPL_LINK_TYPED( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/, void) +IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/, void) { Invalidate(); } @@ -1445,18 +1445,18 @@ void SmSymbolDialog::FillSymbolSets() } -IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolSetChangeHdl, ListBox&, void ) +IMPL_LINK_NOARG( SmSymbolDialog, SymbolSetChangeHdl, ListBox&, void ) { SelectSymbolSet(m_pSymbolSets->GetSelectEntry()); } -IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolChangeHdl, SmShowSymbolSetWindow&, void ) +IMPL_LINK_NOARG( SmSymbolDialog, SymbolChangeHdl, SmShowSymbolSetWindow&, void ) { SelectSymbol(m_pSymbolSetDisplay->GetSelectSymbol()); } -IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void) +IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl, Button*, void) { ScopedVclPtrInstance<SmSymDefineDialog> pDialog(this, pFontListDev, rSymbolMgr); @@ -1497,11 +1497,11 @@ IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl2, SmShowSymbolSetWindow&, void ) +IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl2, SmShowSymbolSetWindow&, void ) { SymbolDblClickHdl(); } -IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl, SmShowSymbol&, void ) +IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl, SmShowSymbol&, void ) { SymbolDblClickHdl(); } @@ -1512,7 +1512,7 @@ void SmSymbolDialog::SymbolDblClickHdl() } -IMPL_LINK_NOARG_TYPED( SmSymbolDialog, GetClickHdl, Button*, void ) +IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl, Button*, void ) { const SmSym *pSym = GetSymbol(); if (pSym) @@ -1773,7 +1773,7 @@ SmSym * SmSymDefineDialog::GetSymbol(const ComboBox &rComboBox) } -IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, void ) +IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, void ) { (void) rComboBox; assert(&rComboBox == pOldSymbols && "Sm : wrong argument"); @@ -1781,7 +1781,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, vo } -IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox, void ) +IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox, void ) { (void) rComboBox; assert(&rComboBox == pOldSymbolSets && "Sm : wrong argument"); @@ -1789,7 +1789,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox, } -IMPL_LINK_TYPED( SmSymDefineDialog, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SmSymDefineDialog, ModifyHdl, Edit&, rEdit, void ) { ComboBox& rComboBox = static_cast<ComboBox&>(rEdit); // remember cursor position for later restoring of it @@ -1816,7 +1816,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, ModifyHdl, Edit&, rEdit, void ) UpdateButtons(); } -IMPL_LINK_TYPED( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void ) +IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void ) { (void) rListBox; assert(&rListBox == pFonts && "Sm : wrong argument"); @@ -1825,7 +1825,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void ) } -IMPL_LINK_NOARG_TYPED( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void ) +IMPL_LINK_NOARG( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void ) { sal_Int32 nPos = pFontsSubsetLB->GetSelectEntryPos(); if (LISTBOX_ENTRY_NOTFOUND != nPos) @@ -1839,7 +1839,7 @@ IMPL_LINK_NOARG_TYPED( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void ) } -IMPL_LINK_TYPED( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void ) +IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void ) { (void) rComboBox; assert(&rComboBox == pStyles && "Sm : falsches Argument"); @@ -1848,7 +1848,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void ) } -IMPL_LINK_NOARG_TYPED(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void) +IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void) { sal_UCS4 cChar = pCharsetDisplay->GetSelectCharacter(); @@ -1876,7 +1876,7 @@ IMPL_LINK_NOARG_TYPED(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void } -IMPL_LINK_TYPED( SmSymDefineDialog, AddClickHdl, Button *, pButton, void ) +IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, pButton, void ) { (void) pButton; assert(pButton == pAddBtn && "Sm : wrong argument"); @@ -1903,7 +1903,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, AddClickHdl, Button *, pButton, void ) } -IMPL_LINK_TYPED( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void ) +IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void ) { (void) pButton; assert(pButton == pChangeBtn && "Sm : wrong argument"); @@ -1940,7 +1940,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void ) } -IMPL_LINK_TYPED( SmSymDefineDialog, DeleteClickHdl, Button *, pButton, void ) +IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton, void ) { (void) pButton; assert(pButton == pDeleteBtn && "Sm : wrong argument"); diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 3cf5b1681407..109ad5ed819a 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -251,13 +251,13 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) Resize(); } -IMPL_LINK_NOARG_TYPED( SmEditWindow, ModifyTimerHdl, Idle *, void ) +IMPL_LINK_NOARG( SmEditWindow, ModifyTimerHdl, Idle *, void ) { UpdateStatus(false); aModifyIdle.Stop(); } -IMPL_LINK_NOARG_TYPED(SmEditWindow, CursorMoveTimerHdl, Idle *, void) +IMPL_LINK_NOARG(SmEditWindow, CursorMoveTimerHdl, Idle *, void) // every once in a while check cursor position (selection) of edit // window and if it has changed (try to) set the formula-cursor // according to that. @@ -403,7 +403,7 @@ bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt ) } -IMPL_LINK_TYPED( SmEditWindow, MenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SmEditWindow, MenuSelectHdl, Menu *, pMenu, bool ) { SmViewShell *pViewSh = rCmdBox.GetView(); if (pViewSh) @@ -579,13 +579,13 @@ void SmEditWindow::CreateEditView() } -IMPL_LINK_NOARG_TYPED( SmEditWindow, EditStatusHdl, EditStatus&, void ) +IMPL_LINK_NOARG( SmEditWindow, EditStatusHdl, EditStatus&, void ) { if (pEditView) Resize(); } -IMPL_LINK_TYPED( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void ) +IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void ) { OSL_ENSURE(pEditView, "EditView missing"); if (pEditView) diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 6072c8fa213f..34a4de5b0015 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -130,7 +130,7 @@ SmFontPickListBox::SmFontPickListBox (vcl::Window* pParent, WinBits nBits) : SetSelectHdl(LINK(this, SmFontPickListBox, SelectHdl)); } -IMPL_LINK_NOARG_TYPED( SmFontPickListBox, SelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( SmFontPickListBox, SelectHdl, ListBox&, void ) { OUString aString; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 03d8d403adaf..a2f7fa8b2814 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -257,7 +257,7 @@ void SmGraphicWindow::RepaintViewShellDoc() pDoc->Repaint(); } -IMPL_LINK_NOARG_TYPED(SmGraphicWindow, CaretBlinkTimerHdl, Timer *, void) +IMPL_LINK_NOARG(SmGraphicWindow, CaretBlinkTimerHdl, Timer *, void) { if (IsCursorVisible()) SetIsCursorVisible(false); @@ -780,7 +780,7 @@ void SmCmdBoxWindow::StateChanged( StateChangedType nStateChange ) SfxDockingWindow::StateChanged( nStateChange ); } -IMPL_LINK_NOARG_TYPED( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, void ) +IMPL_LINK_NOARG( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, void ) { // We want to have the focus in the edit window once Math has been opened // to allow for immediate typing. @@ -2009,7 +2009,7 @@ void SmViewShell::Activate( bool bIsMDIActivate ) } } -IMPL_LINK_TYPED( SmViewShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( SmViewShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { assert(_pFileDlg && "SmViewShell::DialogClosedHdl(): no file dialog"); assert(pImpl->pDocInserter && "ScDocShell::DialogClosedHdl(): no document inserter"); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index b00fc30098ea..9044d884a7a9 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3337,7 +3337,7 @@ const NfCurrencyEntry* SvNumberFormatter::GetLegacyOnlyCurrencyEntry( const OUSt // static -IMPL_STATIC_LINK_NOARG_TYPED( SvNumberFormatter, CurrencyChangeLink, LinkParamNone*, void ) +IMPL_STATIC_LINK_NOARG( SvNumberFormatter, CurrencyChangeLink, LinkParamNone*, void ) { ::osl::MutexGuard aGuard( GetMutex() ); OUString aAbbrev; diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index db5c83956b1c..da1047e6d0d1 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -91,7 +91,7 @@ protected: void Select(); private: - DECL_LINK_TYPED(ImplClickHdl, HyperLabel*, void); + DECL_LINK(ImplClickHdl, HyperLabel*, void); RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 4f6f2891a956..761f4948a8af 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -165,7 +165,7 @@ namespace svt { namespace table private: - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectHdl, LinkParamNone*, void ); private: TableControl( const TableControl& ) = delete; diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx index 88041df09bd8..43cf3b7d491f 100644 --- a/svtools/qa/unit/GraphicObjectTest.cxx +++ b/svtools/qa/unit/GraphicObjectTest.cxx @@ -52,7 +52,7 @@ public: } private: - DECL_LINK_TYPED(getLinkStream, const GraphicObject*, SvStream*); + DECL_LINK(getLinkStream, const GraphicObject*, SvStream*); private: CPPUNIT_TEST_SUITE(GraphicObjectTest); @@ -73,7 +73,7 @@ const Graphic lcl_loadGraphic(const rtl::OUString &rUrl) return Graphic(aImage.GetBitmapEx()); } -IMPL_LINK_NOARG_TYPED(GraphicObjectTest, getLinkStream, const GraphicObject*, SvStream*) +IMPL_LINK_NOARG(GraphicObjectTest, getLinkStream, const GraphicObject*, SvStream*) { return GRFMGR_AUTOSWAPSTREAM_LINK; } diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 5245edcb1cd1..dc22ff3a391d 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1285,7 +1285,7 @@ sal_uInt16 BrowseBox::FrozenColCount() const } -IMPL_LINK_TYPED(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) +IMPL_LINK(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) { if ( pBar->GetDelta() == 0 ) @@ -1304,7 +1304,7 @@ IMPL_LINK_TYPED(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) } -IMPL_LINK_NOARG_TYPED(BrowseBox, EndScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(BrowseBox, EndScrollHdl, ScrollBar*, void) { if ( getDataWindow()->bNoScrollBack ) @@ -1315,7 +1315,7 @@ IMPL_LINK_NOARG_TYPED(BrowseBox, EndScrollHdl, ScrollBar*, void) } -IMPL_LINK_TYPED( BrowseBox, StartDragHdl, HeaderBar*, pBar, void ) +IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar, void ) { pBar->SetDragSize( pDataWin->GetOutputSizePixel().Height() ); } diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index ceb5c3acf2f4..51f0c0e45d57 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -483,7 +483,7 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) } -IMPL_LINK_NOARG_TYPED(BrowserDataWin, RepeatedMouseMove, Timer *, void) +IMPL_LINK_NOARG(BrowserDataWin, RepeatedMouseMove, Timer *, void) { GetParent()->MouseMove( BrowserMouseEvent( this, aRepeatEvt ) ); } diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 266349b8434b..e8d0f8e774e8 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -134,7 +134,7 @@ public: virtual void Command( const CommandEvent& rEvt ) override; virtual void MouseButtonDown( const MouseEvent& rEvt ) override; virtual void MouseMove( const MouseEvent& rEvt ) override; - DECL_LINK_TYPED( RepeatedMouseMove, Timer *, void ); + DECL_LINK( RepeatedMouseMove, Timer *, void ); virtual void MouseButtonUp( const MouseEvent& rEvt ) override; virtual void KeyInput( const KeyEvent& rEvt ) override; diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 9bdd524f3af5..0271ff821527 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -70,7 +70,7 @@ namespace svt GetComboBox().SetModifyHdl( LINK(this, ComboBoxCellController, ModifyHdl) ); } - IMPL_LINK_NOARG_TYPED(ComboBoxCellController, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(ComboBoxCellController, ModifyHdl, Edit&, void) { callModifyHdl(); } @@ -208,7 +208,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(ListBoxCellController, ListBoxSelectHdl, ListBox&, void) + IMPL_LINK_NOARG(ListBoxCellController, ListBoxSelectHdl, ListBox&, void) { callModifyHdl(); } @@ -252,7 +252,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(CheckBoxControl, OnClick, Button*, void) + IMPL_LINK_NOARG(CheckBoxControl, OnClick, Button*, void) { m_aClickLink.Call(pBox); m_aModifyLink.Call(nullptr); @@ -351,7 +351,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(CheckBoxCellController, ModifyHdl, LinkParamNone*, void) + IMPL_LINK_NOARG(CheckBoxCellController, ModifyHdl, LinkParamNone*, void) { callModifyHdl(); } @@ -441,7 +441,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditCellController, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(EditCellController, ModifyHdl, Edit&, void) { callModifyHdl(); } @@ -497,7 +497,7 @@ namespace svt return GetSpinWindow().IsModified(); } - IMPL_LINK_NOARG_TYPED(SpinCellController, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(SpinCellController, ModifyHdl, Edit&, void) { callModifyHdl(); } diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index f56e06c527ba..be82911c6cbb 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -249,7 +249,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditBrowseBox, StartEditHdl, void*, void) + IMPL_LINK_NOARG(EditBrowseBox, StartEditHdl, void*, void) { nStartEvent = nullptr; if (IsEditing()) @@ -1069,7 +1069,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditBrowseBox, EndEditHdl, void*, void) + IMPL_LINK_NOARG(EditBrowseBox, EndEditHdl, void*, void) { nEndEvent = nullptr; @@ -1079,7 +1079,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditBrowseBox, ModifyHdl, LinkParamNone*, void) + IMPL_LINK_NOARG(EditBrowseBox, ModifyHdl, LinkParamNone*, void) { if (nCellModifiedEvent) Application::RemoveUserEvent(nCellModifiedEvent); @@ -1087,7 +1087,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditBrowseBox, CellModifiedHdl, void*, void) + IMPL_LINK_NOARG(EditBrowseBox, CellModifiedHdl, void*, void) { nCellModifiedEvent = nullptr; CellModified(); diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 1f8eb4361311..12dda23476ab 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -97,7 +97,7 @@ public: void SettingsChanged(); bool GetAutoDetectSystemHC() {return m_bAutoDetectSystemHC;} - DECL_LINK_TYPED( DataChangedEventListener, VclSimpleEvent&, void ); + DECL_LINK( DataChangedEventListener, VclSimpleEvent&, void ); void ImplUpdateApplicationSettings(); }; @@ -335,7 +335,7 @@ void ColorConfig_Impl::SettingsChanged() NotifyListeners(0); } -IMPL_LINK_TYPED( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) +IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) { if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index f800ff6f3584..96e61e566572 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -130,7 +130,7 @@ public: static void LockBroadcast(); static void UnlockBroadcast(); - DECL_LINK_TYPED( DataChangedEventListener, VclSimpleEvent&, void ); + DECL_LINK( DataChangedEventListener, VclSimpleEvent&, void ); }; uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const OUString& rScheme) @@ -526,7 +526,7 @@ void ExtendedColorConfig_Impl::UnlockBroadcast() m_bLockBroadcast = false; } -IMPL_LINK_TYPED( ExtendedColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) +IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) { if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 3edd360176c2..82df75ef8f51 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -202,7 +202,7 @@ public: const Reference< XCommandEnvironment >& GetCommandEnvironment() const { return mxCmdEnv; } - DECL_LINK_TYPED(ResetQuickSearch_Impl, Timer *, void); + DECL_LINK(ResetQuickSearch_Impl, Timer *, void); virtual VclPtr<PopupMenu> CreateContextMenu() override; virtual void ExecuteContextMenuAction( sal_uInt16 nSelectedPopentry ) override; @@ -405,7 +405,7 @@ public: void onTimeout(); protected: - DECL_LINK_TYPED( SelectionMultiplexer, SvTreeListBox*, void ); + DECL_LINK( SelectionMultiplexer, SvTreeListBox*, void ); // IEnumerationResultHandler overridables virtual void enumerationDone( ::svt::EnumerationResult eResult ) override; @@ -554,7 +554,7 @@ void ViewTabListBox_Impl::dispose() } -IMPL_LINK_NOARG_TYPED(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void) +IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void) { ::osl::MutexGuard aGuard( maMutex ); @@ -1258,7 +1258,7 @@ void SvtFileView::EndInplaceEditing() return mpImpl->EndEditing(); } -IMPL_LINK_TYPED( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar, void ) { DBG_ASSERT( pBar, "no headerbar" ); sal_uInt16 nItemID = pBar->GetCurItemId(); @@ -1300,7 +1300,7 @@ IMPL_LINK_TYPED( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar, void ) } -IMPL_LINK_TYPED( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if ( !pBar->IsItemMode() ) { @@ -1717,7 +1717,7 @@ void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter ) } -IMPL_LINK_TYPED( SvtFileView_Impl, SelectionMultiplexer, SvTreeListBox*, _pSource, void ) +IMPL_LINK( SvtFileView_Impl, SelectionMultiplexer, SvTreeListBox*, _pSource, void ) { if (!mnSuspendSelectCallback) m_aSelectHandler.Call( _pSource ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index b83ef89724c4..243428181aa6 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -217,14 +217,14 @@ class SvxIconChoiceCtrl_Impl void ResetVirtSize(); void CheckScrollBars(); - DECL_LINK_TYPED( ScrollUpDownHdl, ScrollBar*, void ); - DECL_LINK_TYPED( ScrollLeftRightHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EditTimeoutHdl, Idle *, void); - DECL_LINK_TYPED( UserEventHdl, void*, void ); - DECL_LINK_TYPED( AutoArrangeHdl, Idle*, void ); - DECL_LINK_TYPED( DocRectChangedHdl, Idle*, void ); - DECL_LINK_TYPED( VisRectChangedHdl, Idle*, void ); - DECL_LINK_TYPED( CallSelectHdlHdl, Idle*, void ); + DECL_LINK( ScrollUpDownHdl, ScrollBar*, void ); + DECL_LINK( ScrollLeftRightHdl, ScrollBar*, void ); + DECL_LINK( EditTimeoutHdl, Idle *, void); + DECL_LINK( UserEventHdl, void*, void ); + DECL_LINK( AutoArrangeHdl, Idle*, void ); + DECL_LINK( DocRectChangedHdl, Idle*, void ); + DECL_LINK( VisRectChangedHdl, Idle*, void ); + DECL_LINK( CallSelectHdlHdl, Idle*, void ); void AdjustScrollBars(); void PositionScrollBars( long nRealWidth, long nRealHeight ); @@ -302,7 +302,7 @@ class SvxIconChoiceCtrl_Impl void VisRectChanged() { aVisRectChangedIdle.Start(); } void SetOrigin( const Point& ); - DECL_LINK_TYPED(TextEditEndedHdl, LinkParamNone*, void); + DECL_LINK(TextEditEndedHdl, LinkParamNone*, void); void ShowFocus ( Rectangle& rRect ); void DrawFocusRect(vcl::RenderContext& rRenderContext); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index c51f0f2815c7..62d7d7f03714 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -64,9 +64,9 @@ class IcnViewEdit_Impl : public MultiLineEdit bool bGrabFocus; void CallCallBackHdl_Impl(); - DECL_LINK_TYPED(Timeout_Impl, Idle *, void); - DECL_LINK_TYPED( ReturnHdl_Impl, Accelerator&, void ); - DECL_LINK_TYPED( EscapeHdl_Impl, Accelerator&, void ); + DECL_LINK(Timeout_Impl, Idle *, void); + DECL_LINK( ReturnHdl_Impl, Accelerator&, void ); + DECL_LINK( EscapeHdl_Impl, Accelerator&, void ); public: @@ -240,7 +240,7 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle ) } } -IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar, void ) { StopEntryEditing(); // arrow up: delta=-1; arrow down: delta=+1 @@ -248,7 +248,7 @@ IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar bEndScrollInvalidate = true; } -IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar, void ) { StopEntryEditing(); // arrow left: delta=-1; arrow right: delta=+1 @@ -2654,18 +2654,18 @@ void SvxIconChoiceCtrl_Impl::ClearSelectedRectList() aSelectedRectList.clear(); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, Idle *, void) { aAutoArrangeIdle.Stop(); Arrange( IsAutoArrange(), 0, 0 ); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, VisRectChangedHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, VisRectChangedHdl, Idle *, void) { aVisRectChangedIdle.Stop(); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, Idle *, void) { aDocRectChangedIdle.Stop(); } @@ -2678,7 +2678,7 @@ bool SvxIconChoiceCtrl_Impl::IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Po return false; } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Idle *, void) { SvxIconChoiceCtrlEntry* pEntry = GetCurEntry(); if( bEntryEditingEnabled && pEntry && @@ -2857,7 +2857,7 @@ bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos } -IMPL_LINK_TYPED(SvxIconChoiceCtrl_Impl, UserEventHdl, void*, nId, void ) +IMPL_LINK(SvxIconChoiceCtrl_Impl, UserEventHdl, void*, nId, void ) { if( nId == EVENTID_ADJUST_SCROLLBARS ) { @@ -2923,7 +2923,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry ) LINK( this, SvxIconChoiceCtrl_Impl, TextEditEndedHdl ) ); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, TextEditEndedHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl, LinkParamNone*, void) { DBG_ASSERT(pEdit,"TextEditEnded: pEdit not set"); if( !pEdit ) @@ -3079,19 +3079,19 @@ void IcnViewEdit_Impl::CallCallBackHdl_Impl() } } -IMPL_LINK_NOARG_TYPED(IcnViewEdit_Impl, Timeout_Impl, Idle *, void) +IMPL_LINK_NOARG(IcnViewEdit_Impl, Timeout_Impl, Idle *, void) { CallCallBackHdl_Impl(); } -IMPL_LINK_NOARG_TYPED( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator&, void ) +IMPL_LINK_NOARG( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator&, void ) { bCanceled = false; bGrabFocus = true; CallCallBackHdl_Impl(); } -IMPL_LINK_NOARG_TYPED( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator&, void ) +IMPL_LINK_NOARG( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator&, void ) { bCanceled = true; bGrabFocus = true; @@ -3499,7 +3499,7 @@ void SvxIconChoiceCtrl_Impl::CallSelectHandler( SvxIconChoiceCtrlEntry* ) aCallSelectHdlIdle.Start(); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, CallSelectHdlHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, CallSelectHdlHdl, Idle *, void) { pHdlEntry = nullptr; pView->ClickIcon(); diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 88a8cb3c11c2..ef479e626c5f 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -399,7 +399,7 @@ void SvSimpleTable::Command( const CommandEvent& rCEvt ) SvHeaderTabListBox::Command(rCEvt); } -IMPL_LINK_TYPED( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr, void) +IMPL_LINK( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { @@ -407,7 +407,7 @@ IMPL_LINK_TYPED( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr, void) } } -IMPL_LINK_TYPED( SvSimpleTable, DragHdl, HeaderBar*, pCtr, void) +IMPL_LINK( SvSimpleTable, DragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { @@ -415,7 +415,7 @@ IMPL_LINK_TYPED( SvSimpleTable, DragHdl, HeaderBar*, pCtr, void) } } -IMPL_LINK_TYPED( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr, void) +IMPL_LINK( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { @@ -423,7 +423,7 @@ IMPL_LINK_TYPED( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr, void) } } -IMPL_LINK_TYPED( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr, void) +IMPL_LINK( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { @@ -473,7 +473,7 @@ sal_Int32 SvSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRig return nCompare; } -IMPL_LINK_TYPED( SvSimpleTable, CompareHdl, const SvSortData&, rData, sal_Int32) +IMPL_LINK( SvSimpleTable, CompareHdl, const SvSortData&, rData, sal_Int32) { SvTreeListEntry* pLeft = const_cast<SvTreeListEntry*>(rData.pLeft); SvTreeListEntry* pRight = const_cast<SvTreeListEntry*>(rData.pRight); diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index d364a3b0b635..605d227997f5 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -298,7 +298,7 @@ void SvImpLBox::Clear() // Paint, navigate, scroll // ********************************************************************* -IMPL_LINK_NOARG_TYPED(SvImpLBox, EndScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(SvImpLBox, EndScrollHdl, ScrollBar*, void) { if( nFlags & LBoxFlags::EndScrollSetVisSize ) { @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(SvImpLBox, EndScrollHdl, ScrollBar*, void) // handler for vertical scrollbar -IMPL_LINK_TYPED( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar, void ) +IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar, void ) { DBG_ASSERT(!bInVScrollHdl,"Scroll handler out-paces itself!"); long nDelta = pScrollBar->GetDelta(); @@ -710,7 +710,7 @@ void SvImpLBox::UpdateAll( bool bInvalidateCompleteView ) pView->Invalidate( GetVisibleArea() ); } -IMPL_LINK_TYPED( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar, void ) +IMPL_LINK( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar, void ) { long nDelta = pScrollBar->GetDelta(); if( nDelta ) @@ -2888,7 +2888,7 @@ void SvImpLBox::BeginDrag() } } -IMPL_LINK_NOARG_TYPED(SvImpLBox, BeginDragHdl, Idle *, void) +IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl, Idle *, void) { pView->StartDrag( 0, aAsyncBeginDragPos ); } @@ -3100,7 +3100,7 @@ void SvImpLBox::SetCurEntry( SvTreeListEntry* pEntry ) pView->Select( pEntry ); } -IMPL_LINK_NOARG_TYPED(SvImpLBox, EditTimerCall, Idle *, void) +IMPL_LINK_NOARG(SvImpLBox, EditTimerCall, Idle *, void) { if( pView->IsInplaceEditingEnabled() ) { @@ -3311,7 +3311,7 @@ bool SvImpLBox::IsNowExpandable() const return IsExpandable() && !pView->IsExpanded( pCursor ); } -IMPL_LINK_TYPED(SvImpLBox, MyUserEvent, void*, pArg, void ) +IMPL_LINK(SvImpLBox, MyUserEvent, void*, pArg, void ) { nCurUserEvent = nullptr; if( !pArg ) diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 9b585688a856..e33e31a5e421 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -603,12 +603,12 @@ void SvHeaderTabListBox::Clear() m_aAccessibleChildren.clear(); } -IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, ScrollHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl, SvTreeListBox*, void) { m_pImpl->m_pHeaderBar->SetOffset( -GetXOffset() ); } -IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, void) +IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, void) { vcl::Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - accessible parent not found" ); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index d4b15b260652..ba4abb0cb895 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -151,13 +151,13 @@ void SvInplaceEdit2::Hide() } -IMPL_LINK_NOARG_TYPED(SvInplaceEdit2, ReturnHdl_Impl, Accelerator&, void) +IMPL_LINK_NOARG(SvInplaceEdit2, ReturnHdl_Impl, Accelerator&, void) { bCanceled = false; CallCallBackHdl_Impl(); } -IMPL_LINK_NOARG_TYPED(SvInplaceEdit2, EscapeHdl_Impl, Accelerator&, void) +IMPL_LINK_NOARG(SvInplaceEdit2, EscapeHdl_Impl, Accelerator&, void) { bCanceled = true; CallCallBackHdl_Impl(); @@ -205,7 +205,7 @@ void SvInplaceEdit2::LoseFocus() } } -IMPL_LINK_NOARG_TYPED(SvInplaceEdit2, Timeout_Impl, Idle *, void) +IMPL_LINK_NOARG(SvInplaceEdit2, Timeout_Impl, Idle *, void) { CallCallBackHdl_Impl(); } @@ -423,7 +423,7 @@ bool SvTreeListBox::IsEntryMnemonicsEnabled() const return mpImpl->m_bEntryMnemonicsEnabled; } -IMPL_LINK_TYPED( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry, SvTreeListEntry* ) +IMPL_LINK( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry, SvTreeListEntry* ) { return CloneEntry(pEntry); } @@ -943,7 +943,7 @@ void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect, rSel ); } -IMPL_LINK_NOARG_TYPED(SvTreeListBox, TextEditEndedHdl_Impl, SvInplaceEdit2&, void) +IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl, SvInplaceEdit2&, void) { if ( nImpFlags & SvTreeListBoxFlags::EDTEND_CALLED ) // avoid nesting return; @@ -1313,7 +1313,7 @@ void SvTreeListBox::RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ) SortLBoxes::get().erase( nVal ); } -IMPL_LINK_TYPED( SvTreeListBox, DragFinishHdl_Impl, sal_Int8, nAction, void ) +IMPL_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8, nAction, void ) { sal_uLong nVal = reinterpret_cast<sal_uLong>(this); std::set<sal_uLong> &rSortLBoxes = SortLBoxes::get(); @@ -1711,7 +1711,7 @@ const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry return pItem->GetBitmap1( ); } -IMPL_LINK_TYPED( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData, void ) +IMPL_LINK( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData, void ) { pHdlEntry = pData->GetActEntry(); CheckButtonHdl(); @@ -3497,7 +3497,7 @@ void SvTreeListBox::RequestHelp( const HelpEvent& rHEvt ) Control::RequestHelp( rHEvt ); } -IMPL_LINK_TYPED( SvTreeListBox, DefaultCompare, const SvSortData&, rData, sal_Int32 ) +IMPL_LINK( SvTreeListBox, DefaultCompare, const SvSortData&, rData, sal_Int32 ) { const SvTreeListEntry* pLeft = rData.pLeft; const SvTreeListEntry* pRight = rData.pRight; diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 5eeea8a103e9..1038b9090678 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -63,7 +63,7 @@ AsynchronLink::~AsynchronLink() delete _pMutex; } -IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_Idle, Idle*, void ) +IMPL_LINK_NOARG( AsynchronLink, HandleCall_Idle, Idle*, void ) { if( _pMutex ) _pMutex->acquire(); _nEventId = nullptr; @@ -71,7 +71,7 @@ IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_Idle, Idle*, void ) Call_Impl( _pArg ); } -IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_PostUserEvent, void*, void ) +IMPL_LINK_NOARG( AsynchronLink, HandleCall_PostUserEvent, void*, void ) { HandleCall_Idle(nullptr); } diff --git a/svtools/source/control/autocmpledit.cxx b/svtools/source/control/autocmpledit.cxx index 0ebcac4364db..99f11b27194a 100644 --- a/svtools/source/control/autocmpledit.cxx +++ b/svtools/source/control/autocmpledit.cxx @@ -28,7 +28,7 @@ void AutocompleteEdit::ClearEntries() m_aMatching.clear(); } -IMPL_LINK_NOARG_TYPED(AutocompleteEdit, AutoCompleteHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(AutocompleteEdit, AutoCompleteHdl_Impl, Edit&, void) { if( Application::AnyInput( VclInputFlags::KEYBOARD ) ) return; diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx index f743b2fc56ba..7ed6d4671ea0 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/svtools/source/control/breadcrumb.cxx @@ -282,7 +282,7 @@ bool Breadcrumb::showField( unsigned int nIndex, unsigned int nWidthMax ) return true; } -IMPL_LINK_TYPED( Breadcrumb, ClickLinkHdl, FixedHyperlink&, rLink, void ) +IMPL_LINK( Breadcrumb, ClickLinkHdl, FixedHyperlink&, rLink, void ) { m_sClickedURL = rLink.GetURL(); m_aClickHdl.Call( this ); diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 2f8abea7738a..0ef2b5e22886 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -1298,7 +1298,7 @@ void Calendar::ImplEndTracking( bool bCancel ) } } -IMPL_LINK_NOARG_TYPED( Calendar, ScrollHdl, Timer*, void ) +IMPL_LINK_NOARG( Calendar, ScrollHdl, Timer*, void ) { bool bPrevIn = (mnDragScrollHitTest & CALENDAR_HITTEST_PREV) != 0; bool bNextIn = (mnDragScrollHitTest & CALENDAR_HITTEST_NEXT) != 0; @@ -2175,7 +2175,7 @@ void CalendarField::dispose() DateField::dispose(); } -IMPL_LINK_TYPED( CalendarField, ImplSelectHdl, Calendar*, pCalendar, void ) +IMPL_LINK( CalendarField, ImplSelectHdl, Calendar*, pCalendar, void ) { if ( !pCalendar->IsTravelSelect() ) { @@ -2192,7 +2192,7 @@ IMPL_LINK_TYPED( CalendarField, ImplSelectHdl, Calendar*, pCalendar, void ) } } -IMPL_LINK_TYPED( CalendarField, ImplClickHdl, Button*, pButton, void ) +IMPL_LINK( CalendarField, ImplClickHdl, Button*, pButton, void ) { PushButton* pBtn = static_cast<PushButton*>(pButton); mpFloatWin->EndPopupMode(); @@ -2220,7 +2220,7 @@ IMPL_LINK_TYPED( CalendarField, ImplClickHdl, Button*, pButton, void ) } } -IMPL_LINK_NOARG_TYPED(CalendarField, ImplPopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(CalendarField, ImplPopupModeEndHdl, FloatingWindow*, void) { EndDropDown(); GrabFocus(); diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index dd4b05c47ce5..9164832a321b 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -172,7 +172,7 @@ void FileControl::Resize() } -IMPL_LINK_NOARG_TYPED(FileControl, ButtonHdl, Button*, void) +IMPL_LINK_NOARG(FileControl, ButtonHdl, Button*, void) { ImplBrowseFile( ); } diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 68c5d50f96de..c2218b123b37 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -106,7 +106,7 @@ class SvtMatchContext_Impl: public salhelper::Thread css::uno::Reference< css::ucb::XCommandProcessor > processor_; sal_Int32 commandId_; - DECL_LINK_TYPED( Select_Impl, void*, void ); + DECL_LINK( Select_Impl, void*, void ); virtual ~SvtMatchContext_Impl() override; virtual void execute() override; @@ -207,7 +207,7 @@ void SvtMatchContext_Impl::execute( ) // Cancellable does not discard the information gained so far, it // inserts all collected completions into the listbox. -IMPL_LINK_NOARG_TYPED( SvtMatchContext_Impl, Select_Impl, void*, void ) +IMPL_LINK_NOARG( SvtMatchContext_Impl, Select_Impl, void*, void ) { // avoid recursion through cancel button { @@ -1093,7 +1093,7 @@ bool SvtURLBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -IMPL_LINK_NOARG_TYPED(SvtURLBox, AutoCompleteHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl, Edit&, void) { TryAutoComplete(); } diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 9eba20679a18..640e98da9de0 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -635,7 +635,7 @@ bool ORoadmap::PreNotify(NotifyEvent& _rNEvt) return Window::PreNotify( _rNEvt ); } -IMPL_LINK_TYPED(ORoadmap, ImplClickHdl, HyperLabel*, CurHyperLabel, void) +IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, CurHyperLabel, void) { SelectRoadmapItemByID( CurHyperLabel->GetID() ); } diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 6691a238b9f9..ae3484defafd 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -112,7 +112,7 @@ Size ScrollableWindow::GetOutputSizePixel() const } -IMPL_LINK_TYPED( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) +IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) { // notify the start of scrolling, if not already scrolling if ( !bScrolling ) @@ -135,7 +135,7 @@ IMPL_LINK_TYPED( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) } -IMPL_LINK_TYPED( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll, void ) +IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll, void ) { // notify the start of scrolling, if not already scrolling if ( !bScrolling ) diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 5d6c352137dd..2d7c5d83c96d 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -388,8 +388,8 @@ private: Idle maLoseFocusIdle; bool mbPostEvt; - DECL_LINK_TYPED( ImplEndEditHdl, void*, void ); - DECL_LINK_TYPED( ImplEndTimerHdl, Idle*, void ); + DECL_LINK( ImplEndEditHdl, void*, void ); + DECL_LINK( ImplEndTimerHdl, Idle*, void ); public: TabBarEdit( TabBar* pParent, WinBits nWinStyle = 0 ); @@ -451,7 +451,7 @@ void TabBarEdit::LoseFocus() Edit::LoseFocus(); } -IMPL_LINK_TYPED( TabBarEdit, ImplEndEditHdl, void*, pCancel, void ) +IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel, void ) { ResetPostEvent(); maLoseFocusIdle.Stop(); @@ -468,7 +468,7 @@ IMPL_LINK_TYPED( TabBarEdit, ImplEndEditHdl, void*, pCancel, void ) GetParent()->EndEditMode( pCancel != nullptr ); } -IMPL_LINK_NOARG_TYPED(TabBarEdit, ImplEndTimerHdl, Idle *, void) +IMPL_LINK_NOARG(TabBarEdit, ImplEndTimerHdl, Idle *, void) { if ( HasFocus() ) return; @@ -907,7 +907,7 @@ void TabBar::ImplShowPage( sal_uInt16 nPos ) } } -IMPL_LINK_TYPED( TabBar, ImplClickHdl, Button*, pButton, void ) +IMPL_LINK( TabBar, ImplClickHdl, Button*, pButton, void ) { ImplTabButton* pBtn = static_cast<ImplTabButton*>(pButton); EndEditMode(); @@ -944,7 +944,7 @@ IMPL_LINK_TYPED( TabBar, ImplClickHdl, Button*, pButton, void ) SetFirstPageId(GetPageId(nNewPos)); } -IMPL_LINK_NOARG_TYPED(TabBar, ImplAddClickHandler, Button*, void) +IMPL_LINK_NOARG(TabBar, ImplAddClickHandler, Button*, void) { AddTabClick(); } diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 0d1578405d67..214416b3af1a 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -398,7 +398,7 @@ ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const } -IMPL_LINK_NOARG_TYPED( ToolbarMenu, HighlightHdl, ValueSet*, void ) +IMPL_LINK_NOARG( ToolbarMenu, HighlightHdl, ValueSet*, void ) { mpImpl->notifyHighlightedEntry(); } diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 3cde3c617fe6..30484f470437 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -56,7 +56,7 @@ ToolbarMenuAcc::~ToolbarMenuAcc() } -IMPL_LINK_TYPED( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void ) { /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper * might have been destroyed by the previous VCLEventListener (if no AT tool diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 2e6c0d04f96e..2a164149e1c9 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -159,7 +159,7 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); private: EventListenerVector mxEventListeners; diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 32311ec085b2..7b5cfbaca102 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1129,7 +1129,7 @@ bool ValueSet::ImplHasAccessibleListeners() return( pAcc && pAcc->HasAccessibleListeners() ); } -IMPL_LINK_TYPED( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar, void ) { sal_uInt16 nNewFirstLine = (sal_uInt16)pScrollBar->GetThumbPos(); if ( nNewFirstLine != mnFirstLine ) @@ -1140,7 +1140,7 @@ IMPL_LINK_TYPED( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar, void ) } } -IMPL_LINK_NOARG_TYPED(ValueSet, ImplTimerHdl, Timer *, void) +IMPL_LINK_NOARG(ValueSet, ImplTimerHdl, Timer *, void) { ImplTracking( GetPointerPosPixel(), true ); } diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 837a13cf986f..893ccb7b7252 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -247,7 +247,7 @@ void PlaceEditDialog::UpdateLabel( ) } } -IMPL_LINK_TYPED( PlaceEditDialog, OKHdl, Button*, /*pBtn*/, void) +IMPL_LINK( PlaceEditDialog, OKHdl, Button*, /*pBtn*/, void) { if ( m_xCurrentDetails.get() ) { @@ -282,13 +282,13 @@ IMPL_LINK_TYPED( PlaceEditDialog, OKHdl, Button*, /*pBtn*/, void) } } -IMPL_LINK_TYPED( PlaceEditDialog, DelHdl, Button*, /*pButton*/, void) +IMPL_LINK( PlaceEditDialog, DelHdl, Button*, /*pButton*/, void) { // ReUsing existing symbols... EndDialog( RET_NO ); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditHdl, DetailsContainer*, void ) +IMPL_LINK_NOARG( PlaceEditDialog, EditHdl, DetailsContainer*, void ) { UpdateLabel( ); @@ -297,18 +297,18 @@ IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditHdl, DetailsContainer*, void ) m_pBTOk->Enable( !sName.isEmpty( ) && !sUrl.isEmpty( ) ); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, ModifyHdl, Edit&, void ) +IMPL_LINK_NOARG( PlaceEditDialog, ModifyHdl, Edit&, void ) { EditHdl(nullptr); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditLabelHdl, Edit&, void ) +IMPL_LINK_NOARG( PlaceEditDialog, EditLabelHdl, Edit&, void ) { bLabelChanged = true; EditHdl(nullptr); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditUsernameHdl, Edit&, void ) +IMPL_LINK_NOARG( PlaceEditDialog, EditUsernameHdl, Edit&, void ) { for ( std::vector< std::shared_ptr< DetailsContainer > >::iterator it = m_aDetailsContainers.begin( ); it != m_aDetailsContainers.end( ); ++it ) @@ -320,7 +320,7 @@ IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditUsernameHdl, Edit&, void ) EditHdl(nullptr); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, SelectTypeHdl, ListBox&, void ) +IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl, ListBox&, void ) { if ( m_pLBServerType->GetSelectEntry() == "--------------------" ) { diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 2e46c3438c61..eccf31907481 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -76,7 +76,7 @@ void DetailsContainer::notifyChange( ) m_aChangeHdl.Call( this ); } -IMPL_LINK_NOARG_TYPED( DetailsContainer, ValueChangeHdl, Edit&, void ) +IMPL_LINK_NOARG( DetailsContainer, ValueChangeHdl, Edit&, void ) { notifyChange( ); } @@ -184,7 +184,7 @@ bool DavDetailsContainer::verifyScheme( const OUString& rScheme ) return bValid; } -IMPL_LINK_TYPED( DavDetailsContainer, ToggledDavsHdl, CheckBox&, rCheckBox, void ) +IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, CheckBox&, rCheckBox, void ) { // Change default port if needed bool bCheckedDavs = rCheckBox.IsChecked(); @@ -396,7 +396,7 @@ void CmisDetailsContainer::selectRepository( ) } } -IMPL_LINK_NOARG_TYPED( CmisDetailsContainer, RefreshReposHdl, Button*, void ) +IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl, Button*, void ) { Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XPasswordContainer2 > xMasterPasswd = PasswordContainer::create( xContext ); @@ -490,7 +490,7 @@ IMPL_LINK_NOARG_TYPED( CmisDetailsContainer, RefreshReposHdl, Button*, void ) {} } -IMPL_LINK_NOARG_TYPED( CmisDetailsContainer, SelectRepoHdl, ListBox&, void ) +IMPL_LINK_NOARG( CmisDetailsContainer, SelectRepoHdl, ListBox&, void ) { selectRepository( ); } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index e82d2a4b9a59..c8a94315a120 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -777,7 +777,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_TYPED(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar, void) + IMPL_LINK(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar, void) { implScrollFields( _pScrollBar->GetThumbPos(), true, true ); } @@ -972,7 +972,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_TYPED(AddressBookSourceDialog, OnFieldSelect, ListBox&, _rListbox, void) + IMPL_LINK(AddressBookSourceDialog, OnFieldSelect, ListBox&, _rListbox, void) { // the index of the affected list box in our array sal_IntPtr nListBoxIndex = reinterpret_cast<sal_IntPtr>(_rListbox.GetEntryData(0)); @@ -1097,7 +1097,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_NOARG_TYPED(AddressBookSourceDialog, OnDelayedInitialize, void*, void) + IMPL_LINK_NOARG(AddressBookSourceDialog, OnDelayedInitialize, void*, void) { // load the initial data from the configuration loadConfiguration(); @@ -1110,7 +1110,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_TYPED(AddressBookSourceDialog, OnComboSelect, ComboBox&, _rBox, void) + IMPL_LINK(AddressBookSourceDialog, OnComboSelect, ComboBox&, _rBox, void) { if (&_rBox == m_pDatasource) resetTables(); @@ -1119,14 +1119,14 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_STATIC_LINK_TYPED( + IMPL_STATIC_LINK( AddressBookSourceDialog, OnComboGetFocus, Control&, _rBox, void) { static_cast<ComboBox&>(_rBox).SaveValue(); } - IMPL_LINK_TYPED(AddressBookSourceDialog, OnComboLoseFocus, Control&, rControl, void) + IMPL_LINK(AddressBookSourceDialog, OnComboLoseFocus, Control&, rControl, void) { ComboBox* _pBox = static_cast<ComboBox*>(&rControl); if ( _pBox->IsValueChangedFromSaved() ) @@ -1139,7 +1139,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_NOARG_TYPED(AddressBookSourceDialog, OnOkClicked, Button*, void) + IMPL_LINK_NOARG(AddressBookSourceDialog, OnOkClicked, Button*, void) { OUString sSelectedDS = lcl_getSelectedDataSource(*m_pDatasource); if ( m_pImpl->bWorkingPersistent ) @@ -1165,7 +1165,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_NOARG_TYPED(AddressBookSourceDialog, OnAdministrateDatasources, Button*, void) + IMPL_LINK_NOARG(AddressBookSourceDialog, OnAdministrateDatasources, Button*, void) { // create the dialog object Reference< XExecutableDialog > xAdminDialog; diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 2608486fc8c6..11075849cf3a 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -281,7 +281,7 @@ void PrinterSetupDialog::ImplSetInfo() } -IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl, Timer *, void) { QueueInfo aInfo; ImplPrnDlgUpdateQueueInfo(m_pLbName, aInfo); @@ -289,7 +289,7 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) } -IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) { if ( !mpTempPrinter ) mpTempPrinter = VclPtr<Printer>::Create( mpPrinter->GetJobSetup() ); @@ -297,7 +297,7 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void) { mpTempPrinter = ImplPrnDlgListBoxSelect(m_pLbName, m_pBtnProperties, mpPrinter, mpTempPrinter ); diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index c5b3f0025129..fc8e6e30bcf6 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -80,20 +80,20 @@ public: ModalDialog::dispose(); } private: - DECL_LINK_TYPED(hdlYes, Button*, void); - DECL_LINK_TYPED(hdlNo, Button*, void); + DECL_LINK(hdlYes, Button*, void); + DECL_LINK(hdlNo, Button*, void); VclPtr<vcl::Window> reason_; VclPtr<PushButton> btnYes_; VclPtr<PushButton> btnNo_; }; -IMPL_LINK_NOARG_TYPED(RestartDialog, hdlYes, Button*, void) +IMPL_LINK_NOARG(RestartDialog, hdlYes, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(RestartDialog, hdlNo, Button*, void) +IMPL_LINK_NOARG(RestartDialog, hdlNo, Button*, void) { EndDialog(); } diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 377bb27527ac..5b38e6403aa4 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -430,7 +430,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(RoadmapWizard, OnRoadmapItemSelected, LinkParamNone*, void) + IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected, LinkParamNone*, void) { RoadmapTypes::ItemId nCurItemId = m_pImpl->pRoadmap->GetCurrentRoadmapItemID(); diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index c7cab7046020..dde11dced207 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -399,7 +399,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(OWizardMachine, OnFinish, Button*, void) + IMPL_LINK_NOARG(OWizardMachine, OnFinish, Button*, void) { if ( isTravelingSuspended() ) return; @@ -610,7 +610,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(OWizardMachine, OnPrevPage, Button*, void) + IMPL_LINK_NOARG(OWizardMachine, OnPrevPage, Button*, void) { if ( isTravelingSuspended() ) return; @@ -619,7 +619,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(OWizardMachine, OnNextPage, Button*, void) + IMPL_LINK_NOARG(OWizardMachine, OnNextPage, Button*, void) { if ( isTravelingSuspended() ) return; diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index f04fcb9da442..f8b04d233568 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -119,7 +119,7 @@ void WizardDialog::queue_resize(StateChangedType /*eReason*/) maWizardLayoutIdle.Start(); } -IMPL_LINK_NOARG_TYPED( WizardDialog, ImplHandleWizardLayoutTimerHdl, Idle*, void ) +IMPL_LINK_NOARG( WizardDialog, ImplHandleWizardLayoutTimerHdl, Idle*, void ) { ImplPosCtrls(); ImplPosTabPage(); diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx index b8a9723218be..33fbeafde44a 100644 --- a/svtools/source/filter/GraphicExportOptionsDialog.cxx +++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx @@ -62,7 +62,7 @@ void GraphicExportOptionsDialog::initialize() mSize100mm = mRenderer.getDocumentSizeIn100mm(mCurrentPage); } -IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, widthModifiedHandle, Edit&, void ) +IMPL_LINK_NOARG( GraphicExportOptionsDialog, widthModifiedHandle, Edit&, void ) { mResolution = mpWidth->GetValue() / getViewWidthInch(); @@ -70,7 +70,7 @@ IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, widthModifiedHandle, Edit&, v updateResolution(); } -IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, heightModifiedHandle, Edit&, void ) +IMPL_LINK_NOARG( GraphicExportOptionsDialog, heightModifiedHandle, Edit&, void ) { mResolution = mpHeight->GetValue() / getViewHeightInch(); @@ -78,7 +78,7 @@ IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, heightModifiedHandle, Edit&, updateResolution(); } -IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, resolutionModifiedHandle, Edit&, void ) +IMPL_LINK_NOARG( GraphicExportOptionsDialog, resolutionModifiedHandle, Edit&, void ) { mResolution = mpResolution->GetText().toInt32(); diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 12c705af4481..9f965471dc24 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -977,20 +977,20 @@ void ExportDialog::dispose() |* stores values set in the ini-file |* \************************************************************************/ -IMPL_LINK_NOARG_TYPED(ExportDialog, SelectHdl, Edit&, void) +IMPL_LINK_NOARG(ExportDialog, SelectHdl, Edit&, void) { updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, SelectListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ExportDialog, SelectListBoxHdl, ListBox&, void) { updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdl, Button*, void) +IMPL_LINK_NOARG(ExportDialog, UpdateHdl, Button*, void) { updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeX, Edit&, void) +IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX, Edit&, void) { double fRatio = static_cast< double >( maOriginalSize.Height ) / maOriginalSize.Width; @@ -1022,7 +1022,7 @@ IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeX, Edit&, void) updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) +IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) { double fRatio = static_cast< double >( maOriginalSize.Width ) / maOriginalSize.Height; @@ -1054,7 +1054,7 @@ IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlNfResolution, Edit&, void) +IMPL_LINK_NOARG(ExportDialog, UpdateHdlNfResolution, Edit&, void) { sal_Int32 nResolution = mpNfResolution->GetValue(); if ( mpLbResolution->GetSelectEntryPos() == 0 ) // pixels / cm @@ -1067,13 +1067,13 @@ IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlNfResolution, Edit&, void) updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, SbCompressionUpdateHdl, Slider*, void) +IMPL_LINK_NOARG(ExportDialog, SbCompressionUpdateHdl, Slider*, void) { mpNfCompression->SetValue( mpSbCompression->GetThumbPos() ); updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, OK, Button*, void) +IMPL_LINK_NOARG(ExportDialog, OK, Button*, void) { // writing config parameter diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 5a435b0b7372..ec9452239cfb 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -138,15 +138,15 @@ private: mxPage; - DECL_LINK_TYPED( UpdateHdl, Button*, void ); - DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectHdl, Edit&, void ); - DECL_LINK_TYPED( UpdateHdlMtfSizeX, Edit&, void ); - DECL_LINK_TYPED( UpdateHdlMtfSizeY, Edit&, void ); - DECL_LINK_TYPED( UpdateHdlNfResolution, Edit&, void ); - DECL_LINK_TYPED( SbCompressionUpdateHdl, Slider*, void ); - - DECL_LINK_TYPED( OK, Button*, void ); + DECL_LINK( UpdateHdl, Button*, void ); + DECL_LINK( SelectListBoxHdl, ListBox&, void ); + DECL_LINK( SelectHdl, Edit&, void ); + DECL_LINK( UpdateHdlMtfSizeX, Edit&, void ); + DECL_LINK( UpdateHdlMtfSizeY, Edit&, void ); + DECL_LINK( UpdateHdlNfResolution, Edit&, void ); + DECL_LINK( SbCompressionUpdateHdl, Slider*, void ); + + DECL_LINK( OK, Button*, void ); void setupSizeControls(); void createFilterOptions(); diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 4669f218fa65..6e637d4ac708 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -1259,7 +1259,7 @@ GraphicCacheEntry* GraphicCache::ImplGetCacheEntry( const GraphicObject& rObj ) return pRet; } -IMPL_LINK_TYPED( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer, void ) +IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer, void ) { pTimer->Stop(); diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index 88b6406e9dc5..eaffeb40d219 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -48,7 +48,7 @@ private: GraphicCacheEntry* ImplGetCacheEntry( const GraphicObject& rObj ); - DECL_LINK_TYPED( ReleaseTimeoutHdl, Timer*, void ); + DECL_LINK( ReleaseTimeoutHdl, Timer*, void ); public: diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 780acab62b26..3392814cc4d9 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1057,7 +1057,7 @@ void GraphicObject::SetSwapState() } } -IMPL_LINK_NOARG_TYPED(GraphicObject, ImplAutoSwapOutHdl, Timer *, void) +IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl, Timer *, void) { if( !IsSwappedOut() ) { diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 22821f794fcb..7a20d452590e 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -77,7 +77,7 @@ class MainThreadFrameCloserRequest : m_xFrame( xFrame ) {} - DECL_STATIC_LINK_TYPED( MainThreadFrameCloserRequest, worker, void*, void ); + DECL_STATIC_LINK( MainThreadFrameCloserRequest, worker, void*, void ); static void Start( MainThreadFrameCloserRequest* pRequest ); }; @@ -98,7 +98,7 @@ void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTReque } -IMPL_STATIC_LINK_TYPED( MainThreadFrameCloserRequest, worker, void*, p, void ) +IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, void*, p, void ) { MainThreadFrameCloserRequest* pMTRequest = static_cast<MainThreadFrameCloserRequest*>(p); if ( pMTRequest ) diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 71a4fe34948e..b29b49d13756 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -148,9 +148,9 @@ private: std::vector< short > aContextBmpWidthVector; - DECL_LINK_TYPED(EditTimerCall, Idle *, void); + DECL_LINK(EditTimerCall, Idle *, void); - DECL_LINK_TYPED( BeginDragHdl, Idle*, void ); + DECL_LINK( BeginDragHdl, Idle*, void ); void InvalidateEntriesFrom( long nY ) const; bool IsLineVisible( long nY ) const; @@ -159,9 +159,9 @@ private: void DrawNet(vcl::RenderContext& rRenderContext); // ScrollBar-Handler - DECL_LINK_TYPED( ScrollUpDownHdl, ScrollBar*, void ); - DECL_LINK_TYPED( ScrollLeftRightHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EndScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollUpDownHdl, ScrollBar*, void ); + DECL_LINK( ScrollLeftRightHdl, ScrollBar*, void ); + DECL_LINK( EndScrollHdl, ScrollBar*, void ); void SetNodeBmpYOffset( const Image& ); void SetNodeBmpTabDistance(); @@ -242,7 +242,7 @@ protected: void ShowVerSBar(); void StopUserEvent(); - DECL_LINK_TYPED( MyUserEvent, void*, void); + DECL_LINK( MyUserEvent, void*, void); public: SvImpLBox( SvTreeListBox* pView, SvTreeList*, WinBits nWinStyle ); diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index b9d37d9bcd0b..d99f46efdb39 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -115,7 +115,7 @@ public: class VCLXFileControl : public css::awt::XTextComponent, public css::awt::XTextLayoutConstrains, public VCLXWindow { protected: - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); void ModifyHdl(); TextListenerMultiplexer maTextListeners; diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index f476026a5b23..bec1e4f5a292 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -78,7 +78,7 @@ class AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEventListener> const css::uno::Reference< css::frame::XDispatch >& xDispatch, const css::util::URL& rURL); - DECL_LINK_TYPED(impl_ts_asyncCallback, LinkParamNone*, void); + DECL_LINK(impl_ts_asyncCallback, LinkParamNone*, void); }; @@ -456,7 +456,7 @@ void AsyncAccelExec::execAsync() m_aAsyncCallback.Post(); } -IMPL_LINK_NOARG_TYPED(AsyncAccelExec, impl_ts_asyncCallback, LinkParamNone*, void) +IMPL_LINK_NOARG(AsyncAccelExec, impl_ts_asyncCallback, LinkParamNone*, void) { if (m_xDispatch.is()) { diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index aa1f6043d94c..ea5e81845f6d 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -102,7 +102,7 @@ namespace svt } - IMPL_LINK_TYPED( DialogController, OnWindowEvent, VclWindowEvent&, _rEvent, void ) + IMPL_LINK( DialogController, OnWindowEvent, VclWindowEvent&, _rEvent, void ) { if ( m_pImpl->pEventFilter->payAttentionTo( _rEvent ) ) impl_updateAll( _rEvent ); diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx index 17361fcd095d..c2ac214ebb47 100644 --- a/svtools/source/misc/filechangedchecker.cxx +++ b/svtools/source/misc/filechangedchecker.cxx @@ -76,7 +76,7 @@ bool FileChangedChecker::hasFileChanged() return false; } -IMPL_LINK_NOARG_TYPED(FileChangedChecker, TimerHandler, Idle *, void) +IMPL_LINK_NOARG(FileChangedChecker, TimerHandler, Idle *, void) { // If the file has changed, then update the graphic in the doc OSL_TRACE("Timeout Called"); diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index cb754802f351..b749400a0e26 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -615,7 +615,7 @@ void SvParser::BuildWhichTable( std::vector<sal_uInt16> &rWhichMap, } -IMPL_LINK_NOARG_TYPED( SvParser, NewDataRead, LinkParamNone*, void ) +IMPL_LINK_NOARG( SvParser, NewDataRead, LinkParamNone*, void ) { switch( eState ) { diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 8edd4b1c310a..5627b0ddd91c 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -640,7 +640,7 @@ namespace svt { namespace table } - IMPL_LINK_NOARG_TYPED(TableControl, ImplSelectHdl, LinkParamNone*, void) + IMPL_LINK_NOARG(TableControl, ImplSelectHdl, LinkParamNone*, void) { Select(); } diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 08a4d2927354..dacd04450f51 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -2379,7 +2379,7 @@ namespace svt { namespace table } - IMPL_LINK_NOARG_TYPED( TableControl_Impl, OnUpdateScrollbars, void*, void ) + IMPL_LINK_NOARG( TableControl_Impl, OnUpdateScrollbars, void*, void ) { // TODO: can't we simply use lcl_updateScrollbar here, so the scrollbars ranges are updated, instead of // doing a complete re-layout? @@ -2387,7 +2387,7 @@ namespace svt { namespace table } - IMPL_LINK_TYPED( TableControl_Impl, OnScroll, ScrollBar*, _pScrollbar, void ) + IMPL_LINK( TableControl_Impl, OnScroll, ScrollBar*, _pScrollbar, void ) { DBG_ASSERT( ( _pScrollbar == m_pVScroll ) || ( _pScrollbar == m_pHScroll ), "TableControl_Impl::OnScroll: where did this come from?" ); diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 02b36268ea4b..47a71a356da9 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -448,8 +448,8 @@ namespace svt { namespace table /// invalidates the window area occupied by the given column void impl_invalidateColumn( ColPos const i_column ); - DECL_LINK_TYPED( OnScroll, ScrollBar*, void ); - DECL_LINK_TYPED( OnUpdateScrollbars, void*, void ); + DECL_LINK( OnScroll, ScrollBar*, void ); + DECL_LINK( OnUpdateScrollbars, void*, void ); }; //see seleng.hxx, seleng.cxx, FunctionSet overridables, part of selection engine diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index d8ecef4fff67..43d34379da18 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -167,7 +167,7 @@ throw ( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK_TYPED( GenericToolboxController, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, void*, p, void ) { ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); try diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 821feba1c371..7f1b54b49fc5 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -309,7 +309,7 @@ void OGenericUnoDialog::destroyDialog() } -IMPL_LINK_TYPED( OGenericUnoDialog, OnDialogDying, VclWindowEvent&, _rEvent, void ) +IMPL_LINK( OGenericUnoDialog, OnDialogDying, VclWindowEvent&, _rEvent, void ) { OSL_ENSURE( _rEvent.GetWindow() == m_pDialog, "OGenericUnoDialog::OnDialogDying: where does this come from?" ); if ( _rEvent.GetId() == VCLEVENT_OBJECT_DYING ) diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 527ad0591f08..aacc8e988a77 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -148,7 +148,7 @@ void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, cons } -IMPL_STATIC_LINK_TYPED( PopupMenuControllerBase, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, void*, p, void ) { PopupMenuControllerBaseDispatchInfo* pDispatchInfo = static_cast<PopupMenuControllerBaseDispatchInfo*>(p); pDispatchInfo->mxDispatch->dispatch( pDispatchInfo->maURL, pDispatchInfo->maArgs ); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 39e651c5ab5a..b32824204d73 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -42,7 +42,7 @@ public: ~PopupWindowControllerImpl(); void SetPopupWindow( vcl::Window* pPopupWindow, ToolBox* pToolBox ); - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); private: VclPtr<vcl::Window> mpPopupWindow; @@ -77,7 +77,7 @@ void PopupWindowControllerImpl::SetPopupWindow( vcl::Window* pPopupWindow, ToolB } } -IMPL_LINK_TYPED( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWindowEvent, void ) +IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWindowEvent, void ) { switch( rWindowEvent.GetId() ) { diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index eb455e56df97..e0635714d706 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -759,7 +759,7 @@ throw( css::uno::Exception, std::exception) } -IMPL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, void*, p, void ) { DispatchInfo* pDispatchInfo = static_cast<DispatchInfo*>(p); pDispatchInfo->mxDispatch->dispatch( pDispatchInfo->maURL, pDispatchInfo->maArgs ); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index f76931725980..ece1379a07de 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -94,9 +94,9 @@ public: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ) override; virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override; - DECL_LINK_TYPED(OnSelectionChangeHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(OnExpandingHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED(OnExpandedHdl, SvTreeListBox*, void); + DECL_LINK(OnSelectionChangeHdl, SvTreeListBox*, void); + DECL_LINK(OnExpandingHdl, SvTreeListBox*, bool); + DECL_LINK(OnExpandedHdl, SvTreeListBox*, void); private: rtl::Reference< TreeControlPeer > mxPeer; @@ -1429,14 +1429,14 @@ void UnoTreeListBoxImpl::dispose() } -IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, void) { if( mxPeer.is() ) mxPeer->onSelectionChanged(); } -IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); @@ -1448,7 +1448,7 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) } -IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); if( pEntry && mxPeer.is() ) diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index f76fab042dee..ab1d20f9332b 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -721,7 +721,7 @@ sal_Int16 VCLXFileControl::getMaxTextLen() throw(css::uno::RuntimeException, std } -IMPL_LINK_NOARG_TYPED(VCLXFileControl, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(VCLXFileControl, ModifyHdl, Edit&, void) { ModifyHdl(); } diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 87d8c246b25f..ca6365d686e5 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -58,7 +58,7 @@ private: virtual void Resize() override; virtual void GetFocus() override; - DECL_LINK_TYPED(SplitHdl, Splitter*, void); + DECL_LINK(SplitHdl, Splitter*, void); protected: void ThemeSelectionHasChanged(); diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 13f6b068e66a..b753fd16aa3a 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -126,10 +126,10 @@ private: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK_TYPED( SelectObjectHdl, GalleryListView*, void ); - DECL_LINK_TYPED( SelectObjectValueSetHdl, ValueSet*, void ); - DECL_LINK_TYPED( SelectTbxHdl, ToolBox*, void ); - DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); + DECL_LINK( SelectObjectHdl, GalleryListView*, void ); + DECL_LINK( SelectObjectValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectTbxHdl, ToolBox*, void ); + DECL_LINK( MiscHdl, LinkParamNone*, void ); private: @@ -172,7 +172,7 @@ public: const css::uno::Reference< css::frame::XDispatch > &rxDispatch, const css::util::URL &rURL ); - DECL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, void ); + DECL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, void*, void ); }; #endif diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 5528315fe20f..42fcf21369c1 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -52,7 +52,7 @@ namespace sdr bool mbRefreshWithPreRendering : 1; // link for timer - DECL_LINK_TYPED(ImpBufferTimerHandler, Idle*, void); + DECL_LINK(ImpBufferTimerHandler, Idle*, void); // Internal methods for buffering void ImpPrepareBufferDevice(); diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index fd1c675b3686..86db5f7d29ff 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -102,9 +102,9 @@ class SdrItemBrowser: public FloatingWindow { SdrView* pView; bool bDirty; static vcl::Window* ImpGetViewWin(SdrView& rView); - DECL_LINK_TYPED(IdleHdl, Idle *, void); - DECL_LINK_TYPED(ChangedHdl, SdrItemBrowserControl&, void); - DECL_LINK_TYPED(SetDirtyHdl, SdrItemBrowserControl&, void); + DECL_LINK(IdleHdl, Idle *, void); + DECL_LINK(ChangedHdl, SdrItemBrowserControl&, void); + DECL_LINK(SetDirtyHdl, SdrItemBrowserControl&, void); public: SdrItemBrowser(SdrView& rView); virtual ~SdrItemBrowser() override; diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 81233727bb9b..2b0de95c021d 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -113,7 +113,7 @@ public: // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); private: diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 14032e30cddd..6ecb7978f64d 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -479,7 +479,7 @@ void AccFrameSelector::NotifyFocusListeners(bool bGetFocus) } -IMPL_LINK_TYPED( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, void ) { vcl::Window* pWindow = rEvent.GetWindow(); DBG_ASSERT( pWindow, "AccFrameSelector::WindowEventListener: no window!" ); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 3d81a9e7b495..d8d0ebc3f281 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -169,11 +169,11 @@ public: void SetExecState( bool bState ) { bExecState = bState; } bool IsExecReady() const { return bExecState; } - DECL_LINK_TYPED( PipetteHdl, ToolBox*, void ); - DECL_LINK_TYPED( CbxHdl, Button*, void); - DECL_LINK_TYPED( CbxTransHdl, Button*, void ); - DECL_LINK_TYPED( FocusLbHdl, Control&, void ); - DECL_LINK_TYPED(ExecHdl, Button*, void); + DECL_LINK( PipetteHdl, ToolBox*, void ); + DECL_LINK( CbxHdl, Button*, void); + DECL_LINK( CbxTransHdl, Button*, void ); + DECL_LINK( FocusLbHdl, Control&, void ); + DECL_LINK(ExecHdl, Button*, void); }; @@ -187,7 +187,7 @@ MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) : { } -IMPL_LINK_TYPED( MaskData, PipetteHdl, ToolBox*, pTbx, void ) +IMPL_LINK( MaskData, PipetteHdl, ToolBox*, pTbx, void ) { SfxBoolItem aBItem( SID_BMPMASK_PIPETTE, pTbx->IsItemChecked( pTbx->GetItemId(0) ) ); @@ -196,7 +196,7 @@ IMPL_LINK_TYPED( MaskData, PipetteHdl, ToolBox*, pTbx, void ) { &aBItem }); } -IMPL_LINK_TYPED( MaskData, CbxHdl, Button*, pButton, void ) +IMPL_LINK( MaskData, CbxHdl, Button*, pButton, void ) { CheckBox* pCbx = static_cast<CheckBox*>(pButton); bIsReady = pMask->m_pCbx1->IsChecked() || pMask->m_pCbx2->IsChecked() || @@ -230,7 +230,7 @@ IMPL_LINK_TYPED( MaskData, CbxHdl, Button*, pButton, void ) } -IMPL_LINK_TYPED( MaskData, CbxTransHdl, Button*, pButton, void ) +IMPL_LINK( MaskData, CbxTransHdl, Button*, pButton, void ) { CheckBox* pCbx = static_cast<CheckBox*>(pButton); bIsReady = pCbx->IsChecked(); @@ -291,7 +291,7 @@ IMPL_LINK_TYPED( MaskData, CbxTransHdl, Button*, pButton, void ) } -IMPL_LINK_TYPED( MaskData, FocusLbHdl, Control&, rControl, void ) +IMPL_LINK( MaskData, FocusLbHdl, Control&, rControl, void ) { ColorLB* pLb = static_cast<ColorLB*>(&rControl); // MT: bFireFox as API parameter is ugly, find better solution???? @@ -302,7 +302,7 @@ IMPL_LINK_TYPED( MaskData, FocusLbHdl, Control&, rControl, void ) } -IMPL_LINK_NOARG_TYPED(MaskData, ExecHdl, Button*, void) +IMPL_LINK_NOARG(MaskData, ExecHdl, Button*, void) { SfxBoolItem aBItem( SID_BMPMASK_EXEC, true ); rBindings.GetDispatcher()->ExecuteList(SID_BMPMASK_EXEC, OWN_CALLMODE, diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 0eca974eca16..faedbde8feb0 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -433,7 +433,7 @@ bool SvxSuperContourDlg::IsRedoPossible() const // Click handler for ToolBox -IMPL_LINK_TYPED( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void ) +IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void ) { sal_uInt16 nNewItemId = pTbx->GetCurItemId(); @@ -539,7 +539,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void ) m_pContourWnd->QueueIdleUpdate(); } -IMPL_LINK_TYPED( SvxSuperContourDlg, MousePosHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxSuperContourDlg, MousePosHdl, GraphCtrl*, pWnd, void ) { OUString aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); @@ -554,7 +554,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, MousePosHdl, GraphCtrl*, pWnd, void ) m_pStbStatus->SetItemText( 2, aStr ); } -IMPL_LINK_TYPED( SvxSuperContourDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) { OUString aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); @@ -569,7 +569,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) m_pStbStatus->SetItemText( 3, aStr ); } -IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, UpdateHdl, Idle *, void) +IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl, Idle *, void) { aUpdateIdle.Stop(); @@ -594,7 +594,7 @@ IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, UpdateHdl, Idle *, void) m_pContourWnd->QueueIdleUpdate(); } -IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, CreateHdl, Idle *, void) +IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl, Idle *, void) { aCreateIdle.Stop(); @@ -607,7 +607,7 @@ IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, CreateHdl, Idle *, void) LeaveWait(); } -IMPL_LINK_TYPED( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrView* pView = pWnd->GetSdrView(); @@ -662,7 +662,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) } } -IMPL_LINK_TYPED( SvxSuperContourDlg, PipetteHdl, ContourWindow&, rWnd, void ) +IMPL_LINK( SvxSuperContourDlg, PipetteHdl, ContourWindow&, rWnd, void ) { const Color& rOldLineColor = m_pStbStatus->GetLineColor(); const Color& rOldFillColor = m_pStbStatus->GetFillColor(); @@ -684,7 +684,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, PipetteHdl, ContourWindow&, rWnd, void ) m_pStbStatus->SetFillColor( rOldFillColor ); } -IMPL_LINK_TYPED( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void ) +IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void ) { if ( rWnd.IsClickValid() ) { @@ -729,7 +729,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void m_pStbStatus->Invalidate(); } -IMPL_LINK_TYPED( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow&, rWnd, void ) +IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow&, rWnd, void ) { m_pTbx1->CheckItem(mnWorkSpaceId, false); m_pTbx1->CheckItem(mnSelectId); @@ -739,7 +739,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow&, rWnd, vo Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, MiscHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SvxSuperContourDlg, MiscHdl, LinkParamNone*, void) { SvtMiscOptions aMiscOptions; m_pTbx1->SetOutStyle( aMiscOptions.GetToolboxStyle() ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 710a77ad728b..caf0c31ef5d6 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -669,7 +669,7 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew ) } -IMPL_LINK_NOARG_TYPED(SvxShowCharSet, VscrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl, ScrollBar*, void) { if( nSelectedIndex < FirstInView() ) { diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 9dcc2c561b23..059cb552a06b 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -294,7 +294,7 @@ void CompressGraphicsDialog::Compress(SvStream& aStream) rFilter.ExportGraphic( aScaledGraphic, "none", aStream, nFilterFormat, &aFilterData ); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewWidthModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewWidthModifiedHdl, Edit&, void ) { fprintf(stderr, "NewWidthModifiedHdl\n"); @@ -305,29 +305,29 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewWidthModifiedHdl, Edit&, void Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, EndSlideHdl, Slider*, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, EndSlideHdl, Slider*, void ) { Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewInterpolationModifiedHdl, ListBox&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewInterpolationModifiedHdl, ListBox&, void ) { Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewQualityModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewQualityModifiedHdl, Edit&, void ) { m_pQualitySlider->SetThumbPos(m_pQualityMF->GetValue()); Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewCompressionModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewCompressionModifiedHdl, Edit&, void ) { m_pCompressionSlider->SetThumbPos(m_pCompressionMF->GetValue()); Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewHeightModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewHeightModifiedHdl, Edit&, void ) { m_dResolution = m_pMFNewHeight->GetValue() / GetViewHeightInch(); @@ -336,7 +336,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewHeightModifiedHdl, Edit&, void Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ResolutionModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, ResolutionModifiedHdl, Edit&, void ) { m_dResolution = (double) m_pResolutionLB->GetText().toInt32(); @@ -345,7 +345,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ResolutionModifiedHdl, Edit&, voi Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleCompressionRB, RadioButton&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleCompressionRB, RadioButton&, void ) { bool choice = m_pLosslessRB->IsChecked(); m_pCompressionMF->Enable(choice); @@ -355,7 +355,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleCompressionRB, RadioButton& Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleReduceResolutionRB, CheckBox&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleReduceResolutionRB, CheckBox&, void ) { bool choice = m_pReduceResolutionCB->IsChecked(); m_pMFNewWidth->Enable(choice); @@ -365,7 +365,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleReduceResolutionRB, CheckBo Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, CalculateClickHdl, Button*, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl, Button*, void ) { sal_Int32 aSize = 0; diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index be0fd4adf6a4..75c53ece5c0a 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -83,16 +83,16 @@ class SvxSuperContourDlg : public SvxContourDlg virtual bool Close() override; - DECL_LINK_TYPED( Tbx1ClickHdl, ToolBox*, void ); - DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( UpdateHdl, Idle *, void ); - DECL_LINK_TYPED( CreateHdl, Idle *, void ); - DECL_LINK_TYPED( StateHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( PipetteHdl, ContourWindow&, void ); - DECL_LINK_TYPED( PipetteClickHdl, ContourWindow&, void ); - DECL_LINK_TYPED( WorkplaceClickHdl, ContourWindow&, void ); - DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); + DECL_LINK( Tbx1ClickHdl, ToolBox*, void ); + DECL_LINK( MousePosHdl, GraphCtrl*, void ); + DECL_LINK( GraphSizeHdl, GraphCtrl*, void ); + DECL_LINK( UpdateHdl, Idle *, void ); + DECL_LINK( CreateHdl, Idle *, void ); + DECL_LINK( StateHdl, GraphCtrl*, void ); + DECL_LINK( PipetteHdl, ContourWindow&, void ); + DECL_LINK( PipetteClickHdl, ContourWindow&, void ); + DECL_LINK( WorkplaceClickHdl, ContourWindow&, void ); + DECL_LINK( MiscHdl, LinkParamNone*, void ); public: diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index 3d6b61acb7d9..d31a8636b44e 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -53,7 +53,7 @@ void CrashReportDialog::dispose() Dialog::dispose(); } -IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void) +IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void) { if (pBtn == mpBtnSend.get()) { diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx index fba81d8af39a..602d706d7a8e 100644 --- a/svx/source/dialog/crashreportdlg.hxx +++ b/svx/source/dialog/crashreportdlg.hxx @@ -37,7 +37,7 @@ private: OUString maSuccessMsg; - DECL_LINK_TYPED(BtnHdl, Button*, void); + DECL_LINK(BtnHdl, Button*, void); }; #endif diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 40de9bac9d45..005284fc65c4 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -501,7 +501,7 @@ void SvxTPView::EnableUndo(bool bFlag) } -IMPL_LINK_TYPED( SvxTPView, PbClickHdl, Button*, pButton, void ) +IMPL_LINK( SvxTPView, PbClickHdl, Button*, pButton, void ) { PushButton* pPushB = static_cast<PushButton*>(pButton); if (pPushB == m_pAccept) @@ -896,13 +896,13 @@ void SvxTPFilter::ShowAction(bool bShow) } -IMPL_LINK_NOARG_TYPED( SvxTPFilter, SelDateHdl, ListBox&, void ) +IMPL_LINK_NOARG( SvxTPFilter, SelDateHdl, ListBox&, void ) { ShowDateFields(static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectEntryPos())); bModified=true; } -IMPL_LINK_TYPED( SvxTPFilter, RowEnableHdl, Button*, pButton, void ) +IMPL_LINK( SvxTPFilter, RowEnableHdl, Button*, pButton, void ) { CheckBox* pCB = static_cast<CheckBox*>(pButton); if (pCB == m_pCbDate) @@ -938,7 +938,7 @@ IMPL_LINK_TYPED( SvxTPFilter, RowEnableHdl, Button*, pButton, void ) bModified=true; } -IMPL_LINK_TYPED( SvxTPFilter, TimeHdl, Button*, pButton, void ) +IMPL_LINK( SvxTPFilter, TimeHdl, Button*, pButton, void ) { ImageButton* pIB = static_cast<ImageButton*>(pButton); Date aDate( Date::SYSTEM ); @@ -955,11 +955,11 @@ IMPL_LINK_TYPED( SvxTPFilter, TimeHdl, Button*, pButton, void ) } bModified=true; } -IMPL_LINK_NOARG_TYPED( SvxTPFilter, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG( SvxTPFilter, ModifyHdl, Edit&, void) { bModified=true; } -IMPL_LINK_NOARG_TYPED( SvxTPFilter, ModifyListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG( SvxTPFilter, ModifyListBoxHdl, ListBox&, void) { bModified=true; } @@ -1010,7 +1010,7 @@ void SvxTPFilter::Disable() Enable( false ); } -IMPL_LINK_TYPED( SvxTPFilter, ModifyDate, Edit&, rTF, void) +IMPL_LINK( SvxTPFilter, ModifyDate, Edit&, rTF, void) { Date aDate( Date::SYSTEM ); tools::Time aTime(0); @@ -1050,7 +1050,7 @@ IMPL_LINK_TYPED( SvxTPFilter, ModifyDate, Edit&, rTF, void) ModifyHdl(*m_pDfDate); } -IMPL_LINK_TYPED( SvxTPFilter, RefHandle, Button*, pRef, void ) +IMPL_LINK( SvxTPFilter, RefHandle, Button*, pRef, void ) { if(pRef!=nullptr) { diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 7067ab718163..50b9f089966b 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -415,15 +415,15 @@ void DialControl::SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces rField.SetLoseFocusHdl( LINK( this, DialControl, LinkedFieldFocusHdl ) ); } } -IMPL_LINK_NOARG_TYPED( DialControl, LinkedFieldModifyHdl, Edit&, void ) +IMPL_LINK_NOARG( DialControl, LinkedFieldModifyHdl, Edit&, void ) { LinkedFieldModifyHdl(); } -IMPL_LINK_NOARG_TYPED( DialControl, LinkedFieldFocusHdl, Control&, void ) +IMPL_LINK_NOARG( DialControl, LinkedFieldFocusHdl, Control&, void ) { LinkedFieldModifyHdl(); } -IMPL_LINK_NOARG_TYPED(DialControl, SpinFieldHdl, SpinField&, void) +IMPL_LINK_NOARG(DialControl, SpinFieldHdl, SpinField&, void) { LinkedFieldModifyHdl(); } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 85f04d524964..67bbd780c1db 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1222,7 +1222,7 @@ void SvxLightCtl3D::LoseFocus() maLightControl->HideFocus(); } -IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ScrollBarMove, ScrollBar*, void) +IMPL_LINK_NOARG(SvxLightCtl3D, ScrollBarMove, ScrollBar*, void) { const sal_Int32 nHor(maHorScroller->GetThumbPos()); const sal_Int32 nVer(maVerScroller->GetThumbPos()); @@ -1237,7 +1237,7 @@ IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ScrollBarMove, ScrollBar*, void) } } -IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ButtonPress, Button*, void) +IMPL_LINK_NOARG(SvxLightCtl3D, ButtonPress, Button*, void) { if(SvxPreviewObjectType::SPHERE == GetSvx3DLightControl().GetObjectType()) { @@ -1249,7 +1249,7 @@ IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ButtonPress, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, InternalInteractiveChange, Svx3DLightControl*, void) +IMPL_LINK_NOARG(SvxLightCtl3D, InternalInteractiveChange, Svx3DLightControl*, void) { double fHor(0.0), fVer(0.0); @@ -1263,7 +1263,7 @@ IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, InternalInteractiveChange, Svx3DLightContro } } -IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, InternalSelectionChange, Svx3DLightControl*, void) +IMPL_LINK_NOARG(SvxLightCtl3D, InternalSelectionChange, Svx3DLightControl*, void) { CheckSelection(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 8cd751052267..2f968ccfeb56 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -672,7 +672,7 @@ void SaveDialog::dispose() Dialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SaveDialog, OKButtonHdl, Button*, void) +IMPL_LINK_NOARG(SaveDialog, OKButtonHdl, Button*, void) { // start crash-save with progress ScopedVclPtrInstance< SaveProgressDialog > pProgress(this, m_pCore); @@ -1146,7 +1146,7 @@ void RecoveryDialog::end() m_bWaitForCore = false; } -IMPL_LINK_NOARG_TYPED(RecoveryDialog, NextButtonHdl, Button*, void) +IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl, Button*, void) { switch (m_eRecoveryState) { @@ -1166,7 +1166,7 @@ IMPL_LINK_NOARG_TYPED(RecoveryDialog, NextButtonHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(RecoveryDialog, CancelButtonHdl, Button*, void) +IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl, Button*, void) { switch (m_eRecoveryState) { @@ -1306,7 +1306,7 @@ const OUString& BrokenRecoveryDialog::getSaveDirURL() } -IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, OkButtonHdl, Button*, void) +IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl, Button*, void) { OUString sPhysicalPath = comphelper::string::strip(m_pSaveDirED->GetText(), ' '); OUString sURL; @@ -1319,13 +1319,13 @@ IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, OkButtonHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, CancelButtonHdl, Button*, void) +IMPL_LINK_NOARG(BrokenRecoveryDialog, CancelButtonHdl, Button*, void) { EndDialog(); } -IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, SaveButtonHdl, Button*, void) +IMPL_LINK_NOARG(BrokenRecoveryDialog, SaveButtonHdl, Button*, void) { impl_askForSavePath(); } diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index ade3e1c2deb3..123b4e6c0db6 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -631,7 +631,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) } } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectStyleHdl_Impl, ToolBox *, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, SelectStyleHdl_Impl, ToolBox *, void) { sal_uInt16 nId = m_pTbxStyle->GetCurItemId(); @@ -661,7 +661,7 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectStyleHdl_Impl, ToolBox *, void) } } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectAdjustHdl_Impl, ToolBox *, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl, ToolBox *, void) { sal_uInt16 nId = m_pTbxAdjust->GetCurItemId(); @@ -690,7 +690,7 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectAdjustHdl_Impl, ToolBox *, void) } } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void) { sal_uInt16 nId = m_pTbxShadow->GetCurItemId(); @@ -732,12 +732,12 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void) } } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, ModifyInputHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, ModifyInputHdl_Impl, Edit&, void) { aInputIdle.Start(); } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void) { // Possibly set the Metric system again. This should be done with a // listen, this is however not possible at the moment due to compatibility @@ -791,7 +791,7 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void) { &aDistItem, &aStartItem, &aShadowXItem, &aShadowYItem }); } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, ColorSelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl, ListBox&, void) { XFormTextShadowColorItem aItem( "", m_pShadowColorLB->GetSelectEntryColor() ); GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_SHDWCOLOR, diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 9d7adf3af4ae..37a330fdbd37 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -764,7 +764,7 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) QueueIdleUpdate(); } -IMPL_LINK_TYPED( GraphCtrl, UpdateHdl, Idle *, , void ) +IMPL_LINK( GraphCtrl, UpdateHdl, Idle *, , void ) { mbInIdleUpdate = true; aUpdateLink.Call( this ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 026780ea3307..bc70898c7306 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -494,7 +494,7 @@ void SvxHFPage::InitHandler() m_pBackgroundBtn->SetClickHdl(LINK(this,SvxHFPage, BackgroundHdl)); } -IMPL_LINK_TYPED( SvxHFPage, TurnOnHdl, Button *, pButton, void ) +IMPL_LINK( SvxHFPage, TurnOnHdl, Button *, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if ( m_pTurnOnBox->IsChecked() ) @@ -559,22 +559,22 @@ IMPL_LINK_TYPED( SvxHFPage, TurnOnHdl, Button *, pButton, void ) UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxHFPage, DistModify, Edit&, void) +IMPL_LINK_NOARG(SvxHFPage, DistModify, Edit&, void) { UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxHFPage, HeightModify, Edit&, void) +IMPL_LINK_NOARG(SvxHFPage, HeightModify, Edit&, void) { UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxHFPage, BorderModify, Edit&, void) +IMPL_LINK_NOARG(SvxHFPage, BorderModify, Edit&, void) { UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxHFPage, BackgroundHdl, Button*, void) +IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, Button*, void) { if(!pBBSet) { @@ -1050,7 +1050,7 @@ DeactivateRC SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -IMPL_LINK_NOARG_TYPED(SvxHFPage, RangeFocusHdl, Control&, void) +IMPL_LINK_NOARG(SvxHFPage, RangeFocusHdl, Control&, void) { RangeHdl(); } diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 944215309d73..adecbebdee6a 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -343,7 +343,7 @@ void SvxIMapDlg::KeyInput( const KeyEvent& rKEvt ) // Click-handler for ToolBox -IMPL_LINK_TYPED( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void ) +IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void ) { sal_uInt16 nNewItemId = pTbx->GetCurItemId(); @@ -595,7 +595,7 @@ void SvxIMapDlg::SetActiveTool( sal_uInt16 nId ) m_pTbxIMapDlg1->CheckItem( mnPolyEditId, bEditMode ); } -IMPL_LINK_TYPED( SvxIMapDlg, InfoHdl, IMapWindow&, rWnd, void ) +IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow&, rWnd, void ) { OUString aStr; const NotifyInfo& rInfo = rWnd.GetInfo(); @@ -661,7 +661,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, InfoHdl, IMapWindow&, rWnd, void ) } } -IMPL_LINK_TYPED( SvxIMapDlg, MousePosHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxIMapDlg, MousePosHdl, GraphCtrl*, pWnd, void ) { const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Point& rMousePos = pWnd->GetMousePos(); @@ -674,7 +674,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, MousePosHdl, GraphCtrl*, pWnd, void ) m_pStbStatus->SetItemText( 2, aStr ); } -IMPL_LINK_TYPED( SvxIMapDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxIMapDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) { const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Size& rSize = pWnd->GetGraphicSize(); @@ -688,11 +688,11 @@ IMPL_LINK_TYPED( SvxIMapDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLModifyComboBoxHdl, ComboBox&, void) +IMPL_LINK_NOARG(SvxIMapDlg, URLModifyComboBoxHdl, ComboBox&, void) { URLModifyHdl(*m_pURLBox); } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxIMapDlg, URLModifyHdl, Edit&, void) { NotifyInfo aNewInfo; @@ -703,7 +703,7 @@ IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLModifyHdl, Edit&, void) pIMapWnd->ReplaceActualIMapInfo( aNewInfo ); } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl, Control&, void) { NotifyInfo aNewInfo; const OUString aURLText( m_pURLBox->GetText() ); @@ -729,7 +729,7 @@ IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLLoseFocusHdl, Control&, void) pIMapWnd->ReplaceActualIMapInfo( aNewInfo ); } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, UpdateHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl, Idle *, void) { pOwnData->aIdle.Stop(); @@ -759,7 +759,7 @@ IMPL_LINK_NOARG_TYPED(SvxIMapDlg, UpdateHdl, Idle *, void) pIMapWnd->QueueIdleUpdate(); } -IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrModel* pModel = pWnd->GetSdrModel(); @@ -811,7 +811,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) pIMapWnd->QueueIdleUpdate(); } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, MiscHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl, LinkParamNone*, void) { if (m_pTbxIMapDlg1) { diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index cbe50ac633a8..5d8147b1d01e 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -704,7 +704,7 @@ void IMapWindow::DoPropertyDialog() } } -IMPL_LINK_TYPED( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool ) +IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool ) { if (!pMenu) return false; diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 970662bdd529..9492cabb6fad 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -87,7 +87,7 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper css::uno::Reference< css::frame::XFrame > mxDocumentFrame; - DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); + DECL_LINK( MenuSelectHdl, Menu*, bool ); protected: diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 11655fd32960..69be7aaa7c94 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -677,7 +677,7 @@ sal_Int32 SvxLanguageComboBox::ImplGetSavedValue() const } -IMPL_LINK_NOARG_TYPED( SvxLanguageComboBox, EditModifyHdl, Edit&, void ) +IMPL_LINK_NOARG( SvxLanguageComboBox, EditModifyHdl, Edit&, void ) { EditedAndValid eOldState = meEditedAndValid; OUString aStr( vcl::I18nHelper::filterFormattingChars( GetText())); diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 36efa3272519..4dca17dfc149 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -309,7 +309,7 @@ DeactivateRC SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -IMPL_LINK_TYPED( SvxGridTabPage, ChangeDrawHdl_Impl, Edit&, rField, void ) +IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, Edit&, rField, void ) { bAttrModified = true; if( pCbxSynchronize->IsChecked() ) @@ -322,7 +322,7 @@ IMPL_LINK_TYPED( SvxGridTabPage, ChangeDrawHdl_Impl, Edit&, rField, void ) } -IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void) { if( pCbxRotate->IsChecked() ) pMtrFldAngle->Enable(); @@ -331,7 +331,7 @@ IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxGridTabPage, ChangeDivisionHdl_Impl, Edit&, rField, void ) +IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, Edit&, rField, void ) { bAttrModified = true; if( pCbxSynchronize->IsChecked() ) @@ -344,7 +344,7 @@ IMPL_LINK_TYPED( SvxGridTabPage, ChangeDivisionHdl_Impl, Edit&, rField, void ) } -IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ChangeGridsnapHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl, Button*, void) { bAttrModified = true; } diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index b8f9432ae377..e969cc272fa9 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -48,7 +48,7 @@ struct OrientationHelper_Impl void ShowDependentWindows(); - DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); }; @@ -97,7 +97,7 @@ void OrientationHelper_Impl::ShowDependentWindows() aIt->first->Show( mbVisible ); } -IMPL_LINK_NOARG_TYPED(OrientationHelper_Impl, ClickHdl, Button*, void) +IMPL_LINK_NOARG(OrientationHelper_Impl, ClickHdl, Button*, void) { EnableDependentWindows(); } diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 5dc973ed2f45..10b54deb49a8 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -23,7 +23,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void) +IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, Button*, void) { bool bOK = true; short nRet = RET_OK; @@ -50,7 +50,7 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl, Edit&, void) { if ( !bEmpty ) { diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 65e11f6c5e1b..b7a3e3d359dc 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -542,7 +542,7 @@ void SvxRubyDialog::GetCurrentText(OUString& rBase, OUString& rRuby) rRuby = aEditArr[nCurrentEdit * 2 + 1]->GetText(); } -IMPL_LINK_TYPED(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll, void) +IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll, void) { long nPos = pScroll->GetThumbPos(); if (GetLastPos() != nPos) @@ -557,7 +557,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll, void) m_pPreviewWin->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxRubyDialog, ApplyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl, Button*, void) { const Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues(); if (!aRubyValues.getLength()) @@ -585,12 +585,12 @@ IMPL_LINK_NOARG_TYPED(SvxRubyDialog, ApplyHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxRubyDialog, CloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxRubyDialog, CloseHdl_Impl, Button*, void) { Close(); } -IMPL_LINK_NOARG_TYPED(SvxRubyDialog, StylistHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl, Button*, void) { std::unique_ptr<SfxPoolItem> pState; SfxItemState eState = pBindings->QueryState(SID_STYLE_DESIGNER, pState); @@ -601,7 +601,7 @@ IMPL_LINK_NOARG_TYPED(SvxRubyDialog, StylistHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, void) { AssertOneEntry(); sal_Int16 nAdjust = rBox.GetSelectEntryPos(); @@ -620,7 +620,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, void) m_pPreviewWin->Invalidate(); } -IMPL_LINK_TYPED(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void) { AssertOneEntry(); bool bAbove = !rBox.GetSelectEntryPos(); @@ -639,7 +639,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void) m_pPreviewWin->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxRubyDialog, CharStyleHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxRubyDialog, CharStyleHdl_Impl, ListBox&, void) { AssertOneEntry(); OUString sStyleName; @@ -661,7 +661,7 @@ IMPL_LINK_NOARG_TYPED(SvxRubyDialog, CharStyleHdl_Impl, ListBox&, void) } } -IMPL_LINK_TYPED(SvxRubyDialog, EditModifyHdl_Impl, Edit&, rEdit, void) +IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit&, rEdit, void) { for (sal_uInt16 i = 0; i < 8; i++) { @@ -674,7 +674,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, EditModifyHdl_Impl, Edit&, rEdit, void) m_pPreviewWin->Invalidate(); } -IMPL_LINK_TYPED(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32, nParam, bool) +IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32, nParam, bool) { bool bRet = false; if (m_pScrollSB->IsEnabled()) @@ -702,7 +702,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32, nParam, bool) return bRet; } -IMPL_LINK_TYPED(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32, nParam, void) +IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32, nParam, void) { sal_uInt16 nIndex = USHRT_MAX; for (sal_uInt16 i = 0; i < 8; i++) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 9cc4cbddfd96..e69b91c3ec72 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1120,12 +1120,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, } -IMPL_LINK_TYPED( SvxSearchDialog, LBSelectHdl_Impl, ListBox&, rCtrl, void ) +IMPL_LINK( SvxSearchDialog, LBSelectHdl_Impl, ListBox&, rCtrl, void ) { ClickHdl_Impl(&rCtrl); } -IMPL_LINK_TYPED( SvxSearchDialog, FlagHdl_Impl, Button *, pCtrl, void ) +IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Button *, pCtrl, void ) { ClickHdl_Impl(pCtrl); } @@ -1267,7 +1267,7 @@ void SvxSearchDialog::ClickHdl_Impl(void* pCtrl) } -IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) { bool bInclusive = ( m_pLayoutBtn->GetText() == aLayoutStr ); @@ -1447,7 +1447,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) } -IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) +IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) { if ( !bSet ) SetModifyFlag_Impl( &rEd ); @@ -1489,7 +1489,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, TemplateHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl, Button*, void) { if ( pImpl->bSaveToModule ) SaveToModule_Impl(); @@ -1897,7 +1897,7 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) } -IMPL_LINK_TYPED( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) { sal_Int32 nTxtLen = m_pSearchAttrText->GetText().getLength(); Control* pCtrl = &rControl; @@ -1956,13 +1956,13 @@ IMPL_LINK_TYPED( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, LoseFocusHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxSearchDialog, LoseFocusHdl_Impl, Control&, void) { SaveToModule_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl, Button*, void) { SfxObjectShell* pSh = SfxObjectShell::Current(); @@ -2053,7 +2053,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) { SvtModuleOptions::EFactory eFactory = getModule(rBindings); bool bWriterApp = @@ -2095,7 +2095,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl, Button*, void) { if ( !pSearchList || !pImpl->pRanges ) return; @@ -2111,7 +2111,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void ) +IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void ) { SfxViewShell* pViewShell = SfxViewShell::Current(); diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index dca1640f82d6..02fb2e535f26 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -520,7 +520,7 @@ void SvxBmpNumValueSet::UserDraw(const UserDrawEvent& rUDEvt) } } -IMPL_LINK_NOARG_TYPED(SvxBmpNumValueSet, FormatHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl, Idle *, void) { // only when a graphics was not there, it needs to be formatted if (bGrfNotFound) diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 48aa1c068ae1..9cd586654e31 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3346,14 +3346,14 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint) } -IMPL_LINK_TYPED( SvxRuler, MenuSelect, Menu *, pMenu, bool ) +IMPL_LINK( SvxRuler, MenuSelect, Menu *, pMenu, bool ) { /* Handler of the context menus for switching the unit of measurement */ SetUnit(FieldUnit(pMenu->GetCurItemId())); return false; } -IMPL_LINK_TYPED( SvxRuler, TabMenuSelect, Menu *, pMenu, bool ) +IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu, bool ) { /* Handler of the tab menu for setting the type */ if(mxTabStopItem.get() && mxTabStopItem->Count() > mxRulerImpl->nIdx) diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 948e84fd7f44..0422f84e41b6 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2210,7 +2210,7 @@ void Svx3DWin::Resize() SfxDockingWindow::Resize(); } -IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void) +IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl, Button*, void) { bUpdate = !m_pBtnUpdate->IsChecked(); m_pBtnUpdate->Check( bUpdate ); @@ -2232,7 +2232,7 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void) +IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl, Button*, void) { SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != nullptr) @@ -2244,7 +2244,7 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void) } -IMPL_LINK_TYPED( Svx3DWin, ClickViewTypeHdl, Button*, pBtn, void ) +IMPL_LINK( Svx3DWin, ClickViewTypeHdl, Button*, pBtn, void ) { if( pBtn ) @@ -2352,7 +2352,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickViewTypeHdl, Button*, pBtn, void ) } -IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void ) +IMPL_LINK( Svx3DWin, ClickHdl, Button *, pButton, void ) { PushButton* pBtn = static_cast<PushButton*>(pButton); if( pBtn ) @@ -2510,7 +2510,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void ) } -IMPL_LINK_TYPED( Svx3DWin, ClickColorHdl, Button *, pBtn, void) +IMPL_LINK( Svx3DWin, ClickColorHdl, Button *, pBtn, void) { SvColorDialog aColorDlg( this ); ColorLB* pLb; @@ -2538,7 +2538,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickColorHdl, Button *, pBtn, void) } -IMPL_LINK_TYPED( Svx3DWin, SelectHdl, ListBox&, rListBox, void ) +IMPL_LINK( Svx3DWin, SelectHdl, ListBox&, rListBox, void ) { bool bUpdatePreview = false; @@ -2635,7 +2635,7 @@ IMPL_LINK_TYPED( Svx3DWin, SelectHdl, ListBox&, rListBox, void ) } -IMPL_LINK_TYPED( Svx3DWin, ModifyHdl, Edit&, rField, void ) +IMPL_LINK( Svx3DWin, ModifyHdl, Edit&, rField, void ) { bool bUpdatePreview = false; @@ -2689,7 +2689,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn) } -IMPL_LINK_NOARG_TYPED(Svx3DWin, ChangeSelectionCallbackHdl, SvxLightCtl3D*, void) +IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl, SvxLightCtl3D*, void) { const sal_uInt32 nLight(m_pCtlLightPreview->GetSvx3DLightControl().GetSelectedLight()); PushButton* pBtn = nullptr; diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index 63d5264a405f..185205a0de45 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -45,7 +45,7 @@ E3dObjFactory::~E3dObjFactory() // Generate chart internal objects -IMPL_STATIC_LINK_TYPED( E3dObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) +IMPL_STATIC_LINK( E3dObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { if ( aParams.nInventor == E3dInventor ) { diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 6b3e88bbc03d..a1efee19d1d4 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -375,7 +375,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) return DND_ACTION_LINK; } -IMPL_LINK_NOARG_TYPED( FmGridHeader, OnAsyncExecuteDrop, void*, void ) +IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) { OUString sCommand, sFieldName,sURL; sal_Int32 nCommandType = CommandType::COMMAND; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 3fb86a223a3a..dcc54523cde0 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2794,7 +2794,7 @@ void FmXGridPeer::DisConnectFromDispatcher() } -IMPL_LINK_TYPED(FmXGridPeer, OnQueryGridSlotState, DbGridControlNavigationBarState, nSlot, int) +IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, DbGridControlNavigationBarState, nSlot, int) { if (!m_pStateCache) return -1; // unspecified @@ -2816,7 +2816,7 @@ IMPL_LINK_TYPED(FmXGridPeer, OnQueryGridSlotState, DbGridControlNavigationBarSta } -IMPL_LINK_TYPED(FmXGridPeer, OnExecuteGridSlot, DbGridControlNavigationBarState, nSlot, bool) +IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, DbGridControlNavigationBarState, nSlot, bool) { if (!m_pDispatchers) return false; // not handled diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 90e019f8f969..63c6024bdda9 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3094,7 +3094,7 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co } -IMPL_LINK_NOARG_TYPED(DbFilterField, OnClick, VclPtr<CheckBox>, void) +IMPL_LINK_NOARG(DbFilterField, OnClick, VclPtr<CheckBox>, void) { TriState eState = static_cast<CheckBoxControl*>(m_pWindow.get())->GetBox().GetState(); OUString aText; @@ -3376,7 +3376,7 @@ void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintList } -IMPL_LINK_TYPED( FmXGridCell, OnWindowEvent, VclWindowEvent&, _rEvent, void ) +IMPL_LINK( FmXGridCell, OnWindowEvent, VclWindowEvent&, _rEvent, void ) { ENSURE_OR_THROW( _rEvent.GetWindow(), "illegal window" ); onWindowEvent( _rEvent.GetId(), *_rEvent.GetWindow(), _rEvent.GetData() ); @@ -4311,7 +4311,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Wind } -IMPL_LINK_NOARG_TYPED(FmXListBoxCell, OnDoubleClick, ListBox&, void) +IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick, ListBox&, void) { if (m_pBox) { @@ -4673,7 +4673,7 @@ void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeE } -IMPL_LINK_NOARG_TYPED(FmXFilterCell, OnCommit, DbFilterField&, void) +IMPL_LINK_NOARG(FmXFilterCell, OnCommit, DbFilterField&, void) { ::comphelper::OInterfaceIteratorHelper2 aIt( m_aTextListeners ); css::awt::TextEvent aEvt; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index cc5d93f3f4aa..454a5b227322 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -551,7 +551,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() return nX; } -IMPL_LINK_TYPED(DbGridControl::NavigationBar, OnClick, Button *, pButton, void ) +IMPL_LINK(DbGridControl::NavigationBar, OnClick, Button *, pButton, void ) { DbGridControl* pParent = static_cast<DbGridControl*>(GetParent()); @@ -2894,7 +2894,7 @@ void DbGridControl::Command(const CommandEvent& rEvt) } } -IMPL_LINK_NOARG_TYPED(DbGridControl, OnDelete, void*, void) +IMPL_LINK_NOARG(DbGridControl, OnDelete, void*, void) { m_nDeleteEvent = nullptr; DeleteSelectedRows(); @@ -3498,7 +3498,7 @@ void DbGridControl::implAdjustInSolarThread(bool _bRows) } } -IMPL_LINK_TYPED(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat, void) +IMPL_LINK(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat, void) { m_nAsynAdjustEvent = nullptr; diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 019bbc08a9c3..1648940a5334 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -70,7 +70,7 @@ namespace svx void impl_onLocationModified(); OUString impl_getCurrentURL() const; - DECL_LINK_TYPED( OnControlAction, VclWindowEvent&, void ); + DECL_LINK( OnControlAction, VclWindowEvent&, void ); private: const Reference<XComponentContext> m_xContext; @@ -196,7 +196,7 @@ namespace svx } - IMPL_LINK_TYPED( DatabaseLocationInputController_Impl, OnControlAction, VclWindowEvent&, _rEvent, void ) + IMPL_LINK( DatabaseLocationInputController_Impl, OnControlAction, VclWindowEvent&, _rEvent, void ) { if ( ( _rEvent.GetWindow() == &m_rBrowseButton ) && ( _rEvent.GetId() == VCLEVENT_BUTTON_CLICK ) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 650cb12a91d7..115e96dfa524 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -389,12 +389,12 @@ namespace svxform TabPage::dispose(); } - IMPL_LINK_NOARG_TYPED(XFormsPage, TbxSelectHdl, ToolBox *, void) + IMPL_LINK_NOARG(XFormsPage, TbxSelectHdl, ToolBox *, void) { DoToolBoxAction( m_pToolBox->GetCurItemId() ); } - IMPL_LINK_NOARG_TYPED(XFormsPage, ItemSelectHdl, SvTreeListBox*, void) + IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl, SvTreeListBox*, void) { EnableMenuItems( nullptr ); } @@ -1451,7 +1451,7 @@ namespace svxform } - IMPL_LINK_TYPED( DataNavigatorWindow, ModelSelectListBoxHdl, ListBox&, rBox, void ) + IMPL_LINK( DataNavigatorWindow, ModelSelectListBoxHdl, ListBox&, rBox, void ) { ModelSelectHdl(&rBox); } @@ -1468,7 +1468,7 @@ namespace svxform } } - IMPL_LINK_TYPED( DataNavigatorWindow, MenuSelectHdl, MenuButton *, pBtn, void ) + IMPL_LINK( DataNavigatorWindow, MenuSelectHdl, MenuButton *, pBtn, void ) { bool bIsDocModified = false; Reference< css::xforms::XFormsUIHelper1 > xUIHelper; @@ -1770,7 +1770,7 @@ namespace svxform return m_pTabCtrl->GetPagePos(nId) >= 3; } - IMPL_LINK_TYPED( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn, void ) + IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn, void ) { Menu* pMenu = pBtn->GetPopupMenu(); @@ -1794,7 +1794,7 @@ namespace svxform } } - IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, ActivatePageHdl, TabControl*, void) + IMPL_LINK_NOARG(DataNavigatorWindow, ActivatePageHdl, TabControl*, void) { sal_uInt16 nId = 0; XFormsPage* pPage = GetCurrentPage( nId ); @@ -1806,7 +1806,7 @@ namespace svxform } } - IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, UpdateHdl, Timer *, void) + IMPL_LINK_NOARG(DataNavigatorWindow, UpdateHdl, Timer *, void) { ModelSelectHdl( nullptr ); } @@ -2336,7 +2336,7 @@ namespace svxform } - IMPL_LINK_TYPED( AddDataItemDialog, CheckHdl, Button *, pButton, void ) + IMPL_LINK( AddDataItemDialog, CheckHdl, Button *, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); // Condition buttons are only enable if their check box is checked @@ -2370,7 +2370,7 @@ namespace svxform } - IMPL_LINK_TYPED( AddDataItemDialog, ConditionHdl, Button *, pButton, void ) + IMPL_LINK( AddDataItemDialog, ConditionHdl, Button *, pButton, void ) { PushButton* pBtn = static_cast<PushButton*>(pButton); OUString sTemp, sPropName; @@ -2449,7 +2449,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddDataItemDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(AddDataItemDialog, OKHdl, Button*, void) { bool bIsHandleBinding = ( DITBinding == m_eItemType ); bool bIsHandleText = ( DITText == m_eItemType ); @@ -2813,7 +2813,7 @@ namespace svxform ModalDialog::dispose(); } - IMPL_LINK_NOARG_TYPED(AddConditionDialog, EditHdl, Button*, void) + IMPL_LINK_NOARG(AddConditionDialog, EditHdl, Button*, void) { Reference< XNameContainer > xNameContnr; try @@ -2837,7 +2837,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddConditionDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(AddConditionDialog, OKHdl, Button*, void) { /*!!! try @@ -2854,13 +2854,13 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddConditionDialog, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(AddConditionDialog, ModifyHdl, Edit&, void) { m_aResultIdle.Start(); } - IMPL_LINK_NOARG_TYPED(AddConditionDialog, ResultHdl, Idle *, void) + IMPL_LINK_NOARG(AddConditionDialog, ResultHdl, Idle *, void) { OUString sCondition = comphelper::string::strip(m_pConditionED->GetText(), ' '); OUString sResult; @@ -2936,7 +2936,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED( NamespaceItemDialog, SelectHdl, SvTreeListBox *, void) + IMPL_LINK_NOARG( NamespaceItemDialog, SelectHdl, SvTreeListBox *, void) { bool bEnable = ( m_pNamespacesList->FirstSelected() != nullptr ); m_pEditNamespaceBtn->Enable( bEnable ); @@ -2944,7 +2944,7 @@ namespace svxform } - IMPL_LINK_TYPED( NamespaceItemDialog, ClickHdl, Button *, pButton, void ) + IMPL_LINK( NamespaceItemDialog, ClickHdl, Button *, pButton, void ) { PushButton* pBtn = static_cast<PushButton*>(pButton); if ( m_pAddNamespaceBtn == pBtn ) @@ -2994,7 +2994,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NamespaceItemDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(NamespaceItemDialog, OKHdl, Button*, void) { try { @@ -3084,7 +3084,7 @@ namespace svxform ModalDialog::dispose(); } - IMPL_LINK_NOARG_TYPED(ManageNamespaceDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl, Button*, void) { OUString sPrefix = m_pPrefixED->GetText(); @@ -3152,7 +3152,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddSubmissionDialog, RefHdl, Button*, void) + IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl, Button*, void) { ScopedVclPtrInstance< AddConditionDialog > aDlg(this, PN_BINDING_EXPR, m_xTempBinding ); aDlg->SetCondition( m_pRefED->GetText() ); @@ -3161,7 +3161,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddSubmissionDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl, Button*, void) { OUString sName(m_pNameED->GetText()); if(sName.isEmpty()) { @@ -3392,7 +3392,7 @@ namespace svxform ModalDialog::dispose(); } - IMPL_LINK_NOARG_TYPED(AddInstanceDialog, FilePickerHdl, Button*, void) + IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ); diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 57845711a496..f17c3dcae461 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -37,7 +37,7 @@ namespace svxform m_nEventId = nullptr; } - IMPL_LINK_TYPED( DelayedEvent, OnCall, void*, _pArg, void ) + IMPL_LINK( DelayedEvent, OnCall, void*, _pArg, void ) { m_nEventId = nullptr; m_aHandler.Call( _pArg ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 10dc8b7a4975..d1a3773a8b68 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1212,7 +1212,7 @@ bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rN } -IMPL_LINK_TYPED( FmFilterNavigator, OnRemove, void*, p, void ) +IMPL_LINK( FmFilterNavigator, OnRemove, void*, p, void ) { SvTreeListEntry* pEntry = static_cast<SvTreeListEntry*>(p); // now remove the entry @@ -1220,7 +1220,7 @@ IMPL_LINK_TYPED( FmFilterNavigator, OnRemove, void*, p, void ) } -IMPL_LINK_NOARG_TYPED(FmFilterNavigator, OnDropActionTimer, Timer *, void) +IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer, Timer *, void) { if (--m_aTimerCounter > 0) return; diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 498bfb3a6c6f..35570dacc333 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -481,7 +481,7 @@ void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const } -IMPL_LINK_NOARG_TYPED( FmPropBrw, OnAsyncGetFocus, void*, void ) +IMPL_LINK_NOARG( FmPropBrw, OnAsyncGetFocus, void*, void ) { if (m_xBrowserComponentWindow.is()) m_xBrowserComponentWindow->setFocus(); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 84733dcfd42d..dc244543556f 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -108,7 +108,7 @@ namespace } } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( FmFormObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject*) { SdrObject* pNewObj = nullptr; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index db93df68ab94..0b1a0eba7339 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -134,7 +134,7 @@ namespace svxform void impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSynchronousResult ); private: - DECL_LINK_TYPED( OnAsyncScriptEvent, void*, void ); + DECL_LINK( OnAsyncScriptEvent, void*, void ); }; class FormScriptingEnvironment: @@ -876,7 +876,7 @@ namespace svxform } }; - IMPL_LINK_TYPED( FormScriptListener, OnAsyncScriptEvent, void*, p, void ) + IMPL_LINK( FormScriptListener, OnAsyncScriptEvent, void*, p, void ) { ScriptEvent* _pEvent = static_cast<ScriptEvent*>(p); OSL_PRECOND( _pEvent != nullptr, "FormScriptListener::OnAsyncScriptEvent: invalid event!" ); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index e3d8259c6f5d..1ad1630136b8 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -991,7 +991,7 @@ void FmXFormShell::LockSlotInvalidation(bool bLock) } -IMPL_LINK_NOARG_TYPED(FmXFormShell, OnInvalidateSlots, void*,void) +IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots, void*,void) { if ( impl_checkDisposed() ) return; @@ -2178,7 +2178,7 @@ void FmXFormShell::ShowSelectionProperties( bool bShow ) } -IMPL_LINK_TYPED(FmXFormShell, OnFoundData, FmFoundRecordInformation&, rfriWhere, void) +IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation&, rfriWhere, void) { if ( impl_checkDisposed() ) return; @@ -2260,7 +2260,7 @@ IMPL_LINK_TYPED(FmXFormShell, OnFoundData, FmFoundRecordInformation&, rfriWhere, } -IMPL_LINK_TYPED(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation&, rfriWhere, void) +IMPL_LINK(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation&, rfriWhere, void) { if ( impl_checkDisposed() ) return; @@ -2289,7 +2289,7 @@ IMPL_LINK_TYPED(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation&, rfr } -IMPL_LINK_TYPED(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextInfo, sal_uInt32) +IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextInfo, sal_uInt32) { if ( impl_checkDisposed() ) return 0; @@ -2657,7 +2657,7 @@ void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(css:: } -IMPL_LINK_NOARG_TYPED(FmXFormShell, OnTimeOut, Timer*, void) +IMPL_LINK_NOARG(FmXFormShell, OnTimeOut, Timer*, void) { if ( impl_checkDisposed() ) return; @@ -3588,7 +3588,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivate } -IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFirstTimeActivation, void*, void ) +IMPL_LINK_NOARG( FmXFormShell, OnFirstTimeActivation, void*, void ) { if ( impl_checkDisposed() ) return; @@ -3608,7 +3608,7 @@ IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFirstTimeActivation, void*, void ) } -IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFormsCreated, FmFormPageImpl&, void ) +IMPL_LINK_NOARG( FmXFormShell, OnFormsCreated, FmFormPageImpl&, void ) { UpdateForms( true ); } @@ -3751,7 +3751,7 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels } -IMPL_LINK_NOARG_TYPED( FmXFormShell, OnLoadForms, void*, void ) +IMPL_LINK_NOARG( FmXFormShell, OnLoadForms, void*, void ) { FmLoadAction aAction = m_aLoadingPages.front(); m_aLoadingPages.pop(); diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index f1f1f49e1842..b2db67555831 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -976,7 +976,7 @@ void FmSearchEngine::OnSearchTerminated() } -IMPL_LINK_TYPED(FmSearchEngine, OnNewRecordCount, sal_Int32, theCounter, void) +IMPL_LINK(FmSearchEngine, OnNewRecordCount, sal_Int32, theCounter, void) { if (!m_aProgressHandler.IsSet()) return; diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 52b6b2e67d5b..c1755834469f 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -548,7 +548,7 @@ namespace svx } - IMPL_LINK_NOARG_TYPED( FmTextControlShell, OnInvalidateClipboard, Timer*, void ) + IMPL_LINK_NOARG( FmTextControlShell, OnInvalidateClipboard, Timer*, void ) { if ( m_bNeedClipboardInvalidation ) { diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 79b30f036876..3ee22cca727c 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -596,7 +596,7 @@ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) } -IMPL_LINK_NOARG_TYPED(FmXFormView, OnDelayedErrorMessage, void*, void) +IMPL_LINK_NOARG(FmXFormView, OnDelayedErrorMessage, void*, void) { m_nErrorMessageEvent = nullptr; displayException( m_aAsyncError ); @@ -704,7 +704,7 @@ namespace } -IMPL_LINK_NOARG_TYPED(FmXFormView, OnActivate, void*, void) +IMPL_LINK_NOARG(FmXFormView, OnActivate, void*, void) { m_nActivationEvent = nullptr; @@ -940,7 +940,7 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF } -IMPL_LINK_NOARG_TYPED(FmXFormView, OnAutoFocus, void*, void) +IMPL_LINK_NOARG(FmXFormView, OnAutoFocus, void*, void) { m_nAutoFocusEvent = nullptr; @@ -1054,7 +1054,7 @@ void FmXFormView::breakCreateFormObject() m_xLastCreatedControlModel.clear(); } -IMPL_LINK_NOARG_TYPED( FmXFormView, OnStartControlWizard, void*, void ) +IMPL_LINK_NOARG( FmXFormView, OnStartControlWizard, void*, void ) { m_nControlWizardEvent = nullptr; OSL_PRECOND( m_xLastCreatedControlModel.is(), "FmXFormView::OnStartControlWizard: illegal call!" ); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index e16e6008a4a7..f1773ea316ca 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -493,7 +493,7 @@ void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& } -IMPL_LINK_NOARG_TYPED( FormController, OnActivateTabOrder, Idle*, void ) +IMPL_LINK_NOARG( FormController, OnActivateTabOrder, Idle*, void ) { activateTabOrder(); } @@ -509,7 +509,7 @@ struct UpdateAllListeners : public ::std::unary_function< Reference< XDispatch > } }; -IMPL_LINK_NOARG_TYPED( FormController, OnInvalidateFeatures, Timer*, void ) +IMPL_LINK_NOARG( FormController, OnInvalidateFeatures, Timer*, void ) { ::osl::MutexGuard aGuard( m_aMutex ); for ( ::std::set< sal_Int16 >::const_iterator aLoop = m_aInvalidFeatures.begin(); @@ -1432,7 +1432,7 @@ void FormController::toggleAutoFields(bool bAutoFields) } -IMPL_LINK_NOARG_TYPED(FormController, OnToggleAutoFields, void*, void) +IMPL_LINK_NOARG(FormController, OnToggleAutoFields, void*, void) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1753,7 +1753,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, s } -IMPL_LINK_NOARG_TYPED( FormController, OnActivated, void*, void ) +IMPL_LINK_NOARG( FormController, OnActivated, void*, void ) { EventObject aEvent; aEvent.Source = *this; @@ -1761,7 +1761,7 @@ IMPL_LINK_NOARG_TYPED( FormController, OnActivated, void*, void ) } -IMPL_LINK_NOARG_TYPED( FormController, OnDeactivated, void*, void ) +IMPL_LINK_NOARG( FormController, OnDeactivated, void*, void ) { EventObject aEvent; aEvent.Source = *this; @@ -2604,7 +2604,7 @@ void FormController::updateAllDispatchers() const } -IMPL_LINK_NOARG_TYPED(FormController, OnLoad, void*, void) +IMPL_LINK_NOARG(FormController, OnLoad, void*, void) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); m_bLocked = determineLockState(); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 35ca31efc13f..d41851871cac 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1483,7 +1483,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEdit, void*, void) + IMPL_LINK_NOARG(NavigatorTree, OnEdit, void*, void) { nEditEvent = nullptr; EditEntry( m_pEditEntry ); @@ -1491,7 +1491,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void) + IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer, Timer *, void) { if (--m_aTimerCounter > 0) return; @@ -1526,7 +1526,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void) + IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void) { m_sdiState = SDI_DIRTY; @@ -1541,13 +1541,13 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnSynchronizeTimer, Timer *, void) + IMPL_LINK_NOARG(NavigatorTree, OnSynchronizeTimer, Timer *, void) { SynchronizeMarkList(); } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnClipboardAction, OLocalExchange&, void) + IMPL_LINK_NOARG(NavigatorTree, OnClipboardAction, OLocalExchange&, void) { if ( !m_aControlExchange.isClipboardOwner() ) { diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index f6c113694f51..99f3f06663e5 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -225,7 +225,7 @@ void GalleryControl::ThemeSelectionHasChanged() mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme()); } -IMPL_LINK_NOARG_TYPED( GalleryControl, SplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( GalleryControl, SplitHdl, Splitter*, void ) { if(mpSplitter->IsHorizontal()) { diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index e3012a1d07bf..dd53ecef93ca 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -322,17 +322,17 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties(Dialog* pDialog, bool bCreat Application::PostUserEvent( LINK( this, GalleryBrowser1, DestroyThemePropertiesDlgHdl ), pDialog, true ); } -IMPL_LINK_TYPED( GalleryBrowser1, EndNewThemePropertiesDlgHdl, Dialog&, rDialog, void ) +IMPL_LINK( GalleryBrowser1, EndNewThemePropertiesDlgHdl, Dialog&, rDialog, void ) { ImplEndGalleryThemeProperties(&rDialog, true); } -IMPL_LINK_TYPED( GalleryBrowser1, EndThemePropertiesDlgHdl, Dialog&, rDialog, void ) +IMPL_LINK( GalleryBrowser1, EndThemePropertiesDlgHdl, Dialog&, rDialog, void ) { ImplEndGalleryThemeProperties(&rDialog, false); } -IMPL_LINK_TYPED( GalleryBrowser1, DestroyThemePropertiesDlgHdl, void*, p, void ) +IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, void*, p, void ) { VclAbstractDialog2* pDialog = static_cast<VclAbstractDialog2*>(p); delete pDialog; @@ -574,7 +574,7 @@ bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) return bRet; } -IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ShowContextMenuHdl, void*, void) +IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl, void*, void) { ::std::vector< sal_uInt16 > aExecVector; ImplGetExecuteVector(aExecVector); @@ -601,19 +601,19 @@ IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ShowContextMenuHdl, void*, void) } } -IMPL_LINK_TYPED( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu, bool ) +IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu, bool ) { ImplExecute( pMenu->GetCurItemId() ); return false; } -IMPL_LINK_NOARG_TYPED(GalleryBrowser1, SelectThemeHdl, ListBox&, void) +IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl, ListBox&, void) { if (maThemeSlectionHandler) maThemeSlectionHandler(); } -IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ClickNewThemeHdl, Button*, void) +IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl, Button*, void) { OUString aNewTheme( GAL_RESSTR(RID_SVXSTR_GALLERY_NEWTHEME) ); OUString aName( aNewTheme ); diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index de7cc8cce042..999d8a6cea76 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -105,13 +105,13 @@ private: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK_TYPED( ClickNewThemeHdl, Button*, void ); - DECL_LINK_TYPED( SelectThemeHdl, ListBox&, void ); - DECL_LINK_TYPED( ShowContextMenuHdl, void*, void ); - DECL_LINK_TYPED( PopupMenuHdl, Menu*, bool ); - DECL_LINK_TYPED( EndNewThemePropertiesDlgHdl, Dialog&, void ); - DECL_LINK_TYPED( EndThemePropertiesDlgHdl, Dialog&, void ); - DECL_LINK_TYPED( DestroyThemePropertiesDlgHdl, void*, void ); + DECL_LINK( ClickNewThemeHdl, Button*, void ); + DECL_LINK( SelectThemeHdl, ListBox&, void ); + DECL_LINK( ShowContextMenuHdl, void*, void ); + DECL_LINK( PopupMenuHdl, Menu*, bool ); + DECL_LINK( EndNewThemePropertiesDlgHdl, Dialog&, void ); + DECL_LINK( EndThemePropertiesDlgHdl, Dialog&, void ); + DECL_LINK( DestroyThemePropertiesDlgHdl, void*, void ); public: diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index f2b38b84291c..aff553ac7d09 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -74,7 +74,7 @@ struct DispatchInfo css::uno::Reference< css::frame::XDispatch > Dispatch; }; -IMPL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, p, void ) +IMPL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, void*, p, void ) { DispatchInfo* pDispatchInfo = static_cast<DispatchInfo*>(p); if ( pDispatchInfo && pDispatchInfo->Dispatch.is() ) @@ -122,8 +122,8 @@ private: static void Execute( const CommandInfo &rCmdInfo, const css::uno::Sequence< css::beans::PropertyValue > &rArguments ); - DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); - DECL_LINK_TYPED( BackgroundMenuSelectHdl, Menu*, bool ); + DECL_LINK( MenuSelectHdl, Menu*, bool ); + DECL_LINK( BackgroundMenuSelectHdl, Menu*, bool ); public: GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, @@ -318,7 +318,7 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos mpPopupMenu->Execute( pWindow, aPos ); } -IMPL_LINK_TYPED( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool ) +IMPL_LINK( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool ) { if( !pMenu ) return false; @@ -343,7 +343,7 @@ IMPL_LINK_TYPED( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool ) return false; } -IMPL_LINK_TYPED( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu, bool ) +IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu, bool ) { if( !pMenu ) return false; @@ -1287,17 +1287,17 @@ OUString GalleryBrowser2::GetFilterName() const } -IMPL_LINK_NOARG_TYPED(GalleryBrowser2, SelectObjectValueSetHdl, ValueSet*, void) +IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectValueSetHdl, ValueSet*, void) { ImplUpdateInfoBar(); } -IMPL_LINK_NOARG_TYPED(GalleryBrowser2, SelectObjectHdl, GalleryListView*, void) +IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectHdl, GalleryListView*, void) { ImplUpdateInfoBar(); } -IMPL_LINK_TYPED( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox, void ) +IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox, void ) { if( pBox->GetCurItemId() == TBX_ID_ICON ) SetMode( GALLERYBROWSERMODE_ICON ); @@ -1305,7 +1305,7 @@ IMPL_LINK_TYPED( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox, void ) SetMode( GALLERYBROWSERMODE_LIST ); } -IMPL_LINK_NOARG_TYPED(GalleryBrowser2, MiscHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl, LinkParamNone*, void) { maViewBox->SetOutStyle( maMiscOptions.GetToolboxStyle() ); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 2578ac37a06c..70c9ad68d002 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -76,7 +76,7 @@ BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ) return aBmpEx; } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { if ( aParams.nInventor == IV_IMAPINFO && aParams.nObjIdentifier == ID_IMAPINFO ) diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index fb1771fcd501..de2a2c4f5797 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -101,7 +101,7 @@ public: void NotifyAccessibleEvent( const sal_Int16 _nEventId, const css::uno::Any& _rOldValue, const css::uno::Any& _rNewValue ); protected: - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index da4aba3f3b6d..e0d65a2ef168 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -260,8 +260,8 @@ namespace svxform OUString m_sInstanceURL; bool m_bLinkOnce; - DECL_LINK_TYPED(TbxSelectHdl, ToolBox *, void); - DECL_LINK_TYPED(ItemSelectHdl, SvTreeListBox*, void); + DECL_LINK(TbxSelectHdl, ToolBox *, void); + DECL_LINK(ItemSelectHdl, SvTreeListBox*, void); void AddChildren( SvTreeListEntry* _pParent, const ImageList& _rImgLst, @@ -334,11 +334,11 @@ namespace svxform XFrame_ref m_xFrame; XFrameModel_ref m_xFrameModel; - DECL_LINK_TYPED( ModelSelectListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( MenuActivateHdl, MenuButton *, void ); - DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void); - DECL_LINK_TYPED( UpdateHdl, Timer *, void); + DECL_LINK( ModelSelectListBoxHdl, ListBox&, void ); + DECL_LINK( MenuSelectHdl, MenuButton *, void ); + DECL_LINK( MenuActivateHdl, MenuButton *, void ); + DECL_LINK( ActivatePageHdl, TabControl*, void); + DECL_LINK( UpdateHdl, Timer *, void); void ModelSelectHdl(ListBox*); XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); void LoadModels(); @@ -445,9 +445,9 @@ namespace svxform OUString m_sFL_Binding; OUString m_sFT_BindingExp; - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( ConditionHdl, Button*, void ); - DECL_LINK_TYPED( OKHdl, Button*, void); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( ConditionHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void); void InitDialog(); void InitFromNode(); @@ -477,10 +477,10 @@ namespace svxform XFormsUIHelper1_ref m_xUIHelper; XPropertySet_ref m_xBinding; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(ResultHdl, Idle *, void); - DECL_LINK_TYPED(EditHdl, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(ResultHdl, Idle *, void); + DECL_LINK(EditHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: AddConditionDialog(vcl::Window* pParent, @@ -514,9 +514,9 @@ namespace svxform XNameContainer_ref& m_rNamespaces; - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( OKHdl, Button*, void); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void); void LoadNamespaces(); @@ -536,7 +536,7 @@ namespace svxform VclPtr<AddConditionDialog> m_pConditionDlg; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: ManageNamespaceDialog(vcl::Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit); @@ -577,8 +577,8 @@ namespace svxform XPropertySet_ref m_xTempBinding; XPropertySet_ref m_xCreatedBinding; - DECL_LINK_TYPED(RefHdl, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(RefHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); void FillAllBoxes(); @@ -622,7 +622,7 @@ namespace svxform OUString m_sAllFilterName; - DECL_LINK_TYPED(FilePickerHdl, Button*, void); + DECL_LINK(FilePickerHdl, Button*, void); public: AddInstanceDialog( vcl::Window* pParent, bool _bEdit ); diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index 7fb6dcbd6bcc..4f7925c94b1d 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -65,7 +65,7 @@ namespace svxform ImplSVEvent * m_nEventId; private: - DECL_LINK_TYPED( OnCall, void*, void ); + DECL_LINK( OnCall, void*, void ); private: DelayedEvent( const DelayedEvent& ) = delete; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index bba889059f54..244c56983439 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -394,7 +394,7 @@ class SaveDialog : public Dialog virtual ~SaveDialog() override; virtual void dispose() override; - DECL_LINK_TYPED(OKButtonHdl, Button*, void); + DECL_LINK(OKButtonHdl, Button*, void); }; class SaveProgressDialog : public ModalDialog @@ -538,8 +538,8 @@ class RecoveryDialog : public Dialog // helper private: /** @short TODO */ - DECL_LINK_TYPED(NextButtonHdl, Button*, void); - DECL_LINK_TYPED(CancelButtonHdl, Button*, void); + DECL_LINK(NextButtonHdl, Button*, void); + DECL_LINK(CancelButtonHdl, Button*, void); /** @short TODO */ @@ -593,15 +593,15 @@ class BrokenRecoveryDialog : public ModalDialog /** @short TODO */ - DECL_LINK_TYPED(SaveButtonHdl, Button*, void); + DECL_LINK(SaveButtonHdl, Button*, void); /** @short TODO */ - DECL_LINK_TYPED(OkButtonHdl, Button*, void); + DECL_LINK(OkButtonHdl, Button*, void); /** @short TODO */ - DECL_LINK_TYPED(CancelButtonHdl, Button*, void); + DECL_LINK(CancelButtonHdl, Button*, void); /** @short TODO */ diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 35ebbe57595e..6487e0afff36 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -272,8 +272,8 @@ protected: void Insert(FmFilterData* pItem, sal_uLong nPos); void Remove(FmFilterData* pItem); - DECL_LINK_TYPED(OnRemove, void*, void); - DECL_LINK_TYPED(OnDropActionTimer, Timer*, void); + DECL_LINK(OnRemove, void*, void); + DECL_LINK(OnDropActionTimer, Timer*, void); private: /** returns the first form item and the selected FilterItems in the vector diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 44448b58723f..04c3a28ab467 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -67,7 +67,7 @@ protected: virtual void FillInfo( SfxChildWinInfo& rInfo ) const override; virtual bool Close() override; - DECL_LINK_TYPED( OnAsyncGetFocus, void*, void ); + DECL_LINK( OnAsyncGetFocus, void*, void ); void implSetNewSelection( const InterfaceBag& _rSelection ); void implDetachController(); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 8028ae837af7..122ba071246d 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -468,13 +468,13 @@ namespace svxform static bool IsHiddenControl(FmEntryData* pEntryData); - DECL_LINK_TYPED( OnEdit, void*, void ); - DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); + DECL_LINK( OnEdit, void*, void ); + DECL_LINK( OnDropActionTimer, Timer*, void ); - DECL_LINK_TYPED( OnEntrySelDesel, SvTreeListBox*, void ); - DECL_LINK_TYPED( OnSynchronizeTimer, Timer*, void ); + DECL_LINK( OnEntrySelDesel, SvTreeListBox*, void ); + DECL_LINK( OnSynchronizeTimer, Timer*, void ); - DECL_LINK_TYPED( OnClipboardAction, OLocalExchange&, void ); + DECL_LINK( OnClipboardAction, OLocalExchange&, void ); protected: virtual void Command( const CommandEvent& rEvt ) override; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 21de05b2b7d1..300650ec6ed4 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -465,12 +465,12 @@ public: SAL_DLLPRIVATE bool HasControlFocus() const; private: - DECL_DLLPRIVATE_LINK_TYPED(OnFoundData, FmFoundRecordInformation&, void); - DECL_DLLPRIVATE_LINK_TYPED(OnCanceledNotFound, FmFoundRecordInformation&, void); - DECL_DLLPRIVATE_LINK_TYPED(OnSearchContextRequest, FmSearchContext&, sal_uInt32); - DECL_DLLPRIVATE_LINK_TYPED(OnTimeOut, Timer*, void); - DECL_DLLPRIVATE_LINK_TYPED(OnFirstTimeActivation, void*, void); - DECL_DLLPRIVATE_LINK_TYPED(OnFormsCreated, FmFormPageImpl&, void); + DECL_DLLPRIVATE_LINK(OnFoundData, FmFoundRecordInformation&, void); + DECL_DLLPRIVATE_LINK(OnCanceledNotFound, FmFoundRecordInformation&, void); + DECL_DLLPRIVATE_LINK(OnSearchContextRequest, FmSearchContext&, sal_uInt32); + DECL_DLLPRIVATE_LINK(OnTimeOut, Timer*, void); + DECL_DLLPRIVATE_LINK(OnFirstTimeActivation, void*, void); + DECL_DLLPRIVATE_LINK(OnFormsCreated, FmFormPageImpl&, void); SAL_DLLPRIVATE void LoopGrids(LoopGridsSync nSync, LoopGridsFlags nWhat = LoopGridsFlags::NONE); @@ -481,7 +481,7 @@ private: // (asynchron) invalidiert SAL_DLLPRIVATE void LockSlotInvalidation(bool bLock); - DECL_DLLPRIVATE_LINK_TYPED(OnInvalidateSlots, void*, void); + DECL_DLLPRIVATE_LINK(OnInvalidateSlots, void*, void); SAL_DLLPRIVATE void CloseExternalFormViewer(); // closes the task-local beamer displaying a grid view for a form @@ -531,7 +531,7 @@ public: SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState ); protected: - DECL_DLLPRIVATE_LINK_TYPED( OnLoadForms, void*, void ); + DECL_DLLPRIVATE_LINK( OnLoadForms, void*, void ); }; diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 36825fa24286..9b8801e65ab4 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -199,7 +199,7 @@ namespace svx */ void impl_parseURL_nothrow( css::util::URL& _rURL ); - DECL_LINK_TYPED( OnInvalidateClipboard, Timer*, void ); + DECL_LINK( OnInvalidateClipboard, Timer*, void ); }; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index f01ad9d557d9..f2f0a6875fd7 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -293,10 +293,10 @@ private: /// the auto focus to the first (in terms of the tab order) control void AutoFocus(); - DECL_LINK_TYPED( OnActivate, void*, void ); - DECL_LINK_TYPED( OnAutoFocus, void*, void ); - DECL_LINK_TYPED( OnDelayedErrorMessage, void*, void ); - DECL_LINK_TYPED( OnStartControlWizard, void*, void ); + DECL_LINK( OnActivate, void*, void ); + DECL_LINK( OnAutoFocus, void*, void ); + DECL_LINK( OnDelayedErrorMessage, void*, void ); + DECL_LINK( OnStartControlWizard, void*, void ); private: ::svxform::DocumentType impl_getDocumentType() const; diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index a28e50f0ce23..77966e3ea946 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -563,12 +563,12 @@ namespace svxform bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();} css::uno::Reference< css::awt::XControl> isInList(const css::uno::Reference< css::awt::XWindowPeer>& xPeer) const; - DECL_LINK_TYPED( OnActivateTabOrder, Idle*, void ); - DECL_LINK_TYPED( OnInvalidateFeatures, Timer*, void ); - DECL_LINK_TYPED( OnLoad, void*, void ); - DECL_LINK_TYPED( OnToggleAutoFields, void*, void ); - DECL_LINK_TYPED( OnActivated, void*, void ); - DECL_LINK_TYPED( OnDeactivated, void*, void ); + DECL_LINK( OnActivateTabOrder, Idle*, void ); + DECL_LINK( OnInvalidateFeatures, Timer*, void ); + DECL_LINK( OnLoad, void*, void ); + DECL_LINK( OnToggleAutoFields, void*, void ); + DECL_LINK( OnActivated, void*, void ); + DECL_LINK( OnDeactivated, void*, void ); }; } diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 5a2ce9512b32..38b8478425b4 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -696,7 +696,7 @@ protected: protected: void SetList(const css::uno::Any& rItems, bool bComboBox); void CreateControl(vcl::Window* pParent, const css::uno::Reference< css::beans::XPropertySet >& xModel); - DECL_LINK_TYPED( OnClick, VclPtr<CheckBox>, void ); + DECL_LINK( OnClick, VclPtr<CheckBox>, void ); }; @@ -801,7 +801,7 @@ protected: virtual void onFocusLost( const css::awt::FocusEvent& _rEvent ); private: - DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); + DECL_LINK( OnWindowEvent, VclWindowEvent&, void ); }; @@ -1014,7 +1014,7 @@ public: protected: virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; - DECL_LINK_TYPED( OnDoubleClick, ListBox&, void ); + DECL_LINK( OnDoubleClick, ListBox&, void ); }; @@ -1107,7 +1107,7 @@ public: virtual sal_Int16 SAL_CALL getMaxTextLen() throw(css::uno::RuntimeException, std::exception) override; protected: - DECL_LINK_TYPED( OnCommit, DbFilterField&, void ); + DECL_LINK( OnCommit, DbFilterField&, void ); }; #endif // INCLUDED_SVX_SOURCE_INC_GRIDCELL_HXX diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx index aaa99f0d8630..d1d279bd5a58 100644 --- a/svx/source/mnuctrls/smarttagmenu.cxx +++ b/svx/source/mnuctrls/smarttagmenu.cxx @@ -39,7 +39,7 @@ public: private: void FillMenu(); - DECL_LINK_TYPED( MenuSelect, Menu*, bool ); + DECL_LINK( MenuSelect, Menu*, bool ); struct InvokeAction { css::uno::Reference< css::smarttags::XSmartTagAction > m_xAction; @@ -196,7 +196,7 @@ void SmartTagMenuController::FillMenu() } } -IMPL_LINK_TYPED( SmartTagMenuController, MenuSelect, Menu*, pMenu, bool ) +IMPL_LINK( SmartTagMenuController, MenuSelect, Menu*, pMenu, bool ) { if ( !m_pSmartTagItem ) return false; diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index d5bb135a4c7a..864274093103 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -205,7 +205,7 @@ namespace sdr mpBufferDevice->EnableMapMode(bMapModeWasEnabledSource); } - IMPL_LINK_NOARG_TYPED(OverlayManagerBuffered, ImpBufferTimerHandler, Idle*, void) + IMPL_LINK_NOARG(OverlayManagerBuffered, ImpBufferTimerHandler, Idle*, void) { //Resolves: fdo#46728 ensure this exists until end of scope rtl::Reference<OverlayManager> xRef(this); diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 9e04f33b31ba..9ef444c67344 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -74,7 +74,7 @@ void PanelLayout::queue_resize(StateChangedType /*eReason*/) m_aPanelLayoutIdle.Start(); } -IMPL_LINK_NOARG_TYPED( PanelLayout, ImplHandlePanelLayoutTimerHdl, Idle*, void ) +IMPL_LINK_NOARG( PanelLayout, ImplHandlePanelLayoutTimerHdl, Idle*, void ) { vcl::Window *pChild = GetWindow(GetWindowType::FirstChild); assert(pChild); diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index a48fbf60c172..d65d2bdfa692 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -202,7 +202,7 @@ void AreaPropertyPanelBase::SetTransparency(sal_uInt16 nVal) mpMTRTransparent->SetValue(nVal); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void) { SvxOpenGraphicDialog aDlg( "Import" ); aDlg.EnableLink(false); @@ -244,7 +244,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void } } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) { sal_Int32 nPos = (eFillStyle)mpLbFillType->GetSelectEntryPos(); mpLbFillAttr->Clear(); @@ -484,12 +484,12 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) mpSidebarController->NotifyResize(); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) { SelectFillAttrHdl_Impl(); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeGradientAngle, Edit&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ChangeGradientAngle, Edit&, void) { SelectFillAttrHdl_Impl(); } @@ -1311,7 +1311,7 @@ void AreaPropertyPanelBase::Update() mpSidebarController->NotifyResize(); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ModifyTransSliderHdl, Slider*, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ModifyTransSliderHdl, Slider*, void) { const sal_uInt16 nVal = mpSldTransparent->GetThumbPos(); SetTransparency(nVal); @@ -1319,7 +1319,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ModifyTransSliderHdl, Slider*, void setFillTransparence(aLinearItem); } -IMPL_LINK_TYPED( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void ) +IMPL_LINK( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void ) { if (!mxTrGrPopup) mxTrGrPopup = VclPtr<AreaTransparencyGradientPopup>::Create(pToolBox, *this); @@ -1329,7 +1329,7 @@ IMPL_LINK_TYPED( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, v FloatWinPopupFlags::NoAppFocusClose); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, void) { sal_Int32 nSelectType = mpLBTransType->GetSelectEntryPos(); bool bGradient = false; @@ -1427,7 +1427,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, v setFillFloatTransparence(aGradientItem); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ModifyTransparentHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ModifyTransparentHdl_Impl, Edit&, void) { const sal_uInt16 nTrans = (sal_uInt16)mpMTRTransparent->GetValue(); mnLastTransSolid = nTrans; diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 7b895945cdc0..dc50fb1f8b00 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -291,14 +291,14 @@ void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, s mrAreaPropertyPanel.setFillFloatTransparence(aGradientItem); } -IMPL_LINK_NOARG_TYPED(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl, Edit&, void) { sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue->GetValue() * 255) / 100); sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue->GetValue() * 255) / 100); ExecuteValueModify( nStartCol, nEndCol ); } -IMPL_LINK_NOARG_TYPED(AreaTransparencyGradientControl, Left_Click45_Impl, ToolBox *, void) +IMPL_LINK_NOARG(AreaTransparencyGradientControl, Left_Click45_Impl, ToolBox *, void) { sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue->GetValue() * 255) / 100); sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue->GetValue() * 255) / 100); @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(AreaTransparencyGradientControl, Left_Click45_Impl, ToolBo ExecuteValueModify( nStartCol, nEndCol ); } -IMPL_LINK_NOARG_TYPED(AreaTransparencyGradientControl, Right_Click45_Impl, ToolBox *, void) +IMPL_LINK_NOARG(AreaTransparencyGradientControl, Right_Click45_Impl, ToolBox *, void) { sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue->GetValue() * 255) / 100); sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue->GetValue() * 255) / 100); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index 304e030ed171..452da99030a5 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -66,9 +66,9 @@ private: Image maRotRight; AreaPropertyPanelBase& mrAreaPropertyPanel; - DECL_LINK_TYPED( ModifiedTrgrHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( Left_Click45_Impl, ToolBox*, void ); - DECL_LINK_TYPED( Right_Click45_Impl, ToolBox*, void ); + DECL_LINK( ModifiedTrgrHdl_Impl, Edit&, void ); + DECL_LINK( Left_Click45_Impl, ToolBox*, void ); + DECL_LINK( Right_Click45_Impl, ToolBox*, void ); }; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index ff7acc5a07ba..8b39ad235d79 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -128,7 +128,7 @@ void GraphicPropertyPanel::Initialize() } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) { const sal_Int16 nBright = mpMtrBrightness->GetValue(); const SfxInt16Item aBrightItem( SID_ATTR_GRAF_LUMINANCE, nBright ); @@ -137,7 +137,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) { const sal_Int16 nContrast = mpMtrContrast->GetValue(); const SfxInt16Item aContrastItem( SID_ATTR_GRAF_CONTRAST, nContrast ); @@ -146,7 +146,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) { const sal_Int16 nTrans = mpMtrTrans->GetValue(); const SfxInt16Item aTransItem( SID_ATTR_GRAF_TRANSPARENCE, nTrans ); @@ -155,7 +155,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) { const sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos(); const SfxInt16Item aTransItem( SID_ATTR_GRAF_MODE, nTrans ); @@ -164,7 +164,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, RedHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, RedHdl, Edit&, void ) { const sal_Int16 nRed = mpMtrRed->GetValue(); const SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed ); @@ -173,7 +173,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, RedHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, GreenHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, GreenHdl, Edit&, void ) { const sal_Int16 nGreen = mpMtrGreen->GetValue(); const SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen ); @@ -182,7 +182,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, GreenHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, BlueHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicPropertyPanel, BlueHdl, Edit&, void) { const sal_Int16 nBlue = mpMtrBlue->GetValue(); const SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue ); @@ -191,7 +191,7 @@ IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, BlueHdl, Edit&, void) } -IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, GammaHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicPropertyPanel, GammaHdl, Edit&, void) { const sal_Int32 nGamma = mpMtrGamma->GetValue(); const SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma ); diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index dfdc375804da..4f8903dfd2e6 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -85,14 +85,14 @@ private: SfxBindings* mpBindings; - DECL_LINK_TYPED( ModifyBrightnessHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyContrastHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyTransHdl, Edit&, void ); - DECL_LINK_TYPED( ClickColorModeHdl, ListBox&, void ); - DECL_LINK_TYPED( RedHdl, Edit&, void ); - DECL_LINK_TYPED( GreenHdl, Edit&, void ); - DECL_LINK_TYPED( BlueHdl, Edit&, void ); - DECL_LINK_TYPED( GammaHdl, Edit&, void ); + DECL_LINK( ModifyBrightnessHdl, Edit&, void ); + DECL_LINK( ModifyContrastHdl, Edit&, void ); + DECL_LINK( ModifyTransHdl, Edit&, void ); + DECL_LINK( ClickColorModeHdl, ListBox&, void ); + DECL_LINK( RedHdl, Edit&, void ); + DECL_LINK( GreenHdl, Edit&, void ); + DECL_LINK( BlueHdl, Edit&, void ); + DECL_LINK( GammaHdl, Edit&, void ); void Initialize(); }; diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 41688c851b29..4d1ff4a309f1 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -537,7 +537,7 @@ void LinePropertyPanelBase::updateLineCap(bool bDisabled, bool bSetOrDefault, mpLBCapStyle->SetNoSelection(); } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeLineStyleHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeLineStyleHdl, ListBox&, void) { const sal_Int32 nPos(mpLBStyle->GetSelectEntryPos()); @@ -575,7 +575,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeLineStyleHdl, ListBox&, void) ActivateControls(); } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) { sal_Int32 nPos = mpLBStart->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBStart->IsValueChangedFromSaved() ) @@ -589,7 +589,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) { sal_Int32 nPos = mpLBEnd->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBEnd->IsValueChangedFromSaved() ) @@ -603,7 +603,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeEdgeStyleHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEdgeStyleHdl, ListBox&, void) { const sal_Int32 nPos(mpLBEdgeStyle->GetSelectEntryPos()); @@ -639,7 +639,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeEdgeStyleHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeCapStyleHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeCapStyleHdl, ListBox&, void) { const sal_Int32 nPos(mpLBCapStyle->GetSelectEntryPos()); @@ -670,7 +670,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeCapStyleHdl, ListBox&, void) } } -IMPL_LINK_TYPED(LinePropertyPanelBase, ToolboxWidthSelectHdl,ToolBox*, pToolBox, void) +IMPL_LINK(LinePropertyPanelBase, ToolboxWidthSelectHdl,ToolBox*, pToolBox, void) { if (pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SELECTWIDTH) { @@ -679,7 +679,7 @@ IMPL_LINK_TYPED(LinePropertyPanelBase, ToolboxWidthSelectHdl,ToolBox*, pToolBox, } } -IMPL_LINK_NOARG_TYPED( LinePropertyPanelBase, ChangeTransparentHdl, Edit&, void ) +IMPL_LINK_NOARG( LinePropertyPanelBase, ChangeTransparentHdl, Edit&, void ) { sal_uInt16 nVal = (sal_uInt16)mpMFTransparent->GetValue(); XLineTransparenceItem aItem( nVal ); diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 1bc93919e2a4..b455758f8216 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -111,7 +111,7 @@ LineWidthPopup::~LineWidthPopup() disposeOnce(); } -IMPL_LINK_TYPED(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void) +IMPL_LINK(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void) { sal_uInt16 iPos = m_xVSWidth->GetSelectItemId(); if (iPos >= 1 && iPos <= 8) @@ -154,7 +154,7 @@ IMPL_LINK_TYPED(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void) } } -IMPL_LINK_TYPED(LineWidthPopup, MFModifyHdl, Edit&, /*rControl*/, void) +IMPL_LINK(LineWidthPopup, MFModifyHdl, Edit&, /*rControl*/, void) { if (m_xVSWidth->GetSelItem()) { diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx index f35304c40d75..46f7645c7a3e 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx @@ -124,14 +124,14 @@ void MediaPlaybackPanel::Update() UpdateTimeField( *mpMediaItem, mpMediaItem->getTime() ); } -IMPL_LINK_NOARG_TYPED( MediaPlaybackPanel, VolumeSlideHdl, Slider*, void) +IMPL_LINK_NOARG( MediaPlaybackPanel, VolumeSlideHdl, Slider*, void) { MediaItem aItem(SID_AVMEDIA_TOOLBOX); aItem.setVolumeDB( static_cast< sal_Int16 > (mpVolumeSlider->GetThumbPos())); mpBindings->GetDispatcher()->ExecuteList(SID_AVMEDIA_TOOLBOX, SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED( MediaPlaybackPanel, SeekHdl, Slider*, void) +IMPL_LINK_NOARG( MediaPlaybackPanel, SeekHdl, Slider*, void) { MediaItem aItem(SID_AVMEDIA_TOOLBOX); aItem.setState( MediaState::Pause ); @@ -140,12 +140,12 @@ IMPL_LINK_NOARG_TYPED( MediaPlaybackPanel, SeekHdl, Slider*, void) mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX); } -IMPL_LINK_NOARG_TYPED( MediaPlaybackPanel, TimeoutHdl, Idle*, void) +IMPL_LINK_NOARG( MediaPlaybackPanel, TimeoutHdl, Idle*, void) { mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX); } -IMPL_LINK_TYPED( MediaPlaybackPanel, PlayToolBoxSelectHdl, ToolBox*, pControl, void) +IMPL_LINK( MediaPlaybackPanel, PlayToolBoxSelectHdl, ToolBox*, pControl, void) { MediaItem aItem(SID_AVMEDIA_TOOLBOX); switch(pControl->GetCurItemId()) diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.hxx b/svx/source/sidebar/media/MediaPlaybackPanel.hxx index 4ba851b2333c..d7c88456a605 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx @@ -70,10 +70,10 @@ private: const SfxItemState eState, const SfxPoolItem* pState, const bool bIsEnabled) override; - DECL_LINK_TYPED(PlayToolBoxSelectHdl, ToolBox*, void); - DECL_LINK_TYPED(VolumeSlideHdl, Slider*, void); - DECL_LINK_TYPED(SeekHdl, Slider*, void); - DECL_LINK_TYPED(TimeoutHdl, Idle*, void); + DECL_LINK(PlayToolBoxSelectHdl, ToolBox*, void); + DECL_LINK(VolumeSlideHdl, Slider*, void); + DECL_LINK(SeekHdl, Slider*, void); + DECL_LINK(TimeoutHdl, Idle*, void); }; diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 6887e95d3e86..f58cb6bc11ad 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -324,13 +324,13 @@ void ParaLineSpacingControl::SelectEntryPos(sal_Int32 nPos) UpdateMetricFields(); } -IMPL_LINK_NOARG_TYPED(ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox&, void) { UpdateMetricFields(); ExecuteLineSpace(); } -IMPL_LINK_NOARG_TYPED( ParaLineSpacingControl, LineSPDistAtHdl_Impl, Edit&, void ) +IMPL_LINK_NOARG( ParaLineSpacingControl, LineSPDistAtHdl_Impl, Edit&, void ) { ExecuteLineSpace(); } @@ -416,7 +416,7 @@ void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_In } } -IMPL_LINK_TYPED(ParaLineSpacingControl, PredefinedValuesHandler, Button*, pControl, void) +IMPL_LINK(ParaLineSpacingControl, PredefinedValuesHandler, Button*, pControl, void) { if (pControl == mpSpacing1Button) { diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index e0df457776be..e467392bf6a9 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -69,9 +69,9 @@ private: /// Set the entry and update the metric fields. void SelectEntryPos(sal_Int32 nPos); - DECL_LINK_TYPED(LineSPDistHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(LineSPDistAtHdl_Impl, Edit&, void); - DECL_LINK_TYPED(PredefinedValuesHandler, Button*, void); + DECL_LINK(LineSPDistHdl_Impl, ListBox&, void); + DECL_LINK(LineSPDistAtHdl_Impl, Edit&, void); + DECL_LINK(PredefinedValuesHandler, Button*, void); }; } diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index b6b8c6f6ef6f..b3e7e078145d 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -192,7 +192,7 @@ void ParaPropertyPanel::initial() } // for Paragraph Indent -IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void) +IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void) { SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE ); aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) ); @@ -203,7 +203,7 @@ IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void) SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, { &aMargin }); } -IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, void) +IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, void) { const OUString aCommand(pControl->GetItemCommand(pControl->GetCurItemId())); @@ -283,7 +283,7 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont } // for Paragraph Spacing -IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ULSpaceHdl_Impl, Edit&, void) +IMPL_LINK_NOARG( ParaPropertyPanel, ULSpaceHdl_Impl, Edit&, void) { SvxULSpaceItem aMargin( SID_ATTR_PARA_ULSPACE ); aMargin.SetUpper( (sal_uInt16)GetCoreValue( *mpTopDist, m_eULSpaceUnit ) ); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index fabb1cb62865..04ba3d0ec395 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -111,9 +111,9 @@ private: SfxBindings* mpBindings; css::uno::Reference<css::ui::XSidebar> mxSidebar; - DECL_LINK_TYPED(ModifyIndentHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ClickIndent_IncDec_Hdl_Impl, ToolBox*, void); - DECL_LINK_TYPED(ULSpaceHdl_Impl, Edit&, void); + DECL_LINK(ModifyIndentHdl_Impl, Edit&, void); + DECL_LINK(ClickIndent_IncDec_Hdl_Impl, ToolBox*, void); + DECL_LINK(ULSpaceHdl_Impl, Edit&, void); void StateChangedIndentImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void StateChangedULImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index c534d4c13640..576da6087e28 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -89,7 +89,7 @@ void ParaULSpacingWindow::SetValue(const SvxULSpaceItem* pItem) m_pBelowSpacing->SetValue(nVal, FUNIT_100TH_MM); } -IMPL_LINK_NOARG_TYPED(ParaULSpacingWindow, ModifySpacingHdl, Edit&, void) +IMPL_LINK_NOARG(ParaULSpacingWindow, ModifySpacingHdl, Edit&, void) { SfxDispatcher* pDisp = SfxViewFrame::Current()->GetBindings().GetDispatcher(); if(pDisp) @@ -250,7 +250,7 @@ void ParaLRSpacingWindow::SetUnit(FieldUnit eUnit) m_eUnit = rPool.GetMetric(nWhich); } -IMPL_LINK_NOARG_TYPED(ParaLRSpacingWindow, ModifySpacingHdl, Edit&, void) +IMPL_LINK_NOARG(ParaLRSpacingWindow, ModifySpacingHdl, Edit&, void) { SfxDispatcher* pDisp = SfxViewFrame::Current()->GetBindings().GetDispatcher(); if(pDisp) diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index b396cd50b74f..b0fbcea4d4ec 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -51,7 +51,7 @@ private: MapUnit m_eUnit; - DECL_LINK_TYPED(ModifySpacingHdl, Edit&, void); + DECL_LINK(ModifySpacingHdl, Edit&, void); }; class ParaLRSpacingWindow : public VclVBox, @@ -75,7 +75,7 @@ private: vcl::EnumContext m_aContext; - DECL_LINK_TYPED(ModifySpacingHdl, Edit&, void); + DECL_LINK(ModifySpacingHdl, Edit&, void); }; } diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index b9939b482d4a..6dc0f9025179 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -323,7 +323,7 @@ void PosSizePropertyPanel::HandleContextChange( } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) { if( mpCbxScale->IsChecked() && mpCbxScale->IsEnabled() ) @@ -345,7 +345,7 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) { if( mpCbxScale->IsChecked() && mpCbxScale->IsEnabled() ) @@ -367,19 +367,19 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangePosXHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosXHdl, Edit&, void ) { executePosX(); } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangePosYHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosYHdl, Edit&, void ) { executePosY(); } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) { if ( mpCbxScale->IsChecked() ) { @@ -393,7 +393,7 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) { OUString sTmp = mpMtrAngle->GetText(); if (sTmp.isEmpty()) @@ -438,7 +438,7 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl, DialControl*, void ) { sal_Int32 nTmp = mpDial->GetRotation(); @@ -453,7 +453,7 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void ) } -IMPL_LINK_TYPED( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void ) +IMPL_LINK( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void ) { const OUString aCommand(pBox->GetItemCommand(pBox->GetCurItemId())); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 9501c11987f0..7bb65f5cd671 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -147,14 +147,14 @@ private: css::uno::Reference<css::ui::XSidebar> mxSidebar; - DECL_LINK_TYPED( ChangePosXHdl, Edit&, void ); - DECL_LINK_TYPED( ChangePosYHdl, Edit&, void ); - DECL_LINK_TYPED( ChangeWidthHdl, Edit&, void ); - DECL_LINK_TYPED( ChangeHeightHdl, Edit&, void ); - DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); - DECL_LINK_TYPED( AngleModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( RotationHdl, svx::DialControl*, void ); - DECL_LINK_TYPED( FlipHdl, ToolBox *, void ); + DECL_LINK( ChangePosXHdl, Edit&, void ); + DECL_LINK( ChangePosYHdl, Edit&, void ); + DECL_LINK( ChangeWidthHdl, Edit&, void ); + DECL_LINK( ChangeHeightHdl, Edit&, void ); + DECL_LINK( ClickAutoHdl, Button*, void ); + DECL_LINK( AngleModifiedHdl, Edit&, void ); + DECL_LINK( RotationHdl, svx::DialControl*, void ); + DECL_LINK( FlipHdl, ToolBox *, void ); void Initialize(); void executePosX(); diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index 2dd26e6c2935..693f17149ec8 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -142,7 +142,7 @@ void ShadowPropertyPanel::Initialize() } } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ClickShadowHdl, Button*, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ClickShadowHdl, Button*, void) { if( mpShowShadow->GetState() == TRISTATE_FALSE ) { @@ -158,14 +158,14 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ClickShadowHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowColorHdl, ListBox&, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowColorHdl, ListBox&, void) { XColorItem aItem(makeSdrShadowColorItem(mpLBShadowColor->GetSelectEntryColor())); GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_SHADOW_COLOR, SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransMetricHdl, Edit&, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowTransMetricHdl, Edit&, void) { sal_uInt16 nVal = mpShadowTransMetric->GetValue(); SetTransparencyValue(nVal); @@ -174,7 +174,7 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransMetricHdl, Edit&, vo SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*, void) { sal_uInt16 nVal = mpShadowTransSlider->GetThumbPos(); SetTransparencyValue(nVal); @@ -183,7 +183,7 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*, SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowDistanceHdl, Edit&, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowDistanceHdl, Edit&, void) { OUString sAngle = mpShadowAngle->GetText(); nXY = mpShadowDistance->GetValue(FUNIT_100TH_MM); diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index b4b5f4fcedd5..88343630e8e9 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -84,11 +84,11 @@ private: void InsertAngleValues(); void SetTransparencyValue(long); void UpdateControls(); - DECL_LINK_TYPED(ClickShadowHdl, Button*, void); - DECL_LINK_TYPED(ModifyShadowColorHdl, ListBox&, void); - DECL_LINK_TYPED(ModifyShadowTransMetricHdl, Edit&, void); - DECL_LINK_TYPED(ModifyShadowDistanceHdl, Edit&, void); - DECL_LINK_TYPED(ModifyShadowTransSliderHdl, Slider*, void); + DECL_LINK(ClickShadowHdl, Button*, void); + DECL_LINK(ModifyShadowColorHdl, ListBox&, void); + DECL_LINK(ModifyShadowTransMetricHdl, Edit&, void); + DECL_LINK(ModifyShadowDistanceHdl, Edit&, void); + DECL_LINK(ModifyShadowTransSliderHdl, Slider*, void); }; } } diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index 32254b14acc5..dfc621874664 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -106,7 +106,7 @@ void DefaultShapesPanel::dispose() PanelLayout::dispose(); } -IMPL_LINK_TYPED(DefaultShapesPanel, ShapeSelectHdl, ValueSet*, rValueSet, void) +IMPL_LINK(DefaultShapesPanel, ShapeSelectHdl, ValueSet*, rValueSet, void) { for(auto& aSetMap : mpShapesSetMap) { diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx b/svx/source/sidebar/shapes/DefaultShapesPanel.hxx index 6a57eb3af0db..073e2a1ee151 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.hxx @@ -66,7 +66,7 @@ private: void populateShapes(); void Initialize(); - DECL_LINK_TYPED( ShapeSelectHdl, ValueSet*, void ); + DECL_LINK( ShapeSelectHdl, ValueSet*, void ); }; diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 30d83e647bf6..5005f59c873a 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -163,7 +163,7 @@ void TextCharacterSpacingControl::ExecuteCharacterSpacing(long nValue, bool bClo EndPopupMode(); } -IMPL_LINK_TYPED(TextCharacterSpacingControl, PredefinedValuesHdl, Button*, pControl, void) +IMPL_LINK(TextCharacterSpacingControl, PredefinedValuesHdl, Button*, pControl, void) { mnLastCus = SPACING_CLOSE_BY_CLICK_ICON; @@ -193,7 +193,7 @@ IMPL_LINK_TYPED(TextCharacterSpacingControl, PredefinedValuesHdl, Button*, pCont } } -IMPL_LINK_NOARG_TYPED(TextCharacterSpacingControl, KerningModifyHdl, Edit&, void) +IMPL_LINK_NOARG(TextCharacterSpacingControl, KerningModifyHdl, Edit&, void) { mnLastCus = SPACING_CLOSE_BY_CUS_EDIT; mnCustomKern = static_cast<long>(maEditKerning->GetValue()); diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 0046ea35bce9..7d30ab9704d0 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -58,9 +58,9 @@ private: void Initialize(); void ExecuteCharacterSpacing(long nValue, bool bClose = true); - DECL_LINK_TYPED(PredefinedValuesHdl, Button*, void); - DECL_LINK_TYPED(KerningSelectHdl, ListBox&, void); - DECL_LINK_TYPED(KerningModifyHdl, Edit&, void); + DECL_LINK(PredefinedValuesHdl, Button*, void); + DECL_LINK(KerningSelectHdl, ListBox&, void); + DECL_LINK(KerningModifyHdl, Edit&, void); MapUnit GetCoreMetric() const; }; diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index 1f2416c6e9e6..22f242f9d5bc 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -127,7 +127,7 @@ Color GetUnderlineColor() } -IMPL_LINK_TYPED(TextUnderlineControl, PBClickHdl, Button*, pButton, void) +IMPL_LINK(TextUnderlineControl, PBClickHdl, Button*, pButton, void) { if(pButton == maMoreOptions) { diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 0fd0dfff1aa6..fe7cbf3da300 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -51,7 +51,7 @@ private: FontLineStyle getLineStyle(Button* pButton); - DECL_LINK_TYPED(PBClickHdl, Button*, void); + DECL_LINK(PBClickHdl, Button*, void); }; } diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index a838f8882e41..a76263b46d78 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -106,7 +106,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, } -IMPL_LINK_TYPED( SvxModifyControl, OnTimer, Idle *, pTimer, void ) +IMPL_LINK( SvxModifyControl, OnTimer, Idle *, pTimer, void ) { if (pTimer == nullptr) return; diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 1f95e25f1423..0467ab6495dd 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -36,13 +36,13 @@ class CandidateMgr { std::vector<VclPtr<vcl::Window> > m_aCandidates; std::set<VclPtr<vcl::Window> > m_aDeletedCandidates; - DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); + DECL_LINK(WindowEventListener, VclWindowEvent&, void); public: void PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect); ~CandidateMgr(); }; -IMPL_LINK_TYPED(CandidateMgr, WindowEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(CandidateMgr, WindowEventListener, VclWindowEvent&, rEvent, void) { vcl::Window* pWindow = rEvent.GetWindow(); if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index c06c22ee41ee..3876de9157f7 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -552,7 +552,7 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP return pOutlView; } -IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerStatusEventHdl, EditStatus&, rEditStat, void) +IMPL_LINK(SdrObjEditView,ImpOutlinerStatusEventHdl, EditStatus&, rEditStat, void) { if(pTextEditOutliner ) { @@ -626,7 +626,7 @@ void SdrObjEditView::ImpChainingEventHdl() } -IMPL_LINK_NOARG_TYPED(SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void) { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj * >( GetTextEditObject()); if (!pTextObj) @@ -659,7 +659,7 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent(TextChainCursorManager *pCu } -IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,void) +IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,void) { bool bOk=false; OUString& rStr=pFI->GetRepresentation(); @@ -693,7 +693,7 @@ IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,v } } -IMPL_LINK_NOARG_TYPED(SdrObjEditView, EndTextEditHdl, SdrUndoManager*, void) +IMPL_LINK_NOARG(SdrObjEditView, EndTextEditHdl, SdrUndoManager*, void) { SdrEndTextEdit(); } @@ -2092,12 +2092,12 @@ void SdrObjEditView::MarkListHasChanged() } } -IMPL_LINK_TYPED( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfo, void ) +IMPL_LINK( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfo, void ) { OnEndPasteOrDrop( pInfo ); } -IMPL_LINK_TYPED( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfo, void ) +IMPL_LINK( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfo, void ) { OnBeginPasteOrDrop( pInfo ); } diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 3ee78e9714b5..f10b09f81ed5 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -248,7 +248,7 @@ bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) return bUnloaded; } -IMPL_LINK_NOARG_TYPED(OLEObjCache, UnloadCheckHdl, Timer*, void) +IMPL_LINK_NOARG(OLEObjCache, UnloadCheckHdl, Timer*, void) { UnloadOnDemand(); } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 0ba525c6c065..3e7b9478da1a 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1228,7 +1228,7 @@ void SdrHdlGradient::CreateB2dIAObject() } } -IMPL_LINK_NOARG_TYPED(SdrHdlGradient, ColorChangeHdl, SdrHdlColor*, void) +IMPL_LINK_NOARG(SdrHdlGradient, ColorChangeHdl, SdrHdlColor*, void) { if(GetObj()) FromIAOToItem(GetObj(), true, true); diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index ec2a8a80cecd..c006538f6ab4 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1127,12 +1127,12 @@ void SdrItemBrowser::Undirty() } } -IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void) +IMPL_LINK_NOARG(SdrItemBrowser, IdleHdl, Idle *, void) { Undirty(); } -IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, SdrItemBrowserControl&, rBrowse, void) +IMPL_LINK(SdrItemBrowser, ChangedHdl, SdrItemBrowserControl&, rBrowse, void) { const ImpItemListRow* pEntry = rBrowse.GetAktChangeEntry(); if (pEntry!=nullptr) @@ -1246,7 +1246,7 @@ IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, SdrItemBrowserControl&, rBrowse, voi } } -IMPL_LINK_NOARG_TYPED(SdrItemBrowser, SetDirtyHdl, SdrItemBrowserControl&, void) +IMPL_LINK_NOARG(SdrItemBrowser, SetDirtyHdl, SdrItemBrowserControl&, void) { SetDirty(); } diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index fd4c9ff7f183..602ec30b3d65 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1289,7 +1289,7 @@ void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly ) } } -IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* ) +IMPL_LINK( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* ) { SvStream* pRet = GRFMGR_AUTOSWAPSTREAM_NONE; diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index ff941a738fda..a7211172784f 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -94,13 +94,13 @@ namespace // BlockText (see there) basegfx::B2DRange maClipRange; - DECL_LINK_TYPED(decomposeContourTextPrimitive, DrawPortionInfo*, void); - DECL_LINK_TYPED(decomposeBlockTextPrimitive, DrawPortionInfo*, void); - DECL_LINK_TYPED(decomposeStretchTextPrimitive, DrawPortionInfo*, void); + DECL_LINK(decomposeContourTextPrimitive, DrawPortionInfo*, void); + DECL_LINK(decomposeBlockTextPrimitive, DrawPortionInfo*, void); + DECL_LINK(decomposeStretchTextPrimitive, DrawPortionInfo*, void); - DECL_LINK_TYPED(decomposeContourBulletPrimitive, DrawBulletInfo*, void); - DECL_LINK_TYPED(decomposeBlockBulletPrimitive, DrawBulletInfo*, void); - DECL_LINK_TYPED(decomposeStretchBulletPrimitive, DrawBulletInfo*, void); + DECL_LINK(decomposeContourBulletPrimitive, DrawBulletInfo*, void); + DECL_LINK(decomposeBlockBulletPrimitive, DrawBulletInfo*, void); + DECL_LINK(decomposeStretchBulletPrimitive, DrawBulletInfo*, void); static bool impIsUnderlineAbove(const vcl::Font& rFont); void impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo); @@ -563,7 +563,7 @@ namespace maTextPortionPrimitives.push_back(pNewPrimitive); } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeContourTextPrimitive, DrawPortionInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeContourTextPrimitive, DrawPortionInfo*, pInfo, void) { // for contour text, ignore (clip away) all portions which are below // the visible area given by maScale @@ -573,7 +573,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeBlockTextPrimitive, DrawPortionInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeBlockTextPrimitive, DrawPortionInfo*, pInfo, void) { if(pInfo) { @@ -618,7 +618,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeStretchTextPrimitive, DrawPortionInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeStretchTextPrimitive, DrawPortionInfo*, pInfo, void) { if(pInfo) { @@ -626,7 +626,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeContourBulletPrimitive, DrawBulletInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeContourBulletPrimitive, DrawBulletInfo*, pInfo, void) { if(pInfo) { @@ -634,7 +634,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeBlockBulletPrimitive, DrawBulletInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeBlockBulletPrimitive, DrawBulletInfo*, pInfo, void) { if(pInfo) { @@ -642,7 +642,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeStretchBulletPrimitive, DrawBulletInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeStretchBulletPrimitive, DrawBulletInfo*, pInfo, void) { if(pInfo) { diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index dca4e230da67..3e6e5f3df65e 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -169,7 +169,7 @@ namespace SdrOutliner& mrOutliner; ::std::vector< impPathTextPortion > maPathTextPortions; - DECL_LINK_TYPED(decompositionPathTextPrimitive, DrawPortionInfo*, void ); + DECL_LINK(decompositionPathTextPrimitive, DrawPortionInfo*, void ); public: explicit impTextBreakupHandler(SdrOutliner& rOutliner) @@ -193,7 +193,7 @@ namespace } }; - IMPL_LINK_TYPED(impTextBreakupHandler, decompositionPathTextPrimitive, DrawPortionInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decompositionPathTextPrimitive, DrawPortionInfo*, pInfo, void) { maPathTextPortions.push_back(impPathTextPortion(*pInfo)); } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 2e26091d99c8..b100976e4b81 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -275,7 +275,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_ InvalidateAllWin(); } -IMPL_LINK_NOARG_TYPED(SdrPaintView, ImpComeBackHdl, Idle *, void) +IMPL_LINK_NOARG(SdrPaintView, ImpComeBackHdl, Idle *, void) { if (mbSomeObjChgdFlag) { mbSomeObjChgdFlag=false; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 9385ca843c6a..83a4d99067a4 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2730,7 +2730,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo } -IMPL_LINK_NOARG_TYPED(SvxTableController, UpdateHdl, void*, void) +IMPL_LINK_NOARG(SvxTableController, UpdateHdl, void*, void) { mnUpdateEvent = nullptr; diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index cb67ec81dbff..22186a1a2aee 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -90,7 +90,7 @@ public: void FillTable(); - DECL_LINK_TYPED( RTFImportHdl, ImportInfo&, void ); + DECL_LINK( RTFImportHdl, ImportInfo&, void ); private: SdrTableObj& mrTableObj; @@ -160,7 +160,7 @@ void SdrTableRTFParser::Read( SvStream& rStream ) FillTable(); } -IMPL_LINK_TYPED( SdrTableRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) +IMPL_LINK( SdrTableRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) { switch ( rInfo.eState ) { diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx index 7ad3b628b429..c0b3ed12898b 100644 --- a/svx/source/tbxctrls/SvxPresetListBox.cxx +++ b/svx/source/tbxctrls/SvxPresetListBox.cxx @@ -123,7 +123,7 @@ void SvxPresetListBox::FillPresetListBox(XPatternList& pList, sal_uInt32 nStartI FillPresetListBoxImpl< XPatternList, XBitmapEntry >( pList, nStartIndex ); } -IMPL_LINK_TYPED(SvxPresetListBox, OnMenuItemSelected, Menu*, pMenu, bool) +IMPL_LINK(SvxPresetListBox, OnMenuItemSelected, Menu*, pMenu, bool) { if( pMenu == nullptr ) { diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 4a4df8f7a84d..847d4022276d 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -28,8 +28,8 @@ class NumberingPopup : public svtools::ToolbarMenu NumberingPageType mePageType; NumberingToolBoxControl& mrController; VclPtr<SvxNumValueSet> mpValueSet; - DECL_LINK_TYPED( VSSelectToolbarMenuHdl, ToolbarMenu*, void ); - DECL_LINK_TYPED( VSSelectValueSetHdl, ValueSet*, void ); + DECL_LINK( VSSelectToolbarMenuHdl, ToolbarMenu*, void ); + DECL_LINK( VSSelectValueSetHdl, ValueSet*, void ); void VSSelectHdl(void *); public: NumberingPopup( NumberingToolBoxControl& rController, @@ -156,11 +156,11 @@ void NumberingPopup::statusChanged( const css::frame::FeatureStateEvent& rEvent mpValueSet->SelectItem( nSelItem ); } -IMPL_LINK_TYPED( NumberingPopup, VSSelectValueSetHdl, ValueSet*, pControl, void ) +IMPL_LINK( NumberingPopup, VSSelectValueSetHdl, ValueSet*, pControl, void ) { VSSelectHdl(pControl); } -IMPL_LINK_TYPED( NumberingPopup, VSSelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) +IMPL_LINK( NumberingPopup, VSSelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) { VSSelectHdl(pControl); } diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index cb472bba7d20..22b6d8af9d5e 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -54,10 +54,10 @@ private: std::function<void(const OUString&, const Color&)> maColorSelectFunction; - DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); - DECL_LINK_TYPED( SelectPaletteHdl, ListBox&, void); - DECL_LINK_TYPED( AutoColorClickHdl, Button*, void ); - DECL_LINK_TYPED( OpenPickerClickHdl, Button*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); + DECL_LINK( SelectPaletteHdl, ListBox&, void); + DECL_LINK( AutoColorClickHdl, Button*, void ); + DECL_LINK( OpenPickerClickHdl, Button*, void ); protected: virtual void Resize() override; diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 6db593cd3d39..61ecfa9f7ece 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -166,7 +166,7 @@ void SvxColorValueSet_docking::DoDrag() } } -IMPL_LINK_NOARG_TYPED(SvxColorValueSet_docking, ExecDragHdl, void*, void) +IMPL_LINK_NOARG(SvxColorValueSet_docking, ExecDragHdl, void*, void) { // Als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch die // Farbleiste geloescht werden darf @@ -339,7 +339,7 @@ bool SvxColorDockingWindow::Close() return true; } -IMPL_LINK_NOARG_TYPED(SvxColorDockingWindow, SelectHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl, ValueSet*, void) { SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); sal_uInt16 nPos = aColorSet->GetSelectItemId(); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 0832955ff033..b09e4355a6f6 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -193,11 +193,11 @@ void ExtrusionDirectionWindow::statusChanged( } -IMPL_LINK_TYPED( ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, pControl, void ) +IMPL_LINK( ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); } -IMPL_LINK_TYPED( ExtrusionDirectionWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) +IMPL_LINK( ExtrusionDirectionWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) { SelectHdl(pControl); } @@ -415,7 +415,7 @@ void ExtrusionDepthWindow::statusChanged( } } -IMPL_LINK_NOARG_TYPED(ExtrusionDepthWindow, SelectHdl, ToolbarMenu*, void) +IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl, ToolbarMenu*, void) { int nSelected = getSelectedEntryId(); if( nSelected != -1 ) @@ -681,11 +681,11 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) } -IMPL_LINK_TYPED( ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, pControl, void ) +IMPL_LINK( ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); } -IMPL_LINK_TYPED( ExtrusionLightingWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) +IMPL_LINK( ExtrusionLightingWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) { SelectHdl(pControl); } @@ -848,7 +848,7 @@ void ExtrusionSurfaceWindow::statusChanged( } -IMPL_LINK_NOARG_TYPED(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void) +IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index c055403ca056..f1426cfb4cf8 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -54,8 +54,8 @@ private: Image maImgPerspective; Image maImgParallel; - DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void ); - DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void ); + DECL_LINK( SelectValueSetHdl, ValueSet*, void ); void SelectHdl(void*); void implSetDirection( sal_Int32 nSkew, bool bEnabled ); @@ -100,7 +100,7 @@ private: const OUString msExtrusionDepth; const OUString msMetricUnit; - DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void ); + DECL_LINK( SelectHdl, ToolbarMenu*, void ); void implFillStrings( FieldUnit eUnit ); void implSetDepth( double fDepth ); @@ -152,8 +152,8 @@ private: void implSetIntensity( int nLevel, bool bEnabled ); void implSetDirection( int nDirection, bool bEnabled ); - DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void ); - DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void ); + DECL_LINK( SelectValueSetHdl, ValueSet*, void ); void SelectHdl(void*); public: ExtrusionLightingWindow( svt::ToolboxController& rController, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); @@ -194,7 +194,7 @@ private: Image maImgSurface3; Image maImgSurface4; - DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void ); + DECL_LINK( SelectHdl, ToolbarMenu*, void ); void implSetSurface( int nSurface, bool bEnabled ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 9251ff39eb89..f29663067f81 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -568,7 +568,7 @@ void FillControl::dispose() vcl::Window::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) { const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectEntryPos(); @@ -743,7 +743,7 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) { const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectEntryPos(); const XFillStyleItem aXFillStyleItem(eXFS); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 28cd5274fec0..5400cea008c6 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -229,14 +229,14 @@ void FontWorkGalleryDialog::insertSelectedFontwork() } -IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, ClickOKHdl, Button*, void) +IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl, Button*, void) { insertSelectedFontwork(); EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, void) +IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, void) { insertSelectedFontwork(); EndDialog( RET_OK ); @@ -261,7 +261,7 @@ private: const OUString msFontworkAlignment; - DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void ); + DECL_LINK( SelectHdl, ToolbarMenu*, void ); void implSetAlignment( int nAlignmentMode, bool bEnabled ); }; @@ -317,7 +317,7 @@ void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent } } -IMPL_LINK_NOARG_TYPED(FontworkAlignmentWindow, SelectHdl, ToolbarMenu*, void) +IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl, ToolbarMenu*, void) { if ( IsInPopupMode() ) EndPopupMode(); @@ -422,7 +422,7 @@ private: const OUString msFontworkCharacterSpacing; const OUString msFontworkKernCharacterPairs; - DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void ); + DECL_LINK( SelectHdl, ToolbarMenu*, void ); void implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled ); void implSetKernCharacterPairs( bool bKernOnOff, bool bEnabled ); @@ -516,7 +516,7 @@ void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureSta } -IMPL_LINK_NOARG_TYPED(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void) +IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 250273190957..7f64405eb058 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -79,7 +79,7 @@ void FormatPaintBrushToolBoxControl::Click() } -IMPL_LINK_NOARG_TYPED(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, Timer *, void) +IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, Timer *, void) { //there was no second click during waiting this->impl_executePaintBrush(); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 7c066c8d0bfc..ed7e047b5c2c 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -74,7 +74,7 @@ private: OUString maCommand; Reference< XFrame > mxFrame; - DECL_LINK_TYPED(ImplModifyHdl, Idle *, void); + DECL_LINK(ImplModifyHdl, Idle *, void); protected: @@ -130,7 +130,7 @@ void ImplGrafMetricField::Modify() maIdle.Start(); } -IMPL_LINK_NOARG_TYPED(ImplGrafMetricField, ImplModifyHdl, Idle *, void) +IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl, Idle *, void) { const sal_Int64 nVal = GetValue(); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 858c0ed533fc..1b7da6d23514 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -69,7 +69,7 @@ SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame } -IMPL_LINK_NOARG_TYPED(SvxLineBox, DelayHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl, Timer *, void) { if ( GetEntryCount() == 0 ) { diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 8a4becca15a5..c439d848b24d 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -68,7 +68,7 @@ private: long mnTableWidth; long mnTableHeight; - DECL_LINK_TYPED( SelectHdl, Button*, void ); + DECL_LINK( SelectHdl, Button*, void ); public: TableWindow( sal_uInt16 nSlotId, @@ -94,7 +94,7 @@ const long TableWindow::TABLE_CELLS_HORIZ = 10; const long TableWindow::TABLE_CELLS_VERT = 15; -IMPL_LINK_NOARG_TYPED(TableWindow, SelectHdl, Button*, void) +IMPL_LINK_NOARG(TableWindow, SelectHdl, Button*, void) { CloseAndShowTableDialog(); } diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 96e44e014a12..9305a369a9da 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -153,7 +153,7 @@ void SvxListBoxControl::StateChanged( } -IMPL_LINK_NOARG_TYPED(SvxListBoxControl, PopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(SvxListBoxControl, PopupModeEndHdl, FloatingWindow*, void) { if( pPopupWin && FloatWinPopupFlags::NONE == pPopupWin->GetPopupModeFlags() && pPopupWin->IsUserSelected() ) @@ -189,7 +189,7 @@ void SvxListBoxControl::Impl_SetInfo( sal_Int32 nCount ) } -IMPL_LINK_NOARG_TYPED(SvxListBoxControl, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxListBoxControl, SelectHdl, ListBox&, void) { if (pPopupWin) { diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index f601d5843433..8d78bd1a3870 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -301,7 +301,7 @@ void SvxLineEndWindow::dispose() SfxPopupWindow::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxLineEndWindow, SelectHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl, ValueSet*, void) { std::unique_ptr<XLineEndItem> pLineEndItem; std::unique_ptr<XLineStartItem> pLineStartItem; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index c12dcf6c6030..1998590f69f3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -145,7 +145,7 @@ public: protected: /// Calculate the optimal width of the dropdown. Very expensive operation, triggers lots of font measurement. - DECL_LINK_TYPED(CalcOptimalExtraUserWidth, VclWindowEvent&, void); + DECL_LINK(CalcOptimalExtraUserWidth, VclWindowEvent&, void); virtual void Select() override; @@ -172,7 +172,7 @@ private: void SetupEntry(vcl::RenderContext& rRenderContext, vcl::Window* pParent, sal_Int32 nItem, const Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected); static bool AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight); void SetOptimalSize(); - DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); + DECL_LINK( MenuSelectHdl, Menu *, bool ); }; class SvxFontNameBox_Impl : public FontNameBox @@ -200,7 +200,7 @@ private: ".uno:CharEndPreviewFontName", aArgs ); } - DECL_LINK_TYPED( CheckAndMarkUnknownFont, VclWindowEvent&, void ); + DECL_LINK( CheckAndMarkUnknownFont, VclWindowEvent&, void ); void SetOptimalSize(); @@ -256,7 +256,7 @@ private: ImageList aImgList; bool bParagraphMode; - DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); protected: virtual void Resize() override; @@ -280,7 +280,7 @@ private: VclPtr<LineListBox> m_aLineStyleLb; bool m_bIsWriter; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); protected: virtual void Resize() override; @@ -302,7 +302,7 @@ private: std::vector<OUString> m_aFormatEntries; LanguageType m_eFormatLanguage; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: SvxCurrencyList_Impl( sal_uInt16 nId, const Reference< XFrame >& rxFrame, @@ -396,7 +396,7 @@ void SvxStyleBox_Impl::ReleaseFocus() m_xFrame->getContainerWindow()->setFocus(); } -IMPL_LINK_TYPED( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool) { OUString sEntry = GetSelectEntry(); sal_uInt16 nMenuId = pMenu->GetCurItemId(); @@ -820,7 +820,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) DrawEntry( rUDEvt, false, false ); } -IMPL_LINK_TYPED(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, event, void) +IMPL_LINK(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, event, void) { // perform the calculation only when we are opening the dropdown if (event.GetId() != VCLEVENT_DROPDOWN_PRE_OPEN) @@ -994,7 +994,7 @@ void SvxFontNameBox_Impl::FillList() SetSelection( aOldSel ); } -IMPL_LINK_TYPED( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, event, void ) +IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, event, void ) { if( event.GetId() != VCLEVENT_EDIT_MODIFY ) return; @@ -1384,7 +1384,7 @@ void SvxColorWindow_Impl::KeyInput( const KeyEvent& rKEvt ) mpColorSet->KeyInput(rKEvt); } -IMPL_LINK_TYPED(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void) +IMPL_LINK(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void) { VclPtr<SvxColorWindow_Impl> xThis(this); @@ -1409,7 +1409,7 @@ IMPL_LINK_TYPED(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void) maColorSelectFunction(maCommand, aColor); } -IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, SelectPaletteHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl, ListBox&, void) { sal_Int32 nPos = mpPaletteListBox->GetSelectEntryPos(); mrPaletteManager.SetPalette( nPos ); @@ -1417,7 +1417,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, SelectPaletteHdl, ListBox&, void) mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mrPaletteManager.GetColorCount()); } -IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void) +IMPL_LINK_NOARG(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void) { VclPtr<SvxColorWindow_Impl> xThis(this); @@ -1450,7 +1450,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void) maColorSelectFunction(maCommand, aColor); } -IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, OpenPickerClickHdl, Button*, void) +IMPL_LINK_NOARG(SvxColorWindow_Impl, OpenPickerClickHdl, Button*, void) { VclPtr<SvxColorWindow_Impl> xThis(this); @@ -1694,7 +1694,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) // By default unset lines remain unchanged. // Via Shift unset lines are reset -IMPL_LINK_NOARG_TYPED(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) { VclPtr<SvxFrameWindow_Impl> xThis(this); @@ -1987,7 +1987,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame m_aLineStyleLb->Show(); } -IMPL_LINK_NOARG_TYPED(SvxCurrencyList_Impl, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxCurrencyList_Impl, SelectHdl, ListBox&, void) { VclPtr<SvxCurrencyList_Impl> xThis(this); @@ -2003,7 +2003,7 @@ IMPL_LINK_NOARG_TYPED(SvxCurrencyList_Impl, SelectHdl, ListBox&, void) m_xControl->Select( m_pCurrencyLb->GetSelectEntryPos() + 1 ); } -IMPL_LINK_NOARG_TYPED(SvxLineWindow_Impl, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl, ListBox&, void) { VclPtr<SvxLineWindow_Impl> xThis(this); @@ -2484,7 +2484,7 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, Update(); } -IMPL_LINK_NOARG_TYPED(SvxStyleToolBoxControl, VisibilityNotification, SvxStyleBox_Impl&, void) +IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification, SvxStyleBox_Impl&, void) { // Call ReBind() && UnBind() according to visibility SvxStyleBox_Impl* pBox = static_cast<SvxStyleBox_Impl*>( GetToolBox().GetItemWindow( GetId() )); @@ -2755,7 +2755,7 @@ VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow() return pColorWin; } -IMPL_LINK_TYPED(SvxColorToolBoxControl, SelectedHdl, const Color&, rColor, void) +IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, const Color&, rColor, void) { m_xBtnUpdater->Update( rColor ); mPaletteManager.SetLastColor( rColor ); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 8eb93515e564..8916c5ffbe66 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -495,7 +495,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur textfieldChanged(); } -IMPL_LINK_NOARG_TYPED(FindTextToolbarController, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl, Edit&, void) { textfieldChanged(); } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 778659cc7b43..f68aed90f6c1 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -289,7 +289,7 @@ void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ) } -IMPL_LINK_TYPED( DictionaryList, CompareHdl, const SvSortData&, rData, sal_Int32 ) +IMPL_LINK( DictionaryList, CompareHdl, const SvSortData&, rData, sal_Int32 ) { SvTreeListEntry* pLeft = const_cast<SvTreeListEntry*>(rData.pLeft); SvTreeListEntry* pRight = const_cast<SvTreeListEntry*>(rData.pRight); @@ -585,7 +585,7 @@ void ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirect updateAfterDirectionChange(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, DirectionHdl, Button*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl, Button*, void) { updateAfterDirectionChange(); } @@ -610,15 +610,15 @@ void ChineseDictionaryDialog::updateAfterDirectionChange() updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, EditFieldsListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsListBoxHdl, ListBox&, void) { updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, EditFieldsHdl, Edit&, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsHdl, Edit&, void) { updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, MappingSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl, SvTreeListBox*, void) { DictionaryEntry* pE = getActiveDictionary().getFirstSelectedEntry(); if(pE) @@ -704,7 +704,7 @@ void ChineseDictionaryDialog::updateButtons() m_pPB_Modify->Enable( bModify ); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, AddHdl, Button*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, AddHdl, Button*, void) { if( !isEditFieldsHaveContent() ) return; @@ -722,7 +722,7 @@ IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, AddHdl, Button*, void) updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, ModifyHdl, Button*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl, Button*, void) { OUString aTerm( m_pED_Term->GetText() ); OUString aMapping( m_pED_Mapping->GetText() ); @@ -754,7 +754,7 @@ IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, ModifyHdl, Button*, void) updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, DeleteHdl, Button*, void) { DictionaryList& rActive = getActiveDictionary(); DictionaryList& rReverse = getReverseDictionary(); @@ -811,7 +811,7 @@ short ChineseDictionaryDialog::Execute() return nRet; } -IMPL_LINK_TYPED(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar, void) +IMPL_LINK(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar, void) { sal_uInt16 nId = pHeaderBar->GetCurItemId(); HeaderBarItemBits nBits = pHeaderBar->GetItemBits(nId); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index eac4a01881f9..4b37723a5456 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -83,7 +83,7 @@ private: OUString getPropertyTypeName( sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/ ) const; OUString makeTabString( const DictionaryEntry& rEntry ) const; - DECL_LINK_TYPED( CompareHdl, const SvSortData&, sal_Int32 ); + DECL_LINK( CompareHdl, const SvSortData&, sal_Int32 ); sal_Int32 ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry* pRight ); SvLBoxItem* getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 nColumn ) const; @@ -117,14 +117,14 @@ public: virtual short Execute() override; private: - DECL_LINK_TYPED( DirectionHdl, Button*, void ); - DECL_LINK_TYPED( EditFieldsHdl, Edit&, void ); - DECL_LINK_TYPED( EditFieldsListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( MappingSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AddHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Button*, void ); - DECL_LINK_TYPED( DeleteHdl, Button*, void ); - DECL_LINK_TYPED( HeaderBarClick, HeaderBar*, void ); + DECL_LINK( DirectionHdl, Button*, void ); + DECL_LINK( EditFieldsHdl, Edit&, void ); + DECL_LINK( EditFieldsListBoxHdl, ListBox&, void ); + DECL_LINK( MappingSelectHdl, SvTreeListBox*, void ); + DECL_LINK( AddHdl, Button*, void ); + DECL_LINK( ModifyHdl, Button*, void ); + DECL_LINK( DeleteHdl, Button*, void ); + DECL_LINK( HeaderBarClick, HeaderBar*, void ); void initDictionaryControl(DictionaryList *pList, const css::uno::Reference< css::linguistic2::XConversionDictionary>& xDictionary); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 62ada096b75b..4e4d62fe57ae 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -89,7 +89,7 @@ void ChineseTranslationDialog::getSettings( bool& rbDirectionToSimplified rbTranslateCommonTerms = m_pCB_Translate_Commonterms->IsChecked(); } -IMPL_LINK_NOARG_TYPED(ChineseTranslationDialog, OkHdl, Button*, void) +IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl, Button*, void) { //save settings to configuration SvtLinguConfig aLngCfg; @@ -102,7 +102,7 @@ IMPL_LINK_NOARG_TYPED(ChineseTranslationDialog, OkHdl, Button*, void) EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(ChineseTranslationDialog, DictionaryHdl, Button*, void) +IMPL_LINK_NOARG(ChineseTranslationDialog, DictionaryHdl, Button*, void) { if( !m_pDictionaryDialog ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 74262152d6c8..45c0d53414e6 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -44,8 +44,8 @@ public: , bool& rbTranslateCommonTerms ) const; private: - DECL_LINK_TYPED( DictionaryHdl, Button*, void ); - DECL_LINK_TYPED( OkHdl, Button*, void ); + DECL_LINK( DictionaryHdl, Button*, void ); + DECL_LINK( OkHdl, Button*, void ); private: VclPtr<RadioButton> m_pRB_To_Simplified; diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 0a25d0aa9ad9..be81e31c7ca1 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -160,7 +160,7 @@ namespace { VclPtr<VirtualDevice> CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const; - DECL_LINK_TYPED( CalcFieldValueHdl, EditFieldInfo*, void ); + DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); void ParseSettings( const Sequence< PropertyValue >& aDescriptor, ExportSettings& rSettings ); bool GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, bool bVectorType ); @@ -337,7 +337,7 @@ GraphicExporter::~GraphicExporter() { } -IMPL_LINK_TYPED(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) +IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) { if( pInfo ) { diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 6f8ff3920025..6b7f0d86591e 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -146,7 +146,7 @@ public: Point LogicToPixel( const Point&, const MapMode& rMapMode ); Point PixelToLogic( const Point&, const MapMode& rMapMode ); - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); virtual void ObjectInDestruction(const SdrObject& rObject) override; @@ -980,7 +980,7 @@ Point SvxTextEditSourceImpl::PixelToLogic( const Point& rPoint, const MapMode& r return Point(); } -IMPL_LINK_TYPED(SvxTextEditSourceImpl, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify&, rNotify, void) { if( !mbNotificationsDisabled ) { diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index e6f5460591e6..e6fb35d5c0ca 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -182,7 +182,7 @@ class SwPostItMgr: public SfxListener sal_Int32 GetScrollSize() const; sal_Int32 GetSpaceBetween() const; void SetReadOnlyState(); - DECL_LINK_TYPED( CalcHdl, void*, void); + DECL_LINK( CalcHdl, void*, void); sw::sidebarwindows::SwSidebarWin* GetSidebarWin(const SfxBroadcaster* pBroadcaster) const; diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index e2c76821f935..579a97432022 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -168,7 +168,7 @@ class SwSidebarWin : public vcl::Window return mbReadonly; } - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); inline bool IsMouseOverSidebarWin() const { return mbMouseOver; } void SetLanguage(const SvxLanguageItem& rNewItem); @@ -196,9 +196,9 @@ class SwSidebarWin : public vcl::Window void SetSizePixel( const Size& rNewSize ) override; SfxItemSet DefaultItem(); - DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void); - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED(DeleteHdl, void*, void); + DECL_LINK(ModifyHdl, LinkParamNone*, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); + DECL_LINK(DeleteHdl, void*, void); inline SwView& DocView() { return mrView;} inline SwPostItMgr& Mgr() { return mrMgr; } diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index 2657cd3b2755..13684ac833c4 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -34,7 +34,7 @@ class SwTableWidthDlg : public SvxStandardDialog protected: virtual void Apply() override; - DECL_LINK_TYPED(LoseFocusHdl, Edit&, void); + DECL_LINK(LoseFocusHdl, Edit&, void); public: SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc ); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index d14b176ba7ee..6078b2782d21 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -246,7 +246,7 @@ friend class SwConnectionDisposedListener_Impl; SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, bool bCreate); SAL_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, bool bCreate); - DECL_DLLPRIVATE_LINK_TYPED( PrtCancelHdl, Button *, void ); + DECL_DLLPRIVATE_LINK( PrtCancelHdl, Button *, void ); /// Insert data record as text into document. SAL_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh); diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx index 5bcc3108c842..6778caa77435 100644 --- a/sw/inc/dobjfac.hxx +++ b/sw/inc/dobjfac.hxx @@ -26,7 +26,7 @@ class SdrObjFactory; class SwObjectFactory { public: - DECL_STATIC_LINK_TYPED( SwObjectFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); + DECL_STATIC_LINK( SwObjectFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); }; extern SwObjectFactory aSwObjectFactory; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index b36fb70e4c0c..bc53c5e05c14 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -422,7 +422,7 @@ private: // CharTimer calls this method. void DoUpdateAllCharts(); - DECL_LINK_TYPED( DoUpdateModifiedOLE, Idle *, void ); + DECL_LINK( DoUpdateModifiedOLE, Idle *, void ); public: SwFormat *MakeCharFormat_(const OUString &, SwFormat *, bool, bool ); @@ -533,7 +533,7 @@ public: IDocumentState & getIDocumentState(); // IDocumentDrawModelAccess - DECL_LINK_TYPED( AddDrawUndo, SdrUndoAction *, void ); + DECL_LINK( AddDrawUndo, SdrUndoAction *, void ); IDocumentDrawModelAccess const & getIDocumentDrawModelAccess() const; IDocumentDrawModelAccess & getIDocumentDrawModelAccess(); @@ -578,7 +578,7 @@ public: const OUString& getDocAccTitle() const { return msDocAccTitle; } // INextInterface here - DECL_LINK_TYPED(CalcFieldValueHdl, EditFieldInfo*, void); + DECL_LINK(CalcFieldValueHdl, EditFieldInfo*, void); // OLE ??? bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; } diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index a0228c8e4027..879c367631b5 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -171,7 +171,7 @@ public: virtual ~SwDocShell() override; /// OLE 2.0-notification. - DECL_LINK_TYPED( Ole2ModifiedHdl, bool, void ); + DECL_LINK( Ole2ModifiedHdl, bool, void ); /// OLE-stuff. virtual void SetVisArea( const Rectangle &rRect ) override; diff --git a/sw/inc/gotodlg.hxx b/sw/inc/gotodlg.hxx index 734e9cde3287..314ab3b74e5c 100644 --- a/sw/inc/gotodlg.hxx +++ b/sw/inc/gotodlg.hxx @@ -40,7 +40,7 @@ private: SwView* GetCreateView() const; sal_uInt16 GetPageInfo(); - DECL_LINK_TYPED( PageModifiedHdl, Edit&, void ); + DECL_LINK( PageModifiedHdl, Edit&, void ); VclPtr<Edit> mpMtrPageCtrl; VclPtr<FixedText> mpPageNumberLbl; diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index fef9e18dff85..12ca36e911cd 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -246,7 +246,7 @@ class SwHTMLTableLayout void Resize_( sal_uInt16 nAbsAvail, bool bRecalc ); - DECL_LINK_TYPED( DelayedResize_Impl, Timer*, void ); + DECL_LINK( DelayedResize_Impl, Timer*, void ); static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc ); public: diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 162ac0cfeffd..307e8acfb715 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -70,7 +70,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode void InsertLink( const OUString& rGrfName, const OUString& rFltName ); bool ImportGraphic( SvStream& rStrm ); - DECL_LINK_TYPED( SwapGraphic, const GraphicObject*, SvStream* ); + DECL_LINK( SwapGraphic, const GraphicObject*, SvStream* ); /** helper method to determine stream for the embedded graphic. diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 3309501069d1..2d419708ab44 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -73,7 +73,7 @@ class SwChartLockController_Helper { SwDoc *pDoc; - DECL_LINK_TYPED( DoUnlockAllCharts, Timer *, void ); + DECL_LINK( DoUnlockAllCharts, Timer *, void ); Timer aUnlockTimer; // timer to unlock chart controllers bool bIsLocked; diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 46ade150256a..0ef086c0c3d4 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -266,9 +266,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE bool IsTextTool() const; - DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( TimeoutHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK_TYPED( FieldPopupModeEndHdl, FloatingWindow*, void ); + DECL_DLLPRIVATE_LINK( FieldPopupModeEndHdl, FloatingWindow*, void ); inline long GetXScroll() const; inline long GetYScroll() const; @@ -289,10 +289,10 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE long PhyPageDown(); SAL_DLLPRIVATE void CreateScrollbar( bool bHori ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar*, void ); SAL_DLLPRIVATE bool UpdateScrollbars(); - DECL_DLLPRIVATE_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_DLLPRIVATE_LINK( WindowChildEventListener, VclWindowEvent&, void ); SAL_DLLPRIVATE void CalcVisArea( const Size &rPixelSz ); // linguistics functions @@ -429,7 +429,7 @@ public: void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); void ExecSmartTagPopup( const Point& rPt ); - DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void ); + DECL_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); bool ExecDrwTextSpellPopup(const Point& rPt); void SetTabColFromDocPos( const Point &rPt ) { m_aTabColFromDocPos = rPt; } @@ -452,7 +452,7 @@ public: static sal_uInt16 GetMoveType(); static void SetMoveType(sal_uInt16 nSet); - DECL_LINK_TYPED( MoveNavigationHdl, void*, void ); + DECL_LINK( MoveNavigationHdl, void*, void ); static void SetActMark(sal_Int32 nSet); bool HandleWheelCommands( const CommandEvent& ); @@ -499,7 +499,7 @@ public: void ExecDraw(SfxRequest&); void ExecTabWin(SfxRequest&); void ExecuteStatusLine(SfxRequest&); - DECL_LINK_TYPED( ExecRulerClick, Ruler *, void ); + DECL_LINK( ExecRulerClick, Ruler *, void ); void ExecSearch(SfxRequest&); void ExecViewOptions(SfxRequest &); @@ -538,10 +538,10 @@ public: void StateTabWin(SfxItemSet&); // attributes have changed - DECL_LINK_TYPED( AttrChangedNotify, SwCursorShell*, void ); + DECL_LINK( AttrChangedNotify, SwCursorShell*, void ); // form control has been activated - DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void ); + DECL_LINK( FormControlActivated, LinkParamNone*, void ); // edit links void EditLinkDlg(); @@ -586,7 +586,7 @@ public: void ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem ); long InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVersion ); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper *, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper *, void ); // status methods for clipboard. // Status changes now notified from the clipboard. diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 6792919e0591..855f6a8c352e 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -3222,7 +3222,7 @@ class IdleTask public: bool GetFlag(); IdleTask(); - DECL_LINK_TYPED( FlipFlag, Idle *, void ); + DECL_LINK( FlipFlag, Idle *, void ); ~IdleTask() {} private: bool flag; @@ -3248,7 +3248,7 @@ bool IdleTask::GetFlag() } //Callback function of IdleTask Class -IMPL_LINK_TYPED(IdleTask, FlipFlag, Idle*, , void) +IMPL_LINK(IdleTask, FlipFlag, Idle*, , void) { //setting the flag to make sure that low priority idle task has been dispatched this->flag = true; diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 0c59541d70c1..06b9c5b7f0e2 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -385,7 +385,7 @@ void SwAccessibleDocument::Dispose(bool bRecursive, bool bCanSkipInvisible) SwAccessibleContext::Dispose(bRecursive, bCanSkipInvisible); } -IMPL_LINK_TYPED( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "Window???" ); switch ( rEvent.GetId() ) diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 9160075c5823..8bd71968cadf 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -122,7 +122,7 @@ protected: public: SwAccessibleDocument( SwAccessibleMap* pInitMap ); - DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); // XServiceInfo diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index 51d398e9ceb9..86c055c15a9c 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -231,7 +231,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF return nChars < 0; } -IMPL_LINK_TYPED( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer, void ) +IMPL_LINK( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer, void ) { (void)pTimer; if (IncrementalDocStatCalculate(32000)) diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index 0a38024bd440..f53eab71f2d3 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -79,7 +79,7 @@ void DocumentTimerManager::StartBackgroundJobs() maIdle.Start(); } -IMPL_LINK_TYPED( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void ) +IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void ) { #ifdef TIMELOG static ::rtl::Logfile* pModLogFile = 0; diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index e04649ba95b1..aebf76989a6f 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -774,7 +774,7 @@ void SwDoc::PrtOLENotify( bool bAll ) } } -IMPL_LINK_NOARG_TYPED( SwDoc, DoUpdateModifiedOLE, Idle *, void ) +IMPL_LINK_NOARG( SwDoc, DoUpdateModifiedOLE, Idle *, void ) { SwFEShell* pSh = static_cast<SwFEShell*>(GetEditShell()); if( pSh ) diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 620996fd702c..7669a6d7d4bd 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -521,7 +521,7 @@ void SwDoc::SetCalcFieldValueHdl(Outliner* pOutliner) } /// Recognise fields/URLs in the Outliner and set how they are displayed. -IMPL_LINK_TYPED(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) +IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) { if (!pInfo) return; diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 3fce21e7d42d..c43d7f46f380 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -1741,7 +1741,7 @@ void SwHTMLTableLayout::Resize_( sal_uInt16 nAbsAvail, bool bRecalc ) pRoot->EndAllAction( true ); //True per VirDev (browsing is calmer) } -IMPL_LINK_NOARG_TYPED( SwHTMLTableLayout, DelayedResize_Impl, Timer*, void ) +IMPL_LINK_NOARG( SwHTMLTableLayout, DelayedResize_Impl, Timer*, void ) { m_aResizeTimer.Stop(); Resize_( m_nDelayedResizeAbsAvail, m_bDelayedResizeRecalc ); diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx index 9a46dc993539..b41125698981 100644 --- a/sw/source/core/docnode/retrievedinputstreamdata.cxx +++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx @@ -122,7 +122,7 @@ bool SwRetrievedInputStreamDataManager::PopData( const tDataKey nDataKey, #i73788# Note: This method has to be run in the main thread. */ -IMPL_LINK_TYPED( SwRetrievedInputStreamDataManager, +IMPL_LINK( SwRetrievedInputStreamDataManager, LinkedInputStreamReady, void*, p, void ) { diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index 750ff2090888..d82d84fdc7c7 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -202,7 +202,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData ) return bThreadStarted; } -IMPL_LINK_NOARG_TYPED(ThreadManager, TryToStartNewThread, Idle *, void) +IMPL_LINK_NOARG(ThreadManager, TryToStartNewThread, Idle *, void) { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx index 845c08617195..e092f6d26917 100644 --- a/sw/source/core/draw/dobjfac.cxx +++ b/sw/source/core/draw/dobjfac.cxx @@ -23,7 +23,7 @@ SwObjectFactory aSwObjectFactory; -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( SwObjectFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { if ( aParams.nInventor == SWGInventor ) diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 9614e039fbf0..a5575c2172a4 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -955,7 +955,7 @@ SwContentNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const return pGrfNd; } -IMPL_LINK_TYPED( SwGrfNode, SwapGraphic, const GraphicObject*, pGrfObj, SvStream* ) +IMPL_LINK( SwGrfNode, SwapGraphic, const GraphicObject*, pGrfObj, SvStream* ) { SvStream* pRet; diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx index 0291afc032f5..b21e8ec9ef99 100644 --- a/sw/source/core/inc/DocumentStatisticsManager.hxx +++ b/sw/source/core/inc/DocumentStatisticsManager.hxx @@ -59,7 +59,7 @@ private: bool IncrementalDocStatCalculate(long nChars, bool bFields = true); // Our own 'StatsUpdateTimer' calls the following method - DECL_LINK_TYPED( DoIdleStatsUpdate, Timer *, void ); + DECL_LINK( DoIdleStatsUpdate, Timer *, void ); SwDocStat *mpDocStat; //< Statistics information. diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx index cf6b580a2e69..b8575192eba3 100644 --- a/sw/source/core/inc/DocumentTimerManager.hxx +++ b/sw/source/core/inc/DocumentTimerManager.hxx @@ -48,7 +48,7 @@ public: void StartBackgroundJobs() override; // Our own 'IdleTimer' calls the following method - DECL_LINK_TYPED( DoIdleJobs, Idle *, void ); + DECL_LINK( DoIdleJobs, Idle *, void ); virtual ~DocumentTimerManager() override; diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index 00b624a1b408..61c45fda8044 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -75,7 +75,7 @@ public: SwBlink(); ~SwBlink(); - DECL_LINK_TYPED( Blinker, Timer *, void ); + DECL_LINK( Blinker, Timer *, void ); void Insert( const Point& rPoint, const SwLinePortion* pPor, const SwTextFrame *pTextFrame, sal_uInt16 nDir ); diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx index a8f2a0244e8c..cb8666c060fc 100644 --- a/sw/source/core/inc/retrievedinputstreamdata.hxx +++ b/sw/source/core/inc/retrievedinputstreamdata.hxx @@ -74,7 +74,7 @@ class SwRetrievedInputStreamDataManager bool PopData( const tDataKey nDataKey, tData& rData ); - DECL_LINK_TYPED( LinkedInputStreamReady, void*, void ); + DECL_LINK( LinkedInputStreamReady, void*, void ); private: diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 4a888277bb0b..126973bb58be 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -69,7 +69,7 @@ class ThreadManager void RemoveThread( const oslInterlockedCount nThreadID, const bool bThreadFinished = false ); - DECL_LINK_TYPED( TryToStartNewThread, Idle*, void ); + DECL_LINK( TryToStartNewThread, Idle*, void ); /** suspend the starting of threads diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index 4fd56d2a1c5a..97d868d762f2 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -55,7 +55,7 @@ SwBlink::~SwBlink( ) * Toggle visibility flag * Determine the repaint rectangle and invalidate them in their OleShells. */ -IMPL_LINK_NOARG_TYPED(SwBlink, Blinker, Timer *, void) +IMPL_LINK_NOARG(SwBlink, Blinker, Timer *, void) { bVisible = !bVisible; if( bVisible ) diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index e7ea21fc1b65..cbf89b966b95 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -44,7 +44,7 @@ class SwGrammarContact : public IGrammarContact, public SwClient SwGrammarMarkUp *mpProxyList; bool mbFinished; SwTextNode* getMyTextNode() { return static_cast<SwTextNode*>(GetRegisteredIn()); } - DECL_LINK_TYPED( TimerRepaint, Timer *, void ); + DECL_LINK( TimerRepaint, Timer *, void ); public: SwGrammarContact(); @@ -65,7 +65,7 @@ SwGrammarContact::SwGrammarContact() : mpProxyList(nullptr), mbFinished( false ) aTimer.SetTimeoutHdl( LINK(this, SwGrammarContact, TimerRepaint) ); } -IMPL_LINK_TYPED( SwGrammarContact, TimerRepaint, Timer *, pTimer, void ) +IMPL_LINK( SwGrammarContact, TimerRepaint, Timer *, pTimer, void ) { if( pTimer ) { diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 718e07dff949..1fdb2534d039 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -55,7 +55,7 @@ struct SwUndoGroupObjImpl // Draw-Objecte -IMPL_LINK_TYPED( SwDoc, AddDrawUndo, SdrUndoAction *, pUndo, void ) +IMPL_LINK( SwDoc, AddDrawUndo, SdrUndoAction *, pUndo, void ) { #if OSL_DEBUG_LEVEL > 1 SAL_INFO("sw.core", "Id: " << pUndo->GetId() << "Comment: " << pUndo->GetComment()); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 13baf57da8cd..7d71e852fb85 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -160,7 +160,7 @@ void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock ) bIsLocked = bLock; } -IMPL_LINK_NOARG_TYPED( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, void ) +IMPL_LINK_NOARG( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, void ) { UnlockAllCharts(); } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 4375df835e30..adf16e459d6a 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -484,7 +484,7 @@ SwHTMLParser::~SwHTMLParser() } } -IMPL_LINK_NOARG_TYPED( SwHTMLParser, AsyncCallback, void*, void ) +IMPL_LINK_NOARG( SwHTMLParser, AsyncCallback, void*, void ) { m_nEventId=nullptr; diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 6ec45ba17670..386f11fb6988 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -491,7 +491,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient SwViewShell *CallEndAction( bool bChkAction = false, bool bChkPtr = true ); SwViewShell *CheckActionViewShell(); - DECL_LINK_TYPED( AsyncCallback, void*, void ); + DECL_LINK( AsyncCallback, void*, void ); // Attribute am Dok setzen void SetAttr_( bool bChkEnd, bool bBeforeTable, HTMLAttrs *pPostIts ); diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index c621ce918dc0..5eb010c3d202 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -59,18 +59,18 @@ void SwBreakDlg::Apply() } } -IMPL_LINK_NOARG_TYPED(SwBreakDlg, ClickHdl, Button*, void) +IMPL_LINK_NOARG(SwBreakDlg, ClickHdl, Button*, void) { CheckEnable(); } -IMPL_LINK_NOARG_TYPED(SwBreakDlg, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwBreakDlg, SelectHdl, ListBox&, void) { CheckEnable(); } // Handler for Change Page Number -IMPL_LINK_TYPED( SwBreakDlg, PageNumHdl, Button*, pBox, void ) +IMPL_LINK( SwBreakDlg, PageNumHdl, Button*, pBox, void ) { if(static_cast<CheckBox*>(pBox)->IsChecked()) m_pPageNumEdit->SetValue(1); @@ -79,7 +79,7 @@ IMPL_LINK_TYPED( SwBreakDlg, PageNumHdl, Button*, pBox, void ) } // By changing the Page number the checkbox is checked. -IMPL_LINK_NOARG_TYPED(SwBreakDlg, PageNumModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwBreakDlg, PageNumModifyHdl, Edit&, void) { m_pPageNumBox->Check(); } @@ -89,7 +89,7 @@ IMPL_LINK_NOARG_TYPED(SwBreakDlg, PageNumModifyHdl, Edit&, void) * checks whether pagenumber nPage is a legal pagenumber (left pages with even * numbers etc. for a page template with alternating pages) */ -IMPL_LINK_NOARG_TYPED(SwBreakDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwBreakDlg, OkHdl, Button*, void) { if(m_pPageNumBox->IsChecked()) { // In case of differing page descriptions, test validity diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 28798155aad8..d3da603cf675 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -300,7 +300,7 @@ VclPtr<SfxTabPage> SwCharURLPage::Create( vcl::Window* pParent, return VclPtr<SwCharURLPage>::Create( pParent, *rAttrSet ); } -IMPL_LINK_NOARG_TYPED(SwCharURLPage, InsertFileHdl, Button*, void) +IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, Button*, void) { FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE ); if( aDlgHelper.Execute() == ERRCODE_NONE ) @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(SwCharURLPage, InsertFileHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwCharURLPage, EventHdl, Button*, void) +IMPL_LINK_NOARG(SwCharURLPage, EventHdl, Button*, void) { bModified |= SwMacroAssignDlg::INetFormatDlg( this, ::GetActiveView()->GetWrtShell(), pINetItem ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index f960d6529a7e..77ba0cd65bdb 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -679,7 +679,7 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet) bModified = false; } -IMPL_LINK_NOARG_TYPED(SwDropCapsPage, ClickHdl, Button*, void) +IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl, Button*, void) { bool bChecked = m_pDropCapsBox->IsChecked(); @@ -707,7 +707,7 @@ IMPL_LINK_NOARG_TYPED(SwDropCapsPage, ClickHdl, Button*, void) bModified = true; } -IMPL_LINK_NOARG_TYPED(SwDropCapsPage, WholeWordHdl, Button*, void) +IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl, Button*, void) { m_pDropCapsField->Enable( !m_pWholeWordCB->IsChecked() ); m_pSwitchText->Enable(!m_pWholeWordCB->IsChecked()); @@ -717,7 +717,7 @@ IMPL_LINK_NOARG_TYPED(SwDropCapsPage, WholeWordHdl, Button*, void) bModified = true; } -IMPL_LINK_TYPED( SwDropCapsPage, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit&, rEdit, void ) { OUString sPreview; @@ -766,7 +766,7 @@ IMPL_LINK_TYPED( SwDropCapsPage, ModifyHdl, Edit&, rEdit, void ) bModified = true; } -IMPL_LINK_NOARG_TYPED(SwDropCapsPage, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwDropCapsPage, SelectHdl, ListBox&, void) { m_pPict->UpdatePaintSettings(); bModified = true; diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 41ccbb854b4f..487441cf9fb4 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -310,7 +310,7 @@ void SwParagraphNumTabPage::EnableNewStart() m_pNewStartBX->Show(); } -IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, NewStartHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwParagraphNumTabPage, NewStartHdl_Impl, Button*, void) { bool bEnable = m_pNewStartCB->IsChecked(); m_pNewStartNumberCB->Enable(bEnable); @@ -318,7 +318,7 @@ IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, NewStartHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, LineCountHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, Button*, void) { m_pRestartParaCountCB->Enable(m_pCountParaCB->IsChecked()); @@ -327,7 +327,7 @@ IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, LineCountHdl_Impl, Button*, void) m_pRestartBX->Enable(bEnableRestartValue); } -IMPL_LINK_NOARG_TYPED( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, ListBox&, void ) { sal_Int32 numSelectPos = m_pNumberStyleLB->GetSelectEntryPos(); if ( numSelectPos == 0 ) @@ -336,7 +336,7 @@ IMPL_LINK_NOARG_TYPED( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, ListBo m_pEditNumStyleBtn->Enable(); } -IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, EditNumStyleHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwParagraphNumTabPage, EditNumStyleHdl_Impl, Button*, void) { OUString aTemplName(m_pNumberStyleLB->GetSelectEntry()); ExecuteEditNumStyle_Impl( SID_STYLE_EDIT, aTemplName, OUString(), SfxStyleFamily::Pseudo ); @@ -377,7 +377,7 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl( } -IMPL_LINK_TYPED( SwParagraphNumTabPage, StyleHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox&, rBox, void ) { bool bEnable = bCurNumrule || rBox.GetSelectEntryPos() > 0; m_pNewStartCB->Enable(bEnable); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 30449f073e7c..e102554aa435 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -213,7 +213,7 @@ void SwCondCollPage::Reset(const SfxItemSet *) } -IMPL_LINK_TYPED( SwCondCollPage, OnOffHdl, Button*, pBox, void ) +IMPL_LINK( SwCondCollPage, OnOffHdl, Button*, pBox, void ) { const bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked(); m_pContextFT->Enable( bEnable ); @@ -228,16 +228,16 @@ IMPL_LINK_TYPED( SwCondCollPage, OnOffHdl, Button*, pBox, void ) SelectHdl(nullptr); } -IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveClickHdl, Button*, pBtn, void) +IMPL_LINK( SwCondCollPage, AssignRemoveClickHdl, Button*, pBtn, void) { AssignRemove(pBtn); } -IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveTreeListBoxHdl, SvTreeListBox*, pBtn, bool) +IMPL_LINK( SwCondCollPage, AssignRemoveTreeListBoxHdl, SvTreeListBox*, pBtn, bool) { AssignRemove(pBtn); return false; } -IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveHdl, ListBox&, rBox, void) +IMPL_LINK( SwCondCollPage, AssignRemoveHdl, ListBox&, rBox, void) { AssignRemove(&rBox); } @@ -268,11 +268,11 @@ void SwCondCollPage::AssignRemove(void* pBtn) m_pTbLinks->SetUpdateMode(true); } -IMPL_LINK_TYPED( SwCondCollPage, SelectTreeListBoxHdl, SvTreeListBox*, pBox, void) +IMPL_LINK( SwCondCollPage, SelectTreeListBoxHdl, SvTreeListBox*, pBox, void) { SelectHdl(pBox); } -IMPL_LINK_TYPED( SwCondCollPage, SelectListBoxHdl, ListBox&, rBox, void) +IMPL_LINK( SwCondCollPage, SelectListBoxHdl, ListBox&, rBox, void) { SelectHdl(&rBox); } diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 25fd3feedfb5..b6d0cd2e7397 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -67,8 +67,8 @@ class SwTestAccountSettingsDialog : public SfxModalDialog bool m_bStop; void Test(); - DECL_LINK_TYPED(StopHdl, Button*, void); - DECL_LINK_TYPED(TestHdl, void*, void); + DECL_LINK(StopHdl, Button*, void); + DECL_LINK(TestHdl, void*, void); public: explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent); virtual ~SwTestAccountSettingsDialog() override; @@ -105,9 +105,9 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog SwMailMergeConfigItem& rConfigItem; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED( CheckBoxHdl_Impl, Button*, void); - DECL_LINK_TYPED(RadioButtonHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK( CheckBoxHdl_Impl, Button*, void); + DECL_LINK(RadioButtonHdl_Impl, Button*, void); public: SwAuthenticationSettingsDialog(SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem); @@ -207,20 +207,20 @@ void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ ) m_pSecureCB ->SaveValue(); } -IMPL_LINK_TYPED(SwMailConfigPage, ReplyToHdl, Button*, pBox, void) +IMPL_LINK(SwMailConfigPage, ReplyToHdl, Button*, pBox, void) { bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked(); m_pReplyToFT->Enable(bEnable); m_pReplyToED->Enable(bEnable); } -IMPL_LINK_NOARG_TYPED(SwMailConfigPage, AuthenticationHdl, Button*, void) +IMPL_LINK_NOARG(SwMailConfigPage, AuthenticationHdl, Button*, void) { ScopedVclPtrInstance< SwAuthenticationSettingsDialog > aDlg(this, *m_pConfigItem); aDlg->Execute(); } -IMPL_LINK_NOARG_TYPED(SwMailConfigPage, TestHdl, Button*, void) +IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, Button*, void) { ScopedVclPtrInstance<SwTestAccountSettingsDialog>(this)->Execute(); } @@ -273,12 +273,12 @@ void SwTestAccountSettingsDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, StopHdl, Button*, void) +IMPL_LINK_NOARG(SwTestAccountSettingsDialog, StopHdl, Button*, void) { m_bStop = true; } -IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, TestHdl, void*, void) +IMPL_LINK_NOARG(SwTestAccountSettingsDialog, TestHdl, void*, void) { EnterWait(); Test(); @@ -476,7 +476,7 @@ void SwAuthenticationSettingsDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl, Button*, void) { rConfigItem.SetAuthentication( m_pAuthenticationCB->IsChecked() ); rConfigItem.SetSMTPAfterPOP(m_pSMTPAfterPOPRB->IsChecked()); @@ -491,7 +491,7 @@ IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, OKHdl_Impl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_TYPED( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, Button*, pBox, void) +IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, Button*, pBox, void) { bool bChecked = static_cast<CheckBox*>(pBox)->IsChecked(); m_pSeparateAuthenticationRB->Enable(bChecked); @@ -499,7 +499,7 @@ IMPL_LINK_TYPED( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, Button*, pBox RadioButtonHdl_Impl( nullptr ); } -IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, Button*, void) { bool bSeparate = m_pSeparateAuthenticationRB->IsChecked(); bool bIsEnabled = m_pSeparateAuthenticationRB->IsEnabled(); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index c54be94b0835..d028903d2cd6 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -314,14 +314,14 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) m_pFormattingLB->SetDropDownLineCount( m_pFormattingLB->GetEntryCount() ); } -IMPL_LINK_NOARG_TYPED(SwCompatibilityOptPage, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pFormattingLB->GetSelectEntryPos(); sal_uLong nOptions = reinterpret_cast<sal_uLong>(m_pFormattingLB->GetEntryData( nPos )); SetCurrentOptions( nOptions ); } -IMPL_LINK_NOARG_TYPED(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void) +IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void) { ScopedVclPtrInstance<MessageDialog> aQuery(this, "QueryDefaultCompatDialog", "modules/swriter/ui/querydefaultcompatdialog.ui"); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 214a961b848d..57310326943f 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -155,7 +155,7 @@ VclPtr<SfxTabPage> SwLoadOptPage::Create( vcl::Window* pParent, return VclPtr<SwLoadOptPage>::Create(pParent, *rAttrSet ); } -IMPL_LINK_NOARG_TYPED(SwLoadOptPage, StandardizedPageCountCheckHdl, Button*, void) +IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, Button*, void) { m_pStandardizedPageSizeNF->Enable(m_pShowStandardizedPageCount->IsChecked()); } @@ -356,7 +356,7 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet) m_pStandardizedPageSizeNF->Enable(m_pShowStandardizedPageCount->IsChecked()); } -IMPL_LINK_NOARG_TYPED(SwLoadOptPage, MetricHdl, ListBox&, void) +IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl, ListBox&, void) { const sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); if(nMPos != LISTBOX_ENTRY_NOTFOUND) @@ -682,7 +682,7 @@ void SwCaptionOptPage::DelUserData() } } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) { SvTreeListEntry* pSelEntry = m_pCheckLB->FirstSelected(); @@ -789,7 +789,7 @@ IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) ModifyHdl(*m_pCategoryBox); } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SaveEntryHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pCheckLB->GetHdlEntry(); @@ -825,7 +825,7 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry) } } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl, Edit&, void) { const OUString sFieldTypeName = m_pCategoryBox->GetText(); @@ -843,17 +843,17 @@ IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ModifyHdl, Edit&, void) InvalidatePreview(); } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SelectHdl, ComboBox&, void) +IMPL_LINK_NOARG(SwCaptionOptPage, SelectHdl, ComboBox&, void) { InvalidatePreview(); } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SelectListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwCaptionOptPage, SelectListBoxHdl, ListBox&, void) { InvalidatePreview(); } -IMPL_LINK_TYPED( SwCaptionOptPage, OrderHdl, ListBox&, rBox, void ) +IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox&, rBox, void ) { InvalidatePreview(); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index dde2cb6360cd..05335159f7ec 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -287,7 +287,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) return bRet; } -IMPL_LINK_TYPED(SwContentOptPage, VertRulerHdl, Button*, pBox, void) +IMPL_LINK(SwContentOptPage, VertRulerHdl, Button*, pBox, void) { m_pVRulerRightCBox->Enable(pBox->IsEnabled() && static_cast<CheckBox*>(pBox)->IsChecked()); } @@ -485,7 +485,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* ) m_pProspectCB_RTL->Enable( false ); } -IMPL_LINK_NOARG_TYPED(SwAddPrinterTabPage, AutoClickHdl, Button*, void) +IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, Button*, void) { bAttrModified = true; bool bIsProspect = m_pProspectCB->IsChecked(); @@ -509,7 +509,7 @@ void SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst ) m_pFaxLB->SelectEntryPos(0); } -IMPL_LINK_NOARG_TYPED(SwAddPrinterTabPage, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, ListBox&, void) { bAttrModified=true; } @@ -968,7 +968,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) m_pIndexHeightLB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(SwStdFontTabPage, StandardHdl, Button*, void) +IMPL_LINK_NOARG(SwStdFontTabPage, StandardHdl, Button*, void) { sal_uInt8 nFontOffset = m_nFontGroup * FONT_PER_GROUP; m_pStandardBox->SetText(SwStdFontConfig::GetDefaultFor(FONT_STANDARD + nFontOffset, m_eLanguage)); @@ -1000,7 +1000,7 @@ IMPL_LINK_NOARG_TYPED(SwStdFontTabPage, StandardHdl, Button*, void) MAP_TWIP, 10 )); } -IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHdl, Edit&, rBox, void ) +IMPL_LINK( SwStdFontTabPage, ModifyHdl, Edit&, rBox, void ) { if(&rBox == m_pStandardBox) { @@ -1026,7 +1026,7 @@ IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHdl, Edit&, rBox, void ) } } -IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHeightHdl, Edit&, rBox, void ) +IMPL_LINK( SwStdFontTabPage, ModifyHeightHdl, Edit&, rBox, void ) { if(&rBox == m_pStandardHeightLB) { @@ -1052,7 +1052,7 @@ IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHeightHdl, Edit&, rBox, void ) } } -IMPL_LINK_TYPED( SwStdFontTabPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, Control&, rControl, void ) { ComboBox* pBox = static_cast<ComboBox*>(&rControl); FontSizeBox* pHeightLB = nullptr; @@ -1291,7 +1291,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet) CheckBoxHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwTableOptionsTabPage, CheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl, Button*, void) { m_pNumFormatFormattingCB->Enable(m_pNumFormattingCB->IsChecked()); m_pNumAlignmentCB->Enable(m_pNumFormattingCB->IsChecked()); @@ -2061,7 +2061,7 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet* ) ChangedMaskPrevHdl(*pMarkPosLB); } -IMPL_LINK_TYPED( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void ) +IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void ) { SvxFontPrevWindow *pPrev = nullptr; ColorListBox *pColorLB; @@ -2166,7 +2166,7 @@ IMPL_LINK_TYPED( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void ) pPrev->Invalidate(); } -IMPL_LINK_TYPED( SwRedlineOptionsTabPage, ColorHdl, ListBox&, rListBox, void ) +IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ListBox&, rListBox, void ) { ColorListBox* pColorLB = static_cast<ColorListBox*>(&rListBox); SvxFontPrevWindow *pPrev = nullptr; @@ -2231,7 +2231,7 @@ IMPL_LINK_TYPED( SwRedlineOptionsTabPage, ColorHdl, ListBox&, rListBox, void ) pPrev->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox&, void) +IMPL_LINK_NOARG(SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox&, void) { pMarkPreviewWN->SetMarkPos(pMarkPosLB->GetSelectEntryPos()); pMarkPreviewWN->SetColor(pMarkColorLB->GetSelectEntryColor().GetColor()); @@ -2417,7 +2417,7 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* ) m_pStoreRsidCB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, ComparisonHdl, Button*, void) +IMPL_LINK_NOARG(SwCompareOptionsTabPage, ComparisonHdl, Button*, void) { bool bChecked = !m_pAutoRB->IsChecked(); m_pRsidCB->Enable( bChecked ); @@ -2425,7 +2425,7 @@ IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, ComparisonHdl, Button*, void) m_pLenNF->Enable( bChecked && m_pIgnoreCB->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, IgnoreHdl, Button*, void) +IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, Button*, void) { m_pLenNF->Enable( m_pIgnoreCB->IsChecked() ); } @@ -2535,7 +2535,7 @@ void SwTestTabPage::Init() m_pTest10CBox->SetClickHdl( aLk ); } -IMPL_LINK_NOARG_TYPED(SwTestTabPage, AutoClickHdl, Button*, void) +IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl, Button*, void) { bAttrModified = true; } diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index ccb8673accd6..d001831e308e 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -288,7 +288,7 @@ void SwAddressListDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwAddressListDialog, FilterHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl, Button*, void) { SvTreeListEntry* pSelect = m_pListLB->FirstSelected(); uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); @@ -341,7 +341,7 @@ IMPL_LINK_NOARG_TYPED(SwAddressListDialog, FilterHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwAddressListDialog, LoadHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl, Button*, void) { SwView* pView = m_pAddressPage->GetWizard()->GetSwView(); @@ -354,7 +354,7 @@ IMPL_LINK_NOARG_TYPED(SwAddressListDialog, LoadHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void) { OUString sInputURL; VclPtr<SwCreateAddressListDialog> pDlg( @@ -432,7 +432,7 @@ IMPL_LINK_TYPED(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void) } } -IMPL_LINK_TYPED(SwAddressListDialog, EditHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwAddressListDialog, EditHdl_Impl, Button*, pButton, void) { SvTreeListEntry* pEntry = m_pListLB->FirstSelected(); AddressUserData_Impl* pUserData = pEntry ? static_cast<AddressUserData_Impl*>(pEntry->GetUserData()) : nullptr; @@ -463,14 +463,14 @@ IMPL_LINK_TYPED(SwAddressListDialog, EditHdl_Impl, Button*, pButton, void) } }; -IMPL_LINK_NOARG_TYPED(SwAddressListDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, void) { SvTreeListEntry* pSelect = m_pListLB->FirstSelected(); Application::PostUserEvent( LINK( this, SwAddressListDialog, StaticListBoxSelectHdl_Impl ), pSelect, true ); } -IMPL_LINK_TYPED(SwAddressListDialog, StaticListBoxSelectHdl_Impl, void*, p, void) +IMPL_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, void*, p, void) { SvTreeListEntry* pSelect = static_cast<SvTreeListEntry*>(p); //prevent nested calls of the select handler @@ -623,7 +623,7 @@ void SwAddressListDialog::DetectTablesAndQueries( } } -IMPL_LINK_TYPED(SwAddressListDialog, TableSelectHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, Button*, pButton, void) { EnterWait(); SvTreeListEntry* pSelect = m_pListLB->FirstSelected(); @@ -642,7 +642,7 @@ IMPL_LINK_TYPED(SwAddressListDialog, TableSelectHdl_Impl, Button*, pButton, void LeaveWait(); } -IMPL_LINK_NOARG_TYPED(SwAddressListDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAddressListDialog, OKHdl_Impl, Button*, void) { EndDialog(RET_OK); } diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 40f0fad410eb..818a754228dd 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -74,15 +74,15 @@ class SwAddressListDialog : public SfxModalDialog void DetectTablesAndQueries(SvTreeListEntry* pSelect, bool bWidthDialog); - DECL_LINK_TYPED(FilterHdl_Impl, Button*, void); - DECL_LINK_TYPED(LoadHdl_Impl, Button*, void); - DECL_LINK_TYPED(CreateHdl_Impl, Button*, void); - DECL_LINK_TYPED(ListBoxSelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(EditHdl_Impl, Button*, void); - DECL_LINK_TYPED(TableSelectHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - - DECL_LINK_TYPED(StaticListBoxSelectHdl_Impl, void*, void); + DECL_LINK(FilterHdl_Impl, Button*, void); + DECL_LINK(LoadHdl_Impl, Button*, void); + DECL_LINK(CreateHdl_Impl, Button*, void); + DECL_LINK(ListBoxSelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK(EditHdl_Impl, Button*, void); + DECL_LINK(TableSelectHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); + + DECL_LINK(StaticListBoxSelectHdl_Impl, void*, void); public: SwAddressListDialog(SwMailMergeAddressBlockPage* pParent); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index e5a3354af2b3..ebb3e0eb1b6a 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -60,9 +60,9 @@ class SwAddressControl_Impl : public Control bool m_bNoDataSet; - DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void); - DECL_LINK_TYPED(GotFocusHdl_Impl, Control&, void); - DECL_LINK_TYPED(EditModifyHdl_Impl, Edit&, void); + DECL_LINK(ScrollHdl_Impl, ScrollBar*, void); + DECL_LINK(GotFocusHdl_Impl, Control&, void); + DECL_LINK(EditModifyHdl_Impl, Edit&, void); void MakeVisible(const Rectangle& aRect); @@ -260,13 +260,13 @@ void SwAddressControl_Impl::SetCurrentDataSet(sal_uInt32 nSet) } } -IMPL_LINK_TYPED(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll, void) +IMPL_LINK(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll, void) { long nThumb = pScroll->GetThumbPos(); m_pWindow->SetPosPixel(Point(0, - (m_nLineHeight * nThumb))); } -IMPL_LINK_TYPED(SwAddressControl_Impl, GotFocusHdl_Impl, Control&, rControl, void) +IMPL_LINK(SwAddressControl_Impl, GotFocusHdl_Impl, Control&, rControl, void) { Edit* pEdit = static_cast<Edit*>(&rControl); if(GetFocusFlags::Tab & pEdit->GetGetFocusFlags()) @@ -298,7 +298,7 @@ void SwAddressControl_Impl::MakeVisible(const Rectangle & rRect) } // copy data changes into database -IMPL_LINK_TYPED(SwAddressControl_Impl, EditModifyHdl_Impl, Edit&, rEdit, void) +IMPL_LINK(SwAddressControl_Impl, EditModifyHdl_Impl, Edit&, rEdit, void) { //get the data element number of the current set sal_Int32 nIndex = m_aEditLines[&rEdit]; @@ -515,7 +515,7 @@ void SwCreateAddressListDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, NewHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, NewHdl_Impl, Button*, void) { sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet(); std::vector<OUString> aNewData; @@ -530,7 +530,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, NewHdl_Impl, Button*, void) UpdateButtons(); } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, DeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, DeleteHdl_Impl, Button*, void) { sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet(); if(m_pCSVData->aDBData.size() > 1) @@ -551,7 +551,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, DeleteHdl_Impl, Button*, void) UpdateButtons(); } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, FindHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, FindHdl_Impl, Button*, void) { if(!m_pFindDlg) { @@ -569,7 +569,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, FindHdl_Impl, Button*, void) m_pFindDlg->Show(!m_pFindDlg->IsVisible()); } -IMPL_LINK_TYPED(SwCreateAddressListDialog, CustomizeHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCreateAddressListDialog, CustomizeHdl_Impl, Button*, pButton, void) { VclPtrInstance< SwCustomizeAddressListDialog > pDlg(pButton, *m_pCSVData); if(RET_OK == pDlg->Execute()) @@ -618,7 +618,7 @@ void lcl_WriteValues(const std::vector<OUString> *pFields, SvStream* pStream) } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, OkHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl, Button*, void) { if(m_sURL.isEmpty()) { @@ -658,7 +658,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, OkHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED(SwCreateAddressListDialog, DBCursorHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCreateAddressListDialog, DBCursorHdl_Impl, Button*, pButton, void) { sal_uInt32 nValue = static_cast< sal_uInt32 >(m_pSetNoNF->GetValue()); @@ -683,7 +683,7 @@ IMPL_LINK_TYPED(SwCreateAddressListDialog, DBCursorHdl_Impl, Button*, pButton, v } } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, DBNumCursorHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, DBNumCursorHdl_Impl, Edit&, void) { m_pAddressControl->SetCurrentDataSet( static_cast< sal_uInt32 >(m_pSetNoNF->GetValue() - 1) ); UpdateButtons(); @@ -776,7 +776,7 @@ void SwFindEntryDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, FindHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwFindEntryDialog, FindHdl_Impl, Button*, void) { sal_Int32 nColumn = -1; if(m_pFindOnlyCB->IsChecked()) @@ -785,12 +785,12 @@ IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, FindHdl_Impl, Button*, void) m_pParent->Find(m_pFindED->GetText(), nColumn); } -IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, FindEnableHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl, Edit&, void) { m_pFindPB->Enable(!m_pFindED->GetText().isEmpty()); } -IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, CloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwFindEntryDialog, CloseHdl_Impl, Button*, void) { Show(false); } diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index cd03f78f7194..3bd61463008e 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -62,13 +62,13 @@ class SwCreateAddressListDialog : public SfxModalDialog SwCSVData* m_pCSVData; VclPtr<SwFindEntryDialog> m_pFindDlg; - DECL_LINK_TYPED(NewHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(FindHdl_Impl, Button*, void); - DECL_LINK_TYPED(CustomizeHdl_Impl, Button*, void); - DECL_LINK_TYPED(OkHdl_Impl, Button*, void); - DECL_LINK_TYPED(DBCursorHdl_Impl, Button*, void); - DECL_LINK_TYPED(DBNumCursorHdl_Impl, Edit&, void); + DECL_LINK(NewHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK(FindHdl_Impl, Button*, void); + DECL_LINK(CustomizeHdl_Impl, Button*, void); + DECL_LINK(OkHdl_Impl, Button*, void); + DECL_LINK(DBCursorHdl_Impl, Button*, void); + DECL_LINK(DBNumCursorHdl_Impl, Edit&, void); void UpdateButtons(); @@ -93,9 +93,9 @@ class SwFindEntryDialog : public ModelessDialog VclPtr<SwCreateAddressListDialog> m_pParent; - DECL_LINK_TYPED(FindHdl_Impl, Button*, void); - DECL_LINK_TYPED(FindEnableHdl_Impl, Edit&, void); - DECL_LINK_TYPED(CloseHdl_Impl, Button*, void); + DECL_LINK(FindHdl_Impl, Button*, void); + DECL_LINK(FindEnableHdl_Impl, Edit&, void); + DECL_LINK(CloseHdl_Impl, Button*, void); public: SwFindEntryDialog(SwCreateAddressListDialog* pParent); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 7eb46bd9a09e..aafaffff4b75 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -75,12 +75,12 @@ void SwCustomizeAddressListDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, ListBox&, void) { UpdateButtons(); } -IMPL_LINK_TYPED(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, void) { bool bRename = pButton == m_pRenamePB; sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos(); @@ -125,7 +125,7 @@ IMPL_LINK_TYPED(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButto UpdateButtons(); } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos(); m_pFieldsLB->RemoveEntry(m_pFieldsLB->GetSelectEntryPos()); @@ -141,7 +141,7 @@ IMPL_LINK_NOARG_TYPED(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, voi UpdateButtons(); } -IMPL_LINK_TYPED(SwCustomizeAddressListDialog, UpDownHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, Button*, pButton, void) { sal_Int32 nPos; sal_Int32 nOldPos = nPos = m_pFieldsLB->GetSelectEntryPos(); @@ -203,7 +203,7 @@ void SwAddRenameEntryDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit&, rEdit, void) +IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit&, rEdit, void) { OUString sEntry = rEdit.GetText(); bool bFound = sEntry.isEmpty(); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index ab27eb4db9d9..9ce17611ad20 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -40,10 +40,10 @@ class SwCustomizeAddressListDialog : public SfxModalDialog SwCSVData* m_pNewData; - DECL_LINK_TYPED(AddRenameHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(UpDownHdl_Impl, Button*, void); - DECL_LINK_TYPED(ListBoxSelectHdl_Impl, ListBox&, void); + DECL_LINK(AddRenameHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK(UpDownHdl_Impl, Button*, void); + DECL_LINK(ListBoxSelectHdl_Impl, ListBox&, void); void UpdateButtons(); public: @@ -60,7 +60,7 @@ class SwAddRenameEntryDialog : public SfxModalDialog VclPtr<OKButton> m_pOK; const std::vector< OUString >& m_rCSVHeader; - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); + DECL_LINK(ModifyHdl_Impl, Edit&, void); protected: SwAddRenameEntryDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 048802c86741..acf15d512482 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -454,7 +454,7 @@ void SwInsertDBColAutoPilot::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, PageHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, Button*, pButton, void ) { bool bShowTable = pButton == m_pRbAsTable; @@ -485,7 +485,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, PageHdl, Button*, pButton, void ) SelectHdl( bShowTable ? *m_pLbTableDbColumn : *m_pLbTextDbColumn ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton, void ) { ListBox& rBox = m_pRbAsTable->IsChecked() ? ( nullptr == m_pLbTableCol->GetEntryData( 0 ) @@ -501,7 +501,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton, void ) m_pLbDbFormatFromUsr->Enable( !bFromDB ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void ) { bool bChgEnable = true, bEnableTo = true, bEnableFrom = true; m_pLbTableDbColumn->SetUpdateMode( false ); @@ -644,7 +644,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void m_pLbTableCol->SetUpdateMode( true ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DblClickHdl, ListBox&, rBox, void ) +IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox&, rBox, void ) { Button* pButton = nullptr; if( &rBox == m_pLbTextDbColumn ) @@ -658,7 +658,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DblClickHdl, ListBox&, rBox, void ) TableToFromHdl( pButton ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void ) { SwWrtShell& rSh = pView->GetWrtShell(); bool bNewSet = false; @@ -780,7 +780,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void } } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, AutoFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -791,7 +791,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, AutoFormatHdl, Button*, pButton, void ) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox&, rBox, void ) { ListBox* pGetBox = &rBox == m_pLbDbFormatFromUsr ? ( m_pRbAsTable->IsChecked() @@ -851,7 +851,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, SelectHdl, ListBox&, rBox, void ) } } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton, void ) { if( pButton == m_pCbTableHeadon ) { diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 4637a3cff083..5d92cec760b0 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -159,7 +159,7 @@ bool SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitPageReas return true; } -IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, void) { try { @@ -186,7 +186,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, } } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, SettingsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, Button*, pButton, void) { ScopedVclPtr<SwSelectAddressBlockDialog> pDlg( VclPtr<SwSelectAddressBlockDialog>::Create(pButton, m_pWizard->GetConfigItem())); @@ -212,7 +212,7 @@ IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, SettingsHdl_Impl, Button*, pButton, GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE)); } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AssignHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, Button*, pButton, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); const sal_uInt16 nSel = m_pSettingsWIN->GetSelectedAddress(); @@ -240,7 +240,7 @@ void SwMailMergeAddressBlockPage::EnableAddressBlock(bool bAll, bool bSelective) m_pStep4->Enable(bSelective); } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox, void) +IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox, void) { EnableAddressBlock(pBox->IsEnabled(), static_cast<CheckBox*>(pBox)->IsChecked()); SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); @@ -248,7 +248,7 @@ IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox m_pWizard->UpdateRoadmap(); } -IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, LinkParamNone*, void) +IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, LinkParamNone*, void) { const sal_uInt16 nSel = m_pSettingsWIN->GetSelectedAddress(); const uno::Sequence< OUString> aBlocks = @@ -260,13 +260,13 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, L GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE)); } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, Button*, pBox, void) +IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, Button*, pBox, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); rConfigItem.SetHideEmptyParagraphs( static_cast<CheckBox*>(pBox)->IsChecked() ); } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, Button*, pButton, void) { //if no pButton is given, the first set has to be pre-set SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); @@ -419,7 +419,7 @@ OUString SwSelectAddressBlockDialog::GetCountry() const return OUString(); } -IMPL_LINK_TYPED(SwSelectAddressBlockDialog, DeleteHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, Button*, pButton, void) { if(m_aAddressBlocks.getLength()) { @@ -439,7 +439,7 @@ IMPL_LINK_TYPED(SwSelectAddressBlockDialog, DeleteHdl_Impl, Button*, pButton, vo } } -IMPL_LINK_TYPED(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, Button*, pButton, void) { bool bCustomize = pButton == m_pCustomizePB; SwCustomizeAddressBlockDialog::DialogType nType = bCustomize ? @@ -471,7 +471,7 @@ IMPL_LINK_TYPED(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, Button*, pButt } } -IMPL_LINK_TYPED(SwSelectAddressBlockDialog, IncludeHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwSelectAddressBlockDialog, IncludeHdl_Impl, Button*, pButton, void) { m_pCountryED->Enable(m_pDependentRB == pButton); } @@ -585,25 +585,25 @@ void SwCustomizeAddressBlockDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, OKHdl_Impl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, pBox, void) +IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, pBox, void) { sal_Int32 nUserData = (sal_Int32)reinterpret_cast<sal_IntPtr>(pBox->FirstSelected()->GetUserData()); // Check if the selected entry is already in the address and then forbid inserting m_pInsertFieldIB->Enable(nUserData >= 0 || !HasItem_Impl(nUserData)); } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, Edit&, void) { m_pPreviewWIN->SetAddress(SwAddressPreview::FillData(GetAddress(), m_rConfigItem)); UpdateImageButtons_Impl(); } -IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, Button*, pButton, void) { if (m_pInsertFieldIB == pButton) { @@ -666,7 +666,7 @@ bool SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData) return m_pDragED->GetText().indexOf("<" + sEntry + ">") >= 0; } -IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiLineEdit&, rEdit, void) +IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiLineEdit&, rEdit, void) { // called in case the selection of the edit field changes. // determine selection - if it's one of the editable fields then @@ -718,11 +718,11 @@ IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, Address bOnEntry = false; } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, FieldChangeComboBoxHdl_Impl, ComboBox&, void) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeComboBoxHdl_Impl, ComboBox&, void) { FieldChangeHdl_Impl(*m_pFieldCB); } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, Edit&, void) { //changing the field content changes the related members, too sal_Int32 nSelected = GetSelectedItem_Impl(); @@ -810,9 +810,9 @@ class SwAssignFieldsControl : public Control long m_nYOffset; long m_nFirstYPos; - DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void); - DECL_LINK_TYPED(MatchHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(GotFocusHdl_Impl, Control&, void); + DECL_LINK(ScrollHdl_Impl, ScrollBar*, void); + DECL_LINK(MatchHdl_Impl, ListBox&, void); + DECL_LINK(GotFocusHdl_Impl, Control&, void); virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; @@ -1080,7 +1080,7 @@ void SwAssignFieldsControl::MakeVisible( sal_Int32 nIndex ) ScrollHdl_Impl( m_aVScroll.get() ); } -IMPL_LINK_TYPED(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void) +IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void) { long nThumb = pScroll->GetThumbPos(); // the scrollbar moves on a per line basis @@ -1099,7 +1099,7 @@ IMPL_LINK_TYPED(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void SetUpdateMode(true); } -IMPL_LINK_TYPED(SwAssignFieldsControl, MatchHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox&, rBox, void) { const OUString sColumn = rBox.GetSelectEntry(); uno::Reference< XColumnsSupplier > xColsSupp( m_rConfigItem->GetResultSet(), uno::UNO_QUERY); @@ -1133,7 +1133,7 @@ IMPL_LINK_TYPED(SwAssignFieldsControl, MatchHdl_Impl, ListBox&, rBox, void) m_aModifyHdl.Call(nullptr); } -IMPL_LINK_TYPED(SwAssignFieldsControl, GotFocusHdl_Impl, Control&, rControl, void) +IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, Control&, rControl, void) { ListBox* pBox = static_cast<ListBox*>(&rControl); if(GetFocusFlags::Tab & pBox->GetGetFocusFlags()) @@ -1226,7 +1226,7 @@ uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments() return aAssignments; } -IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, OkHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAssignFieldsDialog, OkHdl_Impl, Button*, void) { m_rConfigItem.SetColumnAssignment( m_rConfigItem.GetCurrentDBData(), @@ -1234,7 +1234,7 @@ IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, OkHdl_Impl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, LinkParamNone*, void) +IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, LinkParamNone*, void) { uno::Sequence< OUString > aAssignments = CreateAssignments(); const OUString sPreview = SwAddressPreview::FillData( diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 4c1632bf0d2f..e69390f9918b 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -65,13 +65,13 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK_TYPED(AddressListHdl_Impl, Button *, void); - DECL_LINK_TYPED(SettingsHdl_Impl, Button*, void); - DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); - DECL_LINK_TYPED(AddressBlockHdl_Impl, Button*, void); - DECL_LINK_TYPED(InsertDataHdl_Impl, Button*, void); - DECL_LINK_TYPED(AddressBlockSelectHdl_Impl, LinkParamNone*, void); - DECL_LINK_TYPED(HideParagraphsHdl_Impl, Button*, void); + DECL_LINK(AddressListHdl_Impl, Button *, void); + DECL_LINK(SettingsHdl_Impl, Button*, void); + DECL_LINK(AssignHdl_Impl, Button*, void); + DECL_LINK(AddressBlockHdl_Impl, Button*, void); + DECL_LINK(InsertDataHdl_Impl, Button*, void); + DECL_LINK(AddressBlockSelectHdl_Impl, LinkParamNone*, void); + DECL_LINK(HideParagraphsHdl_Impl, Button*, void); void EnableAddressBlock(bool bAll, bool bSelective); @@ -101,9 +101,9 @@ class SwSelectAddressBlockDialog : public SfxModalDialog css::uno::Sequence< OUString> m_aAddressBlocks; SwMailMergeConfigItem& m_rConfig; - DECL_LINK_TYPED(NewCustomizeHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(IncludeHdl_Impl, Button*, void); + DECL_LINK(NewCustomizeHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK(IncludeHdl_Impl, Button*, void); using Window::SetSettings; @@ -228,13 +228,13 @@ private: SwMailMergeConfigItem& m_rConfigItem; DialogType m_eType; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(ListBoxSelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(EditModifyHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ImageButtonHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectionChangedHdl_Impl, AddressMultiLineEdit&, void); - DECL_LINK_TYPED(FieldChangeHdl_Impl, Edit&, void); - DECL_LINK_TYPED(FieldChangeComboBoxHdl_Impl, ComboBox&, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(ListBoxSelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK(EditModifyHdl_Impl, Edit&, void); + DECL_LINK(ImageButtonHdl_Impl, Button*, void); + DECL_LINK(SelectionChangedHdl_Impl, AddressMultiLineEdit&, void); + DECL_LINK(FieldChangeHdl_Impl, Edit&, void); + DECL_LINK(FieldChangeComboBoxHdl_Impl, ComboBox&, void); bool HasItem_Impl(sal_Int32 nUserData); sal_Int32 GetSelectedItem_Impl(); @@ -266,8 +266,8 @@ class SwAssignFieldsDialog : public SfxModalDialog SwMailMergeConfigItem& m_rConfigItem; css::uno::Sequence< OUString > CreateAssignments(); - DECL_LINK_TYPED(OkHdl_Impl, Button*, void); - DECL_LINK_TYPED(AssignmentModifyHdl_Impl, LinkParamNone*, void); + DECL_LINK(OkHdl_Impl, Button*, void); + DECL_LINK(AssignmentModifyHdl_Impl, LinkParamNone*, void); public: SwAssignFieldsDialog(vcl::Window* pParent, diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 22bc4545791c..c77e2f77ec24 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -108,7 +108,7 @@ void SwMailMergeDocSelectPage::dispose() svt::OWizardPage::dispose(); } -IMPL_LINK_TYPED(SwMailMergeDocSelectPage, DocSelectHdl, Button*, pButton, void) +IMPL_LINK(SwMailMergeDocSelectPage, DocSelectHdl, Button*, pButton, void) { m_pRecentDocLB->Enable(m_pRecentDocRB == pButton); @@ -116,7 +116,7 @@ IMPL_LINK_TYPED(SwMailMergeDocSelectPage, DocSelectHdl, Button*, pButton, void) m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_OUTPUTTYPETPAGE)); } -IMPL_LINK_TYPED(SwMailMergeDocSelectPage, FileSelectHdl, Button*, pButton, void) +IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, Button*, pButton, void) { bool bTemplate = m_pBrowseTemplatePB == pButton; diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 8015506755a2..b5322c3e127d 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -44,8 +44,8 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK_TYPED(DocSelectHdl, Button*, void); - DECL_LINK_TYPED(FileSelectHdl, Button*, void); + DECL_LINK(DocSelectHdl, Button*, void); + DECL_LINK(FileSelectHdl, Button*, void); virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 3a5a8185872b..c27e9c35bc68 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -79,7 +79,7 @@ static void lcl_StoreGreetingsBox(ComboBox& rBox, rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos()); } -IMPL_LINK_NOARG_TYPED(SwGreetingsHandler, IndividualHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl, Button*, void) { bool bIndividual = m_pPersonalizedCB->IsEnabled() && m_pPersonalizedCB->IsChecked(); m_pFemaleFT->Enable(bIndividual); @@ -103,7 +103,7 @@ IMPL_LINK_NOARG_TYPED(SwGreetingsHandler, IndividualHdl_Impl, Button*, void) UpdatePreview(); } -IMPL_LINK_TYPED(SwGreetingsHandler, GreetingHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwGreetingsHandler, GreetingHdl_Impl, Button*, pButton, void) { ScopedVclPtr<SwCustomizeAddressBlockDialog> pDlg( VclPtr<SwCustomizeAddressBlockDialog>::Create(pButton, m_rConfigItem, @@ -128,7 +128,7 @@ void SwGreetingsHandler::UpdatePreview() //the base class does nothing } -IMPL_LINK_TYPED(SwMailMergeGreetingsPage, AssignHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, Button*, pButton, void) { const OUString sPreview(m_pFemaleLB->GetSelectEntry() + "\n" + m_pMaleLB->GetSelectEntry()); ScopedVclPtr<SwAssignFieldsDialog> pDlg( @@ -141,15 +141,15 @@ IMPL_LINK_TYPED(SwMailMergeGreetingsPage, AssignHdl_Impl, Button*, pButton, void } } -IMPL_LINK_NOARG_TYPED(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl, Edit&, void) { UpdatePreview(); } -IMPL_LINK_NOARG_TYPED(SwMailMergeGreetingsPage, GreetingSelectListBoxHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SwMailMergeGreetingsPage, GreetingSelectListBoxHdl_Impl, ListBox&, void) { UpdatePreview(); } -IMPL_LINK_NOARG_TYPED(SwMailMergeGreetingsPage, GreetingSelectComboBoxHdl_Impl, ComboBox&, void) +IMPL_LINK_NOARG(SwMailMergeGreetingsPage, GreetingSelectComboBoxHdl_Impl, ComboBox&, void) { UpdatePreview(); } @@ -363,7 +363,7 @@ bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason return true; } -IMPL_LINK_TYPED(SwMailMergeGreetingsPage, ContainsHdl_Impl, Button*, pBox, void) +IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, Button*, pBox, void) { bool bContainsGreeting = static_cast<CheckBox*>(pBox)->IsChecked(); SwGreetingsHandler::Contains(bContainsGreeting); @@ -377,7 +377,7 @@ IMPL_LINK_TYPED(SwMailMergeGreetingsPage, ContainsHdl_Impl, Button*, pBox, void) m_pWizard->UpdateRoadmap(); } -IMPL_LINK_TYPED(SwMailMergeGreetingsPage, InsertDataHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, Button*, pButton, void) { //if no pButton is given, the first set has to be pre-set if(!pButton) @@ -490,14 +490,14 @@ void SwMailBodyDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SwMailBodyDialog, ContainsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, Button*, pButton, void) { CheckBox* pBox = static_cast<CheckBox*>(pButton); SwGreetingsHandler::Contains(pBox->IsChecked()); m_rConfigItem.SetGreetingLine(pBox->IsChecked(), true); } -IMPL_LINK_NOARG_TYPED(SwMailBodyDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl, Button*, void) { m_rConfigItem.SetGreetingLine( m_pGreetingLineCB->IsChecked(), false); diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index a1fc1909b375..44c7ac8e4960 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -68,8 +68,8 @@ protected: ~SwGreetingsHandler() {} - DECL_LINK_TYPED(IndividualHdl_Impl, Button*, void); - DECL_LINK_TYPED(GreetingHdl_Impl, Button*, void); + DECL_LINK(IndividualHdl_Impl, Button*, void); + DECL_LINK(GreetingHdl_Impl, Button*, void); void Contains(bool bContainsGreeting); virtual void UpdatePreview(); @@ -87,12 +87,12 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, OUString m_sDocument; - DECL_LINK_TYPED(ContainsHdl_Impl, Button*, void); - DECL_LINK_TYPED(InsertDataHdl_Impl, Button*, void); - DECL_LINK_TYPED(GreetingSelectHdl_Impl, Edit&, void); - DECL_LINK_TYPED(GreetingSelectComboBoxHdl_Impl, ComboBox&, void); - DECL_LINK_TYPED(GreetingSelectListBoxHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); + DECL_LINK(ContainsHdl_Impl, Button*, void); + DECL_LINK(InsertDataHdl_Impl, Button*, void); + DECL_LINK(GreetingSelectHdl_Impl, Edit&, void); + DECL_LINK(GreetingSelectComboBoxHdl_Impl, ComboBox&, void); + DECL_LINK(GreetingSelectListBoxHdl_Impl, ListBox&, void); + DECL_LINK(AssignHdl_Impl, Button*, void); virtual void UpdatePreview() override; virtual void ActivatePage() override; @@ -111,8 +111,8 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler VclPtr<OKButton> m_pOK; - DECL_LINK_TYPED(ContainsHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(ContainsHdl_Impl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: SwMailBodyDialog(vcl::Window* pParent); virtual ~SwMailBodyDialog() override; diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 5ff97ed8ce34..15838bbf25de 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -620,7 +620,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig OSL_ENSURE(nullptr == rShell.GetTableFormat(), "What to do with a table here?"); } -IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExampleFrame&, void) +IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExampleFrame&, void) { m_pExampleContainerWIN->Show(); @@ -660,7 +660,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExample m_pTopMF->SetMax(rPageSize.GetHeight() - DEFAULT_TOP_DISTANCE); } -IMPL_LINK_TYPED(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox&, rBox, void) { if(m_pExampleWrtShell) { @@ -682,11 +682,11 @@ IMPL_LINK_TYPED(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox&, rBox, void) } } -IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, ChangeAddressLoseFocusHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressLoseFocusHdl_Impl, Control&, void) { ChangeAddressHdl_Impl(*m_pLeftMF); } -IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, SpinField&, void) +IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, SpinField&, void) { if(m_pExampleWrtShell && m_pAddressBlockFormat) { @@ -706,7 +706,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, SpinField&, } } -IMPL_LINK_TYPED(SwMailMergeLayoutPage, GreetingsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, Button*, pButton, void) { bool bDown = pButton == m_pDownPB; bool bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 ); @@ -719,7 +719,7 @@ IMPL_LINK_TYPED(SwMailMergeLayoutPage, GreetingsHdl_Impl, Button*, pButton, void } } -IMPL_LINK_TYPED(SwMailMergeLayoutPage, AlignToTextHdl_Impl, Button*, pBox, void) +IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, Button*, pBox, void) { bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked() && pBox->IsEnabled(); m_pLeftFT->Enable(!bCheck); diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index e1c32613e3db..41b04063b6bc 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -65,12 +65,12 @@ class SwMailMergeLayoutPage : public svt::OWizardPage css::uno::Reference< css::beans::XPropertySet > m_xViewProperties; - DECL_LINK_TYPED(PreviewLoadedHdl_Impl, SwOneExampleFrame&, void); - DECL_LINK_TYPED(ZoomHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(ChangeAddressHdl_Impl, SpinField&, void); - DECL_LINK_TYPED(ChangeAddressLoseFocusHdl_Impl, Control&, void); - DECL_LINK_TYPED(GreetingsHdl_Impl, Button*, void); - DECL_LINK_TYPED(AlignToTextHdl_Impl, Button*, void); + DECL_LINK(PreviewLoadedHdl_Impl, SwOneExampleFrame&, void); + DECL_LINK(ZoomHdl_Impl, ListBox&, void); + DECL_LINK(ChangeAddressHdl_Impl, SpinField&, void); + DECL_LINK(ChangeAddressLoseFocusHdl_Impl, Control&, void); + DECL_LINK(GreetingsHdl_Impl, Button*, void); + DECL_LINK(AlignToTextHdl_Impl, Button*, void); static SwFrameFormat* InsertAddressFrame( SwWrtShell& rShell, diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index a8bd05335850..73413e40dc56 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -77,7 +77,7 @@ void SwMailMergeOutputTypePage::dispose() } -IMPL_LINK_NOARG_TYPED(SwMailMergeOutputTypePage, TypeHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, Button*, void) { bool bLetter = m_pLetterRB->IsChecked(); m_pLetterHint->Show(bLetter); @@ -363,7 +363,7 @@ void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments ) UpdateTransferStatus(); } -IMPL_LINK_TYPED( SwSendMailDialog, StopHdl_Impl, Button*, pButton, void ) +IMPL_LINK( SwSendMailDialog, StopHdl_Impl, Button*, pButton, void ) { m_bCancel = true; if(m_pImpl->xMailDispatcher.is()) @@ -383,17 +383,17 @@ IMPL_LINK_TYPED( SwSendMailDialog, StopHdl_Impl, Button*, pButton, void ) } } -IMPL_LINK_NOARG_TYPED(SwSendMailDialog, CloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl, Button*, void) { ModelessDialog::Show( false ); } -IMPL_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, pDialog, void ) +IMPL_STATIC_LINK( SwSendMailDialog, StartSendMails, void*, pDialog, void ) { static_cast<SwSendMailDialog*>(pDialog)->SendMails(); } -IMPL_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) +IMPL_LINK( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) { if( m_pImpl->xMailDispatcher.is() ) { @@ -415,7 +415,7 @@ IMPL_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) } } -IMPL_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, p, void ) +IMPL_STATIC_LINK( SwSendMailDialog, StopSendMails, void*, p, void ) { SwSendMailDialog* pDialog = static_cast<SwSendMailDialog*>(p); if(pDialog->m_pImpl->xMailDispatcher.is() && diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 4eb248b0a127..961153a3c530 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -35,7 +35,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK_TYPED(TypeHdl_Impl, Button*, void); + DECL_LINK(TypeHdl_Impl, Button*, void); public: SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 492944a3f42c..ec0b71b06a36 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -120,7 +120,7 @@ static OUString lcl_GetColumnValueOf(const OUString& rColumn, Reference < contai class SwSaveWarningBox_Impl : public SwMessageAndEditDialog { - DECL_LINK_TYPED( ModifyHdl, Edit&, void); + DECL_LINK( ModifyHdl, Edit&, void); public: SwSaveWarningBox_Impl(vcl::Window* pParent, const OUString& rFileName); @@ -133,7 +133,7 @@ public: class SwSendQueryBox_Impl : public SwMessageAndEditDialog { bool bIsEmptyAllowed; - DECL_LINK_TYPED( ModifyHdl, Edit&, void); + DECL_LINK( ModifyHdl, Edit&, void); public: SwSendQueryBox_Impl(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); @@ -170,7 +170,7 @@ SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(vcl::Window* pParent, const OUStrin ModifyHdl(*m_pEdit); } -IMPL_LINK_TYPED( SwSaveWarningBox_Impl, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, Edit&, rEdit, void) { m_pOKPB->Enable(!rEdit.GetText().isEmpty()); } @@ -185,7 +185,7 @@ SwSendQueryBox_Impl::SwSendQueryBox_Impl(vcl::Window* pParent, const OUString& r ModifyHdl(*m_pEdit); } -IMPL_LINK_TYPED( SwSendQueryBox_Impl, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, Edit&, rEdit, void) { m_pOKPB->Enable(bIsEmptyAllowed || !rEdit.GetText().isEmpty()); } @@ -472,7 +472,7 @@ void SwMMResultEmailDialog::FillInEmailSettings() } } -IMPL_LINK_TYPED(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) { bool bEnableFromTo = pButton == m_pFromRB; m_pFromNF->Enable(bEnableFromTo); @@ -480,7 +480,7 @@ IMPL_LINK_TYPED(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, Button*, pButto m_pToNF->Enable(bEnableFromTo); } -IMPL_LINK_TYPED(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) { bool bEnableFromTo = pButton == m_pFromRB; m_pFromNF->Enable(bEnableFromTo); @@ -488,7 +488,7 @@ IMPL_LINK_TYPED(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, Button*, pButt m_pToNF->Enable(bEnableFromTo); } -IMPL_LINK_TYPED(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) { bool bEnableFromTo = pButton == m_pFromRB; m_pFromNF->Enable(bEnableFromTo); @@ -496,7 +496,7 @@ IMPL_LINK_TYPED(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, Button*, pButt m_pToNF->Enable(bEnableFromTo); } -IMPL_LINK_TYPED(SwMMResultEmailDialog, CopyToHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultEmailDialog, CopyToHdl_Impl, Button*, pButton, void) { ScopedVclPtrInstance< SwCopyToDialog > pDlg(pButton); pDlg->SetCC(m_sCC ); @@ -508,7 +508,7 @@ IMPL_LINK_TYPED(SwMMResultEmailDialog, CopyToHdl_Impl, Button*, pButton, void) } } -IMPL_LINK_NOARG_TYPED(SwMMResultSaveDialog, SaveCancelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveCancelHdl_Impl, Button*, void) { m_bCancelSaving = true; } @@ -568,7 +568,7 @@ void endDialog(Button* pButton) } // anonymous namespace -IMPL_LINK_TYPED(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); @@ -760,7 +760,7 @@ IMPL_LINK_TYPED(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void endDialog(pButton); } -IMPL_LINK_TYPED(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); @@ -796,7 +796,7 @@ IMPL_LINK_TYPED(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, vo xConfigItem->SetSelectedPrinter(rBox.GetSelectEntry()); } -IMPL_LINK_TYPED(SwMMResultPrintDialog, PrintHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultPrintDialog, PrintHdl_Impl, Button*, pButton, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); @@ -855,7 +855,7 @@ IMPL_LINK_TYPED(SwMMResultPrintDialog, PrintHdl_Impl, Button*, pButton, void) endDialog(pButton); } -IMPL_LINK_TYPED(SwMMResultPrintDialog, PrinterSetupHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultPrintDialog, PrinterSetupHdl_Impl, Button*, pButton, void) { if( !m_pTempPrinter ) PrinterChangeHdl_Impl(*m_pPrinterLB); @@ -863,7 +863,7 @@ IMPL_LINK_TYPED(SwMMResultPrintDialog, PrinterSetupHdl_Impl, Button*, pButton, v m_pTempPrinter->Setup(pButton); } -IMPL_LINK_TYPED(SwMMResultEmailDialog, SendTypeHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SwMMResultEmailDialog, SendTypeHdl_Impl, ListBox&, rBox, void) { sal_uLong nDocType = reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData()); bool bEnable = MM_DOCTYPE_HTML != nDocType && MM_DOCTYPE_TEXT != nDocType; @@ -888,7 +888,7 @@ IMPL_LINK_TYPED(SwMMResultEmailDialog, SendTypeHdl_Impl, ListBox&, rBox, void) } } -IMPL_LINK_TYPED(SwMMResultEmailDialog, SendAsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultEmailDialog, SendAsHdl_Impl, Button*, pButton, void) { VclPtr<SwMailBodyDialog> pDlg = VclPtr<SwMailBodyDialog>::Create(pButton); pDlg->SetBody(m_sBody); @@ -899,7 +899,7 @@ IMPL_LINK_TYPED(SwMMResultEmailDialog, SendAsHdl_Impl, Button*, pButton, void) } // Send documents as e-mail -IMPL_LINK_TYPED(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index db2a10f1cf07..230e191e724e 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -156,7 +156,7 @@ void SwSelectDBTableDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SwSelectDBTableDialog, PreviewHdl, Button*, pButton, void) +IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, Button*, pButton, void) { SvTreeListEntry* pEntry = m_pTable->FirstSelected(); if(pEntry) diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index 97a2b993f15c..276afbbd2577 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -45,7 +45,7 @@ class SwSelectDBTableDialog : public SfxModalDialog css::uno::Reference<css::sdbc::XConnection> m_xConnection; - DECL_LINK_TYPED(PreviewHdl, Button*, void); + DECL_LINK(PreviewHdl, Button*, void); public: SwSelectDBTableDialog(vcl::Window* pParent, const css::uno::Reference<css::sdbc::XConnection>& xConnection); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 12b9f8c6da5f..b1afb05cbd6c 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -318,7 +318,7 @@ LineEnd SwAsciiFilterDlg::GetCRLF() const return eEnd; } -IMPL_LINK_TYPED( SwAsciiFilterDlg, CharSetSelHdl, ListBox&, rListBox, void ) +IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, ListBox&, rListBox, void ) { SvxTextEncodingBox* pBox = static_cast<SvxTextEncodingBox*>(&rListBox); LineEnd eOldEnd = GetCRLF(), eEnd = (LineEnd)-1; @@ -393,7 +393,7 @@ IMPL_LINK_TYPED( SwAsciiFilterDlg, CharSetSelHdl, ListBox&, rListBox, void ) m_pLanguageLB->SelectLanguage( nLng ); } -IMPL_LINK_TYPED( SwAsciiFilterDlg, LineEndHdl, RadioButton&, rBtn, void ) +IMPL_LINK( SwAsciiFilterDlg, LineEndHdl, RadioButton&, rBtn, void ) { if( m_bSaveLineStatus ) rBtn.SaveValue(); diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 565d6e7e7d11..9fd9f360557f 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -140,7 +140,7 @@ void SwDocStatPage::Update() SetData(aDocStat); } -IMPL_LINK_NOARG_TYPED(SwDocStatPage, UpdateHdl, Button*, void) +IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl, Button*, void) { Update(); SwDocShell* pDocShell = static_cast<SwDocShell*>( SfxObjectShell::Current()); diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index ddc6e0edd2ec..5efee1fc9985 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -162,7 +162,7 @@ OUString AbstractTabDialog_Impl::GetText() const return pDlg->GetText(); } -IMPL_LINK_NOARG_TYPED(AbstractApplyTabDialog_Impl, ApplyHdl, Button*, void) +IMPL_LINK_NOARG(AbstractApplyTabDialog_Impl, ApplyHdl, Button*, void) { if (pDlg->Apply()) m_aHandler.Call(nullptr); @@ -605,7 +605,7 @@ long AbstractMailMergeWizard_Impl::GetResult() return pDlg->GetResult(); } -IMPL_LINK_TYPED( AbstractMailMergeWizard_Impl, EndDialogHdl, Dialog&, rDialog, void ) +IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, Dialog&, rDialog, void ) { OSL_ENSURE( &rDialog == pDlg, "wrong dialog passed to EndDialogHdl!" ); (void) rDialog; // unused in non-debug diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index e6d935912af1..e3cc72cf7e24 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -131,7 +131,7 @@ public: : AbstractTabDialog_Impl(p) { } - DECL_LINK_TYPED(ApplyHdl, Button*, void); + DECL_LINK(ApplyHdl, Button*, void); private: Link<LinkParamNone*,void> m_aHandler; virtual void SetApplyHdl( const Link<LinkParamNone*,void>& rLink ) override; @@ -347,7 +347,7 @@ class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard VclPtr<SwMailMergeWizard> pDlg; Link<Dialog&,void> aEndDlgHdl; - DECL_LINK_TYPED( EndDialogHdl, Dialog&, void ); + DECL_LINK( EndDialogHdl, Dialog&, void ); public: explicit AbstractMailMergeWizard_Impl( SwMailMergeWizard* p ) : pDlg(p) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index c15dd03c815b..51f1c74608b4 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -567,7 +567,7 @@ void SwEditRegionDlg::SelectSection(const OUString& rSectionName) // selected entry in TreeListBox is showed in Edit window in case of // multiselection some controls are disabled -IMPL_LINK_TYPED( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void ) { bDontCheckPasswd = true; SvTreeListEntry* pEntry=pBox->FirstSelected(); @@ -727,7 +727,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void bDontCheckPasswd = false; } -IMPL_LINK_TYPED( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox, void ) { if( !pBox->GetSelectionCount() ) { @@ -750,7 +750,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox, void ) } // in OkHdl the modified settings are being applied and reversed regions are deleted -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl, Button*, void) { // temp. Array because during changing of a region the position // inside of the "Core-Arrays" can be shifted: @@ -827,7 +827,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OkHdl, Button*, void) } // Toggle protect -IMPL_LINK_TYPED( SwEditRegionDlg, ChangeProtectHdl, Button *, pButton, void ) +IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, Button *, pButton, void ) { TriStateBox* pBox = static_cast<TriStateBox*>(pButton); if(!CheckPasswd(pBox)) @@ -851,7 +851,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangeProtectHdl, Button *, pButton, void ) } // Toggle hide -IMPL_LINK_TYPED( SwEditRegionDlg, ChangeHideHdl, Button *, pButton, void ) +IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, Button *, pButton, void ) { TriStateBox* pBox = static_cast<TriStateBox*>(pButton); if(!CheckPasswd(pBox)) @@ -878,7 +878,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangeHideHdl, Button *, pButton, void ) } // Toggle edit in readonly -IMPL_LINK_TYPED( SwEditRegionDlg, ChangeEditInReadonlyHdl, Button *, pButton, void ) +IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, Button *, pButton, void ) { TriStateBox* pBox = static_cast<TriStateBox*>(pButton); if(!CheckPasswd(pBox)) @@ -896,7 +896,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangeEditInReadonlyHdl, Button *, pButton, vo } // clear selected region -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, ChangeDismissHdl, Button*, void) +IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl, Button*, void) { if(!CheckPasswd()) return; @@ -961,7 +961,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, ChangeDismissHdl, Button*, void) } // link CheckBox to file? -IMPL_LINK_TYPED( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) +IMPL_LINK( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if(!CheckPasswd(pBox)) @@ -1018,7 +1018,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) } // call dialog paste file -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, FileSearchHdl, Button*, void) +IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl, Button*, void) { if(!CheckPasswd()) return; @@ -1028,7 +1028,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, FileSearchHdl, Button*, void) m_pDocInserter->StartExecuteModal( LINK( this, SwEditRegionDlg, DlgClosedHdl ) ); } -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void) +IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, Button*, void) { if(!CheckPasswd()) return; @@ -1127,7 +1127,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void) } // Applying of the filename or the linked region -IMPL_LINK_TYPED( SwEditRegionDlg, FileNameHdl, Edit&, rEdit, void ) +IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit&, rEdit, void ) { Selection aSelect = rEdit.GetSelection(); if(!CheckPasswd()) @@ -1175,7 +1175,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, FileNameHdl, Edit&, rEdit, void ) } } -IMPL_LINK_TYPED( SwEditRegionDlg, DDEHdl, Button*, pButton, void ) +IMPL_LINK( SwEditRegionDlg, DDEHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if(!CheckPasswd(pBox)) @@ -1224,7 +1224,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DDEHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) +IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) { bool bChange = pBox == m_pPasswdPB; if(!CheckPasswd()) @@ -1278,7 +1278,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) // the current region name is being added to the TreeListBox immediately during // editing, with empty string no Ok() -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void) +IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl, Edit&, void) { if(!CheckPasswd()) return; @@ -1295,7 +1295,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void) } } -IMPL_LINK_TYPED( SwEditRegionDlg, ConditionEditHdl, Edit&, rEdit, void ) +IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, Edit&, rEdit, void ) { Selection aSelect = rEdit.GetSelection(); if(!CheckPasswd()) @@ -1311,7 +1311,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ConditionEditHdl, Edit&, rEdit, void ) } } -IMPL_LINK_TYPED( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, void ) +IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, void ) { OUString sFileName, sFilterName, sPassword; if ( _pFileDlg->GetError() == ERRCODE_NONE ) @@ -1340,7 +1340,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFile } } -IMPL_LINK_TYPED( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent&, rEvent, void ) { if( !m_bSubRegionsFilled && rEvent.GetId() == VCLEVENT_DROPDOWN_PRE_OPEN ) { @@ -1664,21 +1664,21 @@ VclPtr<SfxTabPage> SwInsertSectionTabPage::Create( vcl::Window* pParent, return VclPtr<SwInsertSectionTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangeHideHdl, Button *, pBox, void ) +IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, Button *, pBox, void ) { bool bHide = static_cast<CheckBox*>(pBox)->IsChecked(); m_pConditionED->Enable(bHide); m_pConditionFT->Enable(bHide); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangeProtectHdl, Button *, pBox, void ) +IMPL_LINK( SwInsertSectionTabPage, ChangeProtectHdl, Button *, pBox, void ) { bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); m_pPasswdCB->Enable(bCheck); m_pPasswdPB->Enable(bCheck); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, void ) +IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, void ) { bool bChange = pButton == m_pPasswdPB; bool bSet = bChange ? bChange : m_pPasswdCB->IsChecked(); @@ -1708,14 +1708,14 @@ IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, voi m_aNewPasswd.realloc(0); } -IMPL_LINK_NOARG_TYPED(SwInsertSectionTabPage, NameEditHdl, Edit&, void) +IMPL_LINK_NOARG(SwInsertSectionTabPage, NameEditHdl, Edit&, void) { const OUString aName = m_pCurName->GetText(); GetTabDialog()->GetOKButton().Enable(!aName.isEmpty() && m_pCurName->GetEntryPos( aName ) == LISTBOX_ENTRY_NOTFOUND); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, UseFileHdl, Button *, pButton, void ) +IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, Button *, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if( pBox->IsChecked() ) @@ -1745,14 +1745,14 @@ IMPL_LINK_TYPED( SwInsertSectionTabPage, UseFileHdl, Button *, pButton, void ) } } -IMPL_LINK_NOARG_TYPED(SwInsertSectionTabPage, FileSearchHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl, Button*, void) { delete m_pDocInserter; m_pDocInserter = new ::sfx2::DocumentInserter( "swriter" ); m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) ); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, DDEHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertSectionTabPage, DDEHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); bool bDDE = pBox->IsChecked(); @@ -1779,7 +1779,7 @@ IMPL_LINK_TYPED( SwInsertSectionTabPage, DDEHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, void ) +IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, void ) { if ( _pFileDlg->GetError() == ERRCODE_NONE ) { @@ -2014,7 +2014,7 @@ VclPtr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( vcl::Window* pParent, return VclPtr<SwSectionFootnoteEndTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_TYPED( SwSectionFootnoteEndTabPage, FootEndHdl, Button *, pBox, void ) +IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, Button *, pBox, void ) { bool bFoot = m_pFootnoteNtAtTextEndCB == pBox || m_pFootnoteNtNumCB == pBox || m_pFootnoteNtNumFormatCB == pBox ; @@ -2192,7 +2192,7 @@ void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh) m_pPreviewWin->SetSize(aPageSize); } -IMPL_LINK_NOARG_TYPED(SwSectionIndentTabPage, IndentModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwSectionIndentTabPage, IndentModifyHdl, Edit&, void) { m_pPreviewWin->SetLeftMargin( static_cast< long >(m_pBeforeMF->Denormalize(m_pBeforeMF->GetValue(FUNIT_TWIP))) ); m_pPreviewWin->SetRightMargin( static_cast< long >(m_pAfterMF->Denormalize(m_pAfterMF->GetValue(FUNIT_TWIP))) ); diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index befd3a534aa3..6de40a834664 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -34,7 +34,7 @@ #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> -IMPL_STATIC_LINK_NOARG_TYPED(SwWordCountFloatDlg, CloseHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SwWordCountFloatDlg, CloseHdl, Button*, void) { SfxViewFrame* pVFrame = ::GetActiveView()->GetViewFrame(); if (pVFrame != nullptr) diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index b016c35d8323..2332d2a7e2aa 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -46,7 +46,7 @@ void SwSelGlossaryDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwSelGlossaryDlg, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SwSelGlossaryDlg, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 0162a20bbd41..a15de6dcc864 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -218,11 +218,11 @@ void SwEnvFormatPage::dispose() } -IMPL_LINK_TYPED( SwEnvFormatPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwEnvFormatPage, LoseFocusHdl, Control&, rControl, void ) { ModifyHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwEnvFormatPage, ModifyHdl, SpinField&, rEdit, void ) +IMPL_LINK( SwEnvFormatPage, ModifyHdl, SpinField&, rEdit, void ) { long lWVal = static_cast< long >(GetFieldVal(*m_pSizeWidthField )); long lHVal = static_cast< long >(GetFieldVal(*m_pSizeHeightField)); @@ -257,7 +257,7 @@ IMPL_LINK_TYPED( SwEnvFormatPage, ModifyHdl, SpinField&, rEdit, void ) } } -IMPL_LINK_TYPED( SwEnvFormatPage, EditHdl, MenuButton *, pButton, void ) +IMPL_LINK( SwEnvFormatPage, EditHdl, MenuButton *, pButton, void ) { SwWrtShell* pSh = GetParentSwEnvDlg()->pSh; OSL_ENSURE(pSh, "Shell missing"); @@ -383,7 +383,7 @@ SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl* pColl, bool bSende return pAddrSet; } -IMPL_LINK_NOARG_TYPED(SwEnvFormatPage, FormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, ListBox&, void) { long lWidth; long lHeight; diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 6de321c054c0..09eab399cf70 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -43,10 +43,10 @@ class SwEnvFormatPage : public SfxTabPage std::vector<sal_uInt16> aIDs; - DECL_LINK_TYPED( ModifyHdl, SpinField&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( EditHdl, MenuButton *, void ); - DECL_LINK_TYPED(FormatHdl, ListBox&, void); + DECL_LINK( ModifyHdl, SpinField&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( EditHdl, MenuButton *, void ); + DECL_LINK(FormatHdl, ListBox&, void); void SetMinMax(); diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 0188619ef4a4..d027f0270f2a 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -248,7 +248,7 @@ void SwEnvPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_TYPED( SwEnvPage, DatabaseHdl, ListBox&, rListBox, void ) +IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox&, rListBox, void ) { SwWait aWait( *pSh->GetView().GetDocShell(), true ); @@ -266,7 +266,7 @@ IMPL_LINK_TYPED( SwEnvPage, DatabaseHdl, ListBox&, rListBox, void ) m_pTableLB->GetSelectEntry()); } -IMPL_LINK_NOARG_TYPED(SwEnvPage, FieldHdl, Button*, void) +IMPL_LINK_NOARG(SwEnvPage, FieldHdl, Button*, void) { OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + m_pTableLB->GetSelectEntry() + "." + @@ -278,7 +278,7 @@ IMPL_LINK_NOARG_TYPED(SwEnvPage, FieldHdl, Button*, void) m_pAddrEdit->SetSelection(aSel); } -IMPL_LINK_NOARG_TYPED(SwEnvPage, SenderHdl, Button*, void) +IMPL_LINK_NOARG(SwEnvPage, SenderHdl, Button*, void) { const bool bEnable = m_pSenderBox->IsChecked(); GetParentSwEnvDlg()->aEnvItem.bSend = bEnable; diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index d57ba17eb9ce..4ed48bdf1af9 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -84,7 +84,7 @@ void SwEnvPrtPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, ClickHdl, Button*, void) +IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, Button*, void) { if (m_pBottomButton->IsChecked()) { @@ -108,7 +108,7 @@ IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, ClickHdl, Button*, void) } } -IMPL_LINK_TYPED( SwEnvPrtPage, ButtonHdl, Button *, pBtn, void ) +IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn, void ) { if (pBtn == m_pPrtSetup) { @@ -125,7 +125,7 @@ IMPL_LINK_TYPED( SwEnvPrtPage, ButtonHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, AlignHdl, ToolBox *, void) +IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl, ToolBox *, void) { if (m_pAlignBox->GetCurItemId()) { diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 8dc800de6efb..0a71355316ab 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -47,9 +47,9 @@ class SwEnvPrtPage : public SfxTabPage VclPtr<Printer> pPrt; - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(AlignHdl, ToolBox *, void); - DECL_LINK_TYPED(ButtonHdl, Button *, void ); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(AlignHdl, ToolBox *, void); + DECL_LINK(ButtonHdl, Button *, void ); SwEnvDlg* GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>( GetParentDialog());} diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 70ac152f280f..e2d3fc066889 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -323,7 +323,7 @@ void SwLabPage::SetToBusinessCard() m_pAddressFrame->Hide(); }; -IMPL_LINK_NOARG_TYPED(SwLabPage, AddrHdl, Button*, void) +IMPL_LINK_NOARG(SwLabPage, AddrHdl, Button*, void) { OUString aWriting; @@ -334,7 +334,7 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, AddrHdl, Button*, void) m_pWritingEdit->GrabFocus(); } -IMPL_LINK_TYPED( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) +IMPL_LINK( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) { sActDBName = m_pDatabaseLB->GetSelectEntry(); @@ -346,7 +346,7 @@ IMPL_LINK_TYPED( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry()); } -IMPL_LINK_NOARG_TYPED(SwLabPage, FieldHdl, Button*, void) +IMPL_LINK_NOARG(SwLabPage, FieldHdl, Button*, void) { OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + m_pTableLB->GetSelectEntry() + "." + @@ -358,12 +358,12 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, FieldHdl, Button*, void) m_pWritingEdit->SetSelection(aSel); } -IMPL_LINK_NOARG_TYPED(SwLabPage, PageHdl, Button*, void) +IMPL_LINK_NOARG(SwLabPage, PageHdl, Button*, void) { m_pMakeBox->GetSelectHdl().Call(*m_pMakeBox); } -IMPL_LINK_NOARG_TYPED(SwLabPage, MakeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwLabPage, MakeHdl, ListBox&, void) { WaitObject aWait( GetParentSwLabDlg() ); @@ -416,7 +416,7 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, MakeHdl, ListBox&, void) m_pTypeBox->GetSelectHdl().Call(*m_pTypeBox); } -IMPL_LINK_NOARG_TYPED(SwLabPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwLabPage, TypeHdl, ListBox&, void) { DisplayFormat(); aItem.m_aType = m_pTypeBox->GetSelectEntry(); diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 903cba9f332d..2f473617b20b 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -101,7 +101,7 @@ void SwVisitingCardPage::InitFrameControl() } } -IMPL_LINK_NOARG_TYPED(SwVisitingCardPage, FrameControlInitializedHdl, SwOneExampleFrame&, void) +IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl, SwOneExampleFrame&, void) { SvTreeListEntry* pSel = m_pAutoTextLB->FirstSelected(); OUString sEntry; @@ -132,12 +132,12 @@ IMPL_LINK_NOARG_TYPED(SwVisitingCardPage, FrameControlInitializedHdl, SwOneExamp } } -IMPL_LINK_NOARG_TYPED( SwVisitingCardPage, AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( SwVisitingCardPage, AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ) { if(m_xAutoText.is() && pExampleFrame->IsInitialized()) pExampleFrame->ClearDocument(); } -IMPL_LINK_TYPED( SwVisitingCardPage, AutoTextSelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, ListBox&, rBox, void ) { if(m_xAutoText.is()) { diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index c1c39dd85b8d..cc9b92391201 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -383,14 +383,14 @@ void SwLabFormatPage::dispose() // Modify-handler of MetricFields. start preview timer -IMPL_LINK_NOARG_TYPED(SwLabFormatPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwLabFormatPage, ModifyHdl, Edit&, void) { bModified = true; aPreviewIdle.Start(); } // Invalidate preview -IMPL_LINK_NOARG_TYPED(SwLabFormatPage, PreviewHdl, Idle *, void) +IMPL_LINK_NOARG(SwLabFormatPage, PreviewHdl, Idle *, void) { aPreviewIdle.Stop(); ChangeMinMax(); @@ -399,7 +399,7 @@ IMPL_LINK_NOARG_TYPED(SwLabFormatPage, PreviewHdl, Idle *, void) } // LoseFocus-Handler: Update on change -IMPL_LINK_TYPED( SwLabFormatPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwLabFormatPage, LoseFocusHdl, Control&, rControl, void ) { if (static_cast<Edit*>( &rControl)->IsModified()) PreviewHdl(nullptr); @@ -564,7 +564,7 @@ void SwLabFormatPage::Reset(const SfxItemSet* ) PreviewHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwLabFormatPage, SaveHdl, Button*, void) +IMPL_LINK_NOARG(SwLabFormatPage, SaveHdl, Button*, void) { SwLabRec aRec; aRec.lHDist = static_cast< long >(GETFLDVAL(*m_pHDistField)); @@ -633,7 +633,7 @@ void SwSaveLabelDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwSaveLabelDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl, Button*, void) { SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig(); OUString sMake(m_pMakeCB->GetText()); @@ -664,7 +664,7 @@ IMPL_LINK_NOARG_TYPED(SwSaveLabelDlg, OkHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwSaveLabelDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyHdl, Edit&, void) { m_pOKPB->Enable(!m_pMakeCB->GetText().isEmpty() && !m_pTypeED->GetText().isEmpty()); } diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 44268dce46e5..24e6d3460569 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -87,10 +87,10 @@ class SwLabFormatPage : public SfxTabPage SwLabItem aItem; - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( PreviewHdl, Idle *, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( SaveHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( PreviewHdl, Idle *, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( SaveHdl, Button*, void ); void ChangeMinMax(); @@ -123,8 +123,8 @@ class SwSaveLabelDlg : public ModalDialog VclPtr<SwLabFormatPage> pLabPage; SwLabRec& rLabRec; - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SwSaveLabelDlg(SwLabFormatPage* pParent, SwLabRec& rRec); diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 64b75d0d9a41..3fa3742d2894 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -79,7 +79,7 @@ void SwLabPrtPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_TYPED( SwLabPrtPage, CountHdl, Button *, pButton, void ) +IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton, void ) { if (pButton == m_pPrtSetup) { diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 2827f7bf92d5..8d494e8b3795 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -44,7 +44,7 @@ class SwLabPrtPage : public SfxTabPage VclPtr<FixedText> m_pPrinterInfo; VclPtr<PushButton> m_pPrtSetup; - DECL_LINK_TYPED( CountHdl, Button *, void ); + DECL_LINK( CountHdl, Button *, void ); SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetParentDialog());} diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 68f11b1e9347..5ee023d9b18a 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -419,7 +419,7 @@ void SwMailMergeDlg::Apply() { } -IMPL_LINK_TYPED( SwMailMergeDlg, ButtonHdl, Button *, pBtn, void ) +IMPL_LINK( SwMailMergeDlg, ButtonHdl, Button *, pBtn, void ) { if (pBtn == m_pOkBTN) { if( ExecQryShell() ) @@ -427,7 +427,7 @@ IMPL_LINK_TYPED( SwMailMergeDlg, ButtonHdl, Button *, pBtn, void ) } } -IMPL_LINK_TYPED( SwMailMergeDlg, OutputTypeHdl, Button *, pBtn, void ) +IMPL_LINK( SwMailMergeDlg, OutputTypeHdl, Button *, pBtn, void ) { bool bPrint = pBtn == m_pPrinterRB; m_pSingleJobsCB->Enable(bPrint); @@ -450,7 +450,7 @@ IMPL_LINK_TYPED( SwMailMergeDlg, OutputTypeHdl, Button *, pBtn, void ) } } -IMPL_LINK_TYPED( SwMailMergeDlg, SaveTypeHdl, Button*, pBtn, void ) +IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, Button*, pBtn, void ) { bool bIndividual = pBtn == m_pSaveIndividualRB; @@ -468,7 +468,7 @@ IMPL_LINK_TYPED( SwMailMergeDlg, SaveTypeHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( SwMailMergeDlg, FilenameHdl, Button*, pBox, void ) +IMPL_LINK( SwMailMergeDlg, FilenameHdl, Button*, pBox, void ) { bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked(); m_pColumnFT->Enable( bEnable ); @@ -480,7 +480,7 @@ IMPL_LINK_TYPED( SwMailMergeDlg, FilenameHdl, Button*, pBox, void ) m_pFilterLB->Enable( bEnable ); } -IMPL_LINK_NOARG_TYPED(SwMailMergeDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwMailMergeDlg, ModifyHdl, Edit&, void) { m_pFromRB->Check(); } @@ -598,7 +598,7 @@ OUString SwMailMergeDlg::GetTargetURL() const return sPath; } -IMPL_LINK_NOARG_TYPED(SwMailMergeDlg, InsertPathHdl, Button*, void) +IMPL_LINK_NOARG(SwMailMergeDlg, InsertPathHdl, Button*, void) { uno::Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < XFolderPicker2 > xFP = FolderPicker::create(xContext); diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index b042169fdf60..153524ae9445 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -45,12 +45,12 @@ class SwLabPage : public SfxTabPage VclPtr<ListBox> m_pHiddenSortTypeBox; VclPtr<FixedText> m_pFormatInfo; - DECL_LINK_TYPED(AddrHdl, Button*, void); - DECL_LINK_TYPED(DatabaseHdl, ListBox&, void ); - DECL_LINK_TYPED(FieldHdl, Button *, void); - DECL_LINK_TYPED(PageHdl, Button *, void); - DECL_LINK_TYPED(MakeHdl, ListBox&, void); - DECL_LINK_TYPED(TypeHdl, ListBox&, void); + DECL_LINK(AddrHdl, Button*, void); + DECL_LINK(DatabaseHdl, ListBox&, void ); + DECL_LINK(FieldHdl, Button *, void); + DECL_LINK(PageHdl, Button *, void); + DECL_LINK(MakeHdl, ListBox&, void); + DECL_LINK(TypeHdl, ListBox&, void); void DisplayFormat (); SwLabRec* GetSelectedEntryPos(); @@ -93,9 +93,9 @@ class SwVisitingCardPage : public SfxTabPage SwOneExampleFrame* pExampleFrame; css::uno::Reference< css::text::XAutoTextContainer2 > m_xAutoText; - DECL_LINK_TYPED( AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AutoTextSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( FrameControlInitializedHdl, SwOneExampleFrame&, void ); + DECL_LINK( AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ); + DECL_LINK( AutoTextSelectHdl, ListBox&, void ); + DECL_LINK( FrameControlInitializedHdl, SwOneExampleFrame&, void ); void InitFrameControl(); void UpdateFields(); diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 7423d169f2b1..c1d4855f4d02 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -108,12 +108,12 @@ void sw::DropDownFieldDialog::Apply() } } -IMPL_LINK_TYPED(sw::DropDownFieldDialog, ButtonHdl, Button*, pButton, void) +IMPL_LINK(sw::DropDownFieldDialog, ButtonHdl, Button*, pButton, void) { EndDialog(m_pNextPB == pButton ? RET_OK : RET_YES ); } -IMPL_LINK_NOARG_TYPED(sw::DropDownFieldDialog, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(sw::DropDownFieldDialog, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index bdcbad03dc0b..26b3dc063f3a 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -215,7 +215,7 @@ void SwChangeDBDlg::UpdateFields() pSh->EndAllAction(); } -IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void) +IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl, Button*, void) { OUString sTableName; OUString sColumnName; @@ -229,7 +229,7 @@ IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, TreeSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pAvailDBTLB->GetCurEntry(); @@ -256,7 +256,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) } } -IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, AddDBHdl, Button*, void) +IMPL_LINK_NOARG(SwChangeDBDlg, AddDBHdl, Button*, void) { const OUString sNewDB = SwDBManager::LoadAndRegisterDataSource(); if (!sNewDB.isEmpty()) diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index a64ec9a60cec..ed26ffbe74fc 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -275,7 +275,7 @@ sal_uInt16 SwFieldDBPage::GetGroup() return GRP_DB; } -IMPL_LINK_TYPED( SwFieldDBPage, TypeListBoxHdl, ListBox&, rBox, void ) +IMPL_LINK( SwFieldDBPage, TypeListBoxHdl, ListBox&, rBox, void ) { TypeHdl(&rBox); } @@ -400,7 +400,7 @@ void SwFieldDBPage::TypeHdl( ListBox* pBox ) } } -IMPL_LINK_TYPED( SwFieldDBPage, NumSelectHdl, ListBox&, rLB, void ) +IMPL_LINK( SwFieldDBPage, NumSelectHdl, ListBox&, rLB, void ) { m_pNewFormatRB->Check(); m_aOldNumSelectHdl.Call(rLB); @@ -435,7 +435,7 @@ void SwFieldDBPage::CheckInsert() EnableInsert(bInsert); } -IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) { SvTreeListEntry* pEntry = pBox->GetCurEntry(); if (pEntry) @@ -475,7 +475,7 @@ IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) } } -IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldDBPage, AddDBHdl, Button*, void) { OUString sNewDB = SwDBManager::LoadAndRegisterDataSource(); if(!sNewDB.isEmpty()) @@ -485,7 +485,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void) } // Modify -IMPL_LINK_NOARG_TYPED(SwFieldDBPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldDBPage, ModifyHdl, Edit&, void) { CheckInsert(); } diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 8e58090b485f..788de1f064a6 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -54,11 +54,11 @@ class SwFieldDBPage : public SwFieldPage sal_uInt16 m_nOldSubType; Link<ListBox&,void> m_aOldNumSelectHdl; - DECL_LINK_TYPED( TypeListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( NumSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( AddDBHdl, Button*, void ); + DECL_LINK( TypeListBoxHdl, ListBox&, void ); + DECL_LINK( NumSelectHdl, ListBox&, void ); + DECL_LINK( TreeSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( AddDBHdl, Button*, void ); void TypeHdl(ListBox*); void CheckInsert(); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index b09d6d7a8426..7f92d992b82a 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -221,7 +221,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) { // save old ListBoxPos SvTreeListEntry* pOldEntry = pSelEntry; @@ -240,7 +240,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) SubTypeHdl(*m_pSelectionLB); } -IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) { sal_uInt16 nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()); sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index e01057460c16..01ac1d5c0df2 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -50,8 +50,8 @@ class SwFieldDokInfPage : public SwFieldPage sal_uLong nOldFormat; OUString m_sOldCustomFieldName; - DECL_LINK_TYPED(TypeHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(SubTypeHdl, ListBox&, void); + DECL_LINK(TypeHdl, SvTreeListBox*, void); + DECL_LINK(SubTypeHdl, ListBox&, void); sal_Int32 FillSelectionLB(sal_uInt16 nSubTypeId); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index b63c6b21f096..1d4dce0d107c 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -205,7 +205,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldDokPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -458,7 +458,7 @@ void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId) m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } -IMPL_LINK_NOARG_TYPED(SwFieldDokPage, SubTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void) { sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) @@ -525,7 +525,7 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) return nSize; } -IMPL_LINK_NOARG_TYPED(SwFieldDokPage, FormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) { sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index cd20b27cc8cb..ab5cde0c4de8 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -50,9 +50,9 @@ class SwFieldDokPage : public SwFieldPage sal_Int32 nOldSel; sal_uLong nOldFormat; - DECL_LINK_TYPED(TypeHdl, ListBox&, void); - DECL_LINK_TYPED(FormatHdl, ListBox&, void); - DECL_LINK_TYPED(SubTypeHdl, ListBox&, void); + DECL_LINK(TypeHdl, ListBox&, void); + DECL_LINK(FormatHdl, ListBox&, void); + DECL_LINK(SubTypeHdl, ListBox&, void); void AddSubType(sal_uInt16 nTypeId); sal_Int32 FillFormatLB(sal_uInt16 nTypeId); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index e11971426d03..4396c1ead502 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -239,7 +239,7 @@ void SwFieldEditDlg::InsertHdl() } // kick off changing of the field -IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl, Button*, void) { if (GetOKButton()->IsEnabled()) { @@ -257,7 +257,7 @@ short SwFieldEditDlg::Execute() } // Traveling between fields of the same type -IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void ) +IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void ) { bool bNext = pButton == m_pNextBT; @@ -291,7 +291,7 @@ IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void ) Init(); } -IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, AddressHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl, Button*, void) { SwFieldPage* pTabPage = static_cast<SwFieldPage*>(GetTabPage()); SwFieldMgr& rMgr = pTabPage->GetFieldMgr(); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index b5c79b24ea21..60a17d53eb4f 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -210,7 +210,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -403,7 +403,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, TypeHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl, ListBox&, void) { const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); @@ -411,17 +411,17 @@ IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, SelectHdl, ListBox&, void) m_pNameED->SetText( m_pSelectionLB->GetSelectEntry() ); } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, InsertMacroHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, InsertMacroHdl, ListBox&, void) { SelectHdl(*m_pSelectionLB); InsertHdl(nullptr); } -IMPL_LINK_TYPED( SwFieldFuncPage, ListModifyButtonHdl, Button*, pControl, void) +IMPL_LINK( SwFieldFuncPage, ListModifyButtonHdl, Button*, pControl, void) { ListModifyHdl(pControl); } -IMPL_LINK_TYPED( SwFieldFuncPage, ListModifyReturnActionHdl, ReturnActionEdit&, rControl, void) +IMPL_LINK( SwFieldFuncPage, ListModifyReturnActionHdl, ReturnActionEdit&, rControl, void) { ListModifyHdl(&rControl); } @@ -471,11 +471,11 @@ void SwFieldFuncPage::ListModifyHdl(Control* pControl) ListEnableHdl(*m_pListItemED); } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ListEnableListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableListBoxHdl, ListBox&, void) { ListEnableHdl(*m_pListItemED); } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ListEnableHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl, Edit&, void) { //enable "Add" button when text is in the Edit that's not already member of the box m_pListAddPB->Enable(!m_pListItemED->GetText().isEmpty() && @@ -531,7 +531,7 @@ void SwFieldFuncPage::UpdateSubType() } // call MacroBrowser, fill Listbox with Macros -IMPL_LINK_NOARG_TYPED( SwFieldFuncPage, MacroHdl, Button *, void) +IMPL_LINK_NOARG( SwFieldFuncPage, MacroHdl, Button *, void) { const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";")); if (GetFieldMgr().ChooseMacro(sMacro)) @@ -646,7 +646,7 @@ void SwFieldFuncPage::FillUserData() SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel )); } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, ModifyHdl, Edit&, void) { const sal_Int32 nLen = m_pNameED->GetText().getLength(); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index b8034a495beb..2f969b2af15d 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -66,18 +66,18 @@ class SwFieldFuncPage : public SwFieldPage sal_uLong nOldFormat; bool bDropDownLBChanged; - DECL_LINK_TYPED( TypeHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( InsertMacroHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ListModifyReturnActionHdl, ReturnActionEdit&, void ); - DECL_LINK_TYPED( ListModifyButtonHdl, Button*, void ); - DECL_LINK_TYPED( ListEnableHdl, Edit&, void ); - DECL_LINK_TYPED( ListEnableListBoxHdl, ListBox&, void ); + DECL_LINK( TypeHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( InsertMacroHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( ListModifyReturnActionHdl, ReturnActionEdit&, void ); + DECL_LINK( ListModifyButtonHdl, Button*, void ); + DECL_LINK( ListEnableHdl, Edit&, void ); + DECL_LINK( ListEnableListBoxHdl, ListBox&, void ); void ListModifyHdl(Control*); // select Macro - DECL_LINK_TYPED( MacroHdl, Button *, void ); + DECL_LINK( MacroHdl, Button *, void ); void UpdateSubType(); static OUString TurnMacroString(const OUString &rMacro); diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index d4084939d64a..d94a6829df32 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -299,13 +299,13 @@ void SwFieldPage::RestorePos(ListBox* pLst1) } // Insert new fields -IMPL_LINK_TYPED( SwFieldPage, TreeListBoxInsertHdl, SvTreeListBox*, pBtn, bool ) +IMPL_LINK( SwFieldPage, TreeListBoxInsertHdl, SvTreeListBox*, pBtn, bool ) { InsertHdl(pBtn); return false; } -IMPL_LINK_TYPED( SwFieldPage, ListBoxInsertHdl, ListBox&, rBox, void ) +IMPL_LINK( SwFieldPage, ListBoxInsertHdl, ListBox&, rBox, void ) { InsertHdl(&rBox); } @@ -345,7 +345,7 @@ void SwFieldPage::EnableInsert(bool bEnable) m_bInsert = bEnable; } -IMPL_LINK_NOARG_TYPED(SwFieldPage, NumFormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldPage, NumFormatHdl, ListBox&, void) { InsertHdl(nullptr); } diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index b7c5090b9b13..a7e665b428b1 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -54,9 +54,9 @@ protected: SwField* GetCurField() { return m_pCurField;} SwWrtShell* GetWrtShell() { return m_pWrtShell;} - DECL_LINK_TYPED( ListBoxInsertHdl, ListBox&, void ); - DECL_LINK_TYPED( TreeListBoxInsertHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( NumFormatHdl, ListBox&, void ); + DECL_LINK( ListBoxInsertHdl, ListBox&, void ); + DECL_LINK( TreeListBoxInsertHdl, SvTreeListBox*, bool ); + DECL_LINK( NumFormatHdl, ListBox&, void ); void InsertHdl(void *); void Init(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 301cfb5d385b..ab7ce0e6e2cf 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -129,7 +129,7 @@ void SwFieldRefPage::dispose() SwFieldPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl_Impl, Edit&, void) { OUString sFilter = comphelper::string::strip(m_pFilterED->GetText(), ' '); UpdateSubType(sFilter); @@ -299,7 +299,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -438,11 +438,11 @@ IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void) { SubTypeHdl(); } -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldRefPage, SubTypeListBoxHdl, ListBox&, void) { SubTypeHdl(); } @@ -827,7 +827,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) } // Modify -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl, Edit&, void) { OUString aName(m_pNameED->GetText()); const bool bEmptyName = aName.isEmpty(); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 30f13754e246..bcc122e8c17f 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -61,11 +61,11 @@ class SwFieldRefPage : public SwFieldPage // fallback, if previously selected text node doesn't exist anymore size_t mnSavedSelectedPos; - DECL_LINK_TYPED(TypeHdl, ListBox&, void); - DECL_LINK_TYPED(SubTypeListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(SubTypeTreeListBoxHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); + DECL_LINK(TypeHdl, ListBox&, void); + DECL_LINK(SubTypeListBoxHdl, ListBox&, void); + DECL_LINK(SubTypeTreeListBoxHdl, SvTreeListBox*, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl_Impl, Edit&, void); void SubTypeHdl(); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 72cfc891e05b..cfc424d0bfa2 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -179,7 +179,7 @@ SfxItemSet* SwFieldDlg::CreateInputItemSet( sal_uInt16 nID ) } // kick off inserting of new fields -IMPL_LINK_NOARG_TYPED(SwFieldDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldDlg, OKHdl, Button*, void) { if (GetOKButton().IsEnabled()) { @@ -190,7 +190,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDlg, OKHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwFieldDlg, CancelHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldDlg, CancelHdl, Button*, void) { Close(); } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 98e073e045b4..95a367e968ab 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -207,7 +207,7 @@ void SwFieldVarPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldVarPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, ListBox&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -237,7 +237,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, TypeHdl, ListBox&, void) bInit = false; } -IMPL_LINK_TYPED( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void ) +IMPL_LINK( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void ) { SubTypeHdl(&rBox); } @@ -829,7 +829,7 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId) } // Modify -IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void) { OUString sValue(m_pValueED->GetText()); bool bHasValue = !sValue.isEmpty(); @@ -952,7 +952,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ModifyHdl, Edit&, void) EnableInsert(bInsert); } -IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) +IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) { const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); @@ -1096,7 +1096,7 @@ IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) } } -IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ChapterHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl, ListBox&, void) { bool bEnable = m_pChapterLevelLB->GetSelectEntryPos() != 0; @@ -1105,7 +1105,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ChapterHdl, ListBox&, void) SeparatorHdl(*m_pSeparatorED); } -IMPL_LINK_NOARG_TYPED(SwFieldVarPage, SeparatorHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl, Edit&, void) { bool bEnable = !m_pSeparatorED->GetText().isEmpty() || m_pChapterLevelLB->GetSelectEntryPos() == 0; diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 9294da46b626..66421cea84e2 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -76,12 +76,12 @@ class SwFieldVarPage : public SwFieldPage sal_uLong nOldFormat; bool bInit; - DECL_LINK_TYPED( TypeHdl, ListBox&, void ); - DECL_LINK_TYPED( SubTypeListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( TBClickHdl, ToolBox *, void ); - DECL_LINK_TYPED( ChapterHdl, ListBox&, void ); - DECL_LINK_TYPED( SeparatorHdl, Edit&, void ); + DECL_LINK( TypeHdl, ListBox&, void ); + DECL_LINK( SubTypeListBoxHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( TBClickHdl, ToolBox *, void ); + DECL_LINK( ChapterHdl, ListBox&, void ); + DECL_LINK( SeparatorHdl, Edit&, void ); void SubTypeHdl(ListBox*); void UpdateSubType(); diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 8cc3cba5b31d..553e472ea344 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -164,7 +164,7 @@ void SwFieldInputDlg::Apply() rSh.EndAllAction(); } -IMPL_LINK_NOARG_TYPED(SwFieldInputDlg, NextHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldInputDlg, NextHdl, Button*, void) { EndDialog(RET_OK); } diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index d448a193f533..4c8d82e3c90b 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -107,7 +107,7 @@ void SwJavaEditDialog::dispose() SvxStandardDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, PrevHdl, Button*, void) +IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl, Button*, void) { pSh->EnterStdMode(); @@ -118,7 +118,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, PrevHdl, Button*, void) RadioButtonHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void) +IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl, Button*, void) { pSh->EnterStdMode(); @@ -129,7 +129,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void) RadioButtonHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl, Button*, void) { SetField(); EndDialog( RET_OK ); @@ -229,7 +229,7 @@ bool SwJavaEditDialog::IsUpdate() const return pField && ( sal_uInt32(bIsUrl ? 1 : 0) != pField->GetFormat() || pField->GetPar2() != aType || pField->GetPar1() != aText ); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, RadioButtonHdl, Button*, void) +IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl, Button*, void) { bool bEnable = m_pUrlRB->IsChecked(); m_pUrlPB->Enable(bEnable); @@ -248,7 +248,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, RadioButtonHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED( SwJavaEditDialog, InsertFileHdl, Button *, void ) +IMPL_LINK_NOARG( SwJavaEditDialog, InsertFileHdl, Button *, void ) { if ( !pFileDlg ) { @@ -260,7 +260,7 @@ IMPL_LINK_NOARG_TYPED( SwJavaEditDialog, InsertFileHdl, Button *, void ) pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) ); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, void) +IMPL_LINK_NOARG(SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, void) { if ( pFileDlg->GetError() == ERRCODE_NONE ) { diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 7ec636d63c1a..f56babc26998 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -230,7 +230,7 @@ void SwColumnDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SwColumnDlg, ObjectListBoxHdl, ListBox&, rBox, void) +IMPL_LINK(SwColumnDlg, ObjectListBoxHdl, ListBox&, rBox, void) { ObjectHdl(&rBox); } @@ -296,7 +296,7 @@ void SwColumnDlg::ObjectHdl(ListBox* pBox) pTabPage->Reset(pSet); } -IMPL_LINK_NOARG_TYPED(SwColumnDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwColumnDlg, OkHdl, Button*, void) { // evaluate current selection SfxItemSet* pSet = nullptr; @@ -697,11 +697,11 @@ bool SwColumnPage::FillItemSet(SfxItemSet *rSet) } // update ColumnManager -IMPL_LINK_NOARG_TYPED( SwColumnPage, UpdateColMgrListBox, ListBox&, void ) +IMPL_LINK_NOARG( SwColumnPage, UpdateColMgrListBox, ListBox&, void ) { UpdateColMgr(*m_pLineWidthEdit); } -IMPL_LINK_NOARG_TYPED( SwColumnPage, UpdateColMgr, Edit&, void ) +IMPL_LINK_NOARG( SwColumnPage, UpdateColMgr, Edit&, void ) { long nGutterWidth = m_pColMgr->GetGutterWidth(); if(m_nCols > 1) @@ -970,7 +970,7 @@ void SwColumnPage::SetLabels( sal_uInt16 nVis ) * the column number overwrites potential user's width settings; all columns * are equally wide. */ -IMPL_LINK_TYPED( SwColumnPage, ColModify, Edit&, rEdit, void ) +IMPL_LINK( SwColumnPage, ColModify, Edit&, rEdit, void ) { ColModify(static_cast<NumericField*>(&rEdit)); } @@ -1005,7 +1005,7 @@ void SwColumnPage::ColModify(NumericField* pNF) * width the automatic calculation of the column width is overruled; only an * alteration of the column number leads back to that default. */ -IMPL_LINK_TYPED( SwColumnPage, GapModify, Edit&, rEdit, void ) +IMPL_LINK( SwColumnPage, GapModify, Edit&, rEdit, void ) { if (m_nCols < 2) return; @@ -1072,7 +1072,7 @@ IMPL_LINK_TYPED( SwColumnPage, GapModify, Edit&, rEdit, void ) Update(pMetricField); } -IMPL_LINK_TYPED( SwColumnPage, EdModify, Edit&, rEdit, void ) +IMPL_LINK( SwColumnPage, EdModify, Edit&, rEdit, void ) { MetricField * pMetricField = static_cast<MetricField*>(&rEdit); PercentField *pField = m_aPercentFieldsMap[pMetricField]; @@ -1083,7 +1083,7 @@ IMPL_LINK_TYPED( SwColumnPage, EdModify, Edit&, rEdit, void ) // Handler behind the Checkbox for automatic width. When the box is checked // no explicit values for the column width can be entered. -IMPL_LINK_TYPED( SwColumnPage, AutoWidthHdl, Button*, pButton, void ) +IMPL_LINK( SwColumnPage, AutoWidthHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); long nDist = static_cast< long >(m_aDistEd1.DenormalizePercent(m_aDistEd1.GetValue(FUNIT_TWIP))); @@ -1101,7 +1101,7 @@ IMPL_LINK_TYPED( SwColumnPage, AutoWidthHdl, Button*, pButton, void ) } // scroll up the contents of the edits -IMPL_LINK_NOARG_TYPED(SwColumnPage, Up, Button*, void) +IMPL_LINK_NOARG(SwColumnPage, Up, Button*, void) { if( m_nFirstVis ) { @@ -1112,7 +1112,7 @@ IMPL_LINK_NOARG_TYPED(SwColumnPage, Up, Button*, void) } // scroll down the contents of the edits. -IMPL_LINK_NOARG_TYPED(SwColumnPage, Down, Button*, void) +IMPL_LINK_NOARG(SwColumnPage, Down, Button*, void) { if( m_nFirstVis + nVisCols < m_nCols ) { @@ -1335,7 +1335,7 @@ DeactivateRC SwColumnPage::DeactivatePage(SfxItemSet *_pSet) return DeactivateRC::LeavePage; } -IMPL_LINK_TYPED( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS, void ) +IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS, void ) { const sal_uInt16 nItem = pVS->GetSelectItemId(); if( nItem < 4 ) diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 974cd3d0a91e..4d0bac6b27ef 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -279,7 +279,7 @@ void SwCaptionDialog::Apply() our_aSepTextSave = m_pSepEdit->GetText(); } -IMPL_LINK_TYPED( SwCaptionDialog, OptionHdl, Button*, pButton, void ) +IMPL_LINK( SwCaptionDialog, OptionHdl, Button*, pButton, void ) { OUString sFieldTypeName = m_pCategoryBox->GetText(); if(sFieldTypeName == m_sNone) @@ -301,16 +301,16 @@ IMPL_LINK_TYPED( SwCaptionDialog, OptionHdl, Button*, pButton, void ) DrawSample(); } -IMPL_LINK_NOARG_TYPED(SwCaptionDialog, SelectListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwCaptionDialog, SelectListBoxHdl, ListBox&, void) { DrawSample(); } -IMPL_LINK_NOARG_TYPED(SwCaptionDialog, SelectHdl, ComboBox&, void) +IMPL_LINK_NOARG(SwCaptionDialog, SelectHdl, ComboBox&, void) { DrawSample(); } -IMPL_LINK_NOARG_TYPED(SwCaptionDialog, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl, Edit&, void) { SwWrtShell &rSh = rView.GetWrtShell(); OUString sFieldTypeName = m_pCategoryBox->GetText(); @@ -332,7 +332,7 @@ IMPL_LINK_NOARG_TYPED(SwCaptionDialog, ModifyHdl, Edit&, void) DrawSample(); } -IMPL_LINK_NOARG_TYPED(SwCaptionDialog, CaptionHdl, Button*, void) +IMPL_LINK_NOARG(SwCaptionDialog, CaptionHdl, Button*, void) { SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() ); ScopedVclPtrInstance< SwCaptionOptDlg > aDlg( this, aSet ); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index e400ce7125fb..7b16081b027a 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1762,13 +1762,13 @@ DeactivateRC SwFramePage::DeactivatePage(SfxItemSet * _pSet) } // swap left/right with inside/outside -IMPL_LINK_NOARG_TYPED(SwFramePage, MirrorHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, MirrorHdl, Button*, void) { RndStdIds eId = GetAnchor(); InitPos( eId, -1, 0, -1, 0, LONG_MAX, LONG_MAX); } -IMPL_LINK_TYPED( SwFramePage, RelSizeClickHdl, Button *, p, void ) +IMPL_LINK( SwFramePage, RelSizeClickHdl, Button *, p, void ) { CheckBox* pBtn = static_cast<CheckBox*>(p); if (pBtn == m_pRelWidthCB) @@ -1795,11 +1795,11 @@ IMPL_LINK_TYPED( SwFramePage, RelSizeClickHdl, Button *, p, void ) } // range check -IMPL_LINK_NOARG_TYPED(SwFramePage, RangeModifyClickHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, RangeModifyClickHdl, Button*, void) { RangeModifyHdl(); } -IMPL_LINK_NOARG_TYPED(SwFramePage, RangeModifyLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(SwFramePage, RangeModifyLoseFocusHdl, Control&, void) { RangeModifyHdl(); } @@ -1922,7 +1922,7 @@ void SwFramePage::RangeModifyHdl() m_pAtVertPosED->SetValue(m_pAtVertPosED->Normalize(aVal.nVPos), FUNIT_TWIP); } -IMPL_LINK_NOARG_TYPED(SwFramePage, AnchorTypeHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, AnchorTypeHdl, Button*, void) { m_pMirrorPagesCB->Enable(!m_pAnchorAsCharRB->IsChecked()); @@ -1949,7 +1949,7 @@ IMPL_LINK_NOARG_TYPED(SwFramePage, AnchorTypeHdl, Button*, void) && FLY_AS_CHAR == eId) ); } -IMPL_LINK_TYPED( SwFramePage, PosHdl, ListBox&, rLB, void ) +IMPL_LINK( SwFramePage, PosHdl, ListBox&, rLB, void ) { bool bHori = &rLB == m_pHorizontalDLB; ListBox *pRelLB = bHori ? m_pHoriRelationLB : m_pVertRelationLB; @@ -2051,7 +2051,7 @@ IMPL_LINK_TYPED( SwFramePage, PosHdl, ListBox&, rLB, void ) } // horizontal Pos -IMPL_LINK_TYPED( SwFramePage, RelHdl, ListBox&, rLB, void ) +IMPL_LINK( SwFramePage, RelHdl, ListBox&, rLB, void ) { bool bHori = &rLB == m_pHoriRelationLB; @@ -2080,7 +2080,7 @@ IMPL_LINK_TYPED( SwFramePage, RelHdl, ListBox&, rLB, void ) RangeModifyHdl(); } -IMPL_LINK_NOARG_TYPED(SwFramePage, RealSizeHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, RealSizeHdl, Button*, void) { m_aWidthED.SetUserValue( m_aWidthED. NormalizePercent(m_aGrfSize.Width() ), FUNIT_TWIP); m_aHeightED.SetUserValue(m_aHeightED.NormalizePercent(m_aGrfSize.Height()), FUNIT_TWIP); @@ -2088,19 +2088,19 @@ IMPL_LINK_NOARG_TYPED(SwFramePage, RealSizeHdl, Button*, void) UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SwFramePage, AutoWidthClickHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, AutoWidthClickHdl, Button*, void) { if( !IsInGraficMode() ) HandleAutoCB( m_pAutoWidthCB->IsChecked(), *m_pWidthFT, *m_pWidthAutoFT, *m_aWidthED.get() ); } -IMPL_LINK_NOARG_TYPED(SwFramePage, AutoHeightClickHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, AutoHeightClickHdl, Button*, void) { if( !IsInGraficMode() ) HandleAutoCB( m_pAutoHeightCB->IsChecked(), *m_pHeightFT, *m_pHeightAutoFT, *m_aWidthED.get() ); } -IMPL_LINK_TYPED( SwFramePage, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SwFramePage, ModifyHdl, Edit&, rEdit, void ) { SwTwips nWidth = static_cast< SwTwips >(m_aWidthED.DenormalizePercent(m_aWidthED.GetValue(FUNIT_TWIP))); SwTwips nHeight = static_cast< SwTwips >(m_aHeightED.DenormalizePercent(m_aHeightED.GetValue(FUNIT_TWIP))); @@ -2568,7 +2568,7 @@ DeactivateRC SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) return DeactivateRC::LeavePage; } -IMPL_LINK_NOARG_TYPED(SwGrfExtPage, BrowseHdl, Button*, void) +IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, Button*, void) { if(!pGrfDlg) { @@ -2613,7 +2613,7 @@ IMPL_LINK_NOARG_TYPED(SwGrfExtPage, BrowseHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwGrfExtPage, MirrorHdl, Button*, void) +IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl, Button*, void) { bool bEnable = m_pMirrorHorzBox->IsChecked(); @@ -2838,7 +2838,7 @@ VclPtr<SfxTabPage> SwFrameURLPage::Create(vcl::Window *pParent, const SfxItemSet return VclPtr<SwFrameURLPage>::Create( pParent, *rSet ); } -IMPL_LINK_NOARG_TYPED(SwFrameURLPage, InsertFileHdl, Button*, void) +IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, Button*, void) { FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ); uno::Reference < ui::dialogs::XFilePicker2 > xFP = aDlgHelper.GetFilePicker(); @@ -3188,7 +3188,7 @@ bool SwFrameAddPage::FillItemSet(SfxItemSet *rSet) return bRet; } -IMPL_LINK_NOARG_TYPED(SwFrameAddPage, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFrameAddPage, EditModifyHdl, Edit&, void) { bool bEnable = !m_pNameED->GetText().isEmpty(); m_pAltNameED->Enable(bEnable); @@ -3204,7 +3204,7 @@ void SwFrameAddPage::SetFormatUsed(bool bFormatUsed) } } -IMPL_LINK_TYPED(SwFrameAddPage, ChainModifyHdl, ListBox&, rBox, void) +IMPL_LINK(SwFrameAddPage, ChainModifyHdl, ListBox&, rBox, void) { OUString sCurrentPrevChain, sCurrentNextChain; if(m_pPrevLB->GetSelectEntryPos()) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 7d0fe614f921..68266e2e817c 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -587,11 +587,11 @@ DeactivateRC SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) } // range check -IMPL_LINK_TYPED( SwWrapTabPage, RangeLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwWrapTabPage, RangeLoseFocusHdl, Control&, rControl, void ) { RangeModifyHdl( static_cast<SpinField&>(rControl) ); } -IMPL_LINK_TYPED( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) +IMPL_LINK( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) { MetricField& rEdit = static_cast<MetricField&>(rSpin); sal_Int64 nValue = rEdit.GetValue(); @@ -616,7 +616,7 @@ IMPL_LINK_TYPED( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) } } -IMPL_LINK_TYPED( SwWrapTabPage, WrapTypeHdl, Button *, pBtn, void ) +IMPL_LINK( SwWrapTabPage, WrapTypeHdl, Button *, pBtn, void ) { bool bWrapThrough = (pBtn == m_pWrapThroughRB); m_pWrapTransparentCB->Enable( bWrapThrough && !m_bHtmlMode ); @@ -630,7 +630,7 @@ IMPL_LINK_TYPED( SwWrapTabPage, WrapTypeHdl, Button *, pBtn, void ) ContourHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwWrapTabPage, ContourHdl, Button*, void) +IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl, Button*, void) { bool bEnable = !(m_pWrapOutlineCB->IsChecked() && m_pWrapOutlineCB->IsEnabled()); diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index 1c69dddd7cbf..8d6e55b4e35a 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -57,9 +57,9 @@ class SwMMResultSaveDialog : public SfxModalDialog bool m_bCancelSaving; - DECL_LINK_TYPED(SaveOutputHdl_Impl, Button* , void); - DECL_LINK_TYPED(SaveCancelHdl_Impl, Button*, void); - DECL_LINK_TYPED(DocumentSelectionHdl_Impl, Button*, void); + DECL_LINK(SaveOutputHdl_Impl, Button* , void); + DECL_LINK(SaveCancelHdl_Impl, Button*, void); + DECL_LINK(DocumentSelectionHdl_Impl, Button*, void); public: SwMMResultSaveDialog(); @@ -86,10 +86,10 @@ class SwMMResultPrintDialog : public SfxModalDialog VclPtr<Printer> m_pTempPrinter; - DECL_LINK_TYPED(PrinterChangeHdl_Impl, ListBox&,void ); - DECL_LINK_TYPED(PrintHdl_Impl, Button*, void); - DECL_LINK_TYPED(PrinterSetupHdl_Impl, Button*, void ); - DECL_LINK_TYPED(DocumentSelectionHdl_Impl, Button*, void); + DECL_LINK(PrinterChangeHdl_Impl, ListBox&,void ); + DECL_LINK(PrintHdl_Impl, Button*, void); + DECL_LINK(PrinterSetupHdl_Impl, Button*, void ); + DECL_LINK(DocumentSelectionHdl_Impl, Button*, void); void FillInPrinterSettings(); @@ -135,11 +135,11 @@ class SwMMResultEmailDialog : public SfxModalDialog OUString m_sBody; - DECL_LINK_TYPED(CopyToHdl_Impl, Button*, void); - DECL_LINK_TYPED(SendTypeHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SendAsHdl_Impl, Button*, void); - DECL_LINK_TYPED(SendDocumentsHdl_Impl, Button*, void); - DECL_LINK_TYPED(DocumentSelectionHdl_Impl, Button*, void); + DECL_LINK(CopyToHdl_Impl, Button*, void); + DECL_LINK(SendTypeHdl_Impl, ListBox&, void); + DECL_LINK(SendAsHdl_Impl, Button*, void); + DECL_LINK(SendDocumentsHdl_Impl, Button*, void); + DECL_LINK(DocumentSelectionHdl_Impl, Button*, void); void FillInEmailSettings(); @@ -198,11 +198,11 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog sal_Int32 m_nSendCount; sal_Int32 m_nErrorCount; - DECL_LINK_TYPED( StopHdl_Impl, Button*, void ); - DECL_LINK_TYPED( CloseHdl_Impl, Button* , void); - DECL_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, void ); - DECL_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, void ); - DECL_LINK_TYPED( RemoveThis, Idle*, void ); + DECL_LINK( StopHdl_Impl, Button*, void ); + DECL_LINK( CloseHdl_Impl, Button* , void); + DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, void*, void ); + DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, void*, void ); + DECL_LINK( RemoveThis, Idle*, void ); void IterateMails(); void SendMails(); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 30fd38a1ea62..8ad638ee0210 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -96,7 +96,7 @@ static void lcl_SetBOOLProp( } } -IMPL_LINK_NOARG_TYPED(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&, void) +IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&, void) { try { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index ecea420917b5..744d2952119c 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -200,7 +200,7 @@ class SwAutoMarkDlg_Impl : public ModalDialog bool bCreateMode; - DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK(OkHdl, Button*, void); public: SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL, bool bCreate); @@ -476,7 +476,7 @@ SwTOXDescription* SwMultiTOXTabDialog::CreateTOXDescFromTOXBase( return pDesc; } -IMPL_LINK_NOARG_TYPED( SwMultiTOXTabDialog, ShowPreviewHdl, Button*, void ) +IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl, Button*, void ) { if(m_pShowExampleCB->IsChecked()) { @@ -637,9 +637,9 @@ class SwAddStylesDlg_Impl : public SfxModalDialog OUString* pStyleArr; - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED(LeftRightHdl, Button*, void); - DECL_LINK_TYPED(HeaderDragHdl, HeaderBar*, void); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK(LeftRightHdl, Button*, void); + DECL_LINK(HeaderDragHdl, HeaderBar*, void); public: SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]); @@ -731,7 +731,7 @@ void SwAddStylesDlg_Impl::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwAddStylesDlg_Impl, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl, Button*, void) { for(sal_uInt16 i = 0; i < MAXLEVEL; i++) pStyleArr[i].clear(); @@ -753,12 +753,12 @@ IMPL_LINK_NOARG_TYPED(SwAddStylesDlg_Impl, OkHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwAddStylesDlg_Impl, HeaderDragHdl, HeaderBar*, void) +IMPL_LINK_NOARG(SwAddStylesDlg_Impl, HeaderDragHdl, HeaderBar*, void) { m_pHeaderTree->Invalidate(); } -IMPL_LINK_TYPED(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void) +IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void) { bool bLeft = pBtn == m_pLeftPB; SvTreeListEntry* pEntry = m_pHeaderTree->FirstSelected(); @@ -1315,7 +1315,7 @@ VclPtr<SfxTabPage> SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxIt return VclPtr<SwTOXSelectTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_TYPED(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void) { SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog()); const sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >( @@ -1381,11 +1381,11 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void) ModifyHdl(*m_pTitleED); } -IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, ModifyListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyListBoxHdl, ListBox&, void) { ModifyHdl(*m_pTitleED); } -IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyHdl, Edit&, void) { if(!m_bWaitingInitialSettings) { @@ -1395,7 +1395,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, ModifyHdl, Edit&, void) } } -IMPL_LINK_TYPED(SwTOXSelectTabPage, CheckBoxHdl, Button*, pButton, void ) +IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog()); @@ -1424,7 +1424,7 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, CheckBoxHdl, Button*, pButton, void ) ModifyHdl(*m_pTitleED); }; -IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, RadioButtonHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl, Button*, void) { bool bEnable = m_pFromCaptionsRB->IsChecked(); m_pCaptionSequenceFT->Enable(bEnable); @@ -1434,7 +1434,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, RadioButtonHdl, Button*, void) ModifyHdl(*m_pTitleED); } -IMPL_LINK_TYPED(SwTOXSelectTabPage, LanguageListBoxHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXSelectTabPage, LanguageListBoxHdl, ListBox&, rBox, void) { LanguageHdl(&rBox); } @@ -1477,7 +1477,7 @@ void SwTOXSelectTabPage::LanguageHdl( ListBox* pBox ) ModifyHdl(*m_pTitleED); }; -IMPL_LINK_TYPED(SwTOXSelectTabPage, AddStylesHdl, Button*, pButton, void) +IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, Button*, pButton, void) { ScopedVclPtrInstance<SwAddStylesDlg_Impl> pDlg( pButton, static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(), @@ -1487,13 +1487,13 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, AddStylesHdl, Button*, pButton, void) ModifyHdl(*m_pTitleED); } -IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu, bool) +IMPL_LINK(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu, bool) { pMenu->EnableItem("edit", !sAutoMarkURL.isEmpty()); return false; } -IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu, bool) +IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu, bool) { const OUString sSaveAutoMarkURL = sAutoMarkURL; OString sIdent(pMenu->GetCurItemIdent()); @@ -2017,11 +2017,11 @@ void SwTOXEntryTabPage::dispose() // pVoid is used as signal to change all levels of the example -IMPL_LINK_TYPED(SwTOXEntryTabPage, ModifyClickHdl, Button*, pVoid, void) +IMPL_LINK(SwTOXEntryTabPage, ModifyClickHdl, Button*, pVoid, void) { OnModify(pVoid); } -IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, ModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SwTOXEntryTabPage, ModifyHdl, LinkParamNone*, void) { OnModify(nullptr); } @@ -2225,7 +2225,7 @@ VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( vcl::Window* pParent, const Sf return VclPtr<SwTOXEntryTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, EditStyleHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, Button*, void) { if( LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectEntryPos()) { @@ -2238,7 +2238,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, EditStyleHdl, Button*, void) } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, RemoveInsertAuthHdl, Button*, pButton, void) +IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, Button*, pButton, void) { bool bInsert = pButton == m_pAuthInsertPB; if(bInsert) @@ -2300,7 +2300,7 @@ bool SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt ) // This function initializes the default value in the Token // put here the UI dependent initializations -IMPL_LINK_TYPED(SwTOXEntryTabPage, InsertTokenHdl, Button*, pBtn, void) +IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, Button*, pBtn, void) { OUString sText; FormTokenType eTokenType = TOKEN_ENTRY_NO; @@ -2354,7 +2354,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, InsertTokenHdl, Button*, pBtn, void) ModifyHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, AllLevelsHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXEntryTabPage, AllLevelsHdl, Button*, void) { //get current level //write it into all levels @@ -2379,7 +2379,7 @@ void SwTOXEntryTabPage::WriteBackLevel() } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) +IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) { if(bInLevelHdl) return; @@ -2422,13 +2422,13 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) pBox->GrabFocus(); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, SortKeyHdl, Button*, pButton, void) +IMPL_LINK(SwTOXEntryTabPage, SortKeyHdl, Button*, pButton, void) { bool bEnable = m_pSortContentRB == pButton; m_pSortKeyFrame->Enable(bEnable); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) +IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) { if (!rToken.sCharStyleName.isEmpty()) m_pCharStyleLB->SelectEntry(rToken.sCharStyleName); @@ -2541,7 +2541,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) { OUString sEntry = rBox.GetSelectEntry(); const sal_uInt16 nId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rBox.GetSelectEntryData()); @@ -2562,7 +2562,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) ModifyHdl(nullptr); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, ChapterInfoHdl, ListBox&, rBox, void) { sal_Int32 nPos = rBox.GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) @@ -2576,7 +2576,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoHdl, ListBox&, rBox, void) } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoOutlineHdl, Edit&, rEdit, void) +IMPL_LINK(SwTOXEntryTabPage, ChapterInfoOutlineHdl, Edit&, rEdit, void) { const sal_uInt16 nLevel = static_cast<sal_uInt8>(static_cast<NumericField&>(rEdit).GetValue()); @@ -2588,7 +2588,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoOutlineHdl, Edit&, rEdit, void) ModifyHdl(nullptr); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void) { const sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -2604,7 +2604,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void) } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, TabPosHdl, Edit&, rEdit, void) +IMPL_LINK(SwTOXEntryTabPage, TabPosHdl, Edit&, rEdit, void) { MetricField* pField = static_cast<MetricField*>(&rEdit); Control* pCtrl = m_pTokenWIN->GetActiveControl(); @@ -2619,7 +2619,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, TabPosHdl, Edit&, rEdit, void) ModifyHdl(nullptr); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, FillCharHdl, Edit&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, Edit&, rBox, void) { Control* pCtrl = m_pTokenWIN->GetActiveControl(); OSL_ENSURE(pCtrl && WINDOW_EDIT != pCtrl->GetType() && @@ -2637,7 +2637,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, FillCharHdl, Edit&, rBox, void) ModifyHdl(nullptr); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, AutoRightHdl, Button*, pBox, void) +IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, Button*, pBox, void) { //the most right style::TabStop is usually right aligned Control* pCurCtrl = m_pTokenWIN->GetActiveControl(); @@ -3280,7 +3280,7 @@ void SwTokenWindow::AdjustScrolling() } } -IMPL_LINK_TYPED(SwTokenWindow, ScrollHdl, Button*, pBtn, void ) +IMPL_LINK(SwTokenWindow, ScrollHdl, Button*, pBtn, void ) { if(aControlList.empty()) return; @@ -3458,14 +3458,14 @@ bool SwTokenWindow::CreateQuickHelp(Control* pCtrl, return bRet; } -IMPL_LINK_TYPED(SwTokenWindow, EditResize, Edit&, rEdit, void) +IMPL_LINK(SwTokenWindow, EditResize, Edit&, rEdit, void) { static_cast<SwTOXEdit*>(&rEdit)->AdjustSize(); AdjustPositions(); aModifyHdl.Call(nullptr); } -IMPL_LINK_TYPED(SwTokenWindow, NextItemHdl, SwTOXEdit&, rEdit, void) +IMPL_LINK(SwTokenWindow, NextItemHdl, SwTOXEdit&, rEdit, void) { ctrl_iterator it = std::find(aControlList.begin(),aControlList.end(),&rEdit); @@ -3489,7 +3489,7 @@ IMPL_LINK_TYPED(SwTokenWindow, NextItemHdl, SwTOXEdit&, rEdit, void) } } -IMPL_LINK_TYPED(SwTokenWindow, TbxFocusHdl, Control&, rControl, void) +IMPL_LINK(SwTokenWindow, TbxFocusHdl, Control&, rControl, void) { SwTOXEdit* pEdit = static_cast<SwTOXEdit*>(&rControl); for (ctrl_iterator it = aControlList.begin(); it != aControlList.end(); ++it) @@ -3503,7 +3503,7 @@ IMPL_LINK_TYPED(SwTokenWindow, TbxFocusHdl, Control&, rControl, void) SetActiveControl(pEdit); } -IMPL_LINK_TYPED(SwTokenWindow, NextItemBtnHdl, SwTOXButton&, rBtn, void ) +IMPL_LINK(SwTokenWindow, NextItemBtnHdl, SwTOXButton&, rBtn, void ) { ctrl_iterator it = std::find(aControlList.begin(),aControlList.end(),&rBtn); @@ -3540,7 +3540,7 @@ IMPL_LINK_TYPED(SwTokenWindow, NextItemBtnHdl, SwTOXButton&, rBtn, void ) } } -IMPL_LINK_TYPED(SwTokenWindow, TbxFocusBtnHdl, Control&, rControl, void ) +IMPL_LINK(SwTokenWindow, TbxFocusBtnHdl, Control&, rControl, void ) { SwTOXButton* pBtn = static_cast<SwTOXButton*>(&rControl); for (ctrl_iterator it = aControlList.begin(); it != aControlList.end(); ++it) @@ -3735,7 +3735,7 @@ VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( vcl::Window* pParent, return VclPtr<SwTOXStylesTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, EditStyleHdl, Button *, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void) { if( LISTBOX_ENTRY_NOTFOUND != m_pParaLayLB->GetSelectEntryPos()) { @@ -3749,7 +3749,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, EditStyleHdl, Button *, void) } // allocate templates -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, AssignHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl, Button*, void) { sal_Int32 nLevPos = m_pLevelLB->GetSelectEntryPos(); sal_Int32 nTemplPos = m_pParaLayLB->GetSelectEntryPos(); @@ -3770,7 +3770,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, AssignHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, StdHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl, Button*, void) { const sal_Int32 nPos = m_pLevelLB->GetSelectEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) @@ -3784,7 +3784,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, StdHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, DoubleClickHdl, ListBox&, void) { const OUString aTmpName( m_pParaLayLB->GetSelectEntry() ); SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(); @@ -3795,7 +3795,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, DoubleClickHdl, ListBox&, void) } // enable only when selected -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, EnableSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl, ListBox&, void) { m_pStdBT->Enable(m_pLevelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND); @@ -4193,7 +4193,7 @@ void SwAutoMarkDlg_Impl::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwAutoMarkDlg_Impl, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoMarkDlg_Impl, OkHdl, Button*, void) { bool bError = false; if(m_pEntriesBB->IsModified() || bCreateMode) diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 8925b60e0eac..41c99bf7f95e 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -45,7 +45,7 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr) m_pTextFT->SetText(rMgr.GetTOXMark(0)->GetTOXType()->GetTypeName()); } -IMPL_LINK_TYPED( SwMultiTOXMarkDlg, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, ListBox&, rBox, void ) { if(rBox.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) { SwTOXMark* pMark = rMgr.GetTOXMark(rBox.GetSelectEntryPos()); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 00e07b6ff78d..e8d4ef2b492c 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -371,7 +371,7 @@ void SwIndexMarkPane::Activate() } } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, SyncSelectionHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, SyncSelectionHdl, Button*, void) { bSelected = !pSh->HasSelection(); aOrgStr = pSh->GetView().GetSelectionTextParam(true, false); @@ -575,7 +575,7 @@ class SwNewUserIdxDlg : public ModalDialog SwIndexMarkPane* m_pDlg; - DECL_LINK_TYPED( ModifyHdl, Edit&, void); + DECL_LINK( ModifyHdl, Edit&, void); public: explicit SwNewUserIdxDlg(SwIndexMarkPane* pPane) @@ -600,12 +600,12 @@ class SwNewUserIdxDlg : public ModalDialog OUString GetName(){return m_pNameED->GetText();} }; -IMPL_LINK_TYPED( SwNewUserIdxDlg, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK( SwNewUserIdxDlg, ModifyHdl, Edit&, rEdit, void) { m_pOKPB->Enable(!rEdit.GetText().isEmpty() && !m_pDlg->IsTOXType(rEdit.GetText())); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NewUserIdxHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, NewUserIdxHdl, Button*, void) { ScopedVclPtrInstance< SwNewUserIdxDlg > pDlg(this); if(RET_OK == pDlg->Execute()) @@ -616,14 +616,14 @@ IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NewUserIdxHdl, Button*, void) } } -IMPL_LINK_TYPED( SwIndexMarkPane, SearchTypeHdl, Button*, pBox, void) +IMPL_LINK( SwIndexMarkPane, SearchTypeHdl, Button*, pBox, void) { bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked() && pBox->IsEnabled(); m_pSearchCaseWordOnlyCB->Enable(bEnable); m_pSearchCaseSensitiveCB->Enable(bEnable); } -IMPL_LINK_TYPED( SwIndexMarkPane, InsertHdl, Button *, pButton, void ) +IMPL_LINK( SwIndexMarkPane, InsertHdl, Button *, pButton, void ) { Apply(); //close the dialog if only one entry is available @@ -631,7 +631,7 @@ IMPL_LINK_TYPED( SwIndexMarkPane, InsertHdl, Button *, pButton, void ) CloseHdl(pButton); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, CloseHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl, Button*, void) { if(bNewMark) { @@ -646,12 +646,12 @@ IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, CloseHdl, Button*, void) } // select index type only when inserting -IMPL_LINK_TYPED( SwIndexMarkPane, ModifyListBoxHdl, ListBox&, rBox, void ) +IMPL_LINK( SwIndexMarkPane, ModifyListBoxHdl, ListBox&, rBox, void ) { ModifyHdl(&rBox); } -IMPL_LINK_TYPED( SwIndexMarkPane, ModifyEditHdl, Edit&, rEdit, void ) +IMPL_LINK( SwIndexMarkPane, ModifyEditHdl, Edit&, rEdit, void ) { ModifyHdl(&rEdit); } @@ -730,35 +730,35 @@ void SwIndexMarkPane::ModifyHdl(Control* pBox) (!m_pEntryED->GetText().isEmpty() || pSh->GetCursorCnt(false))); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NextHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, NextHdl, Button*, void) { InsertUpdate(); pTOXMgr->NextTOXMark(); UpdateDialog(); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NextSameHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, NextSameHdl, Button*, void) { InsertUpdate(); pTOXMgr->NextTOXMark(true); UpdateDialog(); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, PrevHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, PrevHdl, Button*, void) { InsertUpdate(); pTOXMgr->PrevTOXMark(); UpdateDialog(); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, PrevSameHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, PrevSameHdl, Button*, void) { InsertUpdate(); pTOXMgr->PrevTOXMark(true); UpdateDialog(); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, DelHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, DelHdl, Button*, void) { bDel = true; InsertUpdate(); @@ -876,7 +876,7 @@ void SwIndexMarkPane::UpdateDialog() } // Remind whether the edit boxes for Phonetic reading are changed manually -IMPL_LINK_TYPED( SwIndexMarkPane, PhoneticEDModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SwIndexMarkPane, PhoneticEDModifyHdl, Edit&, rEdit, void ) { if (m_pPhoneticED0 == &rEdit) { @@ -893,7 +893,7 @@ IMPL_LINK_TYPED( SwIndexMarkPane, PhoneticEDModifyHdl, Edit&, rEdit, void ) } // Enable Disable of the 2nd key -IMPL_LINK_TYPED( SwIndexMarkPane, KeyDCBModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, Edit&, rEdit, void ) { ComboBox* pBox = static_cast<ComboBox*>(&rEdit); if (m_pKey1DCB == pBox) @@ -1024,9 +1024,9 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog bool m_bNewEntryMode; bool m_bNameAllowed; - DECL_LINK_TYPED(IdentifierHdl, ComboBox&, void); - DECL_LINK_TYPED(ShortNameHdl, Edit&, void); - DECL_LINK_TYPED(EnableHdl, ListBox&, void); + DECL_LINK(IdentifierHdl, ComboBox&, void); + DECL_LINK(ShortNameHdl, Edit&, void); + DECL_LINK(EnableHdl, ListBox&, void); public: SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, @@ -1135,7 +1135,7 @@ void SwAuthorMarkPane::ReInitDlg(SwWrtShell& rWrtShell) InitControls(); } -IMPL_LINK_NOARG_TYPED(SwAuthorMarkPane, CloseHdl, Button*, void) +IMPL_LINK_NOARG(SwAuthorMarkPane, CloseHdl, Button*, void) { if(bNewEntry) { @@ -1163,7 +1163,7 @@ static OUString lcl_FindColumnEntry(const beans::PropertyValue* pFields, sal_Int return OUString(); } -IMPL_LINK_TYPED( SwAuthorMarkPane, CompEntryHdl, ListBox&, rBox, void) +IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox&, rBox, void) { const OUString sEntry(rBox.GetSelectEntry()); if(bIsFromComponent) @@ -1207,7 +1207,7 @@ IMPL_LINK_TYPED( SwAuthorMarkPane, CompEntryHdl, ListBox&, rBox, void) m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]); } -IMPL_LINK_NOARG_TYPED(SwAuthorMarkPane, InsertHdl, Button*, void) +IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl, Button*, void) { //insert or update the SwAuthorityField... if(pSh) @@ -1260,7 +1260,7 @@ IMPL_LINK_NOARG_TYPED(SwAuthorMarkPane, InsertHdl, Button*, void) CloseHdl(nullptr); } -IMPL_LINK_TYPED(SwAuthorMarkPane, CreateEntryHdl, Button*, pButton, void) +IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, Button*, pButton, void) { bool bCreate = pButton == m_pCreateEntryPB; OUString sOldId = m_sCreatedEntry[0]; @@ -1304,7 +1304,7 @@ IMPL_LINK_TYPED(SwAuthorMarkPane, CreateEntryHdl, Button*, pButton, void) } } -IMPL_LINK_TYPED(SwAuthorMarkPane, ChangeSourceHdl, Button*, pButton, void) +IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, Button*, pButton, void) { bool bFromComp = (pButton == m_pFromComponentRB); bIsFromComponent = bFromComp; @@ -1365,7 +1365,7 @@ IMPL_LINK_TYPED(SwAuthorMarkPane, ChangeSourceHdl, Button*, pButton, void) CompEntryHdl(*m_pEntryLB); } -IMPL_LINK_TYPED(SwAuthorMarkPane, EditModifyHdl, Edit&, rEdit, void) +IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, Edit&, rEdit, void) { Link<Edit*,bool> aAllowed = LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl); bool bResult = aAllowed.Call(&rEdit); @@ -1378,7 +1378,7 @@ IMPL_LINK_TYPED(SwAuthorMarkPane, EditModifyHdl, Edit&, rEdit, void) } }; -IMPL_LINK_TYPED(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit, bool) +IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit, bool) { OUString sEntry = pEdit->GetText(); bool bAllowed = false; @@ -1584,7 +1584,7 @@ OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons return OUString(); } -IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox&, rBox, void) +IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox&, rBox, void) { const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>( rWrtSh.GetFieldType(RES_AUTHORITY, OUString())); @@ -1610,7 +1610,7 @@ IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox&, rBox, void) } } -IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit&, rEdit, void) +IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit&, rEdit, void) { if(aShortNameCheckLink.IsSet()) { @@ -1620,7 +1620,7 @@ IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit&, rEdit, void) } } -IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox&, rBox, void) +IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox&, rBox, void) { m_pOKBT->Enable(m_bNameAllowed && rBox.GetSelectEntryCount()); }; diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 6197c4f64ef3..329fef44ad73 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -43,7 +43,7 @@ const char BookmarkTable::cSeparator(';'); const OUString BookmarkTable::sDefaultBookmarkName("Bookmark"); // callback to modify EditBox -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, Edit&, void) { ValidateBookmarks(); m_pBookmarksBox->SelectAll(false); @@ -90,7 +90,7 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, ModifyHdl, Edit&, void) } // callback to delete a text mark -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl, Button*, void) { if (!ValidateBookmarks()) return; @@ -124,18 +124,18 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, DeleteHdl, Button*, void) } // callback to a goto button -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, GotoHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, GotoHdl, Button*, void) { GotoSelectedBookmark(); } -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, DoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, DoubleClickHdl, SvTreeListBox*, bool) { GotoSelectedBookmark(); return true; } -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, SelectionChangedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, SelectionChangedHdl, SvTreeListBox*, void) { if (!ValidateBookmarks()) return; @@ -171,7 +171,7 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, SelectionChangedHdl, SvTreeListBox*, } } -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, RenameHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, RenameHdl, Button*, void) { if (!ValidateBookmarks()) return; @@ -205,7 +205,7 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, RenameHdl, Button*, void) } // callback to a insert button. Inserts a new text mark to the current position. -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, InsertHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, InsertHdl, Button*, void) { OUString sBookmark = m_pEditBox->GetText(); rSh.SetBookmark(vcl::KeyCode(), sBookmark, OUString()); diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index f457b986b490..30f053bf4a57 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -56,7 +56,7 @@ void SwFootNoteOptionDlg::PageCreated( sal_uInt16 /*nId*/, SfxTabPage &rPage ) static_cast<SwEndNoteOptionPage&>(rPage).SetShell( rSh ); } -IMPL_LINK_TYPED( SwFootNoteOptionDlg, OkHdl, Button *, pBtn, void ) +IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn, void ) { SfxItemSet aDummySet(rSh.GetAttrPool(), 1, 1 ); SfxTabPage *pPage = GetTabPage( m_nFootNoteId ); @@ -294,7 +294,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) // Handler behind the button to collect the footnote at the page. In this case // all kinds of numbering can be used. -IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, PosPageHdl, Button*, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl, Button*, void) { const SwFootnoteNum eNum = (const SwFootnoteNum)GetNumbering(); bPosDoc = false; @@ -308,7 +308,7 @@ IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, PosPageHdl, Button*, void) m_pPageTemplBox->Enable(false); } -IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, NumCountHdl, ListBox&, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl, ListBox&, void) { bool bEnable = true; if( m_pNumCountBox->GetEntryCount() - 1 != m_pNumCountBox->GetSelectEntryPos() ) @@ -322,7 +322,7 @@ IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, NumCountHdl, ListBox&, void) // Handler behind the button to collect the footnote at the chapter or end of // the document. In this case no pagewise numbering can be used. -IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, PosChapterHdl, Button*, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, PosChapterHdl, Button*, void) { if ( !bPosDoc ) SelectNumbering(FTNNUM_DOC); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 9f7942147a9a..5a7f52cb3c31 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -184,7 +184,7 @@ void SwGlossaryGroupDlg::Apply() } } -IMPL_LINK_NOARG_TYPED( SwGlossaryGroupDlg, SelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( SwGlossaryGroupDlg, SelectHdl, SvTreeListBox*, void ) { m_pNewPB->Enable(false); SvTreeListEntry* pFirstEntry = m_pGroupTLB->FirstSelected(); @@ -207,7 +207,7 @@ IMPL_LINK_NOARG_TYPED( SwGlossaryGroupDlg, SelectHdl, SvTreeListBox*, void ) } } -IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, NewHdl, Button*, void) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl, Button*, void) { OUString sGroup = m_pNameED->GetText() + OUStringLiteral1(GLOS_DELIM) @@ -226,7 +226,7 @@ IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, NewHdl, Button*, void) m_pGroupTLB->GetModel()->Resort(); } -IMPL_LINK_TYPED( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton, void ) +IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton, void ) { SvTreeListEntry* pEntry = m_pGroupTLB->FirstSelected(); if(!pEntry) @@ -275,7 +275,7 @@ IMPL_LINK_TYPED( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton, void ) m_pNameED->SetText(aEmptyOUStr); } -IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, RenameHdl, Button*, void) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl, Button*, void) { SvTreeListEntry* pEntry = m_pGroupTLB->FirstSelected(); GlosBibUserData* pUserData = static_cast<GlosBibUserData*>(pEntry->GetUserData()); @@ -320,11 +320,11 @@ IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, RenameHdl, Button*, void) m_pGroupTLB->GetModel()->Resort(); } -IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, ModifyListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyListBoxHdl, ListBox&, void) { ModifyHdl(*m_pNameED); } -IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl, Edit&, void) { OUString sEntry(m_pNameED->GetText()); bool bEnableNew = true; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index e3e7cbd6c6ef..c906e674623b 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -125,8 +125,8 @@ class SwNewGlosNameDlg : public ModalDialog VclPtr<Edit> m_pOldShort; protected: - DECL_LINK_TYPED( Modify, Edit&, void ); - DECL_LINK_TYPED(Rename, Button*, void); + DECL_LINK( Modify, Edit&, void ); + DECL_LINK(Rename, Button*, void); public: SwNewGlosNameDlg( vcl::Window* pParent, @@ -274,7 +274,7 @@ void SwGlossaryDlg::dispose() } // select new group -IMPL_LINK_TYPED( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox, void ) +IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox, void ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); if(!pEntry) @@ -372,7 +372,7 @@ SvTreeListEntry* SwGlossaryDlg::DoesBlockExist(const OUString& rBlock, return nullptr; } -IMPL_LINK_TYPED( SwGlossaryDlg, NameModify, Edit&, rEdit, void ) +IMPL_LINK( SwGlossaryDlg, NameModify, Edit&, rEdit, void ) { const OUString aName(m_pNameED->GetText()); bool bNameED = &rEdit == m_pNameED; @@ -411,7 +411,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, NameModify, Edit&, rEdit, void ) } } -IMPL_LINK_TYPED( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox, bool ) +IMPL_LINK( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox, bool ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); if(pBox->GetParent(pEntry) && !bIsDocReadOnly) @@ -419,7 +419,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox, bool ) return false; } -IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool ) +IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool ) { SvTreeListEntry* pEntry = m_pCategoryBox->FirstSelected(); @@ -441,7 +441,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool ) return true; } -IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) +IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) { OString sItemIdent(pMn->GetCurItemIdent()); @@ -613,7 +613,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) } // dialog manage regions -IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, BibHdl, Button*, void) +IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl, Button*, void) { SwGlossaries* pGloss = ::GetGlossaries(); if( pGloss->IsGlosPathErr() ) @@ -782,7 +782,7 @@ void SwGlossaryDlg::Init() m_pInsertTipCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl)); } -IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, EditHdl, MenuButton *, void) +IMPL_LINK_NOARG(SwGlossaryDlg, EditHdl, MenuButton *, void) { // EndDialog must not be called in MenuHdl if (m_pEditBtn->GetCurItemIdent() == "edit") @@ -794,7 +794,7 @@ IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, EditHdl, MenuButton *, void) } // KeyInput for ShortName - Edits without Spaces -IMPL_LINK_TYPED( SwNewGlosNameDlg, Modify, Edit&, rBox, void ) +IMPL_LINK( SwNewGlosNameDlg, Modify, Edit&, rBox, void ) { OUString aName(m_pNewName->GetText()); SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParent()); @@ -807,7 +807,7 @@ IMPL_LINK_TYPED( SwNewGlosNameDlg, Modify, Edit&, rBox, void ) m_pOk->Enable(bEnable); } -IMPL_LINK_NOARG_TYPED(SwNewGlosNameDlg, Rename, Button*, void) +IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename, Button*, void) { SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParent()); OUString sNew = GetAppCharClass().uppercase(m_pNewShort->GetText()); @@ -821,7 +821,7 @@ IMPL_LINK_NOARG_TYPED(SwNewGlosNameDlg, Rename, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_TYPED( SwGlossaryDlg, CheckBoxHdl, Button *, pBox, void ) +IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, Button *, pBox, void ) { SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); @@ -1035,7 +1035,7 @@ OUString SwGlossaryDlg::GetCurrGrpName() const return OUString(); } -IMPL_LINK_TYPED( SwGlossaryDlg, PathHdl, Button *, pBtn, void ) +IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn, void ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -1058,7 +1058,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, PathHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, InsertHdl, Button*, void) +IMPL_LINK_NOARG(SwGlossaryDlg, InsertHdl, Button*, void) { EndDialog(RET_OK); } @@ -1076,7 +1076,7 @@ void SwGlossaryDlg::ShowPreview() ShowAutoText(::GetCurrGlosGroup(), m_pShortNameEdit->GetText()); }; -IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, PreviewLoadedHdl, SwOneExampleFrame&, void) +IMPL_LINK_NOARG(SwGlossaryDlg, PreviewLoadedHdl, SwOneExampleFrame&, void) { ResumeShowAutoText(); } diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index f4c0a2c11a67..ac812c2802a4 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -62,9 +62,9 @@ class SwEndNoteOptionPage : public SfxTabPage inline void SelectNumbering(int eNum); int GetNumbering() const; - DECL_LINK_TYPED(PosPageHdl, Button*, void); - DECL_LINK_TYPED(PosChapterHdl, Button*, void); - DECL_LINK_TYPED(NumCountHdl, ListBox&, void); + DECL_LINK(PosPageHdl, Button*, void); + DECL_LINK(PosChapterHdl, Button*, void); + DECL_LINK(NumCountHdl, ListBox&, void); public: SwEndNoteOptionPage( vcl::Window *pParent, bool bEndNote, diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 407c366bb63f..791333282791 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -81,24 +81,24 @@ void SwInsFootNoteDlg::Apply() bFootnote = m_pFootnoteBtn->IsChecked(); } -IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberCharHdl, Button*, void) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberCharHdl, Button*, void) { m_pNumberCharEdit->GrabFocus(); m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() || bExtCharAvailable ); } -IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberEditHdl, Edit&, void) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl, Edit&, void) { m_pNumberCharBtn->Check(); m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() ); } -IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberAutoBtnHdl, Button*, void) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberAutoBtnHdl, Button*, void) { m_pOkBtn->Enable(); } -IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) { m_pNumberCharBtn->Check(); @@ -137,7 +137,7 @@ IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) } } -IMPL_LINK_TYPED( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn, void ) +IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn, void ) { Apply(); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 641804d4325f..c96b5d5c5747 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -193,7 +193,7 @@ void SwLineNumberingDlg::dispose() } -IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl, Button*, void) { SwLineNumberInfo aInf(pSh->GetLineNumberInfo()); @@ -255,7 +255,7 @@ IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, OKHdl, Button*, void) } // modify -IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl, Edit&, void) { bool bEnable = m_pNumberingOnCB->IsChecked() && !m_pDivisorED->GetText().isEmpty(); @@ -265,7 +265,7 @@ IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, ModifyHdl, Edit&, void) } // On/Off -IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, LineOnOffHdl, Button*, void) +IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl, Button*, void) { bool bEnable = m_pNumberingOnCB->IsChecked(); m_pBodyContent->Enable(bEnable); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index e44175fd4798..ac2b5ad1728b 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -589,7 +589,7 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) m_pIndentAtMF->SetUnit( eMetric ); } -IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, EditModifyHdl, ListBox&, void) +IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl, ListBox&, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -614,7 +614,7 @@ IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, EditModifyHdl, ListBox&, void) SetModified(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, LevelHdl, ListBox&, rBox, void ) +IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox&, rBox, void ) { sal_uInt16 nSaveNumLvl = nActNumLvl; nActNumLvl = 0; @@ -659,11 +659,11 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, LevelHdl, ListBox&, rBox, void ) InitControls(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, DistanceLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwNumPositionTabPage, DistanceLoseFocusHdl, Control&, rControl, void ) { DistanceHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwNumPositionTabPage, DistanceHdl, SpinField&, rSpin, void ) +IMPL_LINK( SwNumPositionTabPage, DistanceHdl, SpinField&, rSpin, void ) { if(bInInintControl) return; @@ -722,7 +722,7 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, DistanceHdl, SpinField&, rSpin, void ) m_pDistBorderMF->SetText(aEmptyOUStr); } -IMPL_LINK_TYPED( SwNumPositionTabPage, RelativeHdl, Button *, pBox, void ) +IMPL_LINK( SwNumPositionTabPage, RelativeHdl, Button *, pBox, void ) { bool bOn = static_cast<CheckBox*>(pBox)->IsChecked(); bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl; @@ -760,7 +760,7 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, RelativeHdl, Button *, pBox, void ) bLastRelative = bOn; } -IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void) { // determine value to be set at the chosen list levels SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB; @@ -819,11 +819,11 @@ IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, v SetModified(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SwNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) { ListtabPosHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rSpin, void ) +IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rSpin, void ) { MetricField& rField = static_cast<MetricField&>(rSpin); // determine value to be set at the chosen list levels @@ -845,11 +845,11 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rSpin, vo SetModified(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SwNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) { AlignAtHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rSpin, void ) +IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rSpin, void ) { MetricField& rField = static_cast<MetricField&>(rSpin); // determine value to be set at the chosen list levels @@ -872,11 +872,11 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rSpin, void SetModified(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SwNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) { IndentAtHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rSpin, void ) +IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rSpin, void ) { MetricField& rField = static_cast<MetricField&>(rSpin); // determine value to be set at the chosen list levels @@ -902,7 +902,7 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rSpin, void SetModified(); } -IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, StandardHdl, Button*, void) +IMPL_LINK_NOARG(SwNumPositionTabPage, StandardHdl, Button*, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -1027,7 +1027,7 @@ short SwSvxNumBulletTabDialog::Ok() return nRet; } -IMPL_LINK_NOARG_TYPED(SwSvxNumBulletTabDialog, RemoveNumberingHdl, Button*, void) +IMPL_LINK_NOARG(SwSvxNumBulletTabDialog, RemoveNumberingHdl, Button*, void) { EndDialog(RET_USER); } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 25d450d2665f..1e61f437691f 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -63,9 +63,9 @@ class SwNumNamesDlg : public ModalDialog VclPtr<ListBox> m_pFormBox; VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DoubleClickHdl, ListBox&, void ); public: explicit SwNumNamesDlg(vcl::Window *pParent); @@ -91,7 +91,7 @@ void SwNumNamesDlg::dispose() // remember selected entry -IMPL_LINK_TYPED( SwNumNamesDlg, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwNumNamesDlg, SelectHdl, ListBox&, rBox, void ) { m_pFormEdit->SetText(rBox.GetSelectEntry()); m_pFormEdit->SetSelection(Selection(0, SELECTION_MAX)); @@ -119,13 +119,13 @@ void SwNumNamesDlg::SetUserNames(const OUString *pList[]) } // unlock OK-Button when text is in Edit -IMPL_LINK_TYPED( SwNumNamesDlg, ModifyHdl, Edit&, rBox, void ) +IMPL_LINK( SwNumNamesDlg, ModifyHdl, Edit&, rBox, void ) { m_pOKBtn->Enable(!rBox.GetText().isEmpty()); } // DoubleClickHdl -IMPL_LINK_NOARG_TYPED(SwNumNamesDlg, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SwNumNamesDlg, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } @@ -225,14 +225,14 @@ void SwOutlineTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) } } -IMPL_LINK_NOARG_TYPED(SwOutlineTabDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(SwOutlineTabDialog, CancelHdl, Button*, void) { if (!bModified) rWrtSh.ResetModified(); EndDialog(); } -IMPL_LINK_TYPED( SwOutlineTabDialog, FormHdl, Button *, pBtn, void ) +IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn, void ) { PopupMenu *pFormMenu = get_menu("form"); // fill PopupMenu @@ -254,7 +254,7 @@ IMPL_LINK_TYPED( SwOutlineTabDialog, FormHdl, Button *, pBtn, void ) pFormMenu->Execute(pBtn, Rectangle(Point(0,0), pBtn->GetSizePixel()), PopupMenuFlags::ExecuteDown); } -IMPL_LINK_TYPED( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool ) { sal_uInt8 nLevelNo = 0; OString sIdent = pMenu->GetCurItemIdent(); @@ -562,7 +562,7 @@ void SwOutlineSettingsTabPage::Update() SetModified(); } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, LevelHdl, ListBox&, rBox, void ) +IMPL_LINK( SwOutlineSettingsTabPage, LevelHdl, ListBox&, rBox, void ) { nActLevel = 0; if(rBox.IsEntryPosSelected( MAXLEVEL )) @@ -582,7 +582,7 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, LevelHdl, ListBox&, rBox, void ) Update(); } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, ToggleComplete, Edit&, rEdit, void ) +IMPL_LINK( SwOutlineSettingsTabPage, ToggleComplete, Edit&, rEdit, void ) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -599,7 +599,7 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, ToggleComplete, Edit&, rEdit, void ) SetModified(); } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, CollSelect, ListBox&, rBox, void ) +IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox&, rBox, void ) { sal_uInt8 i; @@ -641,13 +641,13 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, CollSelect, ListBox&, rBox, void ) SetModified(); } -IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, CollSelectGetFocus, Control&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CollSelectGetFocus, Control&, void) { for( sal_uInt8 i = 0; i < MAXLEVEL; ++i) aSaveCollNames[i] = pCollNames[i]; } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, NumberSelect, ListBox&, rBox, void ) +IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, ListBox&, rBox, void ) { sal_uInt16 nMask = 1; sal_Int16 nNumberType = static_cast<SwNumberingTypeListBox&>(rBox).GetSelectedNumberingType(); @@ -665,7 +665,7 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, NumberSelect, ListBox&, rBox, void ) SetModified(); } -IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, DelimModify, Edit&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, DelimModify, Edit&, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -682,7 +682,7 @@ IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, DelimModify, Edit&, void) SetModified(); } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, StartModified, Edit&, rEdit, void ) +IMPL_LINK( SwOutlineSettingsTabPage, StartModified, Edit&, rEdit, void ) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -698,7 +698,7 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, StartModified, Edit&, rEdit, void ) SetModified(); } -IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, CharFormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFormatHdl, ListBox&, void) { OUString sEntry = m_pCharFormatLB->GetSelectEntry(); sal_uInt16 nMask = 1; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index efa2aaf63b60..cc55e81cd023 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -52,19 +52,19 @@ const sal_uInt16 SwFootNotePage::aPageRg[] = { // handler to switch between the different possibilities how the footnote // region's height can be set. -IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightPage, Button*, void) +IMPL_LINK_NOARG(SwFootNotePage, HeightPage, Button*, void) { m_pMaxHeightEdit->Enable(false); } -IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightMetric, Button*, void) +IMPL_LINK_NOARG(SwFootNotePage, HeightMetric, Button*, void) { m_pMaxHeightEdit->Enable(); m_pMaxHeightEdit->GrabFocus(); } // handler limit values -IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightModify, Control&, void) +IMPL_LINK_NOARG(SwFootNotePage, HeightModify, Control&, void) { m_pMaxHeightEdit->SetMax(m_pMaxHeightEdit->Normalize(lMaxHeight - (m_pDistEdit->Denormalize(m_pDistEdit->GetValue(FUNIT_TWIP)) + @@ -84,7 +84,7 @@ IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightModify, Control&, void) FUNIT_TWIP); } -IMPL_LINK_NOARG_TYPED(SwFootNotePage, LineWidthChanged_Impl, Edit&, void) +IMPL_LINK_NOARG(SwFootNotePage, LineWidthChanged_Impl, Edit&, void) { sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( m_pLineWidthEdit->GetValue( ), @@ -93,7 +93,7 @@ IMPL_LINK_NOARG_TYPED(SwFootNotePage, LineWidthChanged_Impl, Edit&, void) m_pLineTypeBox->SetWidth( nVal ); } -IMPL_LINK_NOARG_TYPED(SwFootNotePage, LineColorSelected_Impl, ListBox&, void) +IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl, ListBox&, void) { m_pLineTypeBox->SetColor( m_pLineColorBox->GetSelectEntryColor() ); } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 3854fa0400f0..583e2c2332dc 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -387,11 +387,11 @@ const sal_uInt16* SwTextGridPage::GetRanges() return aPageRg; } -IMPL_LINK_TYPED(SwTextGridPage, CharorLineLoseFocusdHdl, Control&, rControl, void) +IMPL_LINK(SwTextGridPage, CharorLineLoseFocusdHdl, Control&, rControl, void) { CharorLineChangedHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void) +IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void) { //if in squared mode if ( m_bSquaredMode ) @@ -437,11 +437,11 @@ IMPL_LINK_TYPED(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void) GridModifyHdl(*m_pColorLB); } -IMPL_LINK_TYPED(SwTextGridPage, TextSizeLoseFocusHdl, Control&, rControl, void) +IMPL_LINK(SwTextGridPage, TextSizeLoseFocusHdl, Control&, rControl, void) { TextSizeChangedHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED(SwTextGridPage, TextSizeChangedHdl, SpinField&, rField, void) +IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField&, rField, void) { //if in squared mode if( m_bSquaredMode ) @@ -492,7 +492,7 @@ IMPL_LINK_TYPED(SwTextGridPage, TextSizeChangedHdl, SpinField&, rField, void) GridModifyHdl(*m_pColorLB); } -IMPL_LINK_TYPED(SwTextGridPage, GridTypeHdl, Button*, pButton, void) +IMPL_LINK(SwTextGridPage, GridTypeHdl, Button*, pButton, void) { bool bEnable = m_pNoGridRB.get() != pButton; m_pLayoutFL->Enable(bEnable); @@ -518,18 +518,18 @@ IMPL_LINK_TYPED(SwTextGridPage, GridTypeHdl, Button*, pButton, void) GridModifyHdl(*m_pColorLB); } -IMPL_LINK_NOARG_TYPED(SwTextGridPage, DisplayGridHdl, Button*, void) +IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, Button*, void) { bool bChecked = m_pDisplayCB->IsChecked(); m_pPrintCB->Enable(bChecked); m_pPrintCB->Check(bChecked); } -IMPL_LINK_NOARG_TYPED(SwTextGridPage, GridModifyClickHdl, Button*, void) +IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, Button*, void) { GridModifyHdl(*m_pColorLB); } -IMPL_LINK_NOARG_TYPED(SwTextGridPage, GridModifyHdl, ListBox&, void) +IMPL_LINK_NOARG(SwTextGridPage, GridModifyHdl, ListBox&, void) { const SfxItemSet& rOldSet = GetItemSet(); SfxItemSet aSet(rOldSet); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 99e42c031a69..23c37459bb7d 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -367,14 +367,14 @@ void SwSortDlg::Apply() ScopedVclPtrInstance<MessageDialog>(this->GetParent(), SW_RES(STR_SRTERR), VclMessageType::Info)->Execute(); } -IMPL_LINK_TYPED( SwSortDlg, DelimHdl, Button*, pButton, void ) +IMPL_LINK( SwSortDlg, DelimHdl, Button*, pButton, void ) { bool bEnable = pButton == m_pDelimFreeRB && m_pDelimFreeRB->IsEnabled(); m_pDelimEdt->Enable( bEnable ); m_pDelimPB->Enable( bEnable ); } -IMPL_LINK_NOARG_TYPED(SwSortDlg, DelimCharHdl, Button*, void) +IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl, Button*, void) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -392,7 +392,7 @@ IMPL_LINK_NOARG_TYPED(SwSortDlg, DelimCharHdl, Button*, void) } } -IMPL_LINK_TYPED( SwSortDlg, CheckHdl, Button*, pControl, void ) +IMPL_LINK( SwSortDlg, CheckHdl, Button*, pControl, void ) { if( pControl == m_pRowRB.get()) { @@ -422,7 +422,7 @@ IMPL_LINK_TYPED( SwSortDlg, CheckHdl, Button*, pControl, void ) static_cast<CheckBox *>(pControl)->Check(); } -IMPL_LINK_TYPED( SwSortDlg, LanguageListBoxHdl, ListBox&, rLBox, void ) +IMPL_LINK( SwSortDlg, LanguageListBoxHdl, ListBox&, rLBox, void ) { LanguageHdl(&rLBox); } diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 08e3e30c0f0a..a150e32df126 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -236,29 +236,29 @@ SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) : m_pPagePropertiesPB->SetClickHdl(LINK(this, SwTitlePageDlg, EditHdl)); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, UpHdl, SpinField&, void) +IMPL_LINK_NOARG(SwTitlePageDlg, UpHdl, SpinField&, void) { if (m_pPageCountNF->GetValue() == 2) FillList(); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, DownHdl, SpinField&, void) +IMPL_LINK_NOARG(SwTitlePageDlg, DownHdl, SpinField&, void) { if (m_pPageCountNF->GetValue() == 1) FillList(); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, RestartNumberingHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, RestartNumberingHdl, Button*, void) { m_pRestartNumberingNF->Enable(m_pRestartNumberingCB->IsChecked()); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, SetPageNumberHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, SetPageNumberHdl, Button*, void) { m_pSetPageNumberNF->Enable(m_pSetPageNumberCB->IsChecked()); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, StartPageHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl, Button*, void) { m_pPageStartNF->Enable(m_pPageStartRB->IsChecked()); } @@ -286,14 +286,14 @@ void SwTitlePageDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, EditHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, EditHdl, Button*, void) { SwView& rView = mpSh->GetView(); rView.GetDocShell()->FormatPage(m_pPagePropertiesLB->GetSelectEntry(), "page", *mpSh); rView.InvalidateRulerPos(); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, OKHdl, Button*, void) { lcl_PushCursor(mpSh); diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index 36286e35af1a..4e2795ea3cf3 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -31,7 +31,7 @@ #include <cmdid.h> #include <table.hrc> -IMPL_LINK_NOARG_TYPED(SwTableWidthDlg, LoseFocusHdl, Edit&, void) +IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl, Edit&, void) { sal_uInt16 nId = (sal_uInt16)m_pColNF->GetValue()-1; const SwTwips lWidth = rFnc.GetColWidth(nId); diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index d245ca3bfdbd..8ddfb70eda79 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -197,7 +197,7 @@ void SwConvertTableDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -208,7 +208,7 @@ IMPL_LINK_TYPED( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void ) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); } -IMPL_LINK_TYPED( SwConvertTableDlg, BtnHdl, Button*, pButton, void ) +IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton, void ) { if( pButton == mpTabBtn ) mpKeepColumn->SetState( mpKeepColumn->GetSavedValue() ); @@ -222,13 +222,13 @@ IMPL_LINK_TYPED( SwConvertTableDlg, BtnHdl, Button*, pButton, void ) mpOtherEd->Enable( mpOtherBtn->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, CheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl, Button*, void) { mpRepeatHeaderCB->Enable(mpHeaderCB->IsChecked()); ReapeatHeaderCheckBoxHdl(); } -IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) { bool bEnable = mpHeaderCB->IsChecked() && mpRepeatHeaderCB->IsChecked(); mpRepeatRows->Enable(bEnable); diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 81cbe188b460..deabff20630f 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -129,7 +129,7 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView ) m_pRepeatHeaderNF->SetMax( nMax ); } -IMPL_LINK_NOARG_TYPED(SwInsTableDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwInsTableDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } @@ -156,7 +156,7 @@ void SwInsTableDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED( SwInsTableDlg, ModifyName, Edit&, rEdit, void ) +IMPL_LINK( SwInsTableDlg, ModifyName, Edit&, rEdit, void ) { OUString sTableName = rEdit.GetText(); if (sTableName.indexOf(' ') != -1) @@ -168,7 +168,7 @@ IMPL_LINK_TYPED( SwInsTableDlg, ModifyName, Edit&, rEdit, void ) m_pInsertBtn->Enable(pShell->GetTableStyle( sTableName ) == nullptr); } -IMPL_LINK_TYPED( SwInsTableDlg, ModifyRowCol, Edit&, rEdit, void ) +IMPL_LINK( SwInsTableDlg, ModifyRowCol, Edit&, rEdit, void ) { if(&rEdit == m_pColNF) { @@ -196,7 +196,7 @@ IMPL_LINK_TYPED( SwInsTableDlg, ModifyRowCol, Edit&, rEdit, void ) m_pRepeatHeaderNF->SetValue( ( nEnteredValRepeatHeaderNF < nMax )? nEnteredValRepeatHeaderNF : nMax ); } } -IMPL_LINK_TYPED( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -207,18 +207,18 @@ IMPL_LINK_TYPED( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void ) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); } -IMPL_LINK_NOARG_TYPED(SwInsTableDlg, CheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl, Button*, void) { m_pRepeatHeaderCB->Enable(m_pHeaderCB->IsChecked()); ReapeatHeaderCheckBoxHdl(); } -IMPL_LINK_NOARG_TYPED(SwInsTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwInsTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) { m_pRepeatGroup->Enable(m_pHeaderCB->IsChecked() && m_pRepeatHeaderCB->IsChecked()); } -IMPL_LINK_NOARG_TYPED(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl, Edit&, void) +IMPL_LINK_NOARG(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl, Edit&, void) { nEnteredValRepeatHeaderNF = m_pRepeatHeaderNF->GetValue(); } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 10acafe08c84..e96e195c7980 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -167,7 +167,7 @@ void SwFormatTablePage::Init() m_pRelWidthCB->SetClickHdl(LINK( this, SwFormatTablePage, RelWidthClickHdl )); } -IMPL_LINK_TYPED( SwFormatTablePage, RelWidthClickHdl, Button*, p, void ) +IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, Button*, p, void ) { CheckBox* pBtn = static_cast<CheckBox*>(p); OSL_ENSURE(pTableData, "table data not available?"); @@ -202,7 +202,7 @@ IMPL_LINK_TYPED( SwFormatTablePage, RelWidthClickHdl, Button*, p, void ) bModified = true; } -IMPL_LINK_TYPED( SwFormatTablePage, AutoClickHdl, Button*, pControl, void ) +IMPL_LINK( SwFormatTablePage, AutoClickHdl, Button*, pControl, void ) { bool bRestore = true, bLeftEnable = false, @@ -283,11 +283,11 @@ void SwFormatTablePage::RightModify() } } -IMPL_LINK_TYPED( SwFormatTablePage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwFormatTablePage, LoseFocusHdl, Control&, rControl, void ) { UpDownHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwFormatTablePage, UpDownHdl, SpinField&, rEdit, void ) +IMPL_LINK( SwFormatTablePage, UpDownHdl, SpinField&, rEdit, void ) { if( m_aRightMF.get() == &rEdit) RightModify(); @@ -867,7 +867,7 @@ void SwTableColumnPage::Init(bool bWeb) m_pProportionalCB->SetClickHdl( aLk ); } -IMPL_LINK_TYPED( SwTableColumnPage, AutoClickHdl, Button*, pControl, void ) +IMPL_LINK( SwTableColumnPage, AutoClickHdl, Button*, pControl, void ) { //move display window if(pControl == m_pDownBtn.get()) @@ -899,19 +899,19 @@ IMPL_LINK_TYPED( SwTableColumnPage, AutoClickHdl, Button*, pControl, void ) UpdateCols(0); } -IMPL_LINK_TYPED( SwTableColumnPage, UpHdl, SpinField&, rEdit, void ) +IMPL_LINK( SwTableColumnPage, UpHdl, SpinField&, rEdit, void ) { bModified = true; ModifyHdl( static_cast<MetricField*>(&rEdit) ); } -IMPL_LINK_TYPED( SwTableColumnPage, DownHdl, SpinField&, rEdit, void ) +IMPL_LINK( SwTableColumnPage, DownHdl, SpinField&, rEdit, void ) { bModified = true; ModifyHdl( static_cast<MetricField*>(&rEdit) ); } -IMPL_LINK_TYPED( SwTableColumnPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwTableColumnPage, LoseFocusHdl, Control&, rControl, void ) { MetricField* pEdit = static_cast<MetricField*>(&rControl); if (pEdit->IsModified()) @@ -921,7 +921,7 @@ IMPL_LINK_TYPED( SwTableColumnPage, LoseFocusHdl, Control&, rControl, void ) } } -IMPL_LINK_TYPED( SwTableColumnPage, ModeHdl, Button*, pBox, void ) +IMPL_LINK( SwTableColumnPage, ModeHdl, Button*, pBox, void ) { bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); if (pBox == m_pProportionalCB) @@ -1677,7 +1677,7 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh) } } -IMPL_LINK_NOARG_TYPED(SwTextFlowPage, PageBreakHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, Button*, void) { if( m_pPgBrkCB->IsChecked() ) { @@ -1714,7 +1714,7 @@ IMPL_LINK_NOARG_TYPED(SwTextFlowPage, PageBreakHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwTextFlowPage, ApplyCollClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl, Button*, void) { bool bEnable = false; if ( m_pPageCollCB->IsChecked() && @@ -1735,7 +1735,7 @@ IMPL_LINK_NOARG_TYPED(SwTextFlowPage, ApplyCollClickHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( SwTextFlowPage, PageBreakPosHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, Button*, pBtn, void ) { if ( m_pPgBrkCB->IsChecked() ) { @@ -1764,7 +1764,7 @@ IMPL_LINK_TYPED( SwTextFlowPage, PageBreakPosHdl_Impl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( SwTextFlowPage, PageBreakTypeHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, Button*, pBtn, void ) { if ( pBtn == m_pColBrkRB || m_pPgBrkAfterRB->IsChecked() ) { @@ -1778,18 +1778,18 @@ IMPL_LINK_TYPED( SwTextFlowPage, PageBreakTypeHdl_Impl, Button*, pBtn, void ) PageBreakPosHdl_Impl(m_pPgBrkBeforeRB); } -IMPL_LINK_TYPED( SwTextFlowPage, SplitHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SwTextFlowPage, SplitHdl_Impl, Button*, pBox, void ) { m_pSplitRowCB->Enable(static_cast<CheckBox*>(pBox)->IsChecked()); } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( SwTextFlowPage, SplitRowHdl_Impl, Button*, pBox, void ) { static_cast<TriStateBox*>(pBox)->EnableTriState(false); } -IMPL_LINK_NOARG_TYPED(SwTextFlowPage, HeadLineCBClickHdl, Button*, void) +IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl, Button*, void) { m_pRepeatHeaderCombo->Enable(m_pHeadLineCB->IsChecked()); } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 9d9a2a1ab36a..e240aeaf17f6 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -279,7 +279,7 @@ void SwAutoFormatDlg::FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const // Handler: -IMPL_LINK_TYPED( SwAutoFormatDlg, CheckHdl, Button *, pBtn, void ) +IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn, void ) { SwTableAutoFormat* pData = &(*pTableTable)[nIndex]; bool bCheck = static_cast<CheckBox*>(pBtn)->IsChecked(), bDataChgd = true; @@ -309,7 +309,7 @@ IMPL_LINK_TYPED( SwAutoFormatDlg, CheckHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, AddHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl, Button*, void) { bool bOk = false, bFormatInserted = false; while( !bOk ) @@ -367,7 +367,7 @@ IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, AddHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RemoveHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl, Button*, void) { OUString aMessage = aStrDelMsg; aMessage += "\n\n"; @@ -402,7 +402,7 @@ IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RemoveHdl, Button*, void) SelFormatHdl( *m_pLbFormat ); } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RenameHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl, Button*, void) { bool bOk = false; while( !bOk ) @@ -465,7 +465,7 @@ IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RenameHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, SelFormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl, ListBox&, void) { bool bBtnEnable = false; sal_uInt8 nSelPos = (sal_uInt8) m_pLbFormat->GetSelectEntryPos(), nOldIdx = nIndex; @@ -497,7 +497,7 @@ IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, SelFormatHdl, ListBox&, void) m_pBtnRename->Enable( bBtnEnable ); } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl, Button*, void) { if( bSetAutoFormat ) pShell->SetTableStyle((*pTableTable)[nIndex]); diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 9c05b4ffcad9..5db8f4dd8d85 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -86,7 +86,7 @@ void SwRenameXNamedDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwRenameXNamedDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwRenameXNamedDlg, OkHdl, Button*, void) { try { @@ -99,7 +99,7 @@ IMPL_LINK_NOARG_TYPED(SwRenameXNamedDlg, OkHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_TYPED(SwRenameXNamedDlg, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK(SwRenameXNamedDlg, ModifyHdl, Edit&, rEdit, void) { OUString sTmp(rEdit.GetText()); diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 4f2a5ee6f7c1..8d575cc80672 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -385,11 +385,11 @@ class SwMailMergeWizardExecutor : public salhelper::SimpleReferenceObject AbstractMailMergeWizard* m_pWizard; // always owner bool m_bDestroyMMToolbarOnCancel; - DECL_LINK_TYPED( EndDialogHdl, Dialog&, void ); - DECL_LINK_TYPED( DestroyDialogHdl, void*, void ); - DECL_STATIC_LINK_TYPED( SwMailMergeWizardExecutor, DestroyWizardHdl, void*, void ); - DECL_LINK_TYPED( CancelHdl, void*, void ); - DECL_LINK_TYPED( CloseFrameHdl, void*, void ); + DECL_LINK( EndDialogHdl, Dialog&, void ); + DECL_LINK( DestroyDialogHdl, void*, void ); + DECL_STATIC_LINK( SwMailMergeWizardExecutor, DestroyWizardHdl, void*, void ); + DECL_LINK( CancelHdl, void*, void ); + DECL_LINK( CloseFrameHdl, void*, void ); void ExecutionFinished(); void ExecuteWizard(); @@ -494,7 +494,7 @@ void SwMailMergeWizardExecutor::ExecuteWizard() LINK( this, SwMailMergeWizardExecutor, EndDialogHdl ) ); } -IMPL_LINK_NOARG_TYPED( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void ) +IMPL_LINK_NOARG( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void ) { long nRet = m_pWizard->GetResult(); sal_uInt16 nRestartPage = m_pWizard->GetRestartPage(); @@ -609,7 +609,7 @@ IMPL_LINK_NOARG_TYPED( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void ) } // switch } -IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, DestroyDialogHdl, void*, void) +IMPL_LINK_NOARG(SwMailMergeWizardExecutor, DestroyDialogHdl, void*, void) { delete m_pWizard; m_pWizard = nullptr; @@ -617,12 +617,12 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, DestroyDialogHdl, void*, void) release(); } -IMPL_STATIC_LINK_TYPED(SwMailMergeWizardExecutor, DestroyWizardHdl, void*, pDialog, void ) +IMPL_STATIC_LINK(SwMailMergeWizardExecutor, DestroyWizardHdl, void*, pDialog, void ) { delete static_cast<AbstractMailMergeWizard*>(pDialog); } -IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CancelHdl, void*, void) +IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CancelHdl, void*, void) { std::shared_ptr<SwMailMergeConfigItem> xMMConfig = m_pView->GetMailMergeConfigItem(); if (xMMConfig) @@ -658,7 +658,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CancelHdl, void*, void) release(); } -IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) +IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) { if ( m_pView2Close ) { diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index e0d0140a652c..235c553c4f6d 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1087,7 +1087,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) } // OLE-Hdls -IMPL_LINK_TYPED( SwDocShell, Ole2ModifiedHdl, bool, bNewStatus, void ) +IMPL_LINK( SwDocShell, Ole2ModifiedHdl, bool, bNewStatus, void ) { if( IsEnableSetModified() ) SetModified( bNewStatus ); diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index e95bbc3414dc..0d2e8ccb7648 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -541,7 +541,7 @@ public: , m_bModified(bModified) { } - DECL_LINK_TYPED( ApplyHdl, LinkParamNone*, void ); + DECL_LINK( ApplyHdl, LinkParamNone*, void ); void apply() { ApplyHdl(nullptr); @@ -559,7 +559,7 @@ private: bool m_bModified; }; -IMPL_LINK_NOARG_TYPED(ApplyStyle, ApplyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void) { SwWrtShell* pWrtShell = m_rDocSh.GetWrtShell(); SwDoc* pDoc = m_rDocSh.GetDoc(); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index a9a6da81aaf8..781ca39149ca 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1631,7 +1631,7 @@ void SwDBManager::MergeCancel() m_aMergeStatus = MergeStatus::CANCEL; } -IMPL_LINK_TYPED( SwDBManager, PrtCancelHdl, Button *, pButton, void ) +IMPL_LINK( SwDBManager, PrtCancelHdl, Button *, pButton, void ) { pButton->GetParent()->Hide(); MergeCancel(); diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index a5b31c6d8e05..441239e69272 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -378,7 +378,7 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) } } -IMPL_LINK_TYPED( SwDBTreeList, DBCompare, const SvSortData&, rData, sal_Int32 ) +IMPL_LINK( SwDBTreeList, DBCompare, const SvSortData&, rData, sal_Int32 ) { SvTreeListEntry* pRight = const_cast<SvTreeListEntry*>(rData.pRight); diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index f83659b7a3d0..85fc4988feb3 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -225,7 +225,7 @@ void SwAddressPreview::Resize() positionScrollBar(); } -IMPL_LINK_NOARG_TYPED(SwAddressPreview, ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(SwAddressPreview, ScrollHdl, ScrollBar*, void) { Invalidate(); } diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 44317c4085a5..e119d5f790ce 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -41,7 +41,7 @@ class MMCurrentEntryController : public svt::ToolboxController, public lang::XSe { VclPtr<Edit> m_pCurrentEdit; - DECL_LINK_TYPED(CurrentEditUpdatedHdl, Edit&, void); + DECL_LINK(CurrentEditUpdatedHdl, Edit&, void); public: explicit MMCurrentEntryController(const uno::Reference<uno::XComponentContext>& rContext) @@ -106,7 +106,7 @@ class MMExcludeEntryController : public svt::ToolboxController, public lang::XSe { VclPtr<CheckBox> m_pExcludeCheckbox; - DECL_STATIC_LINK_TYPED(MMExcludeEntryController, ExcludeHdl, CheckBox&, void); + DECL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, CheckBox&, void); public: explicit MMExcludeEntryController(const uno::Reference<uno::XComponentContext>& rContext) @@ -191,7 +191,7 @@ uno::Reference<awt::XWindow> MMCurrentEntryController::createItemWindow(const un return uno::Reference<awt::XWindow>(VCLUnoHelper::GetInterface(m_pCurrentEdit)); } -IMPL_LINK_TYPED(MMCurrentEntryController, CurrentEditUpdatedHdl, Edit&, rEdit, void) +IMPL_LINK(MMCurrentEntryController, CurrentEditUpdatedHdl, Edit&, rEdit, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem; @@ -262,7 +262,7 @@ uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const un return uno::Reference<awt::XWindow>(VCLUnoHelper::GetInterface(m_pExcludeCheckbox)); } -IMPL_STATIC_LINK_TYPED(MMExcludeEntryController, ExcludeHdl, CheckBox&, rCheckbox, void) +IMPL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, CheckBox&, rCheckbox, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem; diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx index df7ae60cf74d..6bd43d628e78 100644 --- a/sw/source/uibase/dialog/regionsw.cxx +++ b/sw/source/uibase/dialog/regionsw.cxx @@ -174,7 +174,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) } } -IMPL_LINK_TYPED( SwWrtShell, InsertRegionDialog, void*, p, void ) +IMPL_LINK( SwWrtShell, InsertRegionDialog, void*, p, void ) { SwSectionData* pSect = static_cast<SwSectionData*>(p); std::unique_ptr<SwSectionData> xSectionData(pSect); diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 54348396cb19..c443ccfe5763 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -501,7 +501,7 @@ void SwHeaderFooterWin::Select() ExecuteCommand(GetCurItemId()); } -IMPL_LINK_NOARG_TYPED(SwHeaderFooterWin, FadeHandler, Timer *, void) +IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler, Timer *, void) { if (m_bIsAppearing && m_nFadeRate > 0) m_nFadeRate -= 25; diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index a7fdc12835a6..a081b8ed19b5 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -430,14 +430,14 @@ void SwPageBreakWin::Fade( bool bFadeIn ) m_aFadeTimer.Start( ); } -IMPL_LINK_NOARG_TYPED(SwPageBreakWin, HideHandler, Menu *, bool) +IMPL_LINK_NOARG(SwPageBreakWin, HideHandler, Menu *, bool) { Fade( false ); return false; } -IMPL_LINK_NOARG_TYPED(SwPageBreakWin, FadeHandler, Timer *, void) +IMPL_LINK_NOARG(SwPageBreakWin, FadeHandler, Timer *, void) { const int TICKS_BEFORE_WE_APPEAR = 10; if ( m_bIsAppearing && m_nDelayAppearing < TICKS_BEFORE_WE_APPEAR ) diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 962755d3ea51..e09dc6ab34cc 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1965,7 +1965,7 @@ void SwPostItMgr::SetActiveSidebarWin( SwSidebarWin* p) } } -IMPL_LINK_NOARG_TYPED( SwPostItMgr, CalcHdl, void*, void ) +IMPL_LINK_NOARG( SwPostItMgr, CalcHdl, void*, void ) { mnEventId = nullptr; if ( mbLayouting ) diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index 9a21fe6522c5..5ec2a0580d8a 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -362,7 +362,7 @@ void SidebarTextControl::MouseButtonUp( const MouseEvent& rMEvt ) GetTextView()->MouseButtonUp( rMEvt ); } -IMPL_LINK_TYPED( SidebarTextControl, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void ) +IMPL_LINK( SidebarTextControl, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void ) { if ( rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG ) { diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx index e290a87c2d2e..f6e49a4d508a 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx @@ -64,7 +64,7 @@ class SidebarTextControl : public Control OutlinerView* GetTextView() const; - DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void ); + DECL_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index 87f30a65ee21..ffc62edf5049 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -55,7 +55,7 @@ class SidebarTextEditSource : public SvxEditSource, virtual void UpdateData() override; virtual SfxBroadcaster& GetBroadcaster() const override; - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); private: SidebarTextControl& mrSidebarTextControl; @@ -113,7 +113,7 @@ SfxBroadcaster& SidebarTextEditSource::GetBroadcaster() const return *( const_cast< SidebarTextEditSource* > (this) ); } -IMPL_LINK_TYPED(SidebarTextEditSource, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(SidebarTextEditSource, NotifyHdl, EENotify&, rNotify, void) { std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( &rNotify ) ); diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index c1560832a43d..cbccdcc21a1f 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1360,7 +1360,7 @@ void SwSidebarWin::SwitchToPostIt(sal_uInt16 aDirection) pPostIt->GrabFocus(); } -IMPL_LINK_TYPED( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) { if ( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE ) { @@ -1417,18 +1417,18 @@ void SwSidebarWin::Delete() } } -IMPL_LINK_TYPED(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll, void) +IMPL_LINK(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll, void) { long nDiff = GetOutlinerView()->GetEditView().GetVisArea().Top() - pScroll->GetThumbPos(); GetOutlinerView()->Scroll( 0, nDiff ); } -IMPL_LINK_NOARG_TYPED(SwSidebarWin, ModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl, LinkParamNone*, void) { mrView.GetDocShell()->SetModified(); } -IMPL_LINK_NOARG_TYPED(SwSidebarWin, DeleteHdl, void*, void) +IMPL_LINK_NOARG(SwSidebarWin, DeleteHdl, void*, void) { mnEventId = nullptr; Delete(); diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index f38daa7324a9..4a496dacba7d 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -476,7 +476,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) return DND_ACTION_NONE; } -IMPL_LINK_NOARG_TYPED(SwEditWin, DDHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, DDHandler, Timer *, void) { g_bDDTimerStarted = false; m_aTimer.Stop(); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index bf319f586943..a32e294d42f4 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -625,7 +625,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) /** * Increase timer for selection */ -IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, TimerHandler, Timer *, void) { SwWrtShell &rSh = m_rView.GetWrtShell(); Point aModPt( m_aMovePos ); @@ -5907,12 +5907,12 @@ static SfxShell* lcl_GetTextShellFromDispatcher( SwView& rView ) return pShell; } -IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputFlushHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, KeyInputFlushHandler, Timer *, void) { FlushInBuffer(); } -IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputTimerHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, KeyInputTimerHandler, Timer *, void) { m_bTableInsDelMode = false; } @@ -5934,7 +5934,7 @@ void SwEditWin::StopQuickHelp() m_pQuickHlpData->Stop( m_rView.GetWrtShell() ); } -IMPL_LINK_NOARG_TYPED(SwEditWin, TemplateTimerHdl, Idle *, void) +IMPL_LINK_NOARG(SwEditWin, TemplateTimerHdl, Idle *, void) { SetApplyTemplate(SwApplyTemplate()); } diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 6b34e90133e9..4998f49882db 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -573,7 +573,7 @@ void SwSrcEditWindow::InitScrollBars() } -IMPL_LINK_TYPED(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) +IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) { if(pScroll == m_pVScrollbar) { @@ -592,7 +592,7 @@ IMPL_LINK_TYPED(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) GetSrcView()->GetViewFrame()->GetBindings().Invalidate( SID_TABLE_CELL ); } -IMPL_LINK_TYPED( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle, void ) +IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle, void ) { tools::Time aSyntaxCheckStart( tools::Time::SYSTEM ); SAL_WARN_IF(m_pTextView == nullptr, "sw", "No View yet, but syntax highlighting?!"); diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index 8a446b80af98..1237d50a3076 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -79,7 +79,7 @@ void SwSyncBtnDlg::dispose() SfxFloatingWindow::dispose(); } -IMPL_STATIC_LINK_NOARG_TYPED(SwSyncBtnDlg, BtnHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SwSyncBtnDlg, BtnHdl, Button*, void) { SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SfxCallMode::ASYNCHRON); } diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index 5c35092b4cdb..f2fee6e4c260 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -46,7 +46,7 @@ SwChildWinWrapper::SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId) m_aUpdateTimer.SetTimeoutHdl(LINK(this, SwChildWinWrapper, UpdateHdl)); } -IMPL_LINK_NOARG_TYPED(SwChildWinWrapper, UpdateHdl, Timer *, void) +IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl, Timer *, void) { GetWindow()->Activate(); // update dialog } diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index 7b18b6bc918c..d670afb55c70 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -43,9 +43,9 @@ class DropDownFieldDialog : public SvxStandardDialog SwWrtShell &rSh; SwDropDownField* pDropField; - DECL_LINK_TYPED(ButtonHdl, Button*, void); + DECL_LINK(ButtonHdl, Button*, void); virtual void Apply() override; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); public: DropDownFieldDialog( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton ); diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 9a451b9a0bdf..6e9fec7be6a1 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -50,7 +50,7 @@ public: void SetReadonly( bool bReadonly ) override; private: - DECL_LINK_TYPED( FadeHandler, Timer *, void ); + DECL_LINK( FadeHandler, Timer *, void ); }; #endif diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 8d2ff93610ae..0f2e7dc8a04f 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -53,8 +53,8 @@ public: private: /// Hide the button (used when the popup menu is closed by clicking outside) - DECL_LINK_TYPED( HideHandler, Menu *, bool ); - DECL_LINK_TYPED( FadeHandler, Timer *, void ); + DECL_LINK( HideHandler, Menu *, bool ); + DECL_LINK( FadeHandler, Timer *, void ); }; #endif diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index c85a0ca5fff3..99fbba32833f 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -42,8 +42,8 @@ class SwAsciiFilterDlg : public SfxModalDialog VclPtr<RadioButton> m_pLF_RB; bool m_bSaveLineStatus; - DECL_LINK_TYPED( CharSetSelHdl, ListBox&, void ); - DECL_LINK_TYPED( LineEndHdl, RadioButton&, void ); + DECL_LINK( CharSetSelHdl, ListBox&, void ); + DECL_LINK( LineEndHdl, RadioButton&, void ); void SetCRLF( LineEnd eEnd ); LineEnd GetCRLF() const; diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx index 694ccc47ec7d..52133ede7095 100644 --- a/sw/source/uibase/inc/basesh.hxx +++ b/sw/source/uibase/inc/basesh.hxx @@ -50,7 +50,7 @@ class SwBaseShell: public SfxShell // Update-Timer for graphic std::set<sal_uInt16> aGrfUpdateSlots; - DECL_LINK_TYPED( GraphicArrivedHdl, SwCursorShell&, void ); + DECL_LINK( GraphicArrivedHdl, SwCursorShell&, void ); protected: SwWrtShell& GetShell(); @@ -60,7 +60,7 @@ protected: inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } inline bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } - DECL_LINK_TYPED( InsertDBTextHdl, void*, void ); + DECL_LINK( InsertDBTextHdl, void*, void ); void InsertURLButton( const OUString& rURL, const OUString& rTarget, const OUString& rText ); void InsertTable( SfxRequest& _rRequest ); diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index c7fbd5c5b53b..9d6d471222d9 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -63,13 +63,13 @@ class SwInsertBookmarkDlg: public SvxStandardDialog std::vector<std::pair<sw::mark::IMark*, OUString>> aTableBookmarks; sal_Int32 m_nLastBookmarksCount; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(InsertHdl, Button*, void); - DECL_LINK_TYPED(DeleteHdl, Button*, void); - DECL_LINK_TYPED(RenameHdl, Button*, void); - DECL_LINK_TYPED(GotoHdl, Button*, void); - DECL_LINK_TYPED(SelectionChangedHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(DoubleClickHdl, SvTreeListBox*, bool); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(InsertHdl, Button*, void); + DECL_LINK(DeleteHdl, Button*, void); + DECL_LINK(RenameHdl, Button*, void); + DECL_LINK(GotoHdl, Button*, void); + DECL_LINK(SelectionChangedHdl, SvTreeListBox*, void); + DECL_LINK(DoubleClickHdl, SvTreeListBox*, bool); // Fill table with bookmarks void PopulateTable(); diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index e77362b66603..822e0e436bde 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -51,11 +51,11 @@ class SwBreakDlg: public SvxStandardDialog bool bHtmlMode; - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( PageNumHdl, Button*, void ); - DECL_LINK_TYPED(PageNumModifyHdl, Edit&, void); - DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( PageNumHdl, Button*, void ); + DECL_LINK(PageNumModifyHdl, Edit&, void); + DECL_LINK(OkHdl, Button*, void); void CheckEnable(); diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index cc742de2f208..0696c1ff456f 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -45,9 +45,9 @@ class SwChangeDBDlg: public SvxStandardDialog SwWrtShell *pSh; - DECL_LINK_TYPED(TreeSelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(ButtonHdl, Button*, void); - DECL_LINK_TYPED(AddDBHdl, Button*, void); + DECL_LINK(TreeSelectHdl, SvTreeListBox*, void); + DECL_LINK(ButtonHdl, Button*, void); + DECL_LINK(AddDBHdl, Button*, void); virtual void Apply() override; void UpdateFields(); diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx index ac457f1f8a31..7f0b46e4f13e 100644 --- a/sw/source/uibase/inc/chldwrap.hxx +++ b/sw/source/uibase/inc/chldwrap.hxx @@ -29,7 +29,7 @@ class SwChildWinWrapper : public SfxChildWindow Timer m_aUpdateTimer; SwDocShell* m_pDocSh; - DECL_LINK_TYPED( UpdateHdl, Timer*, void ); + DECL_LINK( UpdateHdl, Timer*, void ); // Implementation in fldtdlg.cxx protected: diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 97534091109f..5a955aa3dd60 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -70,8 +70,8 @@ class SwCharURLPage : public SfxTabPage SvxMacroItem* pINetItem; bool bModified; - DECL_LINK_TYPED(InsertFileHdl, Button*, void); - DECL_LINK_TYPED(EventHdl, Button*, void); + DECL_LINK(InsertFileHdl, Button*, void); + DECL_LINK(EventHdl, Button*, void); public: SwCharURLPage( vcl::Window* pParent, diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 446221c6681e..bbaaef6cad08 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -60,8 +60,8 @@ class SwColumnDlg : public SfxModalDialog bool bSelSectionChanged : 1; bool bFrameChanged : 1; - DECL_LINK_TYPED(ObjectListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK(ObjectListBoxHdl, ListBox&, void); + DECL_LINK(OkHdl, Button*, void); void ObjectHdl(ListBox*); public: @@ -135,17 +135,17 @@ class SwColumnPage : public SfxTabPage bool m_bLockUpdate; // Handler - DECL_LINK_TYPED( ColModify, Edit&, void ); + DECL_LINK( ColModify, Edit&, void ); void ColModify(NumericField*); - DECL_LINK_TYPED( GapModify, Edit&, void ); - DECL_LINK_TYPED( EdModify, Edit&, void ); - DECL_LINK_TYPED( AutoWidthHdl, Button *, void ); - DECL_LINK_TYPED( SetDefaultsHdl, ValueSet *, void ); - - DECL_LINK_TYPED( Up, Button *, void ); - DECL_LINK_TYPED( Down, Button *, void ); - DECL_LINK_TYPED( UpdateColMgr, Edit&, void ); - DECL_LINK_TYPED( UpdateColMgrListBox, ListBox&, void ); + DECL_LINK( GapModify, Edit&, void ); + DECL_LINK( EdModify, Edit&, void ); + DECL_LINK( AutoWidthHdl, Button *, void ); + DECL_LINK( SetDefaultsHdl, ValueSet *, void ); + + DECL_LINK( Up, Button *, void ); + DECL_LINK( Down, Button *, void ); + DECL_LINK( UpdateColMgr, Edit&, void ); + DECL_LINK( UpdateColMgrListBox, ListBox&, void ); void Timeout(); void Update(MetricField *pInteractiveField); diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 3138f90c873c..9598b76e6999 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -212,8 +212,8 @@ public: const SwWrtShell* GetActiveWrtShell() {return m_pActiveShell;} SwWrtShell* GetHiddenWrtShell() {return m_pHiddenShell;} - DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( TimerUpdate, Timer *, void ); + DECL_LINK( ContentDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( TimerUpdate, Timer *, void ); virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) override; virtual void RequestingChildren( SvTreeListEntry* pParent ) override; @@ -269,7 +269,7 @@ private: void InsertRegion( const SwGlblDocContent* _pContent, const css::uno::Sequence< OUString >& _rFiles ); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); using SvTreeListBox::DoubleClickHdl; using SvTreeListBox::ExecuteDrop; @@ -312,9 +312,9 @@ protected: void Clear(); - DECL_LINK_TYPED( PopupHdl, Menu*, bool ); - DECL_LINK_TYPED( Timeout, Timer*, void ); - DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( PopupHdl, Menu*, bool ); + DECL_LINK( Timeout, Timer*, void ); + DECL_LINK( DoubleClickHdl, SvTreeListBox*, bool ); SwNavigationPI* GetParentWindow(); @@ -324,7 +324,7 @@ protected: static const SfxObjectShell* GetShowShell() {return pShowShell;} static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} - DECL_STATIC_LINK_TYPED(SwGlobalTree, ShowFrameHdl, void*, void); + DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, void*, void); virtual VclPtr<PopupMenu> CreateContextMenu() override; virtual void ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) override; diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index d8bfbebd406b..d28bd47cc4b8 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -55,10 +55,10 @@ class SwConvertTableDlg: public SfxModalDialog SwTableAutoFormat* pTAutoFormat; SwWrtShell* pShell; - DECL_LINK_TYPED( AutoFormatHdl, Button*, void ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button* = nullptr, void ); - DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void ); + DECL_LINK( AutoFormatHdl, Button*, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( CheckBoxHdl, Button* = nullptr, void ); + DECL_LINK( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void ); public: SwConvertTableDlg( SwView& rView, bool bToTable ); diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 36b5d2c98226..75d664c1a60d 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -93,11 +93,11 @@ class SwCaptionDialog : public SvxStandardDialog css::uno::Reference< css::container::XNameAccess > xNameAccess; - DECL_LINK_TYPED(SelectHdl, ComboBox&, void); - DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(OptionHdl, Button *, void); - DECL_LINK_TYPED(CaptionHdl, Button *, void); + DECL_LINK(SelectHdl, ComboBox&, void); + DECL_LINK(SelectListBoxHdl, ListBox&, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(OptionHdl, Button *, void); + DECL_LINK(CaptionHdl, Button *, void); virtual void Apply() override; diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index d7d9bf953d79..ef71b6492e9e 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -132,14 +132,14 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem SwTableRep* pRep; sal_Int32 nGBFormatLen; - DECL_LINK_TYPED( PageHdl, Button*, void ); - DECL_LINK_TYPED( AutoFormatHdl, Button*, void ); - DECL_LINK_TYPED( TableFormatHdl, Button*, void ); - DECL_LINK_TYPED( DBFormatHdl, Button*, void ); - DECL_LINK_TYPED( TableToFromHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); - DECL_LINK_TYPED( HeaderHdl, Button*, void ); + DECL_LINK( PageHdl, Button*, void ); + DECL_LINK( AutoFormatHdl, Button*, void ); + DECL_LINK( TableFormatHdl, Button*, void ); + DECL_LINK( DBFormatHdl, Button*, void ); + DECL_LINK( TableToFromHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); + DECL_LINK( HeaderHdl, Button*, void ); bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField ); using SfxModalDialog::Notify; diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index a12a0f7fddb5..fb94bc51aa86 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox SwDBTreeList_Impl* pImpl; - DECL_DLLPRIVATE_LINK_TYPED( DBCompare, const SvSortData&, sal_Int32 ); + DECL_DLLPRIVATE_LINK( DBCompare, const SvSortData&, sal_Int32 ); SAL_DLLPRIVATE void InitTreeList(); SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ) override; diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index 3a66f8bc4637..61393659cc51 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -33,7 +33,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; - DECL_LINK_TYPED( OkHdl, Button *, void ); + DECL_LINK( OkHdl, Button *, void ); public: SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh ); diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index ef9505685598..a238c1c2b7f1 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -40,7 +40,7 @@ protected: virtual bool FillItemSet( SfxItemSet *rSet) override; virtual void Reset (const SfxItemSet *rSet) override; - DECL_LINK_TYPED(UpdateHdl, Button*, void); + DECL_LINK(UpdateHdl, Button*, void); private: VclPtr<FixedText> m_pPageNo; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index ca92eb943f5f..c5e698b926f3 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -69,10 +69,10 @@ friend class SwDropCapsPict; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; void FillSet( SfxItemSet &rSet ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( WholeWordHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( WholeWordHdl, Button*, void ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx index 9ae0f9fd28a3..65565443dd66 100644 --- a/sw/source/uibase/inc/drwbassh.hxx +++ b/sw/source/uibase/inc/drwbassh.hxx @@ -30,8 +30,8 @@ struct SvxSwFrameValidation; class SwDrawBaseShell: public SwBaseShell { - DECL_LINK_TYPED( CheckGroupShapeNameHdl, AbstractSvxObjectNameDialog&, bool ); - DECL_LINK_TYPED(ValidatePosition, SvxSwFrameValidation&, void ); + DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxObjectNameDialog&, bool ); + DECL_LINK(ValidatePosition, SvxSwFrameValidation&, void ); public: SwDrawBaseShell(SwView &rShell); virtual ~SwDrawBaseShell() override; diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index a988735e88ac..bc390609a41b 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -167,19 +167,19 @@ friend void PageNumNotify( SwViewShell* pVwSh, * The selection is regularly increased towards the mouse * position. */ - DECL_LINK_TYPED( TimerHandler, Timer *, void ); + DECL_LINK( TimerHandler, Timer *, void ); void StartDDTimer(); void StopDDTimer(SwWrtShell *, const Point &); - DECL_LINK_TYPED( DDHandler, Timer *, void ); + DECL_LINK( DDHandler, Timer *, void ); // timer for ANY-KeyInut question without a following KeyInputEvent - DECL_LINK_TYPED( KeyInputFlushHandler, Timer *, void ); + DECL_LINK( KeyInputFlushHandler, Timer *, void ); // timer for overlapping KeyInputs (e.g. for tables) - DECL_LINK_TYPED( KeyInputTimerHandler, Timer *, void ); + DECL_LINK( KeyInputTimerHandler, Timer *, void ); // timer for ApplyTemplates via mouse (in disguise Drag&Drop) - DECL_LINK_TYPED( TemplateTimerHdl, Idle *, void ); + DECL_LINK( TemplateTimerHdl, Idle *, void ); void MoveCursor( SwWrtShell &rSh, const Point& rDocPos, const bool bOnlyText, bool bLockView ); diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 33edd2b73acb..d454715ec010 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -90,9 +90,9 @@ class SwEnvPage : public SfxTabPage SwWrtShell* pSh; OUString sActDBName; - DECL_LINK_TYPED( DatabaseHdl, ListBox&, void ); - DECL_LINK_TYPED(FieldHdl, Button*, void ); - DECL_LINK_TYPED(SenderHdl, Button*, void ); + DECL_LINK( DatabaseHdl, ListBox&, void ); + DECL_LINK(FieldHdl, Button*, void ); + DECL_LINK(SenderHdl, Button*, void ); void InitDatabaseBox(); diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index 7673e6231e59..54e8b05df01a 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -32,8 +32,8 @@ class SwFieldEditDlg : public SfxSingleTabDialog VclPtr<PushButton> m_pNextBT; VclPtr<PushButton> m_pAddressBT; - DECL_LINK_TYPED(AddressHdl, Button *, void); - DECL_LINK_TYPED(NextPrevHdl, Button *, void); + DECL_LINK(AddressHdl, Button *, void); + DECL_LINK(NextPrevHdl, Button *, void); void Init(); VclPtr<SfxTabPage> CreatePage(sal_uInt16 nGroup); @@ -45,7 +45,7 @@ public: virtual ~SwFieldEditDlg() override; virtual void dispose() override; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); virtual short Execute() override; diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index fd4de61d23c2..59972d880000 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -50,8 +50,8 @@ public: SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent); virtual ~SwFieldDlg() override; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(CancelHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(CancelHdl, Button*, void); void Initialize(SfxChildWinInfo *pInfo); void ReInitDlg(); diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 7978ef994198..cd49e402dbad 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -130,26 +130,26 @@ class SwFramePage: public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; - DECL_LINK_TYPED(RangeModifyLoseFocusHdl, Control&, void); - DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); + DECL_LINK(RangeModifyLoseFocusHdl, Control&, void); + DECL_LINK(RangeModifyClickHdl, Button*, void); void RangeModifyHdl(); - DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); - DECL_LINK_TYPED( PosHdl, ListBox&, void ); - DECL_LINK_TYPED( RelHdl, ListBox&, void ); + DECL_LINK(AnchorTypeHdl, Button*, void); + DECL_LINK( PosHdl, ListBox&, void ); + DECL_LINK( RelHdl, ListBox&, void ); void InitPos(RndStdIds eId, sal_Int16 nH, sal_Int16 nHRel, sal_Int16 nV, sal_Int16 nVRel, long nX, long nY); - DECL_LINK_TYPED(RealSizeHdl, Button *, void); - DECL_LINK_TYPED( RelSizeClickHdl, Button *, void ); - DECL_LINK_TYPED(MirrorHdl, Button *, void); + DECL_LINK(RealSizeHdl, Button *, void); + DECL_LINK( RelSizeClickHdl, Button *, void ); + DECL_LINK(MirrorHdl, Button *, void); - DECL_LINK_TYPED( AutoWidthClickHdl, Button *, void); - DECL_LINK_TYPED( AutoHeightClickHdl, Button *, void); + DECL_LINK( AutoWidthClickHdl, Button *, void); + DECL_LINK( AutoHeightClickHdl, Button *, void); // update example void UpdateExample(); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); void Init(const SfxItemSet& rSet, bool bReset = false); // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous @@ -223,8 +223,8 @@ class SwGrfExtPage: public SfxTabPage bool bHtmlMode; // handler for mirroring - DECL_LINK_TYPED(MirrorHdl, Button*, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); + DECL_LINK(MirrorHdl, Button*, void); + DECL_LINK(BrowseHdl, Button*, void); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual ~SwGrfExtPage() override; @@ -255,7 +255,7 @@ class SwFrameURLPage : public SfxTabPage VclPtr<CheckBox> pServerCB; VclPtr<CheckBox> pClientCB; - DECL_LINK_TYPED(InsertFileHdl, Button*, void); + DECL_LINK(InsertFileHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -304,8 +304,8 @@ class SwFrameAddPage : public SfxTabPage bool m_bFormat; bool m_bNew; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); - DECL_LINK_TYPED(ChainModifyHdl, ListBox&, void); + DECL_LINK(EditModifyHdl, Edit&, void); + DECL_LINK(ChainModifyHdl, ListBox&, void); static const sal_uInt16 aAddPgRg[]; diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index 34cf12a19cda..eb2ca5888665 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -86,12 +86,12 @@ class SwGlossaryGroupDlg : public SvxStandardDialog protected: virtual void Apply() override; - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( NewHdl, Button *, void ); - DECL_LINK_TYPED( DeleteHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( RenameHdl, Button *, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( NewHdl, Button *, void ); + DECL_LINK( DeleteHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( ModifyListBoxHdl, ListBox&, void ); + DECL_LINK( RenameHdl, Button *, void ); public: SwGlossaryGroupDlg(vcl::Window * pParent, diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index bbf7f1fc57e7..9cefe618c554 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -125,17 +125,17 @@ class SwGlossaryDlg : public SvxStandardDialog void EnableShortName(bool bOn = true); void ShowPreview(); - DECL_LINK_TYPED( NameModify, Edit&, void ); - DECL_LINK_TYPED( NameDoubleClick, SvTreeListBox*, bool ); - DECL_LINK_TYPED( GrpSelect, SvTreeListBox *, void ); - DECL_LINK_TYPED( MenuHdl, Menu *, bool ); - DECL_LINK_TYPED( EnableHdl, Menu *, bool ); - DECL_LINK_TYPED( BibHdl, Button *, void ); - DECL_LINK_TYPED( EditHdl, MenuButton *, void ); - DECL_LINK_TYPED( InsertHdl, Button *, void ); - DECL_LINK_TYPED( PathHdl, Button *, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( PreviewLoadedHdl, SwOneExampleFrame&, void ); + DECL_LINK( NameModify, Edit&, void ); + DECL_LINK( NameDoubleClick, SvTreeListBox*, bool ); + DECL_LINK( GrpSelect, SvTreeListBox *, void ); + DECL_LINK( MenuHdl, Menu *, bool ); + DECL_LINK( EnableHdl, Menu *, bool ); + DECL_LINK( BibHdl, Button *, void ); + DECL_LINK( EditHdl, MenuButton *, void ); + DECL_LINK( InsertHdl, Button *, void ); + DECL_LINK( PathHdl, Button *, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( PreviewLoadedHdl, SwOneExampleFrame&, void ); virtual void Apply() override; void Init(); diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index 1c75245edf55..505ed6d52958 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -49,7 +49,7 @@ class SwFieldInputDlg: public SvxStandardDialog VclPtr<OKButton> m_pOKBT; VclPtr<PushButton> m_pNextBT; - DECL_LINK_TYPED(NextHdl, Button*, void); + DECL_LINK(NextHdl, Button*, void); public: SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton ); diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 0f999eb61565..8f1249d7800b 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -66,15 +66,15 @@ friend class InputEdit; void CleanupUglyHackWithUndo(); void DelBoxContent(); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); using Window::IsActive; protected: virtual void Resize() override; virtual void Click() override; - DECL_LINK_TYPED( MenuHdl, Menu *, bool ); - DECL_LINK_TYPED( DropdownClickHdl, ToolBox*, void ); + DECL_LINK( MenuHdl, Menu *, bool ); + DECL_LINK( DropdownClickHdl, ToolBox*, void ); void ApplyFormula(); void CancelFormula(); @@ -87,7 +87,7 @@ public: void ShowWin(); - DECL_LINK_TYPED( SelTableCellsNotify, SwWrtShell&, void ); + DECL_LINK( SelTableCellsNotify, SwWrtShell&, void ); void SetFormula( const OUString& rFormula ); const SwView* GetView() const{return pView;} diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index f8c24464d0ab..9f83638fd88d 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -54,11 +54,11 @@ class SwInsFootNoteDlg: public SvxStandardDialog VclPtr<PushButton> m_pPrevBT; VclPtr<PushButton> m_pNextBT; - DECL_LINK_TYPED(NumberCharHdl, Button *, void); - DECL_LINK_TYPED(NumberEditHdl, Edit&, void); - DECL_LINK_TYPED(NumberAutoBtnHdl, Button *, void); - DECL_LINK_TYPED(NumberExtCharHdl, Button *, void); - DECL_LINK_TYPED(NextPrevHdl, Button *, void); + DECL_LINK(NumberCharHdl, Button *, void); + DECL_LINK(NumberEditHdl, Edit&, void); + DECL_LINK(NumberAutoBtnHdl, Button *, void); + DECL_LINK(NumberExtCharHdl, Button *, void); + DECL_LINK(NextPrevHdl, Button *, void); virtual void Apply() override; diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index 51523e42b8a5..c1698b02654a 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -55,13 +55,13 @@ class SwInsTableDlg : public SfxModalDialog SwTableAutoFormat* pTAutoFormat; sal_Int64 nEnteredValRepeatHeaderNF; - DECL_LINK_TYPED( ModifyName, Edit&, void ); - DECL_LINK_TYPED( ModifyRowCol, Edit&, void ); - DECL_LINK_TYPED( AutoFormatHdl, Button*, void ); - DECL_LINK_TYPED( OKHdl, Button*, void); - DECL_LINK_TYPED( CheckBoxHdl, Button* = nullptr, void); - DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void); - DECL_LINK_TYPED( ModifyRepeatHeaderNF_Hdl, Edit&, void ); + DECL_LINK( ModifyName, Edit&, void ); + DECL_LINK( ModifyRowCol, Edit&, void ); + DECL_LINK( AutoFormatHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void); + DECL_LINK( CheckBoxHdl, Button* = nullptr, void); + DECL_LINK( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void); + DECL_LINK( ModifyRepeatHeaderNF_Hdl, Edit&, void ); public: SwInsTableDlg( SwView& rView ); diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index 14d1a4b8ff9c..22b8c4ce7c4f 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -55,12 +55,12 @@ private: SwWrtShell* pSh; sfx2::FileDialogHelper* pFileDlg; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(PrevHdl, Button*, void); - DECL_LINK_TYPED(NextHdl, Button*, void); - DECL_LINK_TYPED(RadioButtonHdl, Button*, void); - DECL_LINK_TYPED(InsertFileHdl, Button *, void); - DECL_LINK_TYPED(DlgClosedHdl, sfx2::FileDialogHelper *, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(PrevHdl, Button*, void); + DECL_LINK(NextHdl, Button*, void); + DECL_LINK(RadioButtonHdl, Button*, void); + DECL_LINK(InsertFileHdl, Button *, void); + DECL_LINK(DlgClosedHdl, sfx2::FileDialogHelper *, void); virtual void Apply() override; diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index 387b2b647197..92dcf8eaf616 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -48,9 +48,9 @@ private: VclPtr<CheckBox> m_pRestartEachPageCB; VclPtr<CheckBox> m_pNumberingOnCB; VclPtr<CheckBox> m_pNumberingOnFooterHeader; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(LineOnOffHdl, Button* = nullptr, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(LineOnOffHdl, Button* = nullptr, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SwLineNumberingDlg(SwView *pVw); diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index f00b0a55caf0..063712110d89 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -50,9 +50,9 @@ class SwMailConfigPage : public SfxTabPage SwMailMergeConfigItem* m_pConfigItem; - DECL_LINK_TYPED(ReplyToHdl, Button*, void); - DECL_LINK_TYPED(AuthenticationHdl, Button*, void); - DECL_LINK_TYPED(TestHdl, Button*, void); + DECL_LINK(ReplyToHdl, Button*, void); + DECL_LINK(AuthenticationHdl, Button*, void); + DECL_LINK(TestHdl, Button*, void); public: SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index cb9b4a20789b..11f5c00ded6e 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -73,7 +73,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window virtual void StateChanged( StateChangedType nStateChange ) override; void UpdateScrollBar(); - DECL_LINK_TYPED(ScrollHdl, ScrollBar*,void); + DECL_LINK(ScrollHdl, ScrollBar*,void); public: SwAddressPreview(vcl::Window* pParent, WinBits nStyle); diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index a0d801fb7654..d2a9d2bc2856 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -105,12 +105,12 @@ class SwMailMergeDlg : public SvxStandardDialog OUString m_sSaveFilter; OUString m_sFilename; - DECL_LINK_TYPED( ButtonHdl, Button*, void ); - DECL_LINK_TYPED( InsertPathHdl, Button*, void ); - DECL_LINK_TYPED( OutputTypeHdl, Button*, void ); - DECL_LINK_TYPED( FilenameHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SaveTypeHdl, Button*, void ); + DECL_LINK( ButtonHdl, Button*, void ); + DECL_LINK( InsertPathHdl, Button*, void ); + DECL_LINK( OutputTypeHdl, Button*, void ); + DECL_LINK( FilenameHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SaveTypeHdl, Button*, void ); virtual void Apply() override; bool ExecQryShell(); diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index 0134db097567..2d69df0f18af 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -31,7 +31,7 @@ class SwTOXMgr; // insert mark for index entry class SwMultiTOXMarkDlg : public SvxStandardDialog { - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); VclPtr<FixedText> m_pTextFT; VclPtr<ListBox> m_pTOXLB; diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index daeed3fc94f1..7e50ebf19aeb 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -100,18 +100,18 @@ class SwNavigationPI : public vcl::Window, void FillBox(); void MakeMark(); - DECL_LINK_TYPED( DocListBoxSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ToolBoxSelectHdl, ToolBox *, void ); - DECL_LINK_TYPED( ToolBoxClickHdl, ToolBox *, void ); - DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void ); - DECL_LINK_TYPED( EditAction, NumEditAction&, void ); - DECL_LINK_TYPED( EditGetFocus, Control&, void ); - DECL_LINK_TYPED( DoneLink, SfxPoolItem *, void ); - DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); - DECL_LINK_TYPED( ChangePageHdl, Idle*, void ); - DECL_LINK_TYPED( PageEditModifyHdl, SpinField&, void ); - DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( ClosePopupWindow, SfxPopupWindow *, void ); + DECL_LINK( DocListBoxSelectHdl, ListBox&, void ); + DECL_LINK( ToolBoxSelectHdl, ToolBox *, void ); + DECL_LINK( ToolBoxClickHdl, ToolBox *, void ); + DECL_LINK( ToolBoxDropdownClickHdl, ToolBox*, void ); + DECL_LINK( EditAction, NumEditAction&, void ); + DECL_LINK( EditGetFocus, Control&, void ); + DECL_LINK( DoneLink, SfxPoolItem *, void ); + DECL_LINK( MenuSelectHdl, Menu *, bool ); + DECL_LINK( ChangePageHdl, Idle*, void ); + DECL_LINK( PageEditModifyHdl, SpinField&, void ); + DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( ClosePopupWindow, SfxPopupWindow *, void ); void UsePage(); void InitImageList(); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 5d98778ee079..a93d2095692e 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -84,23 +84,23 @@ class SwNumPositionTabPage : public SfxTabPage void InitControls(); - DECL_LINK_TYPED( LevelHdl, ListBox&, void ); - DECL_LINK_TYPED(EditModifyHdl, ListBox&, void); - DECL_LINK_TYPED( DistanceHdl, SpinField&, void ); - DECL_LINK_TYPED( DistanceLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( RelativeHdl, Button*, void ); - DECL_LINK_TYPED(StandardHdl, Button*, void); + DECL_LINK( LevelHdl, ListBox&, void ); + DECL_LINK(EditModifyHdl, ListBox&, void); + DECL_LINK( DistanceHdl, SpinField&, void ); + DECL_LINK( DistanceLoseFocusHdl, Control&, void ); + DECL_LINK( RelativeHdl, Button*, void ); + DECL_LINK(StandardHdl, Button*, void); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); - DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ListtabPosHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( ListtabPosFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( AlignAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( AlignAtFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( IndentAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( IndentAtFocusHdl_Impl, Control&, void ); + DECL_LINK(LabelFollowedByHdl_Impl, ListBox&, void); + DECL_LINK( ListtabPosHdl_Impl, SpinField&, void ); + DECL_LINK( ListtabPosFocusHdl_Impl, Control&, void ); + DECL_LINK( AlignAtHdl_Impl, SpinField&, void ); + DECL_LINK( AlignAtFocusHdl_Impl, Control&, void ); + DECL_LINK( IndentAtHdl_Impl, SpinField&, void ); + DECL_LINK( IndentAtFocusHdl_Impl, Control&, void ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -144,7 +144,7 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog protected: virtual short Ok() override; virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; - DECL_LINK_TYPED(RemoveNumberingHdl, Button*, void); + DECL_LINK(RemoveNumberingHdl, Button*, void); public: SwSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 8214b6ddcb3f..d5c69e645599 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -38,7 +38,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox //to be shown in the number format dialog bool bUseAutomaticLanguage;//determine whether language is automatically assigned - DECL_DLLPRIVATE_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_DLLPRIVATE_LINK( SelectHdl, ListBox&, void ); SAL_DLLPRIVATE double GetDefValue(const short nFormatType) const; SAL_DLLPRIVATE void Init(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 1a2b9dbd18ad..a60dba1c0aa5 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -53,11 +53,11 @@ class SwParagraphNumTabPage : public SfxTabPage bool bModified : 1; bool bCurNumrule : 1; - DECL_LINK_TYPED(NewStartHdl_Impl, Button*, void); - DECL_LINK_TYPED( StyleHdl_Impl, ListBox&,void ); - DECL_LINK_TYPED(LineCountHdl_Impl, Button*, void); - DECL_LINK_TYPED(EditNumStyleHdl_Impl, Button*, void); - DECL_LINK_TYPED(EditNumStyleSelectHdl_Impl, ListBox&, void); + DECL_LINK(NewStartHdl_Impl, Button*, void); + DECL_LINK( StyleHdl_Impl, ListBox&,void ); + DECL_LINK(LineCountHdl_Impl, Button*, void); + DECL_LINK(EditNumStyleHdl_Impl, Button*, void); + DECL_LINK(EditNumStyleSelectHdl_Impl, ListBox&, void); static const sal_uInt16 aPageRg[]; diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 27119d3caad7..370abbd660ec 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -50,8 +50,8 @@ private: sal_uLong m_nSavedOptions; // handler - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(UseAsDefaultHdl, Button*, void); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(UseAsDefaultHdl, Button*, void); // private methods void InitControls( const SfxItemSet& rSet ); diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index e9ecea4448c4..829008b26a2a 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -59,8 +59,8 @@ private: sal_uInt16 m_nLastTab; sal_Int32 m_nOldLinkMode; - DECL_LINK_TYPED(MetricHdl, ListBox&, void); - DECL_LINK_TYPED(StandardizedPageCountCheckHdl, Button*, void); + DECL_LINK(MetricHdl, ListBox&, void); + DECL_LINK(StandardizedPageCountCheckHdl, Button*, void); public: SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -153,12 +153,12 @@ private: SwFieldMgr* pMgr; bool bHTMLMode; - DECL_LINK_TYPED(SelectHdl, ComboBox&, void); - DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED( OrderHdl, ListBox&, void ); - DECL_LINK_TYPED(ShowEntryHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(SaveEntryHdl, SvTreeListBox*, void); + DECL_LINK(SelectHdl, ComboBox&, void); + DECL_LINK(SelectListBoxHdl, ListBox&, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK( OrderHdl, ListBox&, void ); + DECL_LINK(ShowEntryHdl, SvTreeListBox*, void); + DECL_LINK(SaveEntryHdl, SvTreeListBox*, void); void DelUserData(); void SetOptions(const sal_uLong nPos, const SwCapObjType eType, const SvGlobalName *pOleId = nullptr); diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index bf7df696d0e4..a76a1fc27f93 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -60,7 +60,7 @@ class SwContentOptPage : public SfxTabPage VclPtr<FixedText> m_pMetricLabel; VclPtr<ListBox> m_pMetricLB; - DECL_LINK_TYPED(VertRulerHdl, Button*, void); + DECL_LINK(VertRulerHdl, Button*, void); public: SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwContentOptPage() override; @@ -105,8 +105,8 @@ class SwAddPrinterTabPage : public SfxTabPage bool bAttrModified; bool bPreview; - DECL_LINK_TYPED(AutoClickHdl, Button*, void); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); + DECL_LINK(AutoClickHdl, Button*, void); + DECL_LINK(SelectHdl, ListBox&, void); public: SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -172,10 +172,10 @@ class SwStdFontTabPage : public SfxTabPage OUString m_sScriptAsian; OUString m_sScriptComplex; - DECL_LINK_TYPED(StandardHdl, Button*, void ); - DECL_LINK_TYPED(ModifyHdl, Edit&, void ); - DECL_LINK_TYPED(ModifyHeightHdl, Edit&, void ); - DECL_LINK_TYPED(LoseFocusHdl, Control&, void ); + DECL_LINK(StandardHdl, Button*, void ); + DECL_LINK(ModifyHdl, Edit&, void ); + DECL_LINK(ModifyHeightHdl, Edit&, void ); + DECL_LINK(LoseFocusHdl, Control&, void ); SwStdFontTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwStdFontTabPage() override; @@ -218,7 +218,7 @@ class SwTableOptionsTabPage : public SfxTabPage SwWrtShell* m_pWrtShell; bool m_bHTMLMode; - DECL_LINK_TYPED(CheckBoxHdl, Button*, void); + DECL_LINK(CheckBoxHdl, Button*, void); public: SwTableOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -339,9 +339,9 @@ class SwRedlineOptionsTabPage : public SfxTabPage OUString sAuthor; OUString sNone; - DECL_LINK_TYPED(AttribHdl, ListBox&, void); - DECL_LINK_TYPED(ChangedMaskPrevHdl, ListBox&, void); - DECL_LINK_TYPED(ColorHdl, ListBox&, void); + DECL_LINK(AttribHdl, ListBox&, void); + DECL_LINK(ChangedMaskPrevHdl, ListBox&, void); + DECL_LINK(ColorHdl, ListBox&, void); static void InitFontStyle(SvxFontPrevWindow& rExampleWin); @@ -387,7 +387,7 @@ private: bool bAttrModified; void Init(); - DECL_LINK_TYPED(AutoClickHdl, Button*, void); + DECL_LINK(AutoClickHdl, Button*, void); }; #endif // DBG_UTIL @@ -402,8 +402,8 @@ class SwCompareOptionsTabPage : public SfxTabPage VclPtr<NumericField> m_pLenNF; VclPtr<CheckBox> m_pStoreRsidCB; - DECL_LINK_TYPED(ComparisonHdl, Button*, void); - DECL_LINK_TYPED(IgnoreHdl, Button*, void); + DECL_LINK(ComparisonHdl, Button*, void); + DECL_LINK(IgnoreHdl, Button*, void); public: SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index a6faad129f4c..0c8701f455aa 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -59,9 +59,9 @@ class SwOutlineTabDialog : public SfxTabDialog bool bModified : 1; protected: - DECL_LINK_TYPED(CancelHdl, Button*, void); - DECL_LINK_TYPED( FormHdl, Button *, void ); - DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); + DECL_LINK(CancelHdl, Button*, void); + DECL_LINK( FormHdl, Button *, void ); + DECL_LINK( MenuSelectHdl, Menu *, bool ); virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; virtual short Ok() override; @@ -102,14 +102,14 @@ class SwOutlineSettingsTabPage : public SfxTabPage OUString* pCollNames; sal_uInt16 nActLevel; - DECL_LINK_TYPED( LevelHdl, ListBox&, void ); - DECL_LINK_TYPED( ToggleComplete, Edit&, void ); - DECL_LINK_TYPED( CollSelect, ListBox&, void ); - DECL_LINK_TYPED( CollSelectGetFocus, Control&, void ); - DECL_LINK_TYPED( NumberSelect, ListBox&, void ); - DECL_LINK_TYPED( DelimModify, Edit&, void ); - DECL_LINK_TYPED( StartModified, Edit&, void ); - DECL_LINK_TYPED( CharFormatHdl, ListBox&, void ); + DECL_LINK( LevelHdl, ListBox&, void ); + DECL_LINK( ToggleComplete, Edit&, void ); + DECL_LINK( CollSelect, ListBox&, void ); + DECL_LINK( CollSelectGetFocus, Control&, void ); + DECL_LINK( NumberSelect, ListBox&, void ); + DECL_LINK( DelimModify, Edit&, void ); + DECL_LINK( StartModified, Edit&, void ); + DECL_LINK( CharFormatHdl, ListBox&, void ); void Update(); diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index b1f72c8f42cc..4ca6e8d8edc1 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -57,11 +57,11 @@ private: VclPtr<MetricField> m_pLineLengthEdit; VclPtr<MetricField> m_pLineDistEdit; - DECL_LINK_TYPED( HeightPage, Button*, void ); - DECL_LINK_TYPED( HeightMetric, Button*, void ); - DECL_LINK_TYPED( HeightModify, Control&, void ); - DECL_LINK_TYPED( LineWidthChanged_Impl, Edit&, void ); - DECL_LINK_TYPED( LineColorSelected_Impl, ListBox&, void ); + DECL_LINK( HeightPage, Button*, void ); + DECL_LINK( HeightMetric, Button*, void ); + DECL_LINK( HeightModify, Control&, void ); + DECL_LINK( LineWidthChanged_Impl, Edit&, void ); + DECL_LINK( LineColorSelected_Impl, ListBox&, void ); long lMaxHeight; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index f139b7376667..be73daec9483 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -71,14 +71,14 @@ class SwTextGridPage: public SfxTabPage void PutGridItem(SfxItemSet& rSet); static void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ); - DECL_LINK_TYPED(GridTypeHdl, Button*, void); - DECL_LINK_TYPED(CharorLineChangedHdl, SpinField&, void); - DECL_LINK_TYPED(CharorLineLoseFocusdHdl, Control&, void); - DECL_LINK_TYPED(TextSizeChangedHdl, SpinField&, void); - DECL_LINK_TYPED(TextSizeLoseFocusHdl, Control&, void); - DECL_LINK_TYPED(GridModifyHdl, ListBox&, void); - DECL_LINK_TYPED(GridModifyClickHdl, Button*, void); - DECL_LINK_TYPED(DisplayGridHdl, Button*, void); + DECL_LINK(GridTypeHdl, Button*, void); + DECL_LINK(CharorLineChangedHdl, SpinField&, void); + DECL_LINK(CharorLineLoseFocusdHdl, Control&, void); + DECL_LINK(TextSizeChangedHdl, SpinField&, void); + DECL_LINK(TextSizeLoseFocusHdl, Control&, void); + DECL_LINK(GridModifyHdl, ListBox&, void); + DECL_LINK(GridModifyClickHdl, Button*, void); + DECL_LINK(DisplayGridHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 2ddeee6ac546..4f62b6c1ca58 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -194,8 +194,8 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; SAL_DLLPRIVATE void CreateScrollbar( bool bHori); - DECL_DLLPRIVATE_LINK_TYPED(ScrollHdl, ScrollBar*, void); - DECL_DLLPRIVATE_LINK_TYPED(EndScrollHdl, ScrollBar*, void); + DECL_DLLPRIVATE_LINK(ScrollHdl, ScrollBar*, void); + DECL_DLLPRIVATE_LINK(EndScrollHdl, ScrollBar*, void); SAL_DLLPRIVATE bool ChgPage( int eMvMode, bool bUpdateScrollbar = true ); SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 7b55dfc1a3cd..ddd7f0007fd6 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -92,16 +92,16 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg Image m_aTableChgd; Image m_aFormatCollSet; - DECL_DLLPRIVATE_LINK_TYPED( AcceptHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( AcceptAllHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( RejectHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( RejectAllHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( UndoHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( DeselectHdl, SvTreeListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( SelectTimerHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK_TYPED( GotoHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK_TYPED( CommandHdl, SvSimpleTable*, void ); + DECL_DLLPRIVATE_LINK( AcceptHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( AcceptAllHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( RejectHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( RejectAllHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( UndoHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( DeselectHdl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK( SelectHdl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK( SelectTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( GotoHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( CommandHdl, SvSimpleTable*, void ); SAL_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, bool bChild); SAL_DLLPRIVATE void InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFormat); @@ -121,7 +121,7 @@ public: SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFormat = false); virtual ~SwRedlineAcceptDlg(); - DECL_LINK_TYPED( FilterChangedHdl, SvxTPFilter*, void ); + DECL_LINK( FilterChangedHdl, SvxTPFilter*, void ); inline SvxAcceptChgCtr& GetChgCtrl() { return *m_aTabPagesCTRL.get(); } inline bool HasRedlineAutoFormat() const { return m_bRedlnAutoFormat; } diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index e674c491a1bb..8bc5e03e54a8 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -104,26 +104,26 @@ class SwEditRegionDlg : public SfxModalDialog void RecurseList( const SwSectionFormat* pFormat, SvTreeListEntry* pEntry); size_t FindArrPos(const SwSectionFormat* pFormat); - DECL_LINK_TYPED( GetFirstEntryHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( DeselectHdl, SvTreeListBox *, void ); + DECL_LINK( GetFirstEntryHdl, SvTreeListBox *, void ); + DECL_LINK( DeselectHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( NameEditHdl, Edit&, void ); - DECL_LINK_TYPED( ConditionEditHdl, Edit&, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( NameEditHdl, Edit&, void ); + DECL_LINK( ConditionEditHdl, Edit&, void ); - DECL_LINK_TYPED( ChangePasswdHdl, Button *, void ); - DECL_LINK_TYPED( ChangeProtectHdl, Button *, void ); - DECL_LINK_TYPED( ChangeHideHdl, Button *, void ); + DECL_LINK( ChangePasswdHdl, Button *, void ); + DECL_LINK( ChangeProtectHdl, Button *, void ); + DECL_LINK( ChangeHideHdl, Button *, void ); // #114856# edit in readonly sections - DECL_LINK_TYPED( ChangeEditInReadonlyHdl, Button *, void ); - DECL_LINK_TYPED( ChangeDismissHdl, Button*, void); - DECL_LINK_TYPED( UseFileHdl, Button*, void ); - DECL_LINK_TYPED( FileSearchHdl, Button*, void ); - DECL_LINK_TYPED( OptionsHdl, Button*, void ); - DECL_LINK_TYPED( FileNameHdl, Edit&, void ); - DECL_LINK_TYPED( DDEHdl, Button*, void ); - DECL_LINK_TYPED( DlgClosedHdl, sfx2::FileDialogHelper*, void ); - DECL_LINK_TYPED( SubRegionEventHdl, VclWindowEvent&, void ); + DECL_LINK( ChangeEditInReadonlyHdl, Button *, void ); + DECL_LINK( ChangeDismissHdl, Button*, void); + DECL_LINK( UseFileHdl, Button*, void ); + DECL_LINK( FileSearchHdl, Button*, void ); + DECL_LINK( OptionsHdl, Button*, void ); + DECL_LINK( FileNameHdl, Edit&, void ); + DECL_LINK( DDEHdl, Button*, void ); + DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( SubRegionEventHdl, VclWindowEvent&, void ); bool CheckPasswd(CheckBox* pBox = nullptr); @@ -169,14 +169,14 @@ class SwInsertSectionTabPage : public SfxTabPage SwWrtShell* m_pWrtSh; sfx2::DocumentInserter* m_pDocInserter; - DECL_LINK_TYPED( ChangeHideHdl, Button *, void ); - DECL_LINK_TYPED( ChangeProtectHdl, Button *, void ); - DECL_LINK_TYPED( ChangePasswdHdl, Button *, void ); - DECL_LINK_TYPED( NameEditHdl, Edit&, void ); - DECL_LINK_TYPED( UseFileHdl, Button*, void ); - DECL_LINK_TYPED( FileSearchHdl, Button*, void ); - DECL_LINK_TYPED( DDEHdl, Button*, void ); - DECL_LINK_TYPED( DlgClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( ChangeHideHdl, Button *, void ); + DECL_LINK( ChangeProtectHdl, Button *, void ); + DECL_LINK( ChangePasswdHdl, Button *, void ); + DECL_LINK( NameEditHdl, Edit&, void ); + DECL_LINK( UseFileHdl, Button*, void ); + DECL_LINK( FileSearchHdl, Button*, void ); + DECL_LINK( DDEHdl, Button*, void ); + DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void ); public: SwInsertSectionTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet); @@ -220,7 +220,7 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage VclPtr<FixedText> m_pEndSuffixFT; VclPtr<Edit> m_pEndSuffixED; - DECL_LINK_TYPED( FootEndHdl, Button*, void ); + DECL_LINK( FootEndHdl, Button*, void ); void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& ); public: @@ -241,7 +241,7 @@ class SwSectionIndentTabPage : public SfxTabPage VclPtr<MetricField> m_pAfterMF; VclPtr<SvxParaPrevWindow> m_pPreviewWin; - DECL_LINK_TYPED(IndentModifyHdl, Edit&, void); + DECL_LINK(IndentModifyHdl, Edit&, void); public: SwSectionIndentTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage() override; diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx index 32784f684480..0fa5e8a6b058 100644 --- a/sw/source/uibase/inc/selglos.hxx +++ b/sw/source/uibase/inc/selglos.hxx @@ -31,7 +31,7 @@ class SwSelGlossaryDlg : public ModalDialog protected: VclPtr<ListBox> m_pGlosBox; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); public: SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName); virtual ~SwSelGlossaryDlg() override; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index 3e04eb77a7d9..c78199b89b4b 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -92,7 +92,7 @@ private: using OutputDevice::SetFont; void SetFont(); - DECL_LINK_TYPED( SyntaxTimerHdl, Idle *, void ); + DECL_LINK( SyntaxTimerHdl, Idle *, void ); using Window::Notify; using Window::Invalidate; @@ -109,7 +109,7 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); public: SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ); diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index d83649eba3a6..c280a917db4e 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -77,11 +77,11 @@ class SwSortDlg : public SvxStandardDialog virtual void Apply() override; sal_Unicode GetDelimChar() const; - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( DelimHdl, Button*, void ); - DECL_LINK_TYPED( LanguageListBoxHdl, ListBox&, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( DelimHdl, Button*, void ); + DECL_LINK( LanguageListBoxHdl, ListBox&, void ); void LanguageHdl(ListBox*); - DECL_LINK_TYPED(DelimCharHdl, Button*,void); + DECL_LINK(DelimCharHdl, Button*,void); public: SwSortDlg(vcl::Window * pParent, SwWrtShell &rSh); diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index cdbfad81251a..af29999fe0c3 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -41,8 +41,8 @@ class SwRenameXNamedDlg : public ModalDialog css::uno::Reference< css::container::XNameAccess > xSecondAccess; css::uno::Reference< css::container::XNameAccess > xThirdAccess; - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SwRenameXNamedDlg( vcl::Window* pParent, diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index e5adb77b6ff9..824eaca10642 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -107,7 +107,7 @@ protected: Color GetFadedColor(const Color &rHighColor, const Color &rLowColor); /// Fade timer callback. - DECL_LINK_TYPED(FadeHandler, Timer *, void); + DECL_LINK(FadeHandler, Timer *, void); }; #endif diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index eae1ef00933c..a74362bf8135 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -52,12 +52,12 @@ class SwCondCollPage : public SfxTabPage virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; - DECL_LINK_TYPED( OnOffHdl, Button*, void ); - DECL_LINK_TYPED( AssignRemoveHdl, ListBox&, void); - DECL_LINK_TYPED( AssignRemoveTreeListBoxHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED( AssignRemoveClickHdl, Button*, void); - DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void ); + DECL_LINK( OnOffHdl, Button*, void ); + DECL_LINK( AssignRemoveHdl, ListBox&, void); + DECL_LINK( AssignRemoveTreeListBoxHdl, SvTreeListBox*, bool); + DECL_LINK( AssignRemoveClickHdl, Button*, void); + DECL_LINK( SelectTreeListBoxHdl, SvTreeListBox*, void ); + DECL_LINK( SelectListBoxHdl, ListBox&, void ); void AssignRemove(void*); void SelectHdl(void*); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index f6e6d1dd14c6..aafae34192d2 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -93,8 +93,8 @@ class SwMultiTOXTabDialog : public SfxTabDialog virtual short Ok() override; SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); - DECL_LINK_TYPED(CreateExample_Hdl, SwOneExampleFrame&, void); - DECL_LINK_TYPED(ShowPreviewHdl, Button*, void); + DECL_LINK(CreateExample_Hdl, SwOneExampleFrame&, void); + DECL_LINK(ShowPreviewHdl, Button*, void); public: SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, @@ -202,16 +202,16 @@ class SwTOXSelectTabPage : public SfxTabPage bool m_bWaitingInitialSettings; - DECL_LINK_TYPED(TOXTypeHdl, ListBox&, void ); - DECL_LINK_TYPED(AddStylesHdl, Button*, void ); - DECL_LINK_TYPED(MenuEnableHdl, Menu*, bool); - DECL_LINK_TYPED(MenuExecuteHdl, Menu*, bool); - DECL_LINK_TYPED(LanguageListBoxHdl, ListBox&, void); + DECL_LINK(TOXTypeHdl, ListBox&, void ); + DECL_LINK(AddStylesHdl, Button*, void ); + DECL_LINK(MenuEnableHdl, Menu*, bool); + DECL_LINK(MenuExecuteHdl, Menu*, bool); + DECL_LINK(LanguageListBoxHdl, ListBox&, void); void LanguageHdl(ListBox*); - DECL_LINK_TYPED(CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED(RadioButtonHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(ModifyListBoxHdl, ListBox&, void); + DECL_LINK(CheckBoxHdl, Button*, void ); + DECL_LINK(RadioButtonHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(ModifyListBoxHdl, ListBox&, void); void ApplyTOXDescription(); void FillTOXDescription(); @@ -268,12 +268,12 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer VclPtr<SwTOXEntryTabPage> m_pParent; - DECL_LINK_TYPED( EditResize, Edit&, void ); - DECL_LINK_TYPED( NextItemHdl, SwTOXEdit&, void ); - DECL_LINK_TYPED( TbxFocusHdl, Control&, void ); - DECL_LINK_TYPED( NextItemBtnHdl, SwTOXButton&, void ); - DECL_LINK_TYPED( TbxFocusBtnHdl, Control&, void ); - DECL_LINK_TYPED( ScrollHdl, Button*, void ); + DECL_LINK( EditResize, Edit&, void ); + DECL_LINK( NextItemHdl, SwTOXEdit&, void ); + DECL_LINK( TbxFocusHdl, Control&, void ); + DECL_LINK( NextItemBtnHdl, SwTOXButton&, void ); + DECL_LINK( TbxFocusBtnHdl, Control&, void ); + DECL_LINK( ScrollHdl, Button*, void ); void SetActiveControl(Control* pSet); @@ -410,27 +410,27 @@ class SwTOXEntryTabPage : public SfxTabPage CurTOXType aLastTOXType; bool bInLevelHdl; - DECL_LINK_TYPED(StyleSelectHdl, ListBox&, void); - DECL_LINK_TYPED(EditStyleHdl, Button*, void); - DECL_LINK_TYPED(InsertTokenHdl, Button*, void); - DECL_LINK_TYPED(LevelHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(AutoRightHdl, Button*, void); - DECL_LINK_TYPED(TokenSelectedHdl, SwFormToken&, void); - DECL_LINK_TYPED(TabPosHdl, Edit&, void); - DECL_LINK_TYPED(FillCharHdl, Edit&, void); - DECL_LINK_TYPED(RemoveInsertAuthHdl, Button*, void); - DECL_LINK_TYPED(SortKeyHdl, Button*, void); - DECL_LINK_TYPED(ChapterInfoHdl, ListBox&, void); - DECL_LINK_TYPED(ChapterInfoOutlineHdl, Edit&, void); - DECL_LINK_TYPED(NumberFormatHdl, ListBox&, void); - - DECL_LINK_TYPED(AllLevelsHdl, Button*, void); + DECL_LINK(StyleSelectHdl, ListBox&, void); + DECL_LINK(EditStyleHdl, Button*, void); + DECL_LINK(InsertTokenHdl, Button*, void); + DECL_LINK(LevelHdl, SvTreeListBox*, void); + DECL_LINK(AutoRightHdl, Button*, void); + DECL_LINK(TokenSelectedHdl, SwFormToken&, void); + DECL_LINK(TabPosHdl, Edit&, void); + DECL_LINK(FillCharHdl, Edit&, void); + DECL_LINK(RemoveInsertAuthHdl, Button*, void); + DECL_LINK(SortKeyHdl, Button*, void); + DECL_LINK(ChapterInfoHdl, ListBox&, void); + DECL_LINK(ChapterInfoOutlineHdl, Edit&, void); + DECL_LINK(NumberFormatHdl, ListBox&, void); + + DECL_LINK(AllLevelsHdl, Button*, void); void WriteBackLevel(); void UpdateDescriptor(); - DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void); + DECL_LINK(ModifyHdl, LinkParamNone*, void); void OnModify(void*); - DECL_LINK_TYPED(ModifyClickHdl, Button*, void); + DECL_LINK(ModifyClickHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -466,11 +466,11 @@ class SwTOXStylesTabPage : public SfxTabPage SwForm* m_pCurrentForm; - DECL_LINK_TYPED( EditStyleHdl, Button *, void ); - DECL_LINK_TYPED( StdHdl, Button*, void ); - DECL_LINK_TYPED(EnableSelectHdl, ListBox&, void); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); - DECL_LINK_TYPED( AssignHdl, Button*, void ); + DECL_LINK( EditStyleHdl, Button *, void ); + DECL_LINK( StdHdl, Button*, void ); + DECL_LINK(EnableSelectHdl, ListBox&, void); + DECL_LINK( DoubleClickHdl, ListBox&, void ); + DECL_LINK( AssignHdl, Button*, void ); void Modify(); SwForm& GetForm() diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index a6c084f53ff1..06687dd029be 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -108,21 +108,21 @@ class SwIndexMarkPane void InsertMark(); void UpdateMark(); - DECL_LINK_TYPED( InsertHdl, Button *, void ); - DECL_LINK_TYPED( CloseHdl, Button*, void ); - DECL_LINK_TYPED( SyncSelectionHdl, Button*, void ); - DECL_LINK_TYPED( DelHdl, Button*, void ); - DECL_LINK_TYPED( NextHdl, Button*, void ); - DECL_LINK_TYPED( NextSameHdl, Button*, void ); - DECL_LINK_TYPED( PrevHdl, Button*, void ); - DECL_LINK_TYPED( PrevSameHdl, Button*, void ); - DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyEditHdl, Edit&, void ); + DECL_LINK( InsertHdl, Button *, void ); + DECL_LINK( CloseHdl, Button*, void ); + DECL_LINK( SyncSelectionHdl, Button*, void ); + DECL_LINK( DelHdl, Button*, void ); + DECL_LINK( NextHdl, Button*, void ); + DECL_LINK( NextSameHdl, Button*, void ); + DECL_LINK( PrevHdl, Button*, void ); + DECL_LINK( PrevSameHdl, Button*, void ); + DECL_LINK( ModifyListBoxHdl, ListBox&, void ); + DECL_LINK( ModifyEditHdl, Edit&, void ); void ModifyHdl(Control*); - DECL_LINK_TYPED( KeyDCBModifyHdl, Edit&, void ); - DECL_LINK_TYPED( NewUserIdxHdl, Button*, void ); - DECL_LINK_TYPED( SearchTypeHdl, Button*, void ); - DECL_LINK_TYPED( PhoneticEDModifyHdl, Edit&, void ); + DECL_LINK( KeyDCBModifyHdl, Edit&, void ); + DECL_LINK( NewUserIdxHdl, Button*, void ); + DECL_LINK( SearchTypeHdl, Button*, void ); + DECL_LINK( PhoneticEDModifyHdl, Edit&, void ); //this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled' //it needs to be called ones if this dialog is opened to create a new entry (in InitControls), @@ -210,13 +210,13 @@ class SwAuthorMarkPane css::uno::Reference< css::container::XNameAccess > xBibAccess; - DECL_LINK_TYPED(InsertHdl, Button*, void); - DECL_LINK_TYPED(CloseHdl, Button*, void); - DECL_LINK_TYPED(CreateEntryHdl, Button*, void); - DECL_LINK_TYPED(CompEntryHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeSourceHdl, Button*, void); - DECL_LINK_TYPED(IsEntryAllowedHdl, Edit*, bool); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(InsertHdl, Button*, void); + DECL_LINK(CloseHdl, Button*, void); + DECL_LINK(CreateEntryHdl, Button*, void); + DECL_LINK(CompEntryHdl, ListBox&, void); + DECL_LINK(ChangeSourceHdl, Button*, void); + DECL_LINK(IsEntryAllowedHdl, Edit*, bool); + DECL_LINK(EditModifyHdl, Edit&, void); void InitControls(); void Activate(); diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx index 88729b8c3698..4934b41f9b9a 100644 --- a/sw/source/uibase/inc/syncbtn.hxx +++ b/sw/source/uibase/inc/syncbtn.hxx @@ -27,7 +27,7 @@ class SwSyncBtnDlg : public SfxFloatingWindow { VclPtr<PushButton> m_pSyncBtn; - DECL_STATIC_LINK_TYPED( SwSyncBtnDlg, BtnHdl, Button*, void ); + DECL_STATIC_LINK( SwSyncBtnDlg, BtnHdl, Button*, void ); public: SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index bf790bfe4611..169b741a150a 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -70,12 +70,12 @@ class SwAutoFormatDlg : public SfxModalDialog void Init( const SwTableAutoFormat* pSelFormat ); void UpdateChecks( const SwTableAutoFormat&, bool bEnableBtn ); - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED( AddHdl, Button*, void ); - DECL_LINK_TYPED( RemoveHdl, Button*, void ); - DECL_LINK_TYPED( RenameHdl, Button*, void ); - DECL_LINK_TYPED( SelFormatHdl, ListBox&, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK( AddHdl, Button*, void ); + DECL_LINK( RemoveHdl, Button*, void ); + DECL_LINK( RenameHdl, Button*, void ); + DECL_LINK( SelFormatHdl, ListBox&, void ); public: SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx index 69f42eb31b57..b99290e632d5 100644 --- a/sw/source/uibase/inc/textsh.hxx +++ b/sw/source/uibase/inc/textsh.hxx @@ -44,8 +44,8 @@ private: static void InitInterface_Impl(); public: - DECL_LINK_TYPED( RedlineNextHdl, AbstractSvxPostItDialog&, void ); - DECL_LINK_TYPED( RedlinePrevHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog&, void ); void Execute(SfxRequest &); void GetState(SfxItemSet &); diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index f83fc93a32bd..de709bc702f5 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -53,13 +53,13 @@ private: sal_uInt16 GetInsertPosition() const; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(EditHdl, Button*, void); - DECL_LINK_TYPED(RestartNumberingHdl, Button*, void); - DECL_LINK_TYPED(SetPageNumberHdl, Button*, void); - DECL_LINK_TYPED(UpHdl, SpinField&, void); - DECL_LINK_TYPED(DownHdl, SpinField&, void); - DECL_LINK_TYPED(StartPageHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(EditHdl, Button*, void); + DECL_LINK(RestartNumberingHdl, Button*, void); + DECL_LINK(SetPageNumberHdl, Button*, void); + DECL_LINK(UpHdl, SpinField&, void); + DECL_LINK(DownHdl, SpinField&, void); + DECL_LINK(StartPageHdl, Button*, void); public: SwTitlePageDlg( vcl::Window *pParent ); virtual ~SwTitlePageDlg() override; diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 71a96fc908f8..a79b85a0b529 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -89,8 +89,8 @@ class SW_DLLPUBLIC SwOneExampleFrame static bool bShowServiceNotAvailableMessage; - DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Idle*, void ); - DECL_DLLPRIVATE_LINK_TYPED( PopupHdl, Menu*, bool ); + DECL_DLLPRIVATE_LINK( TimeoutHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( PopupHdl, Menu*, bool ); SAL_DLLPRIVATE void CreateControl(); SAL_DLLPRIVATE void DisposeControl(); diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index a494df7e5dcd..dde606841299 100644 --- a/sw/source/uibase/inc/wordcountdialog.hxx +++ b/sw/source/uibase/inc/wordcountdialog.hxx @@ -50,7 +50,7 @@ class SwWordCountFloatDlg : public SfxModelessDialog VclPtr<CloseButton> m_pClosePB; - DECL_STATIC_LINK_TYPED( SwWordCountFloatDlg, CloseHdl, Button*, void ); + DECL_STATIC_LINK( SwWordCountFloatDlg, CloseHdl, Button*, void ); public: SwWordCountFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 81b9d85c90fd..afc83927b7fe 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -68,7 +68,7 @@ public: SfxItemState eState, const SfxPoolItem* pState ) override; - DECL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool); + DECL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool); }; class SwScrollNaviPopup; @@ -103,7 +103,7 @@ class SwScrollNaviPopup : public SfxPopupWindow using Window::GetQuickHelpText; protected: - DECL_LINK_TYPED(SelectHdl, ToolBox*, void); + DECL_LINK(SelectHdl, ToolBox*, void); virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 802ff82e6b81..b596dc511158 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -85,10 +85,10 @@ class SwWrapTabPage: public SfxTabPage virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - DECL_LINK_TYPED( RangeModifyHdl, SpinField&, void ); - DECL_LINK_TYPED( RangeLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( WrapTypeHdl, Button *, void ); - DECL_LINK_TYPED( ContourHdl, Button *, void); + DECL_LINK( RangeModifyHdl, SpinField&, void ); + DECL_LINK( RangeLoseFocusHdl, Control&, void ); + DECL_LINK( WrapTypeHdl, Button *, void ); + DECL_LINK( ContourHdl, Button *, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index f8ec6a41797a..72cc0e066ccd 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -242,7 +242,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool GotoPage( sal_uInt16 nPage, bool bRecord ); // setting the cursor; remember the old position for turning back - DECL_LINK_TYPED( ExecFlyMac, const SwFlyFrameFormat*, void ); + DECL_LINK( ExecFlyMac, const SwFlyFrameFormat*, void ); bool PageCursor(SwTwips lOffset, bool bSelect); @@ -439,7 +439,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = nullptr ); // link for inserting ranges via Drag&Drop/Clipboard - DECL_LINK_TYPED( InsertRegionDialog, void*, void ); + DECL_LINK( InsertRegionDialog, void*, void ); // ctor, the first one is a kind of a controlled copy ctor for more views of a document SwWrtShell( SwWrtShell&, vcl::Window *pWin, SwView &rShell); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 8afcea8794e9..33c4dacc4cd6 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -883,27 +883,27 @@ sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvTreeListEntry& rEntry ) co rEntry.GetUserData())->pData)->pData ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, AcceptHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptHdl, SvxTPView*, void) { CallAcceptReject( true, true ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, AcceptAllHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptAllHdl, SvxTPView*, void) { CallAcceptReject( false, true ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, RejectHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectHdl, SvxTPView*, void) { CallAcceptReject( true, false ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, RejectAllHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectAllHdl, SvxTPView*, void) { CallAcceptReject( false, false ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, UndoHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl, SvxTPView*, void) { SwView * pView = ::GetActiveView(); pView->GetViewFrame()->GetDispatcher()-> @@ -913,7 +913,7 @@ IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, UndoHdl, SvxTPView*, void) Activate(); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) { SvxTPFilter *pFilterTP = m_aTabPagesCTRL->GetFilterPage(); @@ -925,24 +925,24 @@ IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) Init(); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, DeselectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, DeselectHdl, SvTreeListBox*, void) { // avoid flickering of buttons: m_aDeselectTimer.Start(); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, SelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectHdl, SvTreeListBox*, void) { SelectTimerHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, SelectTimerHdl, Timer *, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectTimerHdl, Timer *, void) { m_aDeselectTimer.Stop(); m_aSelectTimer.Start(); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, GotoHdl, Timer *, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl, Timer *, void) { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); m_aSelectTimer.Stop(); @@ -1009,7 +1009,7 @@ IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, GotoHdl, Timer *, void) m_pTPView->EnableRejectAll( bEnable && !m_bOnlyFormatedRedlines ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void) { const CommandEvent aCEvt(m_pTable->GetCommandEvent()); diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 5eabc7c1589d..e84b6a04c90e 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -300,7 +300,7 @@ Color SwCommentRuler::GetFadedColor(const Color &rHighColor, const Color &rLowCo return aColor; } -IMPL_LINK_NOARG_TYPED(SwCommentRuler, FadeHandler, Timer *, void) +IMPL_LINK_NOARG(SwCommentRuler, FadeHandler, Timer *, void) { const int nStep = 25; if ( mbIsHighlighted && mnFadeRate < 100 ) diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 71cdc006cb21..cd2347fd2ce4 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -302,7 +302,7 @@ void SwInputWindow::ShowWin() ToolBox::Show(); } -IMPL_LINK_TYPED( SwInputWindow, MenuHdl, Menu *, pMenu, bool ) +IMPL_LINK( SwInputWindow, MenuHdl, Menu *, pMenu, bool ) { static const char * const aStrArr[] = { sCalc_Phd, @@ -342,7 +342,7 @@ static const char * const aStrArr[] = { return false; } -IMPL_LINK_NOARG_TYPED(SwInputWindow, DropdownClickHdl, ToolBox *, void) +IMPL_LINK_NOARG(SwInputWindow, DropdownClickHdl, ToolBox *, void) { sal_uInt16 nCurID = GetCurItemId(); EndSelection(); // reset back CurItemId ! @@ -421,7 +421,7 @@ void SwInputWindow::CancelFormula() const sal_Unicode CH_LRE = 0x202a; const sal_Unicode CH_PDF = 0x202c; -IMPL_LINK_TYPED( SwInputWindow, SelTableCellsNotify, SwWrtShell&, rCaller, void ) +IMPL_LINK( SwInputWindow, SelTableCellsNotify, SwWrtShell&, rCaller, void ) { if(bIsTable) { @@ -475,7 +475,7 @@ void SwInputWindow::SetFormula( const OUString& rFormula ) bDelSel = true; } -IMPL_LINK_NOARG_TYPED(SwInputWindow, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwInputWindow, ModifyHdl, Edit&, void) { if (bIsTable && m_bResetUndo) { diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 1c773f59408c..e49564f12bdc 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -135,7 +135,7 @@ void SwTbxAutoTextCtrl::StateChanged( sal_uInt16, GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) ); } -IMPL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, pMenu, bool) +IMPL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, Menu*, pMenu, bool) { sal_uInt16 nId = pMenu->GetCurItemId(); @@ -306,7 +306,7 @@ void SwScrollNaviPopup::ApplyImageList() } } -IMPL_LINK_TYPED(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet, void) +IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet, void) { sal_uInt16 nSet = pSet->GetCurItemId(); if( nSet != NID_PREV && nSet != NID_NEXT ) diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index c40a2eaa4ba3..832da5fd261a 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -1249,7 +1249,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) // Here the state fpr SID_IMAP / SID_CONTOUR will be handled // until the swapping of the graphic is finished. -IMPL_LINK_NOARG_TYPED(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void) +IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void) { GraphicType nGrfType; SwWrtShell &rSh = GetShell(); diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index ab0c55bc7bed..9f3145a805ca 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -587,7 +587,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) // Checks whether a given name is allowed for a group shape -IMPL_LINK_TYPED( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxObjectNameDialog&, rNameDialog, bool ) +IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxObjectNameDialog&, rNameDialog, bool ) { SwWrtShell &rSh = GetShell(); SdrView *pSdrView = rSh.GetDrawView(); @@ -747,7 +747,7 @@ bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich) // Validate of drawing positions -IMPL_LINK_TYPED(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation&, rValidation, void ) +IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation&, rValidation, void ) { SwWrtShell *pSh = &GetShell(); rValidation.nMinHeight = MINFLY; diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index c6d580c5450e..c96d62c48030 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -850,7 +850,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem) } } -IMPL_LINK_TYPED( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog&, rDlg, void ) +IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog&, rDlg, void ) { SwWrtShell* pSh = GetShellPtr(); @@ -897,7 +897,7 @@ IMPL_LINK_TYPED( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog&, rDlg, vo } } -IMPL_LINK_TYPED( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog&, rDlg, void ) +IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog&, rDlg, void ) { SwWrtShell* pSh = GetShellPtr(); diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index 5e5d384a3d38..48ebf4406298 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -230,7 +230,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) } } -IMPL_LINK_TYPED( SwBaseShell, InsertDBTextHdl, void*, p, void ) +IMPL_LINK( SwBaseShell, InsertDBTextHdl, void*, p, void ) { DBTextStruct_Impl* pDBStruct = static_cast<DBTextStruct_Impl*>(p); if( pDBStruct ) diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index 3b1fd05f2d30..4aea45b41b33 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -102,7 +102,7 @@ void PageColumnControl::ExecuteColumnChange( const sal_uInt16 nColumnType ) SfxCallMode::RECORD, { mpPageColumnTypeItem.get() }); } -IMPL_LINK_TYPED( PageColumnControl, ColumnButtonClickHdl_Impl, Button*, pButton, void ) +IMPL_LINK( PageColumnControl, ColumnButtonClickHdl_Impl, Button*, pButton, void ) { if ( pButton == m_pOneColumn.get() ) ExecuteColumnChange( 1 ); @@ -118,7 +118,7 @@ IMPL_LINK_TYPED( PageColumnControl, ColumnButtonClickHdl_Impl, Button*, pButton, EndPopupMode(); } -IMPL_LINK_NOARG_TYPED( PageColumnControl, MoreButtonClickHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( PageColumnControl, MoreButtonClickHdl_Impl, Button*, void ) { if ( SfxViewFrame::Current() ) SfxViewFrame::Current()->GetBindings().GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SfxCallMode::ASYNCHRON ); diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index f83943dee1c2..cb16460a6b3c 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -48,8 +48,8 @@ private: static void ExecuteColumnChange( const sal_uInt16 nColumnType ); - DECL_LINK_TYPED( ColumnButtonClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( MoreButtonClickHdl_Impl, Button*, void ); + DECL_LINK( ColumnButtonClickHdl_Impl, Button*, void ); + DECL_LINK( MoreButtonClickHdl_Impl, Button*, void ); }; } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx index 68fb1e8ed731..82813700de11 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.cxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx @@ -225,7 +225,7 @@ void PageFooterPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterToggleHdl, Button*, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, Button*, void ) { bool IsChecked = mpFooterToggle->IsChecked(); mpFooterItem->SetValue(IsChecked); @@ -233,7 +233,7 @@ IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterToggleHdl, Button*, void ) UpdateFooterCheck(); } -IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterLRMarginHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterLRMarginHdl, ListBox&, void ) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterMarginPresetLB->GetSelectEntryData()); mpFooterLRMarginItem->SetLeft(nVal); @@ -242,7 +242,7 @@ IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterLRMarginHdl, ListBox&, void ) SfxCallMode::RECORD, { mpFooterLRMarginItem.get() } ); } -IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterSpacingHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterSpacingHdl, ListBox&, void ) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterSpacingLB->GetSelectEntryData()); mpFooterSpacingItem->SetUpper(nVal); @@ -250,7 +250,7 @@ IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterSpacingHdl, ListBox&, void ) SfxCallMode::RECORD, { mpFooterSpacingItem.get() } ); } -IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterLayoutHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterLayoutHdl, ListBox&, void ) { sal_uInt16 nVal = mpFooterLayoutLB->GetSelectEntryPos(); mpFooterLayoutItem->SetValue(nVal); diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index c1357ad0942b..8845b5add9e3 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -98,10 +98,10 @@ private: ::std::unique_ptr<SvxLongULSpaceItem> mpFooterSpacingItem; ::std::unique_ptr<SfxInt16Item> mpFooterLayoutItem; - DECL_LINK_TYPED( FooterToggleHdl, Button*, void ); - DECL_LINK_TYPED( FooterLRMarginHdl, ListBox&, void); - DECL_LINK_TYPED( FooterSpacingHdl, ListBox&, void); - DECL_LINK_TYPED( FooterLayoutHdl, ListBox&, void); + DECL_LINK( FooterToggleHdl, Button*, void ); + DECL_LINK( FooterLRMarginHdl, ListBox&, void); + DECL_LINK( FooterSpacingHdl, ListBox&, void); + DECL_LINK( FooterLayoutHdl, ListBox&, void); }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx index 6d7bac0dd684..8e3b1a343e98 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.cxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx @@ -217,7 +217,7 @@ void PageFormatPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG_TYPED(PageFormatPanel, PaperFormatModifyHdl, ListBox&, void) +IMPL_LINK_NOARG(PageFormatPanel, PaperFormatModifyHdl, ListBox&, void) { Paper ePaper = mpPaperSizeBox->GetSelection(); Size aSize(SvxPaperInfo::GetPaperSize(ePaper, (MapUnit)(meUnit))); @@ -230,14 +230,14 @@ IMPL_LINK_NOARG_TYPED(PageFormatPanel, PaperFormatModifyHdl, ListBox&, void) mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem, mpPageItem.get() }); } -IMPL_LINK_NOARG_TYPED(PageFormatPanel, PaperSizeModifyHdl, Edit&, void) +IMPL_LINK_NOARG(PageFormatPanel, PaperSizeModifyHdl, Edit&, void) { Size aSize( GetCoreValue( *mpPaperWidth, meUnit ), GetCoreValue( *mpPaperHeight, meUnit)); SvxSizeItem aSizeItem(SID_ATTR_PAGE_SIZE, aSize); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem }); } -IMPL_LINK_NOARG_TYPED(PageFormatPanel, PaperModifyMarginHdl, ListBox&, void) +IMPL_LINK_NOARG(PageFormatPanel, PaperModifyMarginHdl, ListBox&, void) { bool bMirrored = false; bool bApplyNewPageMargins = true; diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx index 5fc5f2c9914c..ef9d1bcbafc9 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.hxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx @@ -108,9 +108,9 @@ private: void UpdateMarginBox(); void ExecuteMarginLRChange( const long nPageLeftMargin, const long nPageRightMargin ); void ExecuteMarginULChange( const long nPageTopMargin, const long nPageBottomMargin); - DECL_LINK_TYPED(PaperFormatModifyHdl, ListBox&, void); - DECL_LINK_TYPED(PaperSizeModifyHdl, Edit&, void); - DECL_LINK_TYPED(PaperModifyMarginHdl, ListBox&, void ); + DECL_LINK(PaperFormatModifyHdl, ListBox&, void); + DECL_LINK(PaperSizeModifyHdl, Edit&, void); + DECL_LINK(PaperModifyMarginHdl, ListBox&, void ); }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx index c88960ba6b9b..75ac6d7fa720 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx @@ -228,7 +228,7 @@ void PageHeaderPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderToggleHdl, Button*, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderToggleHdl, Button*, void ) { bool IsChecked = mpHeaderToggle->IsChecked(); mpHeaderItem->SetValue(IsChecked); @@ -236,7 +236,7 @@ IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderToggleHdl, Button*, void ) UpdateHeaderCheck(); } -IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void ) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderMarginPresetLB->GetSelectEntryData()); mpHeaderLRMarginItem->SetLeft(nVal); @@ -245,14 +245,14 @@ IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void ) SfxCallMode::RECORD, { mpHeaderLRMarginItem.get() } ); } -IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderSpacingHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderSpacingHdl, ListBox&, void ) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderSpacingLB->GetSelectEntryData()); mpHeaderSpacingItem->SetLower(nVal); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_HEADER_SPACING, SfxCallMode::RECORD, { mpHeaderSpacingItem.get() } ); } -IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderLayoutHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderLayoutHdl, ListBox&, void ) { sal_uInt16 nVal = mpHeaderLayoutLB->GetSelectEntryPos(); mpHeaderLayoutItem->SetValue(nVal); diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx index ffce2057730c..35db413ffbf8 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx @@ -98,10 +98,10 @@ private: ::std::unique_ptr<SvxLongULSpaceItem> mpHeaderSpacingItem; ::std::unique_ptr<SfxInt16Item> mpHeaderLayoutItem; - DECL_LINK_TYPED( HeaderToggleHdl, Button*, void ); - DECL_LINK_TYPED( HeaderLRMarginHdl, ListBox&, void); - DECL_LINK_TYPED( HeaderSpacingHdl, ListBox&, void); - DECL_LINK_TYPED( HeaderLayoutHdl, ListBox&, void); + DECL_LINK( HeaderToggleHdl, Button*, void ); + DECL_LINK( HeaderLRMarginHdl, ListBox&, void); + DECL_LINK( HeaderSpacingHdl, ListBox&, void); + DECL_LINK( HeaderLayoutHdl, ListBox&, void); }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 1576c6ac8678..885bb515b26c 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -362,7 +362,7 @@ void PageMarginControl::FillHelpText( const bool bUserCustomValuesAvailable ) m_pLast->SetQuickHelpText( aHelpText ); } -IMPL_LINK_TYPED( PageMarginControl, SelectMarginHdl, Button*, pControl, void ) +IMPL_LINK( PageMarginControl, SelectMarginHdl, Button*, pControl, void ) { bool bMirrored = false; bool bApplyNewPageMargins = true; @@ -478,7 +478,7 @@ void PageMarginControl::ExecutePageLayoutChange( const bool bMirrored ) } } -IMPL_LINK_NOARG_TYPED( PageMarginControl, ModifyLRMarginHdl, Edit&, void ) +IMPL_LINK_NOARG( PageMarginControl, ModifyLRMarginHdl, Edit&, void ) { m_nPageLeftMargin = GetCoreValue( *m_pLeftMarginEdit.get(), m_eUnit ); m_nPageRightMargin = GetCoreValue( *m_pRightMarginEdit.get(), m_eUnit ); @@ -487,7 +487,7 @@ IMPL_LINK_NOARG_TYPED( PageMarginControl, ModifyLRMarginHdl, Edit&, void ) m_bCustomValuesUsed = true; } -IMPL_LINK_NOARG_TYPED( PageMarginControl, ModifyULMarginHdl, Edit&, void ) +IMPL_LINK_NOARG( PageMarginControl, ModifyULMarginHdl, Edit&, void ) { m_nPageTopMargin = GetCoreValue( *m_pTopMarginEdit.get(), m_eUnit ); m_nPageBottomMargin = GetCoreValue( *m_pBottomMarginEdit.get(), m_eUnit ); diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 822d7a8bdd40..fd82641c204c 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -91,9 +91,9 @@ private: bool m_bCustomValuesUsed; - DECL_LINK_TYPED( SelectMarginHdl, Button*, void ); - DECL_LINK_TYPED( ModifyLRMarginHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyULMarginHdl, Edit&, void ); + DECL_LINK( SelectMarginHdl, Button*, void ); + DECL_LINK( ModifyLRMarginHdl, Edit&, void ); + DECL_LINK( ModifyULMarginHdl, Edit&, void ); static void ExecuteMarginLRChange( const long nPageLeftMargin, diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index 20e3bb83b7f8..2140923116aa 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -187,7 +187,7 @@ void PageOrientationControl::ExecuteOrientationChange( const bool bLandscape ) mxUndoManager->leaveUndoContext(); } -IMPL_LINK_TYPED(PageOrientationControl, ImplOrientationHdl, Button*, pControl, void) +IMPL_LINK(PageOrientationControl, ImplOrientationHdl, Button*, pControl, void) { if ( pControl == m_pPortrait.get() ) ExecuteOrientationChange( false ); diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index 590659200faa..cc9c1b3fc539 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -52,7 +52,7 @@ private: void ExecuteMarginLRChange(const long nPageLeftMargin, const long nPageRightMargin); void ExecuteOrientationChange(const bool bLandscape); - DECL_LINK_TYPED(ImplOrientationHdl, Button*, void); + DECL_LINK(ImplOrientationHdl, Button*, void); }; } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 29a2f0304814..cd6acf721600 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -218,7 +218,7 @@ void PageSizeControl::ExecuteSizeChange( const Paper ePaper ) } -IMPL_LINK_TYPED(PageSizeControl, ImplSizeHdl, ValueSet*, pControl, void) +IMPL_LINK(PageSizeControl, ImplSizeHdl, ValueSet*, pControl, void) { mpSizeValueSet->SetNoSelection(); if ( pControl == mpSizeValueSet ) @@ -231,7 +231,7 @@ IMPL_LINK_TYPED(PageSizeControl, ImplSizeHdl, ValueSet*, pControl, void) EndPopupMode(); } -IMPL_LINK_NOARG_TYPED(PageSizeControl, MoreButtonClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(PageSizeControl, MoreButtonClickHdl_Impl, Button*, void) { if ( SfxViewFrame::Current() ) SfxViewFrame::Current()->GetDispatcher()->Execute( FN_FORMAT_PAGE_SETTING_DLG, SfxCallMode::ASYNCHRON ); diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index 3bd1da17beb1..0d3321a17f97 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -58,8 +58,8 @@ private: static void ExecuteSizeChange( const Paper ePaper ); - DECL_LINK_TYPED(ImplSizeHdl, ::ValueSet*, void); - DECL_LINK_TYPED(MoreButtonClickHdl_Impl, Button*, void); + DECL_LINK(ImplSizeHdl, ::ValueSet*, void); + DECL_LINK(MoreButtonClickHdl_Impl, Button*, void); }; } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx index 3221eae389aa..7cc75c5da45c 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.cxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx @@ -444,7 +444,7 @@ void PageStylesPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void ) { sal_uInt16 nColumnType = mpColumnCount->GetSelectEntryPos() + 1; mpPageColumnItem->SetValue( nColumnType ); @@ -452,21 +452,21 @@ IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void ) SfxCallMode::RECORD, { mpPageColumnItem.get() }); } -IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyNumberingHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageStylesPanel, ModifyNumberingHdl, ListBox&, void ) { SvxNumType nEntryData = static_cast<SvxNumType>(reinterpret_cast<sal_uLong>(mpNumberSelectLB->GetEntryData(mpNumberSelectLB->GetSelectEntryPos()))); mpPageItem->SetNumType(nEntryData); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE, SfxCallMode::RECORD, { mpPageItem.get() }); } -IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyLayoutHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageStylesPanel, ModifyLayoutHdl, ListBox&, void ) { sal_uInt16 nUse = mpLayoutSelectLB->GetSelectEntryPos(); mpPageItem->SetPageUsage(PosToPageUsage_Impl(nUse)); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE, SfxCallMode::RECORD, { mpPageItem.get() }); } -IMPL_LINK_NOARG_TYPED(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void) +IMPL_LINK_NOARG(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void) { const drawing::FillStyle eXFS = (drawing::FillStyle)mpBgFillType->GetSelectEntryPos(); const XFillStyleItem aXFillStyleItem(eXFS); @@ -514,7 +514,7 @@ IMPL_LINK_NOARG_TYPED(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void) mpBgFillType->Selected(); } -IMPL_LINK_NOARG_TYPED(PageStylesPanel, ModifyFillColorHdl, ListBox&, void) +IMPL_LINK_NOARG(PageStylesPanel, ModifyFillColorHdl, ListBox&, void) { const drawing::FillStyle eXFS = (drawing::FillStyle)mpBgFillType->GetSelectEntryPos(); SfxObjectShell* pSh = SfxObjectShell::Current(); diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx index 2f3f401df976..c0dacdbfb10f 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.hxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -112,11 +112,11 @@ private: const OUString GetHatchingSetOrDefault(); const OUString GetBitmapSetOrDefault(); - DECL_LINK_TYPED( ModifyColumnCountHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyNumberingHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyLayoutHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyFillStyleHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyFillColorHdl, ListBox&, void ); + DECL_LINK( ModifyColumnCountHdl, ListBox&, void ); + DECL_LINK( ModifyNumberingHdl, ListBox&, void ); + DECL_LINK( ModifyLayoutHdl, ListBox&, void ); + DECL_LINK( ModifyFillStyleHdl, ListBox&, void ); + DECL_LINK( ModifyFillColorHdl, ListBox&, void ); }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index 863fe2cf3b2b..e8caaca34efa 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -202,7 +202,7 @@ void StylePresetsPanel::dispose() PanelLayout::dispose(); } -IMPL_LINK_NOARG_TYPED(StylePresetsPanel, DoubleClickHdl, ValueSet*, void) +IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl, ValueSet*, void) { sal_Int32 nItemId = mpValueSet->GetSelectItemId(); TemplateEntry* pEntry = static_cast<TemplateEntry*>(mpValueSet->GetItemData(nItemId)); diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx index 3f4afbf07dcc..0fd077f140fd 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx @@ -76,7 +76,7 @@ private: std::vector<std::unique_ptr<TemplateEntry>> maTemplateEntries; - DECL_LINK_TYPED(DoubleClickHdl, ValueSet*, void); + DECL_LINK(DoubleClickHdl, ValueSet*, void); }; }} // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 3c84adbda75d..20d418c62029 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -485,15 +485,15 @@ void ThemePanel::dispose() PanelLayout::dispose(); } -IMPL_LINK_NOARG_TYPED(ThemePanel, ClickHdl, Button*, void) +IMPL_LINK_NOARG(ThemePanel, ClickHdl, Button*, void) { DoubleClickHdl(); } -IMPL_LINK_NOARG_TYPED(ThemePanel, DoubleClickValueSetHdl, ValueSet*, void) +IMPL_LINK_NOARG(ThemePanel, DoubleClickValueSetHdl, ValueSet*, void) { DoubleClickHdl(); } -IMPL_LINK_NOARG_TYPED(ThemePanel, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(ThemePanel, DoubleClickHdl, ListBox&, void) { DoubleClickHdl(); } diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx index d9833afff080..d22b303f5101 100644 --- a/sw/source/uibase/sidebar/ThemePanel.hxx +++ b/sw/source/uibase/sidebar/ThemePanel.hxx @@ -67,9 +67,9 @@ private: svx::ColorSets maColorSets; - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(DoubleClickValueSetHdl, ValueSet*, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); + DECL_LINK(DoubleClickValueSetHdl, ValueSet*, void); void DoubleClickHdl(); }; diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index 8897123ea3dc..a81222e65e81 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -211,14 +211,14 @@ void WrapPropertyPanel::UpdateSpacingLB() mpSpacingLB->SelectEntry(aCustomEntry); } -IMPL_LINK_NOARG_TYPED(WrapPropertyPanel, EditContourHdl, Button*, void) +IMPL_LINK_NOARG(WrapPropertyPanel, EditContourHdl, Button*, void) { SfxBoolItem aItem(SID_CONTOUR_DLG, true); mpBindings->GetDispatcher()->ExecuteList(SID_CONTOUR_DLG, SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(WrapPropertyPanel, EnableContourHdl, Button*, void) +IMPL_LINK_NOARG(WrapPropertyPanel, EnableContourHdl, Button*, void) { bool IsContour = mpEnableContour->IsChecked(); SfxBoolItem aItem(FN_FRAME_WRAP_CONTOUR, IsContour); @@ -226,7 +226,7 @@ IMPL_LINK_NOARG_TYPED(WrapPropertyPanel, EnableContourHdl, Button*, void) SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_TYPED(WrapPropertyPanel, SpacingLBHdl, ListBox&, rBox, void) +IMPL_LINK(WrapPropertyPanel, SpacingLBHdl, ListBox&, rBox, void) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData()); @@ -240,7 +240,7 @@ IMPL_LINK_TYPED(WrapPropertyPanel, SpacingLBHdl, ListBox&, rBox, void) SfxCallMode::RECORD, { &aULItem }); } -IMPL_LINK_NOARG_TYPED(WrapPropertyPanel, WrapTypeHdl, Button*, void) +IMPL_LINK_NOARG(WrapPropertyPanel, WrapTypeHdl, Button*, void) { sal_uInt16 nSlot = 0; if ( mpRBWrapLeft->IsChecked() ) diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index 8421ec858b03..55d0026a3742 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -96,10 +96,10 @@ namespace sw { namespace sidebar { void UpdateEditContour(); void UpdateSpacingLB(); - DECL_LINK_TYPED(WrapTypeHdl, Button*, void); - DECL_LINK_TYPED(EnableContourHdl, Button*, void); - DECL_LINK_TYPED(EditContourHdl, Button*, void); - DECL_LINK_TYPED(SpacingLBHdl, ListBox&, void); + DECL_LINK(WrapTypeHdl, Button*, void); + DECL_LINK(EnableContourHdl, Button*, void); + DECL_LINK(EditContourHdl, Button*, void); + DECL_LINK(SpacingLBHdl, ListBox&, void); }; } } // end of namespace ::sw::sidebar diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 07da38c4d243..63a270762516 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -70,11 +70,11 @@ class SwFormatTablePage : public SfxTabPage void Init(); void ModifyHdl(const Edit* pEdit); - DECL_LINK_TYPED( AutoClickHdl, Button*, void ); - DECL_LINK_TYPED( RelWidthClickHdl, Button*, void ); + DECL_LINK( AutoClickHdl, Button*, void ); + DECL_LINK( RelWidthClickHdl, Button*, void ); void RightModify(); - DECL_LINK_TYPED( UpDownHdl, SpinField&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( UpDownHdl, SpinField&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); using TabPage::ActivatePage; using TabPage::DeactivatePage; @@ -117,12 +117,12 @@ class SwTableColumnPage : public SfxTabPage bool bPercentMode:1; void Init(bool bWeb); - DECL_LINK_TYPED( AutoClickHdl, Button *, void ); + DECL_LINK( AutoClickHdl, Button *, void ); void ModifyHdl( MetricField* pEdit ); - DECL_LINK_TYPED( UpHdl, SpinField&, void ); - DECL_LINK_TYPED( DownHdl, SpinField&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( ModeHdl, Button *, void ); + DECL_LINK( UpHdl, SpinField&, void ); + DECL_LINK( DownHdl, SpinField&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( ModeHdl, Button *, void ); void UpdateCols( sal_uInt16 nAktPos ); SwTwips GetVisibleWidth(sal_uInt16 nPos); void SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth); @@ -172,13 +172,13 @@ class SwTextFlowPage : public SfxTabPage bool bPageBreak; bool bHtmlMode; - DECL_LINK_TYPED(PageBreakHdl_Impl, Button*, void); - DECL_LINK_TYPED(ApplyCollClickHdl_Impl, Button*, void); - DECL_LINK_TYPED( PageBreakPosHdl_Impl, Button*, void ); - DECL_LINK_TYPED( PageBreakTypeHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SplitHdl_Impl, Button*, void ); - DECL_STATIC_LINK_TYPED( SwTextFlowPage, SplitRowHdl_Impl, Button*, void ); - DECL_LINK_TYPED( HeadLineCBClickHdl, Button* = nullptr, void ); + DECL_LINK(PageBreakHdl_Impl, Button*, void); + DECL_LINK(ApplyCollClickHdl_Impl, Button*, void); + DECL_LINK( PageBreakPosHdl_Impl, Button*, void ); + DECL_LINK( PageBreakTypeHdl_Impl, Button*, void ); + DECL_LINK( SplitHdl_Impl, Button*, void ); + DECL_STATIC_LINK( SwTextFlowPage, SplitRowHdl_Impl, Button*, void ); + DECL_LINK( HeadLineCBClickHdl, Button* = nullptr, void ); public: SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index c9c74980507f..167049dc18d1 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1420,7 +1420,7 @@ void SwPagePreview::SetVisArea( const Rectangle &rRect ) m_pViewWin->Invalidate(); } -IMPL_LINK_TYPED( SwPagePreview, ScrollHdl, ScrollBar *, p, void ) +IMPL_LINK( SwPagePreview, ScrollHdl, ScrollBar *, p, void ) { SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p); if(!GetViewShell()) @@ -1453,7 +1453,7 @@ IMPL_LINK_TYPED( SwPagePreview, ScrollHdl, ScrollBar *, p, void ) EndScrollHdl( pScrollbar ); } -IMPL_LINK_TYPED( SwPagePreview, EndScrollHdl, ScrollBar *, p, void ) +IMPL_LINK( SwPagePreview, EndScrollHdl, ScrollBar *, p, void ) { SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p); if(!GetViewShell()) diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 8052a712534d..b5a0d53b7b42 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -203,7 +203,7 @@ void SwView::GotFocus() const // called by the FormShell when a form control is focused. This is // a request to put the form shell on the top of the dispatcher stack -IMPL_LINK_NOARG_TYPED(SwView, FormControlActivated, LinkParamNone*, void) +IMPL_LINK_NOARG(SwView, FormControlActivated, LinkParamNone*, void) { // if a form control has been activated, and the form shell is not on the top // of the dispatcher stack, then we need to activate it @@ -466,7 +466,7 @@ extern "C" } } -IMPL_LINK_NOARG_TYPED(SwView, AttrChangedNotify, SwCursorShell*, void) +IMPL_LINK_NOARG(SwView, AttrChangedNotify, SwCursorShell*, void) { if ( GetEditWin().IsChainMode() ) GetEditWin().SetChainMode( false ); @@ -512,7 +512,7 @@ IMPL_LINK_NOARG_TYPED(SwView, AttrChangedNotify, SwCursorShell*, void) } } -IMPL_LINK_NOARG_TYPED(SwView, TimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(SwView, TimeoutHdl, Timer *, void) { if( m_pWrtShell->BasicActionPend() || g_bNoInterrupt ) { diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 5d200aef812b..477d52610f2a 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -2452,7 +2452,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) #endif } -IMPL_LINK_TYPED( SwView, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( SwView, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { if ( ERRCODE_NONE != _pFileDlg->GetError() ) return; diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index c45467254110..07887a7f9b91 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -714,7 +714,7 @@ bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const } //#i87414# mod -IMPL_LINK_TYPED(SwView, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void) +IMPL_LINK(SwView, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void) { if (rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG) GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON); diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index a983002218fa..866087e60590 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -605,10 +605,10 @@ struct ExecuteInfo class AsyncExecute { public: - DECL_STATIC_LINK_TYPED( AsyncExecute, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, void*, void ); }; -IMPL_STATIC_LINK_TYPED( AsyncExecute, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, void*, p, void ) { ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); SolarMutexReleaser aReleaser; @@ -834,7 +834,7 @@ private: VclPtr<ListBox> aListBox; IFieldmark *pFieldmark; - DECL_LINK_TYPED( MyListBoxHandler, ListBox&, void ); + DECL_LINK( MyListBoxHandler, ListBox&, void ); public: SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ); @@ -897,7 +897,7 @@ void SwFieldDialog::dispose() FloatingWindow::dispose(); } -IMPL_LINK_TYPED( SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void ) +IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void ) { if ( !rBox.IsTravelSelect() ) { @@ -915,7 +915,7 @@ IMPL_LINK_TYPED( SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void ) } } -IMPL_LINK_NOARG_TYPED(SwView, FieldPopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(SwView, FieldPopupModeEndHdl, FloatingWindow*, void) { m_pFieldPopup.disposeAndClear(); } diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index a2d19dfccbe4..8c7ccf7e1693 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -258,7 +258,7 @@ void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, bool bViewOnly // Scrollbar - Handler -IMPL_LINK_TYPED( SwView, WindowChildEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SwView, WindowChildEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "Window???" ); vcl::Window* pChildWin = static_cast< vcl::Window* >( rEvent.GetData() ); @@ -304,7 +304,7 @@ void SwView::CreateScrollbar( bool bHori ) ppScrollbar->ExtendedShow(); } -IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void ) +IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void ) { bool* pbNext = static_cast<bool*>(p); if ( !pbNext ) @@ -518,7 +518,7 @@ int SwView::KillVRuler() return 1; } -IMPL_LINK_TYPED( SwView, ExecRulerClick, Ruler *, pRuler, void ) +IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler, void ) { OUString sDefPage; switch( pRuler->GetClickType() ) diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 89b3e1478e04..fab131719b7a 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -680,7 +680,7 @@ bool SwView::PageDownCursor(bool bSelect) // Handler of the scrollbars -IMPL_LINK_TYPED( SwView, ScrollHdl, ScrollBar *, p, void ) +IMPL_LINK( SwView, ScrollHdl, ScrollBar *, p, void ) { SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p); if ( GetWrtShell().ActionPend() ) @@ -752,7 +752,7 @@ IMPL_LINK_TYPED( SwView, ScrollHdl, ScrollBar *, p, void ) // Handler of the scrollbars -IMPL_LINK_TYPED( SwView, EndScrollHdl, ScrollBar *, p, void ) +IMPL_LINK( SwView, EndScrollHdl, ScrollBar *, p, void ) { SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p); if ( !GetWrtShell().ActionPend() ) diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index acdd0e487de2..aa667ef23aad 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -211,7 +211,7 @@ namespace private: void implTakeOwnership( ); - DECL_LINK_TYPED( OnTryDeleteFile, Timer*, void ); + DECL_LINK( OnTryDeleteFile, Timer*, void ); }; DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const OUString& _rTemporaryFile ) @@ -240,7 +240,7 @@ namespace osl_atomic_decrement( &m_refCount ); } - IMPL_LINK_NOARG_TYPED(DelayedFileDeletion, OnTryDeleteFile, Timer *, void) + IMPL_LINK_NOARG(DelayedFileDeletion, OnTryDeleteFile, Timer *, void) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f6a4cc1a30b2..48a21a981099 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1483,7 +1483,7 @@ bool SwContentTree::Collapse( SvTreeListEntry* pParent ) // Also on double click will be initially opened only. -IMPL_LINK_NOARG_TYPED(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) { SvTreeListEntry* pEntry = GetCurEntry(); // Is it a content type? @@ -2387,7 +2387,7 @@ void SwContentTree::HideTree() } /** No idle with focus or while dragging */ -IMPL_LINK_NOARG_TYPED(SwContentTree, TimerUpdate, Timer *, void) +IMPL_LINK_NOARG(SwContentTree, TimerUpdate, Timer *, void) { if (IsDisposed()) return; diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 46902cc28a3d..e47dabbdde6b 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -767,7 +767,7 @@ void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) } } -IMPL_LINK_TYPED( SwGlobalTree, PopupHdl, Menu* , pMenu, bool) +IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu, bool) { ExecuteContextMenuAction( pMenu->GetCurItemId()); return true; @@ -1005,7 +1005,7 @@ void SwGlobalTree::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) delete pContCopy; } -IMPL_LINK_NOARG_TYPED(SwGlobalTree, Timeout, Timer *, void) +IMPL_LINK_NOARG(SwGlobalTree, Timeout, Timer *, void) { if(!IsDisposed() && !HasFocus() && Update( false )) Display(); @@ -1193,7 +1193,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) } } -IMPL_LINK_NOARG_TYPED( SwGlobalTree, DoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG( SwGlobalTree, DoubleClickHdl, SvTreeListBox*, bool) { SvTreeListEntry* pEntry = GetCurEntry(); SwGlblDocContent* pCont = static_cast<SwGlblDocContent*>(pEntry->GetUserData()); @@ -1212,7 +1212,7 @@ SwNavigationPI* SwGlobalTree::GetParentWindow() return static_cast<SwNavigationPI*>(Window::GetParent()); } -IMPL_STATIC_LINK_NOARG_TYPED(SwGlobalTree, ShowFrameHdl, void*, void) +IMPL_STATIC_LINK_NOARG(SwGlobalTree, ShowFrameHdl, void*, void) { const SfxObjectShell* pShell = SwGlobalTree::GetShowShell(); SfxViewFrame* pFirst = pShell ? SfxViewFrame::GetFirst(pShell) : nullptr; @@ -1354,7 +1354,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen } } -IMPL_LINK_TYPED( SwGlobalTree, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( SwGlobalTree, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { if ( ERRCODE_NONE != _pFileDlg->GetError() ) return; diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 48280c4f9cad..6f4f39f5c5b7 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -54,8 +54,8 @@ class SwGlossDecideDlg : public ModalDialog VclPtr<OKButton> m_pOk; VclPtr<ListBox> m_pListLB; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); + DECL_LINK(SelectHdl, ListBox&, void); public: explicit SwGlossDecideDlg(vcl::Window* pParent); @@ -88,12 +88,12 @@ void SwGlossDecideDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwGlossDecideDlg, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SwGlossDecideDlg, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwGlossDecideDlg, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwGlossDecideDlg, SelectHdl, ListBox&, void) { m_pOk->Enable(LISTBOX_ENTRY_NOTFOUND != m_pListLB->GetSelectEntryPos()); } diff --git a/sw/source/uibase/utlui/gotodlg.cxx b/sw/source/uibase/utlui/gotodlg.cxx index df76db6a2362..1098923f40f4 100644 --- a/sw/source/uibase/utlui/gotodlg.cxx +++ b/sw/source/uibase/utlui/gotodlg.cxx @@ -63,7 +63,7 @@ void SwGotoPageDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwGotoPageDlg, PageModifiedHdl, Edit&, void) +IMPL_LINK_NOARG(SwGotoPageDlg, PageModifiedHdl, Edit&, void) { if(!(mpMtrPageCtrl->GetText()).isEmpty() ) { diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index cb68eb601121..ff1df896201f 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -140,7 +140,7 @@ static void lcl_UnSelectFrame(SwWrtShell *pSh) // Select the document view -IMPL_LINK_TYPED( SwNavigationPI, DocListBoxSelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox&, rBox, void ) { int nEntryIdx = rBox.GetSelectEntryPos(); SwView *pView ; @@ -209,7 +209,7 @@ void SwNavigationPI::UsePage() // Select handler of the toolboxes -IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void ) +IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void ) { const sal_uInt16 nCurrItemId = pBox->GetCurItemId(); SwView *pView = GetCreateView(); @@ -347,7 +347,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void ) // Click handler of the toolboxes -IMPL_LINK_TYPED( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox, void ) +IMPL_LINK( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox, void ) { const sal_uInt16 nCurrItemId = pBox->GetCurItemId(); switch (nCurrItemId) @@ -361,7 +361,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox, void ) } } -IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void ) +IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void ) { const sal_uInt16 nCurrItemId = pBox->GetCurItemId(); switch (nCurrItemId) @@ -467,7 +467,7 @@ void SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt ) // Action-Handler Edit: // Switches to the page if the structure view is not turned on. -IMPL_LINK_TYPED( SwNavigationPI, EditAction, NumEditAction&, rEdit, void ) +IMPL_LINK( SwNavigationPI, EditAction, NumEditAction&, rEdit, void ) { SwView *pView = GetCreateView(); if (pView) @@ -482,7 +482,7 @@ IMPL_LINK_TYPED( SwNavigationPI, EditAction, NumEditAction&, rEdit, void ) // If the page can be set here, the maximum is set. -IMPL_LINK_TYPED( SwNavigationPI, EditGetFocus, Control&, rControl, void ) +IMPL_LINK( SwNavigationPI, EditGetFocus, Control&, rControl, void ) { NumEditAction* pEdit = static_cast<NumEditAction*>(&rControl); SwView *pView = GetCreateView(); @@ -894,7 +894,7 @@ void SwNavigationPI::SetPopupWindow( SfxPopupWindow* pWindow ) m_pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNavigationPI, ClosePopupWindow )); } -IMPL_LINK_NOARG_TYPED(SwNavigationPI, PopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(SwNavigationPI, PopupModeEndHdl, FloatingWindow*, void) { if ( m_pPopupWindow->IsVisible() ) { @@ -912,7 +912,7 @@ IMPL_LINK_NOARG_TYPED(SwNavigationPI, PopupModeEndHdl, FloatingWindow*, void) } } -IMPL_LINK_TYPED( SwNavigationPI, ClosePopupWindow, SfxPopupWindow *, pWindow, void ) +IMPL_LINK( SwNavigationPI, ClosePopupWindow, SfxPopupWindow *, pWindow, void ) { if ( pWindow == m_pFloatingWindow ) m_pFloatingWindow = nullptr; @@ -998,7 +998,7 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint ) } } -IMPL_LINK_TYPED( SwNavigationPI, MenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SwNavigationPI, MenuSelectHdl, Menu *, pMenu, bool ) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); if(nMenuId != USHRT_MAX) @@ -1079,7 +1079,7 @@ void SwNavigationPI::UpdateListBox() m_aDocListBox->SetUpdateMode(true); } -IMPL_LINK_TYPED(SwNavigationPI, DoneLink, SfxPoolItem *, pItem, void) +IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem, void) { const SfxViewFrameItem* pFrameItem = dynamic_cast<SfxViewFrameItem*>( pItem ); if( pFrameItem ) @@ -1251,7 +1251,7 @@ bool SwNavigationPI::IsGlobalDoc() const return bRet; } -IMPL_LINK_NOARG_TYPED(SwNavigationPI, ChangePageHdl, Idle *, void) +IMPL_LINK_NOARG(SwNavigationPI, ChangePageHdl, Idle *, void) { if (!IsDisposed()) { @@ -1260,7 +1260,7 @@ IMPL_LINK_NOARG_TYPED(SwNavigationPI, ChangePageHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(SwNavigationPI, PageEditModifyHdl, SpinField&, void) +IMPL_LINK_NOARG(SwNavigationPI, PageEditModifyHdl, SpinField&, void) { if(m_aPageChgIdle.IsActive()) m_aPageChgIdle.Stop(); diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index 39fd6b37081a..cd69de7721bf 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -358,7 +358,7 @@ sal_uLong NumFormatListBox::GetFormat() const return reinterpret_cast<sal_uLong>(GetEntryData(nPos)); } -IMPL_LINK_TYPED( NumFormatListBox, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( NumFormatListBox, SelectHdl, ListBox&, rBox, void ) { const sal_Int32 nPos = rBox.GetSelectEntryPos(); OUString sDefine(SW_RES( STR_DEFINE_NUMBERFORMAT )); diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 8ecc523e7b95..040c44861512 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -194,7 +194,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > const & xVie } } -IMPL_LINK_TYPED( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void ) +IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void ) { if(!_xControl.is()) return; @@ -484,7 +484,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) aPop->Execute( aTopWindow.get(), rPt ); } -IMPL_LINK_TYPED(SwOneExampleFrame, PopupHdl, Menu*, pMenu, bool ) +IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu, bool ) { sal_uInt16 nId = pMenu->GetCurItemId(); if ((nId > ITEM_ZOOM) && diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 8fb183c55c40..0874d2af4f73 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -702,7 +702,7 @@ void SwWrtShell::LeaveSelFrameMode() // Description: execute framebound macro -IMPL_LINK_TYPED( SwWrtShell, ExecFlyMac, const SwFlyFrameFormat*, pFlyFormat, void ) +IMPL_LINK( SwWrtShell, ExecFlyMac, const SwFlyFrameFormat*, pFlyFormat, void ) { const SwFrameFormat *pFormat = pFlyFormat ? static_cast<const SwFrameFormat*>(pFlyFormat) : GetFlyFrameFormat(); OSL_ENSURE(pFormat, "no frame format"); diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index 442216ac6754..c97c0ceed535 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -212,7 +212,7 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor #endif } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( test::BootstrapFixture, ImplInitFilterHdl, ConvertData&, rData, bool) { return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( rData ); diff --git a/test/source/setupvcl.cxx b/test/source/setupvcl.cxx index c1703aa47e5a..bd5401b2f059 100644 --- a/test/source/setupvcl.cxx +++ b/test/source/setupvcl.cxx @@ -27,14 +27,14 @@ namespace { struct Hook { // LINK only works as a member of a class... - DECL_STATIC_LINK_TYPED(Hook, deinitHook, LinkParamNone *, void); + DECL_STATIC_LINK(Hook, deinitHook, LinkParamNone *, void); }; // HACK so that defaultBootstrap_InitialComponentContext (in // unobootstrapprotector) is called before InitVCL (below), but component // context is disposed (redundantly again in unobootstrapprotector) from within // DeInitVCL (cf. Desktop::DeInit, desktop/source/app/app.cxx): -IMPL_STATIC_LINK_NOARG_TYPED(Hook, deinitHook, LinkParamNone *, void) { +IMPL_STATIC_LINK_NOARG(Hook, deinitHook, LinkParamNone *, void) { css::uno::Reference<css::uno::XComponentContext> context; try { context = comphelper::getProcessComponentContext(); diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index 35ccc6a547e6..95467f944d35 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -61,7 +61,7 @@ private: css::uno::Any aData; }; - DECL_STATIC_LINK_TYPED( AsyncCallback, Notify_Impl, void*, void ); + DECL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, void ); virtual ~AsyncCallback() override {} }; @@ -96,7 +96,7 @@ void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XC } // private asynchronous link to call reference to the callback object -IMPL_STATIC_LINK_TYPED( AsyncCallback, Notify_Impl, void*, p, void ) +IMPL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, p, void ) { CallbackData* pCallbackData = static_cast<CallbackData*>(p); try diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx index d1fc2ddabf43..a74aab53201d 100644 --- a/toolkit/source/awt/scrollabledialog.cxx +++ b/toolkit/source/awt/scrollabledialog.cxx @@ -115,8 +115,8 @@ void ScrollableWrapper<T>::lcl_Scroll( long nX, long nY ) } } -//Can't use IMPL_LINK_TYPED with the template -//IMPL_LINK_TYPED( ScrollableWrapper, ScrollBarHdl, ScrollBar*, pSB, void ) +//Can't use IMPL_LINK with the template +//IMPL_LINK( ScrollableWrapper, ScrollBarHdl, ScrollBar*, pSB, void ) template< class T> void ScrollableWrapper<T>::LinkStubScrollBarHdl( void* pThis, ScrollBar* pCaller) diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 0aad2ed2e0b1..f38bdcf38aa8 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -56,11 +56,11 @@ namespace toolkit { } - DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); + DECL_LINK( OnWindowEvent, VclWindowEvent&, void ); }; - IMPL_LINK_TYPED( WindowStyleSettings_Data, OnWindowEvent, VclWindowEvent&, rEvent, void ) + IMPL_LINK( WindowStyleSettings_Data, OnWindowEvent, VclWindowEvent&, rEvent, void ) { if ( rEvent.GetId() != VCLEVENT_WINDOW_DATACHANGED ) return; diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index c182d5634916..20c39d111cfb 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -111,7 +111,7 @@ uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames() th return aNames; } -IMPL_LINK_TYPED( VCLXAccessibleComponent, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclWindowEvent&, rEvent, void ) { /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper * might have been destroyed by the previous VCLEventListener (if no AT tool @@ -127,7 +127,7 @@ IMPL_LINK_TYPED( VCLXAccessibleComponent, WindowEventListener, VclWindowEvent&, } } -IMPL_LINK_TYPED( VCLXAccessibleComponent, WindowChildEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( VCLXAccessibleComponent, WindowChildEventListener, VclWindowEvent&, rEvent, void ) { if ( m_xVCLXWindow.is() /* #i68079# */ ) { diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 827e0df4756d..2b98cc7436ae 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -77,7 +77,7 @@ void VCLXMenu::ImplCreateMenu( bool bPopup ) mpMenu->AddEventListener( LINK( this, VCLXMenu, MenuEventListener ) ); } -IMPL_LINK_TYPED( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void ) +IMPL_LINK( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void ) { DBG_ASSERT( rMenuEvent.GetMenu() && mpMenu, "Menu???" ); diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 6acd3bbc090b..b3469f2e9ef3 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -195,9 +195,9 @@ class VCLXToolkit : public VCLXToolkitMutexHelper, bool m_bEventListener; bool m_bKeyListener; - DECL_LINK_TYPED(eventListenerHandler, ::VclSimpleEvent&, void); + DECL_LINK(eventListenerHandler, ::VclSimpleEvent&, void); - DECL_LINK_TYPED(keyListenerHandler, ::VclWindowEvent&, bool); + DECL_LINK(keyListenerHandler, ::VclWindowEvent&, bool); void callTopWindowListeners( ::VclSimpleEvent const * pEvent, @@ -1751,7 +1751,7 @@ void SAL_CALL VCLXToolkit::fireFocusLost( } -IMPL_LINK_TYPED(VCLXToolkit, eventListenerHandler, ::VclSimpleEvent&, rEvent, void) +IMPL_LINK(VCLXToolkit, eventListenerHandler, ::VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) { @@ -1792,7 +1792,7 @@ IMPL_LINK_TYPED(VCLXToolkit, eventListenerHandler, ::VclSimpleEvent&, rEvent, vo } } -IMPL_LINK_TYPED(VCLXToolkit, keyListenerHandler, ::VclWindowEvent&, rEvent, bool) +IMPL_LINK(VCLXToolkit, keyListenerHandler, ::VclWindowEvent&, rEvent, bool) { switch (rEvent.GetId()) { diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 3e825b5b9e20..2f21102e5a4b 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -188,7 +188,7 @@ public: ~VCLXWindowImpl(); private: - DECL_LINK_TYPED( OnProcessCallbacks, void*, void ); + DECL_LINK( OnProcessCallbacks, void*, void ); }; @@ -271,7 +271,7 @@ void VCLXWindowImpl::callBackAsync( const VCLXWindow::Callback& i_callback ) } -IMPL_LINK_NOARG_TYPED(VCLXWindowImpl, OnProcessCallbacks, void*, void) +IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks, void*, void) { const Reference< uno::XInterface > xKeepAlive( mrAntiImpl ); @@ -401,7 +401,7 @@ void VCLXWindow::notifyWindowRemoved( vcl::Window& _rWindow ) } } -IMPL_LINK_TYPED( VCLXWindow, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( VCLXWindow, WindowEventListener, VclWindowEvent&, rEvent, void ) { if ( mpImpl->mnListenerLockLevel ) return; diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx index d7ec24640297..b86bf9f18287 100644 --- a/tubes/source/contacts.cxx +++ b/tubes/source/contacts.cxx @@ -31,11 +31,11 @@ class TubeContacts : public ModelessDialog VclPtr<ListBox> mpList; Collaboration* mpCollaboration; - DECL_LINK_TYPED( BtnDemoHdl, Button*, void ); - DECL_LINK_TYPED( BtnConnectHdl, Button*, void ); - DECL_LINK_TYPED( BtnGroupHdl, Button*, void ); - DECL_LINK_TYPED( BtnInviteHdl, Button*, void ); - DECL_LINK_TYPED( BtnListenHdl, Button*, void ); + DECL_LINK( BtnDemoHdl, Button*, void ); + DECL_LINK( BtnConnectHdl, Button*, void ); + DECL_LINK( BtnGroupHdl, Button*, void ); + DECL_LINK( BtnInviteHdl, Button*, void ); + DECL_LINK( BtnListenHdl, Button*, void ); AccountContactPairV maACs; @@ -186,27 +186,27 @@ public: } }; -IMPL_LINK_NOARG_TYPED( TubeContacts, BtnDemoHdl, Button*, void ) +IMPL_LINK_NOARG( TubeContacts, BtnDemoHdl, Button*, void ) { StartDemoSession(); } -IMPL_LINK_NOARG_TYPED( TubeContacts, BtnConnectHdl, Button*, void ) +IMPL_LINK_NOARG( TubeContacts, BtnConnectHdl, Button*, void ) { StartBuddySession(); } -IMPL_LINK_NOARG_TYPED( TubeContacts, BtnGroupHdl, Button*, void ) +IMPL_LINK_NOARG( TubeContacts, BtnGroupHdl, Button*, void ) { StartGroupSession(); } -IMPL_LINK_NOARG_TYPED( TubeContacts, BtnInviteHdl, Button*, void ) +IMPL_LINK_NOARG( TubeContacts, BtnInviteHdl, Button*, void ) { Invite(); } -IMPL_LINK_NOARG_TYPED( TubeContacts, BtnListenHdl, Button*, void ) +IMPL_LINK_NOARG( TubeContacts, BtnListenHdl, Button*, void ) { Listen(); } diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx index dedcdc8a1aee..230de254ca11 100644 --- a/uui/source/authfallbackdlg.cxx +++ b/uui/source/authfallbackdlg.cxx @@ -79,12 +79,12 @@ void AuthFallbackDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED ( AuthFallbackDlg, OKHdl, Button *, void) +IMPL_LINK_NOARG ( AuthFallbackDlg, OKHdl, Button *, void) { EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED ( AuthFallbackDlg, CancelHdl, Button *, void) +IMPL_LINK_NOARG ( AuthFallbackDlg, CancelHdl, Button *, void) { EndDialog(); } diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx index 36d1b41adcb8..ff10407265b5 100644 --- a/uui/source/authfallbackdlg.hxx +++ b/uui/source/authfallbackdlg.hxx @@ -40,8 +40,8 @@ public: private: - DECL_LINK_TYPED ( OKHdl, Button *, void ); - DECL_LINK_TYPED ( CancelHdl, Button *, void ); + DECL_LINK ( OKHdl, Button *, void ); + DECL_LINK ( CancelHdl, Button *, void ); }; #endif // INCLUDED_SVTOOLS_AUTHFALLBACKDLG_HXX diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index 740c847df5fd..1bdb85f91da5 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -151,7 +151,7 @@ void LoginDialog::SetRequest() m_pRequestInfo->SetText(aRequest); } -IMPL_LINK_NOARG_TYPED(LoginDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(LoginDialog, OKHdl_Impl, Button*, void) { // trim the strings m_pNameED->SetText(comphelper::string::strip(m_pNameED->GetText(), ' ')); @@ -159,7 +159,7 @@ IMPL_LINK_NOARG_TYPED(LoginDialog, OKHdl_Impl, Button*, void) EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(LoginDialog, PathHdl_Impl, Button*, void) +IMPL_LINK_NOARG(LoginDialog, PathHdl_Impl, Button*, void) { try { @@ -181,7 +181,7 @@ IMPL_LINK_NOARG_TYPED(LoginDialog, PathHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(LoginDialog, UseSysCredsHdl_Impl, Button*, void) +IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl, Button*, void) { EnableUseSysCredsControls_Impl( m_pUseSysCredsCB->IsChecked() ); } diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 6d156a035784..ecef81e8dae5 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -62,9 +62,9 @@ class LoginDialog : public ModalDialog void EnableUseSysCredsControls_Impl( bool bUseSysCredsEnabled ); void SetRequest(); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(PathHdl_Impl, Button*, void); - DECL_LINK_TYPED(UseSysCredsHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(PathHdl_Impl, Button*, void); + DECL_LINK(UseSysCredsHdl_Impl, Button*, void); public: LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags, diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index 9d6bf6e562d8..1064d140df6e 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -26,12 +26,12 @@ // MasterPasswordCreateDialog--------------------------------------------------- -IMPL_LINK_NOARG_TYPED(MasterPasswordCreateDialog, EditHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl, Edit&, void) { m_pOKBtn->Enable( m_pEDMasterPasswordCrt->GetText().getLength() >= 1 ); } -IMPL_LINK_NOARG_TYPED(MasterPasswordCreateDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl, Button*, void) { // compare both passwords and show message box if there are not equal!! if( m_pEDMasterPasswordCrt->GetText() == m_pEDMasterPasswordRepeat->GetText() ) diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index 48310e5fd276..38efbcb0ac46 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -37,8 +37,8 @@ private: VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(EditHdl_Impl, Edit&, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(EditHdl_Impl, Edit&, void); public: MasterPasswordCreateDialog( vcl::Window* pParent, ResMgr * pResMgr ); diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index 4f055e73c22b..625d307583c9 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -25,7 +25,7 @@ // MasterPasswordDialog--------------------------------------------------- -IMPL_LINK_NOARG_TYPED(MasterPasswordDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(MasterPasswordDialog, OKHdl_Impl, Button*, void) { EndDialog( RET_OK ); } diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index 80da364af488..7dcc81074612 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -33,7 +33,7 @@ class MasterPasswordDialog : public ModalDialog VclPtr<Edit> m_pEDMasterPassword; VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); public: MasterPasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx index e299b2709233..43a7351bdcb9 100644 --- a/uui/source/nameclashdlg.cxx +++ b/uui/source/nameclashdlg.cxx @@ -25,7 +25,7 @@ // NameClashDialog --------------------------------------------------------- -IMPL_LINK_TYPED( NameClashDialog, ButtonHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( NameClashDialog, ButtonHdl_Impl, Button *, pBtn, void ) { long nRet = (long) ABORT; if ( m_pBtnRename == pBtn ) diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx index 0f98ed243bf1..3fb37ea1cdc5 100644 --- a/uui/source/nameclashdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -39,7 +39,7 @@ class NameClashDialog : public ModalDialog OUString maSameName; OUString maNewName; - DECL_LINK_TYPED( ButtonHdl_Impl, Button *, void ); + DECL_LINK( ButtonHdl_Impl, Button *, void ); public: NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr, diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index bcba73ef1b26..490af47a9c16 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -102,7 +102,7 @@ void PasswordDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(PasswordDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl, Button*, void) { bool bEDPasswdValid = m_pEDPassword->GetText().getLength() >= nMinLen; bool bPasswdMismatch = m_pEDConfirmPassword->GetText() != m_pEDPassword->GetText(); diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index 71c81eefec87..34627b9cfb64 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -40,7 +40,7 @@ class PasswordDialog : public ModalDialog OUString aPasswdMismatch; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); public: PasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 08bf026b8796..17bbc161eb2d 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -113,7 +113,7 @@ void MacroWarning::SetDocumentURL( const OUString& rDocURL ) mpDocNameFI->SetText( rDocURL ); } -IMPL_LINK_NOARG_TYPED(MacroWarning, ViewSignsBtnHdl, Button*, void) +IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl, Button*, void) { DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" ); @@ -128,7 +128,7 @@ IMPL_LINK_NOARG_TYPED(MacroWarning, ViewSignsBtnHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(MacroWarning, EnableBtnHdl, Button*, void) +IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl, Button*, void) { if( mbSignedMode && mpAlwaysTrustCB->IsChecked() ) { // insert path into trusted path list @@ -149,12 +149,12 @@ IMPL_LINK_NOARG_TYPED(MacroWarning, EnableBtnHdl, Button*, void) EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(MacroWarning, DisableBtnHdl, Button*, void) +IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl, Button*, void) { EndDialog(); } -IMPL_LINK_NOARG_TYPED(MacroWarning, AlwaysTrustCheckHdl, Button*, void) +IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, Button*, void) { bool bEnable = ( mnActSecLevel < 2 || mpAlwaysTrustCB->IsChecked() ); mpEnableBtn->Enable( bEnable ); diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index d71286d28a8d..fec9a519f55b 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -59,10 +59,10 @@ private: const bool mbShowSignatures; sal_Int32 mnActSecLevel; - DECL_LINK_TYPED( ViewSignsBtnHdl, Button*, void ); - DECL_LINK_TYPED( EnableBtnHdl, Button*, void ); - DECL_LINK_TYPED( DisableBtnHdl, Button*, void ); - DECL_LINK_TYPED( AlwaysTrustCheckHdl, Button*, void ); + DECL_LINK( ViewSignsBtnHdl, Button*, void ); + DECL_LINK( EnableBtnHdl, Button*, void ); + DECL_LINK( DisableBtnHdl, Button*, void ); + DECL_LINK( AlwaysTrustCheckHdl, Button*, void ); void InitControls(); diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 9184365a160c..e3e38e72062c 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -28,7 +28,7 @@ using namespace css; -IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl, Button*, void) { if ( m_pOptionButtonAccept->IsChecked() ) { @@ -40,7 +40,7 @@ IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, OKHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void) +IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void) { uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures( css::security::DocumentDigitalSignatures::createDefault(m_xContext) ); diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 34911525b5d6..6dfd3bea41f1 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -39,8 +39,8 @@ private: const css::uno::Reference< css::uno::XComponentContext >& m_xContext; const css::uno::Reference< css::security::XCertificate >& m_rXCert; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(ViewCertHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(ViewCertHdl_Impl, Button*, void); public: UnknownAuthDialog(vcl::Window* pParent, diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 50c38abaeb61..80ef3040a93d 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -112,10 +112,10 @@ public: m_aTimer.Start(); } - DECL_LINK_TYPED( MacroCallHdl, Timer*, void ); + DECL_LINK( MacroCallHdl, Timer*, void ); }; -IMPL_LINK_NOARG_TYPED(VbaTimer, MacroCallHdl, Timer *, void) +IMPL_LINK_NOARG(VbaTimer, MacroCallHdl, Timer *, void) { if ( m_aTimerInfo.second.second == 0 || GetNow() < m_aTimerInfo.second.second ) { diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx index 6e2bb2fec703..bd3d4bfcf736 100644 --- a/vcl/backendtest/VisualBackendTest.cxx +++ b/vcl/backendtest/VisualBackendTest.cxx @@ -132,7 +132,7 @@ public: disposeOnce(); } - DECL_LINK_TYPED(updateHdl, Timer*, void); + DECL_LINK(updateHdl, Timer*, void); virtual void dispose() override { @@ -504,7 +504,7 @@ public: } }; -IMPL_LINK_NOARG_TYPED(VisualBackendTestWindow, updateHdl, Timer *, void) +IMPL_LINK_NOARG(VisualBackendTestWindow, updateHdl, Timer *, void) { if (mbAnimate) { diff --git a/vcl/inc/dndeventdispatcher.hxx b/vcl/inc/dndeventdispatcher.hxx index 5cb29bd2105c..79851892c144 100644 --- a/vcl/inc/dndeventdispatcher.hxx +++ b/vcl/inc/dndeventdispatcher.hxx @@ -36,7 +36,7 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper< VclPtr<vcl::Window> m_pCurrentWindow; void designate_currentwindow(vcl::Window *pWindow); - DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); + DECL_LINK(WindowEventListener, VclWindowEvent&, void); ::osl::Mutex m_aMutex; css::uno::Sequence< css::datatransfer::DataFlavor > m_aDataFlavorList; diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index 3f1606d504a8..beb72460024d 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -42,7 +42,7 @@ private: QuickHelpFlags mnStyle; private: - DECL_LINK_TYPED( TimerHdl, Timer*, void ); + DECL_LINK( TimerHdl, Timer*, void ); virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index abddd4eed0b9..a237e346bd2d 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -380,9 +380,9 @@ protected: void ImplCheckScrollBars(); void ImplInitScrollBars(); - DECL_LINK_TYPED( ScrollBarHdl, ScrollBar*, void ); - DECL_LINK_TYPED( LBWindowScrolled, ImplListBoxWindow*, void ); - DECL_LINK_TYPED( MRUChanged, LinkParamNone*, void ); + DECL_LINK( ScrollBarHdl, ScrollBar*, void ); + DECL_LINK( LBWindowScrolled, ImplListBoxWindow*, void ); + DECL_LINK( MRUChanged, LinkParamNone*, void ); public: ImplListBox( vcl::Window* pParent, WinBits nWinStyle ); diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 0409130a2c4f..69d6771ed751 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -231,16 +231,16 @@ namespace vcl virtual void Command( const CommandEvent& ) override; virtual void DataChanged( const DataChangedEvent& ) override; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( ToggleHdl, CheckBox&, void ); - DECL_LINK_TYPED( ToggleRadioHdl, RadioButton&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( ToggleHdl, CheckBox&, void ); + DECL_LINK( ToggleRadioHdl, RadioButton&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( UIOption_CheckHdl, CheckBox&, void ); - DECL_LINK_TYPED( UIOption_RadioHdl, RadioButton&, void ); - DECL_LINK_TYPED( UIOption_SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( UIOption_ModifyHdl, Edit&, void ); + DECL_LINK( UIOption_CheckHdl, CheckBox&, void ); + DECL_LINK( UIOption_RadioHdl, RadioButton&, void ); + DECL_LINK( UIOption_SelectHdl, ListBox&, void ); + DECL_LINK( UIOption_ModifyHdl, Edit&, void ); public: PrintDialog( vcl::Window*, const std::shared_ptr< PrinterController >& ); @@ -266,7 +266,7 @@ namespace vcl sal_Int32 mnCur; sal_Int32 mnMax; - DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); public: PrintProgressDialog(vcl::Window* i_pParent, int i_nMax); diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 128cebf2cdd6..7a04037a045e 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -141,12 +141,12 @@ struct ImplSVAppData Idle* mpEventTestingIdle; int mnEventTestLimit; - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplQuitMsg, void*, void); - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplPrepareExitMsg, void*, void); - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplEndAllDialogsMsg, void*, void); - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplEndAllPopupsMsg, void*, void); - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplVclEventTestingHdl, void*, void); - DECL_LINK_TYPED(VclEventTestingHdl, Idle*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplQuitMsg, void*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplPrepareExitMsg, void*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplEndAllDialogsMsg, void*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplEndAllPopupsMsg, void*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplVclEventTestingHdl, void*, void); + DECL_LINK(VclEventTestingHdl, Idle*, void); }; struct ImplSVGDIData diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 76ab0644c29a..057436a5d6a8 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -322,7 +322,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager Timer m_aFontInstallerTimer; #if ENABLE_DBUS - DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void ); + DECL_LINK( autoInstallFontLangSupport, Timer*, void ); #endif PrintFontManager(); ~PrintFontManager(); diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index cbb7d2cae936..368ff74c8c60 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -64,7 +64,7 @@ private: void ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries); void ActivateAllSubmenus(Menu* pMenuBar); - DECL_LINK_TYPED(MenuBarHierarchyChangeHandler, Idle*, void); + DECL_LINK(MenuBarHierarchyChangeHandler, Idle*, void); public: GtkSalMenu( bool bMenuBar ); diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 07a285353460..2c0be07f4b82 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -148,7 +148,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl long HandleReparentEvent ( XReparentEvent *pEvent ); long HandleClientMessage ( XClientMessageEvent*pEvent ); - DECL_LINK_TYPED( HandleAlwaysOnTopRaise, Timer*, void ); + DECL_LINK( HandleAlwaysOnTopRaise, Timer*, void ); void createNewWindow( ::Window aParent, SalX11Screen nXScreen = SalX11Screen( -1 ) ); void updateScreenNumber(); diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx index 203c372f3fc8..f754547da76a 100644 --- a/vcl/inc/unx/sm.hxx +++ b/vcl/inc/unx/sm.hxx @@ -57,10 +57,10 @@ class SessionManagerClient static OString getPreviousSessionID(); - DECL_STATIC_LINK_TYPED( SessionManagerClient, ShutDownHdl, void*, void ); - DECL_STATIC_LINK_TYPED( SessionManagerClient, ShutDownCancelHdl, void*, void ); - DECL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, void ); - DECL_STATIC_LINK_TYPED( SessionManagerClient, InteractionHdl, void*, void ); + DECL_STATIC_LINK( SessionManagerClient, ShutDownHdl, void*, void ); + DECL_STATIC_LINK( SessionManagerClient, ShutDownCancelHdl, void*, void ); + DECL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, void ); + DECL_STATIC_LINK( SessionManagerClient, InteractionHdl, void*, void ); public: static void open(SalSession * pSession); static void close(); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index a5e72b32541e..d63011b4cb2e 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -448,7 +448,7 @@ void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode ) maShowTimer.Start(); } -IMPL_LINK_TYPED( HelpTextWindow, TimerHdl, Timer*, pTimer, void) +IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer, void) { if ( pTimer == &maShowTimer ) { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index bd6bccba70be..98dfacdb2d48 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -332,14 +332,14 @@ const vcl::KeyCode* Application::GetReservedKeyCode( sal_uLong i ) return &ImplReservedKeys::get()->first[i].mKeyCode; } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplEndAllPopupsMsg, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplEndAllPopupsMsg, void*, void ) { ImplSVData* pSVData = ImplGetSVData(); while (pSVData->maWinData.mpFirstFloat) pSVData->maWinData.mpFirstFloat->EndPopupMode(FloatWinPopupEndFlags::Cancel); } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplEndAllDialogsMsg, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplEndAllDialogsMsg, void*, void ) { vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow(); while (pAppWindow) @@ -411,7 +411,7 @@ namespace } } -IMPL_LINK_NOARG_TYPED(ImplSVAppData, VclEventTestingHdl, Idle *, void) +IMPL_LINK_NOARG(ImplSVAppData, VclEventTestingHdl, Idle *, void) { if (Application::AnyInput()) { @@ -423,7 +423,7 @@ IMPL_LINK_NOARG_TYPED(ImplSVAppData, VclEventTestingHdl, Idle *, void) } } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplVclEventTestingHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplVclEventTestingHdl, void*, void ) { ImplSVData* pSVData = ImplGetSVData(); SAL_INFO("vcl.eventtesting", "EventTestLimit is " << pSVData->maAppData.mnEventTestLimit); @@ -446,7 +446,7 @@ IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplVclEventTestingHdl, void*, void } } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplPrepareExitMsg, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplPrepareExitMsg, void*, void ) { //now close top level frames (void)GetpApp()->QueryExit(); @@ -575,7 +575,7 @@ void Application::ReAcquireSolarMutex(sal_uLong const nReleased) #endif } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplQuitMsg, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg, void*, void ) { ImplGetSVData()->maAppData.mbAppQuit = true; } @@ -960,7 +960,7 @@ ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, } -IMPL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, pCallData, void ) +IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData, void ) { const SolarMutexGuard aGuard; ImplPostEventData* pData = static_cast< ImplPostEventData * >( pCallData ); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 37a6dbc69ae9..658a8b0d19c1 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -626,7 +626,7 @@ FactoryFunction Button::GetUITestFactory() const return ButtonUIObject::create; } -IMPL_STATIC_LINK_TYPED( Button, dispatchCommandHandler, Button*, pButton, void ) +IMPL_STATIC_LINK( Button, dispatchCommandHandler, Button*, pButton, void ) { if (pButton == nullptr) return; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 4eceb395eb8c..c64e05d317fc 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -77,15 +77,15 @@ struct ComboBox::Impl ComboBoxBounds calcComboBoxDropDownComponentBounds( const Size &rOutSize, const Size &rBorderOutSize) const; - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplCancelHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplDoubleClickHdl, ImplListBoxWindow*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplClickBtnHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectionChangedHdl, sal_Int32, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplUserDrawHdl, UserDrawEvent*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplAutocompleteHdl, Edit&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplListItemSelectHdl , LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplCancelHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, ImplListBoxWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplClickBtnHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, sal_Int32, void ); + DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent*, void ); + DECL_DLLPRIVATE_LINK( ImplAutocompleteHdl, Edit&, void ); + DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , LinkParamNone*, void ); }; @@ -298,7 +298,7 @@ bool ComboBox::IsAutocompleteEnabled() const return m_pImpl->m_pSubEdit->GetAutocompleteHdl().IsSet(); } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplClickBtnHdl, void*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplClickBtnHdl, void*, void) { m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); m_pSubEdit->GrabFocus(); @@ -316,7 +316,7 @@ IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplClickBtnHdl, void*, void) m_pImplLB->GetMainWindow()->ImplClearLayoutData(); } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void) { if (m_pFloatWin->IsPopupModeCanceled()) { @@ -339,7 +339,7 @@ IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_CLOSE ); } -IMPL_LINK_TYPED(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void) +IMPL_LINK(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void) { Selection aSel = rEdit.GetSelection(); @@ -377,7 +377,7 @@ IMPL_LINK_TYPED(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void) } } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) { bool bPopup = m_rThis.IsInDropDown(); bool bCallSelect = false; @@ -465,18 +465,18 @@ IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) } } -IMPL_LINK_NOARG_TYPED( ComboBox::Impl, ImplListItemSelectHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( ComboBox::Impl, ImplListItemSelectHdl, LinkParamNone*, void ) { m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_SELECT ); } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplCancelHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplCancelHdl, LinkParamNone*, void) { if (m_rThis.IsInDropDown()) m_pFloatWin->EndPopupMode(); } -IMPL_LINK_TYPED( ComboBox::Impl, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) +IMPL_LINK( ComboBox::Impl, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) { if (!m_pImplLB->IsTrackingSelect()) { @@ -485,7 +485,7 @@ IMPL_LINK_TYPED( ComboBox::Impl, ImplSelectionChangedHdl, sal_Int32, nChanged, v } } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplDoubleClickHdl, ImplListBoxWindow*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplDoubleClickHdl, ImplListBoxWindow*, void) { m_rThis.DoubleClick(); } @@ -1282,7 +1282,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, D } -IMPL_LINK_TYPED(ComboBox::Impl, ImplUserDrawHdl, UserDrawEvent*, pEvent, void) +IMPL_LINK(ComboBox::Impl, ImplUserDrawHdl, UserDrawEvent*, pEvent, void) { m_rThis.UserDraw(*pEvent); } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index fd1ab81fab22..ef7b9c2ee9d1 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2389,7 +2389,7 @@ void Edit::UpdateData() maUpdateDataHdl.Call( *this ); } -IMPL_LINK_NOARG_TYPED(Edit, ImplUpdateDataHdl, Timer *, void) +IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl, Timer *, void) { UpdateData(); } diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index 304494e98068..56a7aa105bff 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -2225,12 +2225,12 @@ void ImplListBox::Resize() ImplCheckScrollBars(); } -IMPL_LINK_NOARG_TYPED(ImplListBox, MRUChanged, LinkParamNone*, void) +IMPL_LINK_NOARG(ImplListBox, MRUChanged, LinkParamNone*, void) { CompatStateChanged( StateChangedType::Data ); } -IMPL_LINK_NOARG_TYPED(ImplListBox, LBWindowScrolled, ImplListBoxWindow*, void) +IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled, ImplListBoxWindow*, void) { long nSet = GetTopEntry(); if( nSet > mpVScrollBar->GetRangeMax() ) @@ -2242,7 +2242,7 @@ IMPL_LINK_NOARG_TYPED(ImplListBox, LBWindowScrolled, ImplListBoxWindow*, void) maScrollHdl.Call( this ); } -IMPL_LINK_TYPED( ImplListBox, ScrollBarHdl, ScrollBar*, pSB, void ) +IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB, void ) { sal_uInt16 nPos = (sal_uInt16) pSB->GetThumbPos(); if( pSB == mpVScrollBar ) diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index b95c1dcf855c..fa696faf8768 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -211,7 +211,7 @@ void ListBox::ImplLoadRes( const ResId& rResId ) SelectEntryPos( nSelPos ); } -IMPL_LINK_NOARG_TYPED(ListBox, ImplSelectHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ListBox, ImplSelectHdl, LinkParamNone*, void) { bool bPopup = IsInDropDown(); if( IsDropDownBox() ) @@ -236,28 +236,28 @@ IMPL_LINK_NOARG_TYPED(ListBox, ImplSelectHdl, LinkParamNone*, void) Select(); } -IMPL_LINK_TYPED( ListBox, ImplFocusHdl, sal_Int32, nPos, void ) +IMPL_LINK( ListBox, ImplFocusHdl, sal_Int32, nPos, void ) { CallEventListeners( VCLEVENT_LISTBOX_FOCUS, reinterpret_cast<void*>(nPos) ); } -IMPL_LINK_NOARG_TYPED( ListBox, ImplListItemSelectHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( ListBox, ImplListItemSelectHdl, LinkParamNone*, void ) { CallEventListeners( VCLEVENT_DROPDOWN_SELECT ); } -IMPL_LINK_NOARG_TYPED(ListBox, ImplScrollHdl, ImplListBox*, void) +IMPL_LINK_NOARG(ListBox, ImplScrollHdl, ImplListBox*, void) { CallEventListeners( VCLEVENT_LISTBOX_SCROLLED ); } -IMPL_LINK_NOARG_TYPED(ListBox, ImplCancelHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ListBox, ImplCancelHdl, LinkParamNone*, void) { if( IsInDropDown() ) mpFloatWin->EndPopupMode(); } -IMPL_LINK_TYPED( ListBox, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) +IMPL_LINK( ListBox, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) { if ( !mpImplLB->IsTrackingSelect() ) { @@ -286,12 +286,12 @@ IMPL_LINK_TYPED( ListBox, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) } } -IMPL_LINK_NOARG_TYPED(ListBox, ImplDoubleClickHdl, ImplListBoxWindow*, void) +IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl, ImplListBoxWindow*, void) { DoubleClick(); } -IMPL_LINK_NOARG_TYPED(ListBox, ImplClickBtnHdl, void*, void) +IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl, void*, void) { if( !mpFloatWin->IsInPopupMode() ) { @@ -309,7 +309,7 @@ IMPL_LINK_NOARG_TYPED(ListBox, ImplClickBtnHdl, void*, void) } } -IMPL_LINK_NOARG_TYPED(ListBox, ImplPopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl, FloatingWindow*, void) { if( mpFloatWin->IsPopupModeCanceled() ) { @@ -1365,7 +1365,7 @@ void ListBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines } } -IMPL_LINK_TYPED( ListBox, ImplUserDrawHdl, UserDrawEvent*, pEvent, void ) +IMPL_LINK( ListBox, ImplUserDrawHdl, UserDrawEvent*, pEvent, void ) { UserDraw( *pEvent ); } diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 28f5ffcba8ec..c2c099cf80b9 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -91,7 +91,7 @@ void MenuButton::dispose() PushButton::dispose(); } -IMPL_LINK_NOARG_TYPED(MenuButton, ImplMenuTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl, Timer *, void) { // See if Button Tracking is still active, as it could've been cancelled earlier if ( IsTracking() ) diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index 1e2e251dd383..e4769505c128 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -51,7 +51,7 @@ namespace vcl aSearchTimeout.Stop(); } - DECL_LINK_TYPED( SearchStringTimeout, Timer*, void ); + DECL_LINK( SearchStringTimeout, Timer*, void ); }; namespace @@ -64,7 +64,7 @@ namespace vcl } } - IMPL_LINK_NOARG_TYPED( QuickSelectionEngine_Data, SearchStringTimeout, Timer*, void ) + IMPL_LINK_NOARG( QuickSelectionEngine_Data, SearchStringTimeout, Timer*, void ) { lcl_reset( *this ); } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 79f8c6bdef31..7d2a23923599 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1126,7 +1126,7 @@ void ScrollBar::Resize() Invalidate(); } -IMPL_LINK_NOARG_TYPED(ScrollBar, ImplAutoTimerHdl, Timer *, void) +IMPL_LINK_NOARG(ScrollBar, ImplAutoTimerHdl, Timer *, void) { if( mpData && mpData->mbHide ) return; diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 1c38fbe65e3a..0f2ef5e4e662 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -846,17 +846,17 @@ void Slider::SetLinkedField(VclPtr<NumericField> const & pField) } } -IMPL_LINK_NOARG_TYPED(Slider, LinkedFieldSpinnerHdl, SpinField&, void) +IMPL_LINK_NOARG(Slider, LinkedFieldSpinnerHdl, SpinField&, void) { if (mpLinkedField) SetThumbPos(mpLinkedField->GetValue()); } -IMPL_LINK_NOARG_TYPED(Slider, LinkedFieldLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(Slider, LinkedFieldLoseFocusHdl, Control&, void) { if (mpLinkedField) SetThumbPos(mpLinkedField->GetValue()); } -IMPL_LINK_NOARG_TYPED(Slider, LinkedFieldModifyHdl, Edit&, void) +IMPL_LINK_NOARG(Slider, LinkedFieldModifyHdl, Edit&, void) { if (mpLinkedField) SetThumbPos(mpLinkedField->GetValue()); diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index e7d62bedb48e..4c1a7085eb2b 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -56,7 +56,7 @@ SpinButton::SpinButton( vcl::Window* pParent, WinBits nStyle ) ImplInit(pParent, nStyle); } -IMPL_LINK_TYPED(SpinButton, ImplTimeout, Timer*, pTimer, void) +IMPL_LINK(SpinButton, ImplTimeout, Timer*, pTimer, void) { if (pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat()) { diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 26c9887afd93..a0c1a0352f20 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -962,7 +962,7 @@ Size SpinField::CalcSize(sal_Int32 nChars) const return aSz; } -IMPL_LINK_TYPED( SpinField, ImplTimeout, Timer*, pTimer, void ) +IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer, void ) { if ( pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat() ) { diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index af2a0d0317ca..dc4998262784 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -989,12 +989,12 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) return bRet; } -IMPL_LINK_NOARG_TYPED(TabControl, ImplListBoxSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl, ListBox&, void) { SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectEntryPos() ) ); } -IMPL_LINK_TYPED( TabControl, ImplWindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( TabControl, ImplWindowEventListener, VclWindowEvent&, rEvent, void ) { if ( rEvent.GetId() == VCLEVENT_WINDOW_KEYINPUT ) { diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index a2630932e01a..e6a8d91814ba 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -227,7 +227,7 @@ void Throbber::setImageList( ::std::vector< Image > const& i_images ) return aImageURLs; } -IMPL_LINK_NOARG_TYPED(Throbber, TimeOutHdl, Timer *, void) +IMPL_LINK_NOARG(Throbber, TimeOutHdl, Timer *, void) { SolarMutexGuard aGuard; if ( maImageList.empty() ) diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 7fa7b1a2f1e4..20969d26e8bd 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1478,7 +1478,7 @@ void TextEngine::UpdateViews( TextView* pCurView ) maInvalidRect = Rectangle(); } -IMPL_LINK_NOARG_TYPED(TextEngine, IdleFormatHdl, Idle *, void) +IMPL_LINK_NOARG(TextEngine, IdleFormatHdl, Idle *, void) { FormatAndUpdate( mpIdleFormatter->GetView() ); } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 1ee606a08b90..744abc2bee6d 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -91,7 +91,7 @@ protected: void ImpInitScrollBars(); void ImpSetScrollBarRanges(); void ImpSetHScrollBarThumbPos(); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); public: ImpVclMEdit( VclMultiLineEdit* pVclMultiLineEdit, WinBits nWinStyle ); @@ -317,7 +317,7 @@ void ImpVclMEdit::ImpSetHScrollBarThumbPos() } -IMPL_LINK_TYPED( ImpVclMEdit, ScrollHdl, ScrollBar*, pCurScrollBar, void ) +IMPL_LINK( ImpVclMEdit, ScrollHdl, ScrollBar*, pCurScrollBar, void ) { long nDiffX = 0, nDiffY = 0; @@ -1086,7 +1086,7 @@ void VclMultiLineEdit::CaretChanged() CallEventListeners(VCLEVENT_EDIT_CARETCHANGED); } -IMPL_LINK_NOARG_TYPED(VclMultiLineEdit, ImpUpdateDataHdl, Timer *, void) +IMPL_LINK_NOARG(VclMultiLineEdit, ImpUpdateDataHdl, Timer *, void) { UpdateData(); } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index a95819fd8ccb..dba350de110a 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -2164,7 +2164,7 @@ const Link<ConvertData&,bool> GraphicFilter::GetFilterCallback() const return aLink; } -IMPL_LINK_TYPED( GraphicFilter, FilterCallback, ConvertData&, rData, bool ) +IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, rData, bool ) { bool bRet = false; diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index c585e0ac8104..181ad8a9e972 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -340,7 +340,7 @@ void Animation::ImplRestartTimer( sal_uLong nTimeout ) maTimer.Start(); } -IMPL_LINK_NOARG_TYPED(Animation, ImplTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer *, void) { const size_t nAnimCount = maList.size(); std::vector< AInfo* > aAInfoList; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index bfaab261502f..741038d77b6c 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -266,10 +266,10 @@ struct PrintJobAsync : mxController( i_xController ), maInitSetup( i_rInitSetup ) {} - DECL_LINK_TYPED( ExecJob, void*, void ); + DECL_LINK( ExecJob, void*, void ); }; -IMPL_LINK_NOARG_TYPED(PrintJobAsync, ExecJob, void*, void) +IMPL_LINK_NOARG(PrintJobAsync, ExecJob, void*, void) { Printer::ImplPrintJob(mxController, maInitSetup); diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx index cccb8443057a..710ac0ce197c 100644 --- a/vcl/source/helper/evntpost.cxx +++ b/vcl/source/helper/evntpost.cxx @@ -45,7 +45,7 @@ void EventPoster::Post() m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ) ); } -IMPL_LINK_TYPED( EventPoster, DoEvent_Impl, void*, /*p*/, void ) +IMPL_LINK( EventPoster, DoEvent_Impl, void*, /*p*/, void ) { DBG_TESTSOLARMUTEX(); m_nId = nullptr; diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index 0117d0e0f1a5..f09f2f43f313 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -36,7 +36,7 @@ SolarThreadExecutor::~SolarThreadExecutor() osl_destroyCondition( m_aFinish ); } -IMPL_LINK_NOARG_TYPED(SolarThreadExecutor, worker, void*, void) +IMPL_LINK_NOARG(SolarThreadExecutor, worker, void*, void) { if ( !m_bTimeout ) { diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 94e701ed6a41..70d3d45031ef 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -213,7 +213,7 @@ void ButtonDialog::ImplPosControls() mbFormat = false; } -IMPL_LINK_TYPED( ButtonDialog, ImplClickHdl, Button*, pBtn, void ) +IMPL_LINK( ButtonDialog, ImplClickHdl, Button*, pBtn, void ) { for (auto & it : m_ItemList) { diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 1318d535d6d8..7d76f19dee9e 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -258,7 +258,7 @@ void vcl::Cursor::ImplNew() } } -IMPL_LINK_NOARG_TYPED(vcl::Cursor, ImplTimerHdl, Timer *, void) +IMPL_LINK_NOARG(vcl::Cursor, ImplTimerHdl, Timer *, void) { if ( mpData->mbCurVisible ) ImplRestore(); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 30ba461b7e60..9b60717c6228 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -591,7 +591,7 @@ void Dialog::dispose() SystemWindow::dispose(); } -IMPL_LINK_NOARG_TYPED(Dialog, ImplAsyncCloseHdl, void*, void) +IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl, void*, void) { Close(); } diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx index 1fcf74d60db2..2772c02a0d6c 100644 --- a/vcl/source/window/dndeventdispatcher.cxx +++ b/vcl/source/window/dndeventdispatcher.cxx @@ -68,7 +68,7 @@ vcl::Window* DNDEventDispatcher::findTopLevelWindow(Point location) return pChildWindow; } -IMPL_LINK_TYPED(DNDEventDispatcher, WindowEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(DNDEventDispatcher, WindowEventListener, VclWindowEvent&, rEvent, void) { if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) { diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index d01b055cf04e..984e5af8332e 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -50,9 +50,9 @@ private: bool mbInMove; ImplSVEvent * mnLastUserEvent; - DECL_LINK_TYPED(DockingHdl, void *, void); - DECL_LINK_TYPED(DockTimerHdl, Idle *, void); - DECL_LINK_TYPED(EndDockTimerHdl, Idle *, void); + DECL_LINK(DockingHdl, void *, void); + DECL_LINK(DockTimerHdl, Idle *, void); + DECL_LINK(EndDockTimerHdl, Idle *, void); public: ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); @@ -107,7 +107,7 @@ void ImplDockFloatWin2::dispose() FloatingWindow::dispose(); } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl, Idle *, void) { SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "docktimer called but not floating" ); @@ -133,7 +133,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockTimerHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, EndDockTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl, Idle *, void) { SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "enddocktimer called but not floating" ); @@ -150,7 +150,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, EndDockTimerHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockingHdl, void*, void) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl, void*, void) { // called during move of a floating window mnLastUserEvent = nullptr; @@ -1131,7 +1131,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin } } -IMPL_LINK_NOARG_TYPED(ImplDockingWindowWrapper, PopupModeEnd, FloatingWindow*, void) +IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd, FloatingWindow*, void) { GetWindow()->Show( false, ShowFlags::NoFocusChange ); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index af564e6d5df0..f069b5583241 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -67,8 +67,8 @@ private: bool mbInMove; ImplSVEvent * mnLastUserEvent; - DECL_LINK_TYPED(DockingHdl, void *, void); - DECL_LINK_TYPED(DockTimerHdl, Idle *, void); + DECL_LINK(DockingHdl, void *, void); + DECL_LINK(DockTimerHdl, Idle *, void); public: ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ); @@ -125,7 +125,7 @@ void ImplDockFloatWin::dispose() FloatingWindow::dispose(); } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin, DockTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl, Idle *, void) { SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "docktimer called but not floating" ); @@ -152,7 +152,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin, DockTimerHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin, DockingHdl, void*, void) +IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl, void*, void) { PointerState aState = mpDockWin->GetParent()->GetPointerState(); @@ -1117,7 +1117,7 @@ void DockingWindow::queue_resize(StateChangedType eReason) vcl::Window::queue_resize(eReason); } -IMPL_LINK_NOARG_TYPED(DockingWindow, ImplHandleLayoutTimerHdl, Idle*, void) +IMPL_LINK_NOARG(DockingWindow, ImplHandleLayoutTimerHdl, Idle*, void) { if (!isLayoutEnabled()) { diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 137944ebcbd3..f9c4513d32a8 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -561,7 +561,7 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const vcl::Window* pWindow ) return false; } -IMPL_LINK_NOARG_TYPED(FloatingWindow, ImplEndPopupModeHdl, void*, void) +IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl, void*, void) { VclPtr<FloatingWindow> pThis(this); mnPostId = nullptr; diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 5324558a02d5..7b4d12a91d46 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1534,7 +1534,7 @@ void VclFrame::setAllocation(const Size &rAllocation) setLayoutAllocation(*pChild, aChildPos, aAllocation); } -IMPL_LINK_TYPED(VclFrame, WindowEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(VclFrame, WindowEventListener, VclWindowEvent&, rEvent, void) { if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) designate_label(nullptr); @@ -1791,7 +1791,7 @@ void VclExpander::StateChanged(StateChangedType nType) } } -IMPL_LINK_TYPED( VclExpander, ClickHdl, CheckBox&, rBtn, void ) +IMPL_LINK( VclExpander, ClickHdl, CheckBox&, rBtn, void ) { vcl::Window *pChild = get_child(); if (pChild) @@ -1827,7 +1827,7 @@ void VclScrolledWindow::dispose() VclBin::dispose(); } -IMPL_LINK_NOARG_TYPED(VclScrolledWindow, ScrollBarHdl, ScrollBar*, void) +IMPL_LINK_NOARG(VclScrolledWindow, ScrollBarHdl, ScrollBar*, void) { vcl::Window *pChild = get_child(); if (!pChild) @@ -2232,7 +2232,7 @@ void MessageDialog::response(short nResponseId) EndDialog(nResponseId); } -IMPL_LINK_TYPED(MessageDialog, ButtonHdl, Button *, pButton, void) +IMPL_LINK(MessageDialog, ButtonHdl, Button *, pButton, void) { response(get_response(pButton)); } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 7b99f2a4597e..120ff9ff9426 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2172,7 +2172,7 @@ void Menu::ImplCallHighlight(sal_uInt16 nItem) nSelectedId = 0; } -IMPL_LINK_NOARG_TYPED(Menu, ImplCallSelect, void*, void) +IMPL_LINK_NOARG(Menu, ImplCallSelect, void*, void) { nEventId = nullptr; Select(); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 6ab3f8b5b84a..a0167833edc4 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -222,7 +222,7 @@ Size MenuBarWindow::MinCloseButtonSize() return aCloseBtn->getMinSize(); } -IMPL_LINK_NOARG_TYPED(MenuBarWindow, CloseHdl, ToolBox *, void) +IMPL_LINK_NOARG(MenuBarWindow, CloseHdl, ToolBox *, void) { if( ! pMenu ) return; @@ -248,7 +248,7 @@ IMPL_LINK_NOARG_TYPED(MenuBarWindow, CloseHdl, ToolBox *, void) } } -IMPL_LINK_TYPED( MenuBarWindow, ToolboxEventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( MenuBarWindow, ToolboxEventHdl, VclWindowEvent&, rEvent, void ) { if( ! pMenu ) return; @@ -271,7 +271,7 @@ IMPL_LINK_TYPED( MenuBarWindow, ToolboxEventHdl, VclWindowEvent&, rEvent, void ) } } -IMPL_LINK_TYPED( MenuBarWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) { if( ! pMenu ) return; diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index e7fec20b4a80..188219c1957b 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -99,9 +99,9 @@ private: virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - DECL_LINK_TYPED( CloseHdl, ToolBox*, void ); - DECL_LINK_TYPED( ToolboxEventHdl, VclWindowEvent&, void ); - DECL_LINK_TYPED( ShowHideListener, VclWindowEvent&, void ); + DECL_LINK( CloseHdl, ToolBox*, void ); + DECL_LINK( ToolboxEventHdl, VclWindowEvent&, void ); + DECL_LINK( ShowHideListener, VclWindowEvent&, void ); void StateChanged( StateChangedType nType ) override; void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index aeb97dc32524..643aeb786ff3 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -266,7 +266,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDow } } -IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, PopupEnd, FloatingWindow*, void) +IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd, FloatingWindow*, void) { // "this" will be deleted before the end of this method! Menu* pM = pMenu; @@ -293,12 +293,12 @@ IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, PopupEnd, FloatingWindow*, void) pM->pStartedFrom = nullptr; } -IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, AutoScroll, Timer *, void) +IMPL_LINK_NOARG(MenuFloatingWindow, AutoScroll, Timer *, void) { ImplScroll( GetPointerPosPixel() ); } -IMPL_LINK_TYPED( MenuFloatingWindow, HighlightChanged, Timer*, pTimer, void ) +IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer, void ) { if( ! pMenu ) return; @@ -359,7 +359,7 @@ IMPL_LINK_TYPED( MenuFloatingWindow, HighlightChanged, Timer*, pTimer, void ) } } -IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, SubmenuClose, Timer *, void) +IMPL_LINK_NOARG(MenuFloatingWindow, SubmenuClose, Timer *, void) { if( pMenu && pMenu->pStartedFrom ) { @@ -369,7 +369,7 @@ IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, SubmenuClose, Timer *, void) } } -IMPL_LINK_TYPED( MenuFloatingWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( MenuFloatingWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) { if( ! pMenu ) return; diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx index cbbabad7b2e2..97d676e2f6bb 100644 --- a/vcl/source/window/menufloatingwindow.hxx +++ b/vcl/source/window/menufloatingwindow.hxx @@ -56,11 +56,11 @@ private: bool bIgnoreFirstMove : 1; bool bKeyInput : 1; - DECL_LINK_TYPED( PopupEnd, FloatingWindow*, void ); - DECL_LINK_TYPED( HighlightChanged, Timer*, void ); - DECL_LINK_TYPED( SubmenuClose, Timer *, void ); - DECL_LINK_TYPED( AutoScroll, Timer *, void ); - DECL_LINK_TYPED( ShowHideListener, VclWindowEvent&, void ); + DECL_LINK( PopupEnd, FloatingWindow*, void ); + DECL_LINK( HighlightChanged, Timer*, void ); + DECL_LINK( SubmenuClose, Timer *, void ); + DECL_LINK( AutoScroll, Timer *, void ); + DECL_LINK( ShowHideListener, VclWindowEvent&, void ); virtual void StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 516db21ed49f..adea785a8a38 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -164,7 +164,7 @@ void Window::ImplGenerateMouseMove() mpWindowImpl->mpFrameData->mnMouseMoveId = Application::PostUserEvent( LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ), nullptr, true ); } -IMPL_LINK_NOARG_TYPED(Window, ImplGenerateMouseMoveHdl, void*, void) +IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl, void*, void) { mpWindowImpl->mpFrameData->mnMouseMoveId = nullptr; vcl::Window* pCaptureWin = ImplGetSVData()->maWinData.mpCaptureWin; diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 2c2c943c547d..96054a2b37ae 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -644,7 +644,7 @@ void Window::ImplPostPaint() mpWindowImpl->mpFrameData->maPaintIdle.Start(); } -IMPL_LINK_NOARG_TYPED(Window, ImplHandlePaintHdl, Idle *, void) +IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Idle *, void) { // save paint events until layout is done if (IsSystemWindow() && static_cast<const SystemWindow*>(this)->hasPendingLayout()) @@ -665,7 +665,7 @@ IMPL_LINK_NOARG_TYPED(Window, ImplHandlePaintHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(Window, ImplHandleResizeTimerHdl, Idle *, void) +IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Idle *, void) { if( mpWindowImpl->mbReallyVisible ) { diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 0ddf2f6c4570..19d292c68c1e 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1520,7 +1520,7 @@ void PrintDialog::updateNup() preparePreview( true, true ); } -IMPL_LINK_TYPED( PrintDialog, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( PrintDialog, SelectHdl, ListBox&, rBox, void ) { if( &rBox == maJobPage.mpPrinters ) { @@ -1557,17 +1557,17 @@ IMPL_LINK_TYPED( PrintDialog, SelectHdl, ListBox&, rBox, void ) } } -IMPL_LINK_TYPED( PrintDialog, ToggleRadioHdl, RadioButton&, rButton, void ) +IMPL_LINK( PrintDialog, ToggleRadioHdl, RadioButton&, rButton, void ) { ClickHdl(static_cast<Button*>(&rButton)); } -IMPL_LINK_TYPED( PrintDialog, ToggleHdl, CheckBox&, rButton, void ) +IMPL_LINK( PrintDialog, ToggleHdl, CheckBox&, rButton, void ) { ClickHdl(&rButton); } -IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void ) +IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton, void ) { if( pButton == mpOKButton || pButton == mpCancelButton ) { @@ -1656,7 +1656,7 @@ IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( PrintDialog, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( PrintDialog, ModifyHdl, Edit&, rEdit, void ) { checkControlDependencies(); if( &rEdit == maNUpPage.mpNupRowsEdt || &rEdit == maNUpPage.mpNupColEdt || @@ -1758,7 +1758,7 @@ void PrintDialog::makeEnabled( vcl::Window* i_pWindow ) } } -IMPL_LINK_TYPED( PrintDialog, UIOption_CheckHdl, CheckBox&, i_rBox, void ) +IMPL_LINK( PrintDialog, UIOption_CheckHdl, CheckBox&, i_rBox, void ) { PropertyValue* pVal = getValueForWindow( &i_rBox ); if( pVal ) @@ -1775,7 +1775,7 @@ IMPL_LINK_TYPED( PrintDialog, UIOption_CheckHdl, CheckBox&, i_rBox, void ) } } -IMPL_LINK_TYPED( PrintDialog, UIOption_RadioHdl, RadioButton&, i_rBtn, void ) +IMPL_LINK( PrintDialog, UIOption_RadioHdl, RadioButton&, i_rBtn, void ) { // this handler gets called for all radiobuttons that get unchecked, too // however we only want one notificaction for the new value (that is for @@ -1803,7 +1803,7 @@ IMPL_LINK_TYPED( PrintDialog, UIOption_RadioHdl, RadioButton&, i_rBtn, void ) } } -IMPL_LINK_TYPED( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void ) +IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void ) { PropertyValue* pVal = getValueForWindow( &i_rBox ); if( pVal ) @@ -1828,7 +1828,7 @@ IMPL_LINK_TYPED( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void ) } } -IMPL_LINK_TYPED( PrintDialog, UIOption_ModifyHdl, Edit&, i_rBox, void ) +IMPL_LINK( PrintDialog, UIOption_ModifyHdl, Edit&, i_rBox, void ) { PropertyValue* pVal = getValueForWindow( &i_rBox ); if( pVal ) @@ -1935,7 +1935,7 @@ void PrintProgressDialog::dispose() ModelessDialog::dispose(); } -IMPL_LINK_TYPED( PrintProgressDialog, ClickHdl, Button*, pButton, void ) +IMPL_LINK( PrintProgressDialog, ClickHdl, Button*, pButton, void ) { if( pButton == mpButton ) mbCanceled = true; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 528659ec9162..07a762f93328 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -359,7 +359,7 @@ void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt ) FloatingWindow::MouseButtonUp( rMEvt ); } -IMPL_LINK_NOARG_TYPED(ImplWheelWindow, ImplScrollHdl, Timer *, void) +IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl, Timer *, void) { if ( mnActDeltaX || mnActDeltaY ) { diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index 3509312eccff..ae233075c7b6 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -62,7 +62,7 @@ private: void ImplDrawWheel(vcl::RenderContext& rRenderContext); void ImplRecalcScrollValues(); - DECL_LINK_TYPED(ImplScrollHdl, Timer *, void); + DECL_LINK(ImplScrollHdl, Timer *, void); protected: diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index b9f09fc30088..27075d431c3e 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -51,7 +51,7 @@ SelectionEngine::~SelectionEngine() aWTimer.Stop(); } -IMPL_LINK_NOARG_TYPED(SelectionEngine, ImpWatchDog, Timer *, void) +IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog, Timer *, void) { if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) SelMouseMove( aLastMove ); diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 7526fa914baf..dca00fd98f27 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -1110,7 +1110,7 @@ void SystemWindow::setPosSizeOnContainee(Size aSize, Window &rBox) VclContainer::setLayoutAllocation(rBox, aPos, aSize); } -IMPL_LINK_NOARG_TYPED( SystemWindow, ImplHandleLayoutTimerHdl, Idle*, void ) +IMPL_LINK_NOARG( SystemWindow, ImplHandleLayoutTimerHdl, Idle*, void ) { if (!isLayoutEnabled()) { diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index effb2fb84b58..440de8c47ae3 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -135,7 +135,7 @@ public: void EndDragging( bool bOK = true ); void HideDragRect() { if ( mbShowDragRect ) mpDragBox->HideTracking(); } void UpdateDragRect(); - DECL_LINK_TYPED( SelectHdl, Accelerator&, void ); + DECL_LINK( SelectHdl, Accelerator&, void ); }; @@ -1322,7 +1322,7 @@ void ImplTBDragMgr::UpdateDragRect() mpDragBox->ShowTracking( maRect ); } -IMPL_LINK_TYPED( ImplTBDragMgr, SelectHdl, Accelerator&, rAccel, void ) +IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator&, rAccel, void ) { if ( rAccel.GetCurItemId() == KEY_ESCAPE ) EndDragging( false ); @@ -2719,7 +2719,7 @@ void ToolBox::ImplFormat( bool bResize ) mbFormat = false; } -IMPL_LINK_NOARG_TYPED(ToolBox, ImplDropdownLongClickHdl, Timer *, void) +IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl, Timer *, void) { if (mnCurPos != TOOLBOX_ITEM_NOTFOUND && (mpData->m_aItems[ mnCurPos ].mnBits & ToolBoxItemBits::DROPDOWN)) @@ -2745,7 +2745,7 @@ IMPL_LINK_NOARG_TYPED(ToolBox, ImplDropdownLongClickHdl, Timer *, void) } } -IMPL_LINK_NOARG_TYPED(ToolBox, ImplUpdateHdl, Idle *, void) +IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl, Idle *, void) { if( mbFormat && mpData ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index fedc41c7ccfa..f35f2cd82146 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1787,7 +1787,7 @@ void ToolBox::UpdateCustomMenu() } } -IMPL_LINK_TYPED( ToolBox, ImplCustomMenuListener, VclMenuEvent&, rEvent, void ) +IMPL_LINK( ToolBox, ImplCustomMenuListener, VclMenuEvent&, rEvent, void ) { if( rEvent.GetMenu() == GetMenu() && rEvent.GetId() == VCLEVENT_MENU_SELECT ) { @@ -1797,7 +1797,7 @@ IMPL_LINK_TYPED( ToolBox, ImplCustomMenuListener, VclMenuEvent&, rEvent, void ) } } -IMPL_LINK_NOARG_TYPED(ToolBox, ImplCallExecuteCustomMenu, void*, void) +IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu, void*, void) { mpData->mnEventId = nullptr; ImplExecuteCustomMenu(); diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 91498636fa77..1c71a6497a1d 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -277,7 +277,7 @@ void Window::InvertTracking( const tools::Polygon& rPoly, ShowTrackFlags nFlags pGraphics->Invert( nPoints, pPtAry, SalInvert::TrackFrame, this ); } -IMPL_LINK_TYPED( Window, ImplTrackTimerHdl, Timer*, pTimer, void ) +IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer, void ) { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 04dd36043f7d..43e5692c396b 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1717,7 +1717,7 @@ static void ImplActivateFloatingWindows( vcl::Window* pWindow, bool bActive ) } } -IMPL_LINK_NOARG_TYPED(vcl::Window, ImplAsyncFocusHdl, void*, void) +IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl, void*, void) { ImplGetWindowImpl()->mpFrameData->mnFocusId = nullptr; diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index eb0d833077c5..1b1ae8e61941 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -91,7 +91,7 @@ class XIMStatusWindow : public StatusWindow void layout(); bool checkLastParent() const; - DECL_LINK_TYPED( DelayedShowHdl, void*, void ); + DECL_LINK( DelayedShowHdl, void*, void ); public: explicit XIMStatusWindow( bool bOn ); virtual ~XIMStatusWindow() override; @@ -257,7 +257,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent ) } } -IMPL_LINK_NOARG_TYPED(XIMStatusWindow, DelayedShowHdl, void*, void) +IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl, void*, void) { m_nDelayedEvent = nullptr; const SystemEnvData* pData = GetSystemData(); @@ -304,7 +304,7 @@ class IIIMPStatusWindow : public StatusWindow bool m_bShow; bool m_bOn; - DECL_LINK_TYPED( SelectHdl, MenuButton*, void ); + DECL_LINK( SelectHdl, MenuButton*, void ); void show(); @@ -458,7 +458,7 @@ void IIIMPStatusWindow::GetFocus() } } -IMPL_LINK_TYPED( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn, void ) +IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn, void ) { if( pBtn == m_aStatusBtn ) { diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index d05d6af54329..5dea963552d3 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -237,7 +237,7 @@ bool SessionManagerClient::checkDocumentsSaved() return m_bDocSaveDone; } -IMPL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, void ) +IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, void ) { // Decode argument smuggled in as void*: sal_uIntPtr nStateVal = reinterpret_cast< sal_uIntPtr >(pStateVal); @@ -278,7 +278,7 @@ IMPL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, saveDone(); } -IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, InteractionHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, InteractionHdl, void*, void ) { SAL_INFO("vcl.sm", "interaction link"); if( m_pSession ) @@ -288,7 +288,7 @@ IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, InteractionHdl, void*, void } } -IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, ShutDownCancelHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownCancelHdl, void*, void ) { SAL_INFO("vcl.sm", "shutdown cancel"); if( m_pSession ) @@ -336,7 +336,7 @@ void SessionManagerClient::SaveYourselfProc( SAL_INFO("vcl.sm", "waiting for save yourself event to be processed" ); } -IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, ShutDownHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownHdl, void*, void ) { if( m_pSession ) { diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index b0b1b16d7c62..cbdbd3302e4e 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -887,7 +887,7 @@ namespace } #if ENABLE_DBUS -IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void) +IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { guint xid = get_xid_for_dbus(); diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 76a615c63249..17ca9cddae49 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -97,7 +97,7 @@ namespace VclPtr<Edit> m_pEdit; OUString& m_rReturnValue; - DECL_LINK_TYPED( ClickBtnHdl, Button*, void ); + DECL_LINK( ClickBtnHdl, Button*, void ); public: // parent window, Query text, initial value @@ -130,7 +130,7 @@ namespace SetText(rQuery); } - IMPL_LINK_TYPED( QueryString, ClickBtnHdl, Button*, pButton, void ) + IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton, void ) { if (pButton == m_pOKButton) { @@ -1283,7 +1283,7 @@ class PrinterUpdate static int nActiveJobs; static void doUpdate(); - DECL_STATIC_LINK_TYPED( PrinterUpdate, UpdateTimerHdl, Idle*, void ); + DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, Idle*, void ); public: static void update(SalGenericInstance &rInstance); static void jobStarted() { nActiveJobs++; } @@ -1301,7 +1301,7 @@ void PrinterUpdate::doUpdate() pInst->PostPrintersChanged(); } -IMPL_STATIC_LINK_NOARG_TYPED( PrinterUpdate, UpdateTimerHdl, Idle*, void ) +IMPL_STATIC_LINK_NOARG( PrinterUpdate, UpdateTimerHdl, Idle*, void ) { if( nActiveJobs < 1 ) { diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 0bea78b66c8f..02684af1e765 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -107,7 +107,7 @@ void RTSDialog::dispose() TabDialog::dispose(); } -IMPL_LINK_TYPED( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void ) +IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void ) { if( pTabCtrl != m_pTabControl ) return; @@ -131,7 +131,7 @@ IMPL_LINK_TYPED( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void ) } } -IMPL_LINK_TYPED( RTSDialog, ClickButton, Button*, pButton, void ) +IMPL_LINK( RTSDialog, ClickButton, Button*, pButton, void ) { if( pButton == m_pOKButton ) { @@ -262,7 +262,7 @@ void RTSPaperPage::update() } } -IMPL_LINK_TYPED( RTSPaperPage, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( RTSPaperPage, SelectHdl, ListBox&, rBox, void ) { const PPDKey* pKey = nullptr; if( &rBox == m_pPaperBox ) @@ -448,7 +448,7 @@ sal_uLong RTSDevicePage::getPDFDevice() return -1; //explicitly PS } -IMPL_LINK_TYPED(RTSDevicePage, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK(RTSDevicePage, ModifyHdl, Edit&, rEdit, void) { if (m_pCustomValue) { @@ -456,7 +456,7 @@ IMPL_LINK_TYPED(RTSDevicePage, ModifyHdl, Edit&, rEdit, void) } } -IMPL_LINK_TYPED( RTSDevicePage, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( RTSDevicePage, SelectHdl, ListBox&, rBox, void ) { if( &rBox == m_pPPDKeyBox ) { diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index 6de4bf7a66de..fa22a4417ab3 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -58,8 +58,8 @@ class RTSDialog : public TabDialog bool mbDataModified; - DECL_LINK_TYPED( ActivatePage, TabControl*, void ); - DECL_LINK_TYPED( ClickButton, Button*, void ); + DECL_LINK( ActivatePage, TabControl*, void ); + DECL_LINK( ClickButton, Button*, void ); // helper functions void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* ); @@ -89,7 +89,7 @@ class RTSPaperPage : public TabPage VclPtr<FixedText> m_pSlotText; VclPtr<ListBox> m_pSlotBox; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: explicit RTSPaperPage( RTSDialog* ); virtual ~RTSPaperPage() override; @@ -115,8 +115,8 @@ class RTSDevicePage : public TabPage void FillValueBox( const ::psp::PPDKey* ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); public: explicit RTSDevicePage( RTSDialog* ); virtual ~RTSDevicePage() override; diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 29f0b4e89887..3f4b5e887b69 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3541,7 +3541,7 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) return 1; } -IMPL_LINK_NOARG_TYPED(X11SalFrame, HandleAlwaysOnTopRaise, Timer *, void) +IMPL_LINK_NOARG(X11SalFrame, HandleAlwaysOnTopRaise, Timer *, void) { if( bMapped_ ) ToTop( SalFrameToTop::NONE ); diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 6a9ac73175af..041e9c22f50b 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -439,7 +439,7 @@ GtkSalMenu::GtkSalMenu( bool bMenuBar ) : maUpdateMenuBarIdle.SetDebugName("Native Gtk Menu Update Idle"); } -IMPL_LINK_NOARG_TYPED(GtkSalMenu, MenuBarHierarchyChangeHandler, Idle *, void) +IMPL_LINK_NOARG(GtkSalMenu, MenuBarHierarchyChangeHandler, Idle *, void) { SAL_WARN_IF(!mpFrame, "vcl.gtk", "MenuBar layout changed, but no frame for some reason!"); if (!mpFrame) diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 1fe64da78e64..c3db7ecb45a0 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -114,9 +114,9 @@ public: void parseList( const OString& rList ); static OString processCommand( const OString& rCommand ); - DECL_LINK_TYPED( ListHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_STATIC_LINK_TYPED( MyWin, QuitHdl, Button*, void ); + DECL_LINK( ListHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_STATIC_LINK( MyWin, QuitHdl, Button*, void ); }; void Main() @@ -245,17 +245,17 @@ OString MyWin::processCommand( const OString& rCommand ) return aAnswer.makeStringAndClear(); } -IMPL_LINK_NOARG_TYPED( MyWin, ListHdl, Button*, void) +IMPL_LINK_NOARG( MyWin, ListHdl, Button*, void) { parseList( processCommand( "list" ) ); } -IMPL_STATIC_LINK_NOARG_TYPED( MyWin, QuitHdl, Button*, void) +IMPL_STATIC_LINK_NOARG( MyWin, QuitHdl, Button*, void) { processCommand( "quit" ); } -IMPL_LINK_NOARG_TYPED( MyWin, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG( MyWin, SelectHdl, ListBox&, void) { OUString aEntry = m_aSvpBitmaps->GetSelectEntry(); sal_Int32 nPos = aEntry.indexOf( ": " ); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 368e30bb0114..e1b65851edcf 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -168,7 +168,7 @@ public: FloatingWindow *mpButtonWin; AutoTimer maBounce; int mnBounceX, mnBounceY; - DECL_LINK_TYPED(BounceTimerCb, Timer*, void); + DECL_LINK(BounceTimerCb, Timer*, void); #endif bool MouseButtonDown(const MouseEvent& rMEvt); @@ -1511,7 +1511,7 @@ public: }; #if FIXME_BOUNCE_BUTTON -IMPL_LINK_NOARG_TYPED(DemoRenderer,BounceTimerCb,Timer*,void) +IMPL_LINK_NOARG(DemoRenderer,BounceTimerCb,Timer*,void) { mpButton->Check(mnBounceX>0); mpButton->SetPressed(mnBounceY>0); @@ -1823,7 +1823,7 @@ class DemoWidgets : public WorkWindow VclPtr<ComboBox> mpGLCombo; VclPtr<PushButton> mpGLButton; - DECL_LINK_TYPED(GLTestClick, Button*, void); + DECL_LINK(GLTestClick, Button*, void); public: DemoWidgets() : @@ -1923,7 +1923,7 @@ public: static void leave() { OpenGLZone::leave(); } }; -IMPL_LINK_NOARG_TYPED(DemoWidgets, GLTestClick, Button*, void) +IMPL_LINK_NOARG(DemoWidgets, GLTestClick, Button*, void) { sal_Int32 nSelected = mpGLCombo->GetSelectEntryPos(); diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx index f6daaab89ebf..6f99398f8797 100644 --- a/writerperfect/inc/WPFTEncodingDialog.hxx +++ b/writerperfect/inc/WPFTEncodingDialog.hxx @@ -42,8 +42,8 @@ private: bool m_userHasCancelled; private: - DECL_LINK_TYPED(DoubleClickHdl, ListBox &, void); - DECL_LINK_TYPED(CancelHdl, Button *, void); + DECL_LINK(DoubleClickHdl, ListBox &, void); + DECL_LINK(CancelHdl, Button *, void); void dispose() override; diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx index 30c02c48388b..d4c3c77e0fcc 100644 --- a/writerperfect/source/common/WPFTEncodingDialog.cxx +++ b/writerperfect/source/common/WPFTEncodingDialog.cxx @@ -194,13 +194,13 @@ OUString WPFTEncodingDialog::GetEncoding() const return getEncoding(m_pLbCharset); } -IMPL_LINK_NOARG_TYPED(WPFTEncodingDialog, CancelHdl, Button *, void) +IMPL_LINK_NOARG(WPFTEncodingDialog, CancelHdl, Button *, void) { m_userHasCancelled=true; Close(); } -IMPL_LINK_TYPED(WPFTEncodingDialog, DoubleClickHdl, ListBox &, rLb, void) +IMPL_LINK(WPFTEncodingDialog, DoubleClickHdl, ListBox &, rLb, void) { if (&rLb == m_pLbCharset) { diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index 9f96e338cdf9..fe138c67700b 100644 --- a/xmlsecurity/inc/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -56,9 +56,9 @@ private: sal_uInt16 GetSelectedEntryPos() const; - DECL_LINK_TYPED(ViewButtonHdl, Button*, void); - DECL_LINK_TYPED(CertificateHighlightHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED(CertificateSelectHdl, SvTreeListBox*, bool ); + DECL_LINK(ViewButtonHdl, Button*, void); + DECL_LINK(CertificateHighlightHdl, SvTreeListBox*, void ); + DECL_LINK(CertificateSelectHdl, SvTreeListBox*, bool ); void ImplShowCertificateDetails(); void ImplInitialize(); diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index bd5e19c87cd9..03f8b89bfe2f 100644 --- a/xmlsecurity/inc/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -102,7 +102,7 @@ private: vcl::Font m_aStdFont; vcl::Font m_aFixedWidthFont; - DECL_LINK_TYPED( ElementSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ElementSelectHdl, SvTreeListBox*, void ); void Clear(); void InsertElement( const OUString& _rField, const OUString& _rValue, const OUString& _rDetails, bool _bFixedWidthFont = false ); @@ -129,8 +129,8 @@ private: OUString msCertOK; OUString msCertNotValidated; - DECL_LINK_TYPED( ViewCertHdl, Button*, void ); - DECL_LINK_TYPED( CertSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ViewCertHdl, Button*, void ); + DECL_LINK( CertSelectHdl, SvTreeListBox*, void ); void Clear(); SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, const css::uno::Reference< css::security::XCertificate >& rxCert, diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index 075f67fa4b9b..1422acadcf9d 100644 --- a/xmlsecurity/inc/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -83,13 +83,13 @@ private: bool m_bHasDocumentSignature; bool m_bWarningShowSignMacro; - DECL_LINK_TYPED(ViewButtonHdl, Button*, void); - DECL_LINK_TYPED(AddButtonHdl, Button*, void); - DECL_LINK_TYPED(RemoveButtonHdl, Button*, void); - DECL_LINK_TYPED(SignatureHighlightHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED(SignatureSelectHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED(StartVerifySignatureHdl, LinkParamNone*, bool ); - DECL_LINK_TYPED(OKButtonHdl, Button*, void ); + DECL_LINK(ViewButtonHdl, Button*, void); + DECL_LINK(AddButtonHdl, Button*, void); + DECL_LINK(RemoveButtonHdl, Button*, void); + DECL_LINK(SignatureHighlightHdl, SvTreeListBox*, void ); + DECL_LINK(SignatureSelectHdl, SvTreeListBox*, bool ); + DECL_LINK(StartVerifySignatureHdl, LinkParamNone*, bool ); + DECL_LINK(OKButtonHdl, Button*, void ); void ImplGetSignatureInformations(bool bUseTempStream, bool bCacheLastSignature = true); void ImplFillSignaturesBox(); diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index 7a2ac1d11bca..19da1e764289 100644 --- a/xmlsecurity/inc/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -61,7 +61,7 @@ private: VclPtr<MacroSecurityTP> mpLevelTP; VclPtr<MacroSecurityTP> mpTrustSrcTP; - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); public: MacroSecurity(vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext>& rxCtx, @@ -99,7 +99,7 @@ private: sal_uInt16 mnCurLevel; protected: - DECL_LINK_TYPED(RadioButtonHdl, Button*, void); + DECL_LINK(RadioButtonHdl, Button*, void); public: MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg ); @@ -127,12 +127,12 @@ private: bool mbAuthorsReadonly; bool mbURLsReadonly; - DECL_LINK_TYPED( ViewCertPBHdl, Button*, void ); - DECL_LINK_TYPED( RemoveCertPBHdl, Button*, void ); - DECL_LINK_TYPED( AddLocPBHdl, Button*, void ); - DECL_LINK_TYPED( RemoveLocPBHdl, Button*, void ); - DECL_LINK_TYPED( TrustCertLBSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( TrustFileLocLBSelectHdl, ListBox&, void ); + DECL_LINK( ViewCertPBHdl, Button*, void ); + DECL_LINK( RemoveCertPBHdl, Button*, void ); + DECL_LINK( AddLocPBHdl, Button*, void ); + DECL_LINK( RemoveLocPBHdl, Button*, void ); + DECL_LINK( TrustCertLBSelectHdl, SvTreeListBox*, void ); + DECL_LINK( TrustFileLocLBSelectHdl, ListBox&, void ); void FillCertLB(); void ImplCheckButtons(); diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx index 4118b6304b42..4ba359c0bd67 100644 --- a/xmlsecurity/inc/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsignaturehelper.hxx @@ -107,9 +107,9 @@ private: Link<LinkParamNone*,bool> maStartVerifySignatureHdl; private: - DECL_LINK_TYPED( SignatureCreationResultListener, XMLSignatureCreationResult&, void ); - DECL_LINK_TYPED( SignatureVerifyResultListener, XMLSignatureVerifyResult&, void ); - DECL_LINK_TYPED( StartVerifySignatureElement, LinkParamNone*, void ); + DECL_LINK( SignatureCreationResultListener, XMLSignatureCreationResult&, void ); + DECL_LINK( SignatureVerifyResultListener, XMLSignatureVerifyResult&, void ); + DECL_LINK( StartVerifySignatureElement, LinkParamNone*, void ); XMLSignatureHelper(const XMLSignatureHelper&) = delete; diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 62ec941220c7..499ad49f5063 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -215,7 +215,7 @@ OUString CertificateChooser::GetDescription() return m_pDescriptionED->GetText(); } -IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateHighlightHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(CertificateChooser, CertificateHighlightHdl, SvTreeListBox*, void) { bool bEnable = GetSelectedCertificate().is(); m_pViewBtn->Enable( bEnable ); @@ -223,13 +223,13 @@ IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateHighlightHdl, SvTreeListBox m_pDescriptionED->Enable(bEnable); } -IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateSelectHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl, SvTreeListBox*, bool) { EndDialog( RET_OK ); return false; } -IMPL_LINK_NOARG_TYPED(CertificateChooser, ViewButtonHdl, Button*, void) +IMPL_LINK_NOARG(CertificateChooser, ViewButtonHdl, Button*, void) { ImplShowCertificateDetails(); } diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index a2b61370e86b..9f42cd127970 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -317,7 +317,7 @@ void CertificateViewerDetailsTP::ActivatePage() { } -IMPL_LINK_NOARG_TYPED(CertificateViewerDetailsTP, ElementSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pElementsLB->FirstSelected(); OUString aElementText; @@ -425,7 +425,7 @@ void CertificateViewerCertPathTP::ActivatePage() } } -IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, ViewCertHdl, Button*, void) +IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl, Button*, void) { SvTreeListEntry* pEntry = mpCertPathLB->FirstSelected(); if( pEntry ) @@ -438,7 +438,7 @@ IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, ViewCertHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, CertSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl, SvTreeListBox*, void) { OUString sStatus; SvTreeListEntry* pEntry = mpCertPathLB->FirstSelected(); diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index e7456a9a72b2..ca33f875b38b 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -315,7 +315,7 @@ short DigitalSignaturesDialog::Execute() return Dialog::Execute(); } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeListBox*, void) { bool bSel = m_pSignaturesLB->FirstSelected(); m_pViewBtn->Enable( bSel ); @@ -323,25 +323,25 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeList m_pRemoveBtn->Enable( bSel ); } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, OKButtonHdl, Button*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl, Button*, void) { maSignatureManager.write(); EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureSelectHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl, SvTreeListBox*, bool) { ImplShowSignaturesDetails(); return false; } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, ViewButtonHdl, Button*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, ViewButtonHdl, Button*, void) { ImplShowSignaturesDetails(); } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl, Button*, void) { if( ! canAdd()) return; @@ -382,7 +382,7 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, RemoveButtonHdl, Button*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl, Button*, void) { if (!canRemove()) return; @@ -407,7 +407,7 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, RemoveButtonHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, StartVerifySignatureHdl, LinkParamNone*, bool) +IMPL_LINK_NOARG(DigitalSignaturesDialog, StartVerifySignatureHdl, LinkParamNone*, bool) { return mbVerifySignatures; } diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index d73123ea7ba5..b5771f4b3b78 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; -IMPL_LINK_NOARG_TYPED(MacroSecurity, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl, Button*, void) { mpLevelTP->ClosePage(); mpTrustSrcTP->ClosePage(); @@ -182,7 +182,7 @@ void MacroSecurityLevelTP::dispose() MacroSecurityTP::dispose(); } -IMPL_LINK_NOARG_TYPED(MacroSecurityLevelTP, RadioButtonHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl, Button*, void) { sal_uInt16 nNewLevel = 0; if( m_pVeryHighRB->IsChecked() ) @@ -215,7 +215,7 @@ void MacroSecurityTrustedSourcesTP::ImplCheckButtons() } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, void) { if( m_pTrustCertLB->FirstSelected() ) { @@ -240,7 +240,7 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, voi } } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, Button*, void) { if( m_pTrustCertLB->FirstSelected() ) { @@ -252,7 +252,7 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, Button*, v } } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, AddLocPBHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl, Button*, void) { try { @@ -290,7 +290,7 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, AddLocPBHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, void) { sal_Int32 nSel = m_pTrustFileLocLB->GetSelectEntryPos(); if( nSel != LISTBOX_ENTRY_NOTFOUND ) @@ -309,12 +309,12 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, vo } } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, SvTreeListBox*, void) { ImplCheckButtons(); } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl, ListBox&, void) { ImplCheckButtons(); } diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index a79a98213c10..8a895b5c867a 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -350,21 +350,21 @@ uno::Reference< css::xml::crypto::XSecurityEnvironment > XMLSignatureHelper::Get return (mxSecurityContext.is()?(mxSecurityContext->getSecurityEnvironment()): uno::Reference< css::xml::crypto::XSecurityEnvironment >()); } -IMPL_LINK_TYPED( XMLSignatureHelper, SignatureCreationResultListener, XMLSignatureCreationResult&, rResult, void ) +IMPL_LINK( XMLSignatureHelper, SignatureCreationResultListener, XMLSignatureCreationResult&, rResult, void ) { maCreationResults.insert( maCreationResults.begin() + maCreationResults.size(), rResult ); if ( rResult.nSignatureCreationResult != css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED ) mbError = true; } -IMPL_LINK_TYPED( XMLSignatureHelper, SignatureVerifyResultListener, XMLSignatureVerifyResult&, rResult, void ) +IMPL_LINK( XMLSignatureHelper, SignatureVerifyResultListener, XMLSignatureVerifyResult&, rResult, void ) { maVerifyResults.insert( maVerifyResults.begin() + maVerifyResults.size(), rResult ); if ( rResult.nSignatureVerifyResult != css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED ) mbError = true; } -IMPL_LINK_NOARG_TYPED( XMLSignatureHelper, StartVerifySignatureElement, LinkParamNone*, void ) +IMPL_LINK_NOARG( XMLSignatureHelper, StartVerifySignatureElement, LinkParamNone*, void ) { if ( !maStartVerifySignatureHdl.IsSet() || maStartVerifySignatureHdl.Call(nullptr) ) { diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index 5ced7d40d20b..252e4882cfaa 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -123,9 +123,9 @@ private: FixedLine maHintLine; FixedText maHintText; - DECL_LINK_TYPED( CryptoCheckBoxHdl, CheckBox*, void ); - DECL_LINK_TYPED( DigitalSignaturesWithServiceHdl, Button*, void ); - DECL_LINK_TYPED( VerifyDigitalSignaturesHdl, Button*, void ); + DECL_LINK( CryptoCheckBoxHdl, CheckBox*, void ); + DECL_LINK( DigitalSignaturesWithServiceHdl, Button*, void ); + DECL_LINK( VerifyDigitalSignaturesHdl, Button*, void ); public: MyWin( vcl::Window* pParent, WinBits nWinStyle ); @@ -251,7 +251,7 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : } -IMPL_LINK_NOARG_TYPED(MyWin, CryptoCheckBoxHdl, CheckBox*, void) +IMPL_LINK_NOARG(MyWin, CryptoCheckBoxHdl, CheckBox*, void) { if ( maCryptoCheckBox.IsChecked() ) { @@ -265,7 +265,7 @@ IMPL_LINK_NOARG_TYPED(MyWin, CryptoCheckBoxHdl, CheckBox*, void) } } -IMPL_LINK_NOARG_TYPED(MyWin, DigitalSignaturesWithServiceHdl, Button*, void) +IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl, Button*, void) { OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( @@ -276,7 +276,7 @@ IMPL_LINK_NOARG_TYPED(MyWin, DigitalSignaturesWithServiceHdl, Button*, void) xD->signDocumentContent( xStore, NULL ); } -IMPL_LINK_NOARG_TYPED(MyWin, VerifyDigitalSignaturesHdl, Button*, void) +IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl, Button*, void) { OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( |