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 /svtools/source/brwbox | |
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
Diffstat (limited to 'svtools/source/brwbox')
-rw-r--r-- | svtools/source/brwbox/brwbox2.cxx | 6 | ||||
-rw-r--r-- | svtools/source/brwbox/datwin.cxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/datwin.hxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/ebbcontrols.cxx | 12 | ||||
-rw-r--r-- | svtools/source/brwbox/editbrowsebox.cxx | 8 |
5 files changed, 15 insertions, 15 deletions
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(); |