diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /svtools/source/brwbox | |
parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff) |
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and
return types, but provide default template arguments that keep the generic,
unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the
Link class can be updated over time.
All the related macros are duplicated with ..._TYPED counterparts, that
additionally take the RetType (except for LINK_TYPED, which manages to infer the
relevant types from the supplied Member).
(It would have been attractive to change the "untyped" LinkStubs from taking a
void* to a properly typed ArgType parameter, too, but that would cause
-fsanitize=function to flag uses of "untyped" Link::Call.)
Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'svtools/source/brwbox')
-rw-r--r-- | svtools/source/brwbox/ebbcontrols.cxx | 10 | ||||
-rw-r--r-- | svtools/source/brwbox/editbrowsebox.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index d4d4cfb21a46..02a32e96251e 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -130,7 +130,7 @@ namespace svt GetComboBox().SaveValue(); } - void ComboBoxCellController::SetModifyHdl(const Link& rLink) + void ComboBoxCellController::SetModifyHdl(const Link<>& rLink) { GetComboBox().SetModifyHdl(rLink); } @@ -215,7 +215,7 @@ namespace svt } - void ListBoxCellController::SetModifyHdl(const Link& rLink) + void ListBoxCellController::SetModifyHdl(const Link<>& rLink) { GetListBox().SetSelectHdl(rLink); } @@ -352,7 +352,7 @@ namespace svt } - void CheckBoxCellController::SetModifyHdl(const Link& rLink) + void CheckBoxCellController::SetModifyHdl(const Link<>& rLink) { static_cast<CheckBoxControl &>(GetWindow()).SetModifyHdl(rLink); } @@ -441,7 +441,7 @@ namespace svt } - void EditCellController::SetModifyHdl(const Link& rLink) + void EditCellController::SetModifyHdl(const Link<>& rLink) { m_pEditImplementation->SetModifyHdl(rLink); } @@ -498,7 +498,7 @@ namespace svt } - void SpinCellController::SetModifyHdl(const Link& rLink) + void SpinCellController::SetModifyHdl(const Link<>& rLink) { GetSpinWindow().SetModifyHdl(rLink); } diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index c95369f2521c..b70d96a173ec 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -1074,7 +1074,7 @@ namespace svt aController.Clear(); // reset the modify handler - aOldController->SetModifyHdl(Link()); + aOldController->SetModifyHdl(Link<>()); if (bHasFocus) GrabFocus(); // ensure that we have (and keep) the focus |