diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
commit | bd205223ec029a875c662474bb6d423d3cdd1994 (patch) | |
tree | 6531a292edb0d2a13103a4c55cbd10e7137b8a58 /cui/source/customize | |
parent | 32781c2d268ed94eb46318a0398385baf31368c4 (diff) |
New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
for the problem.
Diffstat (limited to 'cui/source/customize')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 16 | ||||
-rw-r--r-- | cui/source/customize/macropg.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/macropg_impl.hxx | 2 | ||||
-rw-r--r-- | cui/source/customize/selector.cxx | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 9ed07419f172..87daa0023652 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1036,7 +1036,7 @@ void SfxAcceleratorConfigPage::ResetConfig() } //----------------------------------------------- -IMPL_LINK( SfxAcceleratorConfigPage, Load, Button*, EMPTYARG ) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load) { // ask for filename, where we should load the new config data from StartFileDialog( 0, aLoadAccelConfigStr ); @@ -1044,14 +1044,14 @@ IMPL_LINK( SfxAcceleratorConfigPage, Load, Button*, EMPTYARG ) } //----------------------------------------------- -IMPL_LINK( SfxAcceleratorConfigPage, Save, Button*, EMPTYARG ) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Save) { StartFileDialog( WB_SAVEAS, aSaveAccelConfigStr ); return 0; } //----------------------------------------------- -IMPL_LINK(SfxAcceleratorConfigPage, Default, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default) { css::uno::Reference< css::form::XReset > xReset(m_xAct, css::uno::UNO_QUERY); if (xReset.is()) @@ -1068,7 +1068,7 @@ IMPL_LINK(SfxAcceleratorConfigPage, Default, PushButton*, EMPTYARG) } //----------------------------------------------- -IMPL_LINK( SfxAcceleratorConfigPage, ChangeHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl) { sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() ); TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData(); @@ -1086,7 +1086,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, ChangeHdl, Button*, EMPTYARG ) } //----------------------------------------------- -IMPL_LINK( SfxAcceleratorConfigPage, RemoveHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl) { // get selected entry sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() ); @@ -1191,7 +1191,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) } //----------------------------------------------- -IMPL_LINK( SfxAcceleratorConfigPage, RadioHdl, RadioButton *, EMPTYARG ) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl) { css::uno::Reference< css::ui::XAcceleratorConfiguration > xOld = m_xAct; @@ -1225,7 +1225,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, RadioHdl, RadioButton *, EMPTYARG ) } //----------------------------------------------- -IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, EMPTYARG ) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl) { DBG_ASSERT( m_pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" ); @@ -1309,7 +1309,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, EMPTYARG } //----------------------------------------------- -IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG ) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl) { DBG_ASSERT( m_pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 7a29e06de7fd..6f8b8d5b1aa4 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -877,7 +877,7 @@ SvxMacroAssignDlg::~SvxMacroAssignDlg() //=============================================== -IMPL_LINK(AssignComponentDialog, ButtonHandler, Button *, EMPTYARG) +IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler) { ::rtl::OUString aMethodName = maMethodEdit.GetText(); maURL = ::rtl::OUString(); diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index c79b91f50fff..e8632b8e9070 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -59,7 +59,7 @@ private: ::rtl::OUString maURL; - DECL_LINK(ButtonHandler, Button *); + DECL_LINK(ButtonHandler, void *); public: AssignComponentDialog( Window * pParent, const ::rtl::OUString& rURL ); diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 2f624e26c9bb..4b6159fdcf60 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -128,7 +128,7 @@ void SvxConfigFunctionListBox_Impl::MouseMove( const MouseEvent& rMEvt ) } -IMPL_LINK( SvxConfigFunctionListBox_Impl, TimerHdl, Timer*, EMPTYARG) +IMPL_LINK_NOARG(SvxConfigFunctionListBox_Impl, TimerHdl) { aTimer.Stop(); Point aMousePos = GetPointerPosPixel(); |