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 | |
| 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')
121 files changed, 515 insertions, 515 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(); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index cd9b273a16bc..21ab29cf5684 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -648,7 +648,7 @@ String SpellDialog::getReplacementString() const // ----------------------------------------------------------------------- -IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SpellDialog, ChangeHdl) { if(aSentenceED.IsUndoEditMode()) { @@ -670,7 +670,7 @@ IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SpellDialog, ChangeAllHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl) { aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP ); String aString = getReplacementString(); @@ -746,7 +746,7 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) } //----------------------------------------------------------------------- -IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(SpellDialog, UndoHdl) { aSentenceED.Undo(); if(!aSentenceED.GetUndoActionCount()) @@ -814,7 +814,7 @@ void SpellDialog::Impl_Restore() aIgnorePB.SetText(aIgnoreOnceST); } -IMPL_LINK( SpellDialog, IgnoreHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SpellDialog, IgnoreHdl) { if(aIgnorePB.GetText() == aResumeST) { @@ -1086,7 +1086,7 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) }; //----------------------------------------------------------------------- -IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SpellDialog, CancelHdl) { //apply changes and ignored text parts first - if there are any rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), false); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 60772e9e24d3..b39b7381b396 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1425,7 +1425,7 @@ IMPL_LINK( ColorPickerDialog, ColorModifyHdl, void *, p ) // -------------------------------------------------------------------- -IMPL_LINK( ColorPickerDialog, ModeModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ColorPickerDialog, ModeModifyHdl) { ColorMode eMode = HUE; diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 612f476d4ca2..2db6e32757e9 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -371,7 +371,7 @@ void SvxCharMapData::SetCharFont( const Font& rFont ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharMapData, OKHdl) { String aStr = aShowText.GetText(); @@ -388,7 +388,7 @@ IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharMapData, FontSelectHdl) { sal_uInt16 nPos = aFontLB.GetSelectEntryPos(), nFont = (sal_uInt16)(sal_uLong)aFontLB.GetEntryData( nPos ); @@ -450,7 +450,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharMapData, SubsetSelectHdl) { sal_uInt16 nPos = aSubsetLB.GetSelectEntryPos(); const Subset* pSubset = reinterpret_cast<const Subset*> (aSubsetLB.GetEntryData(nPos)); @@ -465,7 +465,7 @@ IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharMapData, CharDoubleClickHdl) { mpDialog->EndDialog( sal_True ); return 0; @@ -473,7 +473,7 @@ IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharMapData, CharSelectHdl, Control *, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharMapData, CharSelectHdl) { if ( !bOne ) { @@ -496,7 +496,7 @@ IMPL_LINK( SvxCharMapData, CharSelectHdl, Control *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharMapData, CharHighlightHdl) { String aText; sal_UCS4 cChar = aShowSet.GetSelectCharacter(); @@ -535,7 +535,7 @@ IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharMapData, CharPreSelectHdl, Control *, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharMapData, CharPreSelectHdl) { // adjust subset selection if( pSubsetMap ) @@ -552,7 +552,7 @@ IMPL_LINK( SvxCharMapData, CharPreSelectHdl, Control *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharMapData, DeleteHdl) { aShowText.SetText( String() ); aOKBtn.Disable(); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index ac5fd9e824c3..2d28672ad525 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -342,7 +342,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) } //------------------------------------------------------------------------ -IMPL_LINK(FmSearchDialog, OnClickedSearchAgain, Button*, EMPTYARG) +IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain) { if (m_pbClose.IsEnabled()) { // der Button hat die Funktion 'Suchen' @@ -436,7 +436,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton ) } //------------------------------------------------------------------------ -IMPL_LINK(FmSearchDialog, OnSearchTextModified, ComboBox*, EMPTYARG) +IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified) { if ((m_cmbSearchText.GetText().Len() != 0) || !m_rbSearchForText.IsChecked()) m_pbSearchAgain.Enable(); @@ -739,7 +739,7 @@ void FmSearchDialog::EnableControlPaint(sal_Bool bEnable) } //------------------------------------------------------------------------ -IMPL_LINK(FmSearchDialog, OnDelayedPaint, void*, EMPTYARG) +IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint) { EnableControlPaint(sal_True); return 0L; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 3cfb82d8ef65..49b210657ff7 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -245,7 +245,7 @@ void SearchProgress::Terminate() // ------------------------------------------------------------------------ -IMPL_LINK( SearchProgress, ClickCancelBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn) { Terminate(); return 0L; @@ -253,7 +253,7 @@ IMPL_LINK( SearchProgress, ClickCancelBtn, void*, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK( SearchProgress, CleanUpHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SearchProgress, CleanUpHdl) { EndDialog( RET_OK ); delete this; @@ -380,7 +380,7 @@ void TakeProgress::Terminate() // ------------------------------------------------------------------------ -IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn) { Terminate(); return 0L; @@ -388,7 +388,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(TakeProgress, CleanUpHdl) { TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent(); ::std::vector<bool, std::allocator<bool> > aRemoveEntries( mpBrowser->aFoundList.size(), false ); @@ -497,7 +497,7 @@ short ActualizeProgress::Execute() // ------------------------------------------------------------------------ -IMPL_LINK( ActualizeProgress, ClickCancelBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn) { pTheme->AbortActualize(); EndDialog( RET_OK ); @@ -584,7 +584,7 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) : // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) { Gallery* pGal = pThm->GetParent(); const sal_uLong nId = GetId(); @@ -1015,7 +1015,7 @@ void TPGalleryThemeProperties::FillFilterList() // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, SelectFileTypeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl) { String aText( aCbbFileType.GetText() ); @@ -1051,7 +1051,7 @@ void TPGalleryThemeProperties::SearchFiles() // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl) { if( bInputAllowed ) { @@ -1114,7 +1114,7 @@ void TPGalleryThemeProperties::TakeFiles() // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, ClickPreviewHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl) { if ( bInputAllowed ) { @@ -1165,7 +1165,7 @@ void TPGalleryThemeProperties::DoPreview() // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl) { if( bInputAllowed ) { @@ -1192,7 +1192,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, ClickTakeAllHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl) { if( bInputAllowed ) { @@ -1206,7 +1206,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeAllHdl, void *, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl) { if( bInputAllowed ) { @@ -1239,7 +1239,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, DClickFoundHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl) { if( bInputAllowed ) { @@ -1254,7 +1254,7 @@ IMPL_LINK( TPGalleryThemeProperties, DClickFoundHdl, void *, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl) { aPreviewTimer.Stop(); DoPreview(); @@ -1263,7 +1263,7 @@ IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMPTYARG ) +IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl) { if( !aFoundList.empty() ) { diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 2e8caee8b188..21ccf63117b3 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -144,7 +144,7 @@ GraphicFilterDialog::~GraphicFilterDialog() // ----------------------------------------------------------------------------- -IMPL_LINK( GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl) { maTimer.Stop(); maPreview.SetGraphic( GetFilteredGraphic( maGraphic, mfScaleX, mfScaleY ) ); @@ -154,7 +154,7 @@ IMPL_LINK( GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer*, EMPTYARG ) // ----------------------------------------------------------------------------- -IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl) { if( maGraphic.GetType() == GRAPHIC_BITMAP ) { diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 1b44a8dbf54a..1b5e92fa196f 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -233,7 +233,7 @@ void SvxHpLinkDlg::Move() |* |************************************************************************/ -IMPL_LINK ( SvxHpLinkDlg, ClickApplyHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl) { SfxItemSet aItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK, SID_HYPERLINK_SETLINK ); @@ -265,7 +265,7 @@ IMPL_LINK ( SvxHpLinkDlg, ClickApplyHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHpLinkDlg, ClickCloseHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl) { Close(); diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index ae0beaa3623d..7239b4a8d695 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -75,7 +75,7 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String } } -IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG) +IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl) { if(aCheckNameHdl.IsSet()) aBtnOK.Enable(aCheckNameHdl.Call(this) > 0); @@ -109,7 +109,7 @@ SvxObjectNameDialog::SvxObjectNameDialog( aEdtName.SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl)); } -IMPL_LINK(SvxObjectNameDialog, ModifyHdl, Edit*, EMPTYARG) +IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl) { if(aCheckNameHdl.IsSet()) { @@ -190,21 +190,21 @@ SvxMessDialog::~SvxMessDialog() /*************************************************************************/ -IMPL_LINK_INLINE_START( SvxMessDialog, Button1Hdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button1Hdl) { EndDialog( RET_BTN_1 ); return 0; } -IMPL_LINK_INLINE_END( SvxMessDialog, Button1Hdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button1Hdl) /*************************************************************************/ -IMPL_LINK_INLINE_START( SvxMessDialog, Button2Hdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button2Hdl) { EndDialog( RET_BTN_2 ); return 0; } -IMPL_LINK_INLINE_END( SvxMessDialog, Button2Hdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button2Hdl) /*************************************************************************/ diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index e5186492c42f..93705c65d19a 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -698,7 +698,7 @@ namespace svx } //------------------------------------------------------------------------- - IMPL_LINK( HangulHanjaConversionDialog, OnSuggestionSelected, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionSelected) { m_pPlayground->GetWordInputControl().SetText( m_aSuggestions.GetSelectEntry() ); OnSuggestionModified( NULL ); @@ -706,7 +706,7 @@ namespace svx } //------------------------------------------------------------------------- - IMPL_LINK( HangulHanjaConversionDialog, OnSuggestionModified, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified) { m_aFind.Enable( m_pPlayground->GetWordInputControl().GetSavedValue() != m_pPlayground->GetWordInputControl().GetText() ); @@ -748,13 +748,13 @@ namespace svx } //------------------------------------------------------------------------- - IMPL_LINK( HangulHanjaConversionDialog, OnClose, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnClose) { Close(); return 0L; } - IMPL_LINK( HangulHanjaConversionDialog, OnOption, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnOption) { HangulHanjaOptionsDialog aOptDlg( this ); aOptDlg.Execute(); @@ -980,7 +980,7 @@ namespace svx } } - IMPL_LINK( HangulHanjaOptionsDialog, OkHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, OkHdl) { sal_uInt32 nCnt = m_aDictList.size(); sal_uInt32 n = 0; @@ -1034,7 +1034,7 @@ namespace svx return 0; } - IMPL_LINK( HangulHanjaOptionsDialog, DictsLB_SelectHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl) { bool bSel = m_aDictsLB.FirstSelected() != NULL; @@ -1044,7 +1044,7 @@ namespace svx return 0; } - IMPL_LINK( HangulHanjaOptionsDialog, NewDictHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, NewDictHdl) { String aName; HangulHanjaNewDictDialog aNewDlg( this ); @@ -1077,7 +1077,7 @@ namespace svx return 0L; } - IMPL_LINK( HangulHanjaOptionsDialog, EditDictHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, EditDictHdl) { SvLBoxEntry* pEntry = m_aDictsLB.FirstSelected(); DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" ); @@ -1089,7 +1089,7 @@ namespace svx return 0L; } - IMPL_LINK( HangulHanjaOptionsDialog, DeleteDictHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl) { sal_uInt16 nSelPos = m_aDictsLB.GetSelectEntryPos(); if( nSelPos != LISTBOX_ENTRY_NOTFOUND ) @@ -1199,7 +1199,7 @@ namespace svx //========================================================================= //------------------------------------------------------------------------- - IMPL_LINK( HangulHanjaNewDictDialog, OKHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl) { String aName( m_aDictNameED.GetText() ); @@ -1212,7 +1212,7 @@ namespace svx return 0; } - IMPL_LINK( HangulHanjaNewDictDialog, ModifyHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl) { String aName( m_aDictNameED.GetText() ); @@ -1538,14 +1538,14 @@ namespace svx } - IMPL_LINK( HangulHanjaEditDictDialog, ScrollHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaEditDictDialog, ScrollHdl) { UpdateScrollbar(); return 0; } - IMPL_LINK( HangulHanjaEditDictDialog, OriginalModifyHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaEditDictDialog, OriginalModifyHdl) { m_bModifiedOriginal = true; m_aOriginal = m_aOriginalLB.GetText(); @@ -1581,13 +1581,13 @@ namespace svx return 0; } - IMPL_LINK( HangulHanjaEditDictDialog, BookLBSelectHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaEditDictDialog, BookLBSelectHdl) { InitEditDictDialog( m_aBookLB.GetSelectEntryPos() ); return 0; } - IMPL_LINK( HangulHanjaEditDictDialog, NewPBPushHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaEditDictDialog, NewPBPushHdl) { DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." ); Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; @@ -1656,7 +1656,7 @@ namespace svx return bRemovedSomething; } - IMPL_LINK( HangulHanjaEditDictDialog, DeletePBPushHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaEditDictDialog, DeletePBPushHdl) { if( DeleteEntryFromDictionary( m_aOriginal, m_rDictList[ m_nCurrentDict ] ) ) { diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index cca1fa813af8..3531a203b230 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -414,7 +414,7 @@ void SvxHyperlinkNewDocTp::DoApply () |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) { rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) ); uno::Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 63d96e8a0b75..57b665fb2aba 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -203,7 +203,7 @@ void SvxHyperlinkDocTp::SetInitFocus() |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkDocTp, ClickFileopenHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) { // Open Fileopen-Dialog ::sfx2::FileDialogHelper aDlg( @@ -242,7 +242,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickFileopenHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkDocTp, ClickTargetHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl) { if ( GetPathType ( maStrURL ) == Type_ExistsFile || maStrURL == aEmptyStr || @@ -274,7 +274,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickTargetHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkDocTp, ModifiedPathHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl) { maStrURL = GetCurrentURL(); @@ -292,7 +292,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ModifiedPathHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl) { if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile || maStrURL == aEmptyStr || @@ -317,7 +317,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl) { maStrURL = GetCurrentURL(); @@ -335,7 +335,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkDocTp, LostFocusPathHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl) { maStrURL = GetCurrentURL(); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 68cc9b407294..ec74b25a0bf2 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -238,7 +238,7 @@ void SvxHyperlinkInternetTp::SetInitFocus() |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl) { String aScheme = GetSchemeFromURL( maCbbTarget.GetText() ); if(aScheme.Len()!=0) @@ -257,7 +257,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl) { RefreshMarkWindow(); return( 0L ); @@ -269,7 +269,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl) { String aStrLogin ( maEdLogin.GetText() ); if ( aStrLogin.EqualsIgnoreCaseAscii( sAnonymous ) ) @@ -366,7 +366,7 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl) { String aScheme = GetSchemeFromButtons(); SetScheme( aScheme ); @@ -379,7 +379,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, void*, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl) { // disable login-editfields if checked if ( maCbAnonymous.IsChecked() ) @@ -409,7 +409,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl) { RefreshMarkWindow(); return (0L); @@ -421,7 +421,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) { ///////////////////////////////////////////////// // Open URL if available @@ -448,7 +448,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkInternetTp, ClickTargetHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickTargetHdl_Impl) { RefreshMarkWindow(); ShowMarkWnd (); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index bc1ab0b41c61..0f84219c976e 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -271,7 +271,7 @@ INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkMailTp, Click_SmartProtocol_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkMailTp, Click_SmartProtocol_Impl) { String aScheme = GetSchemeFromButtons(); SetScheme( aScheme ); @@ -284,7 +284,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, Click_SmartProtocol_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) { String aScheme = GetSchemeFromURL( maCbbReceiver.GetText() ); if(aScheme.Len()!=0) @@ -299,7 +299,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) { SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if( pViewFrame ) diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 0e2bdc053456..04e90b5a5b10 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -486,7 +486,7 @@ void SvxHlinkDlgMarkWnd::SelectEntry ( String aStrMark ) |* |************************************************************************/ -IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl) { SvLBoxEntry* pEntry = maLbTree.GetCurEntry(); @@ -510,7 +510,7 @@ IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl) { Close(); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 4b6fd2cb03e5..33533a11c449 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -427,7 +427,7 @@ SfxDispatcher* SvxHyperlinkTabPageBase::GetDispatcher() const |* |************************************************************************/ -IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) { SvxHyperlinkItem *pHyperlinkItem = (SvxHyperlinkItem *) GetItemSet().GetItem (SID_HYPERLINK_GETLINK); diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index da10e8331038..35c1fd11fd3f 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -135,14 +135,14 @@ struct SvxHyphenWordDialog_Impl void SelLeft_Impl(); void SelRight_Impl(); - DECL_LINK( Left_Impl, Button* ); - DECL_LINK( Right_Impl, Button* ); - DECL_LINK( CutHdl_Impl, Button* ); - DECL_LINK( ContinueHdl_Impl, Button* ); - DECL_LINK( DeleteHdl_Impl, Button* ); + DECL_LINK(Left_Impl, void *); + DECL_LINK(Right_Impl, void *); + DECL_LINK(CutHdl_Impl, void *); + DECL_LINK(ContinueHdl_Impl, void *); + DECL_LINK(DeleteHdl_Impl, void *); DECL_LINK( HyphenateAllHdl_Impl, Button* ); - DECL_LINK( CancelHdl_Impl, Button* ); - DECL_LINK( GetFocusHdl_Impl, Edit* ); + DECL_LINK(CancelHdl_Impl, void *); + DECL_LINK(GetFocusHdl_Impl, void *); SvxHyphenWordDialog_Impl( @@ -489,7 +489,7 @@ void SvxHyphenWordDialog_Impl::SelRight_Impl() } -IMPL_LINK( SvxHyphenWordDialog_Impl, CutHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, CutHdl_Impl) { if( !bBusy ) { @@ -531,7 +531,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /* } -IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, DeleteHdl_Impl) { if( !bBusy ) { @@ -543,7 +543,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG ) } -IMPL_LINK( SvxHyphenWordDialog_Impl, ContinueHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, ContinueHdl_Impl) { if( !bBusy ) { @@ -555,7 +555,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, ContinueHdl_Impl, Button *, EMPTYARG ) } -IMPL_LINK( SvxHyphenWordDialog_Impl, CancelHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, CancelHdl_Impl) { if( !bBusy ) { @@ -568,7 +568,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, CancelHdl_Impl, Button *, EMPTYARG ) } -IMPL_LINK( SvxHyphenWordDialog_Impl, Left_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, Left_Impl) { if( !bBusy ) { @@ -580,7 +580,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, Left_Impl, Button *, EMPTYARG ) } -IMPL_LINK( SvxHyphenWordDialog_Impl, Right_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, Right_Impl) { if( !bBusy ) { @@ -592,7 +592,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, Right_Impl, Button *, EMPTYARG ) } -IMPL_LINK( SvxHyphenWordDialog_Impl, GetFocusHdl_Impl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, GetFocusHdl_Impl) { aWordEdit.SetSelection( Selection( nOldPos, nOldPos + 1 ) ); return 0; diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 6774c98f7e9e..db3fe8b055cd 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -638,7 +638,7 @@ void IconChoiceDialog::SetPosSizePages ( sal_uInt16 nId ) | \**********************************************************************/ -IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl) { sal_uLong nPos; @@ -669,7 +669,7 @@ IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG ) | \**********************************************************************/ -IMPL_LINK( IconChoiceDialog, OkHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(IconChoiceDialog, OkHdl) { bInOK = sal_True; @@ -688,7 +688,7 @@ IMPL_LINK( IconChoiceDialog, OkHdl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( IconChoiceDialog, ResetHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl) { ResetPageImpl (); @@ -710,7 +710,7 @@ IMPL_LINK( IconChoiceDialog, ResetHdl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( IconChoiceDialog, CancelHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(IconChoiceDialog, CancelHdl) { Close(); diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 2ff622ba546d..c85443fa7cef 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -110,7 +110,7 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl( Window * pParent, const ResId // ----------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SvInsertOleDlg, DoubleClickHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvInsertOleDlg, DoubleClickHdl) { EndDialog( RET_OK ); return 0; @@ -119,7 +119,7 @@ IMPL_LINK_INLINE_END( SvInsertOleDlg, DoubleClickHdl, ListBox *, pListBox ) // ----------------------------------------------------------------------- -IMPL_LINK( SvInsertOleDlg, BrowseHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl) { Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); if( xFactory.is() ) @@ -162,7 +162,7 @@ IMPL_LINK( SvInsertOleDlg, BrowseHdl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvInsertOleDlg, RadioHdl, RadioButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl) { if ( aRbNewObject.IsChecked() ) { @@ -396,7 +396,7 @@ uno::Reference< io::XInputStream > SvInsertOleDlg::GetIconIfIconified( ::rtl::OU return uno::Reference< io::XInputStream >(); } -IMPL_LINK( SvInsertPlugInDialog, BrowseHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl) { Sequence< OUString > aFilterNames, aFilterTypes; void fillNetscapePluginFilters( Sequence< OUString >& rNames, Sequence< OUString >& rTypes ); diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 42b9080715e9..e6d4e5ef8630 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -259,7 +259,7 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioBut } IMPL_LINK_INLINE_END( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton ) -IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl) { SvTabListBox& rListBox = Links(); sal_uInt16 nSelCnt = (sal_uInt16)rListBox.GetSelectionCount(); diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index cc76430f7da0..6de3daa5cd0f 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -142,7 +142,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxMultiFileDialog, DelHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxMultiFileDialog, DelHdl_Impl) { sal_uInt16 nPos = aPathLB.GetSelectEntryPos(); aPathLB.RemoveEntry( nPos ); diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 1f052682c75d..eee534e6d8b9 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -63,7 +63,7 @@ struct MultiPath_Impl // class SvxMultiPathDialog ---------------------------------------------- -IMPL_LINK( SvxMultiPathDialog, SelectHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl) { sal_uLong nCount = pImpl->bIsRadioButtonMode ? aRadioLB.GetEntryCount() : aPathLB.GetEntryCount(); bool bIsSelected = pImpl->bIsRadioButtonMode @@ -87,7 +87,7 @@ IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox // ----------------------------------------------------------------------- -IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl) { rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) ); Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); @@ -140,7 +140,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl) { if ( pImpl->bIsRadioButtonMode ) { diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 0bb2a3e91743..329d8765325a 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -199,25 +199,25 @@ void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev) // ----------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SvxPostItDialog, PrevHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, PrevHdl) { aPrevHdlLink.Call( this ); return 0; } -IMPL_LINK_INLINE_END( SvxPostItDialog, PrevHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, PrevHdl) // ----------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SvxPostItDialog, NextHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, NextHdl) { aNextHdlLink.Call( this ); return 0; } -IMPL_LINK_INLINE_END( SvxPostItDialog, NextHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, NextHdl) // ----------------------------------------------------------------------- -IMPL_LINK( SvxPostItDialog, Stamp, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPostItDialog, Stamp) { Date aDate( Date::SYSTEM ); Time aTime( Time::SYSTEM ); @@ -247,7 +247,7 @@ IMPL_LINK( SvxPostItDialog, Stamp, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxPostItDialog, OKHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPostItDialog, OKHdl) { LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() ); pOutSet = new SfxItemSet( rSet ); diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index f5b9affb4d80..41152a3ccc85 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -65,7 +65,7 @@ FmShowColsDialog::~FmShowColsDialog() } //-------------------------------------------------------------------------- -IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG ) +IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) { 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/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 2013e6917162..531c3357825a 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -203,7 +203,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, // ----------------------------------------------------------------------- -IMPL_LINK( SvxSearchAttributeDialog, OKHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) { SearchAttrItem aInvalidItem; aInvalidItem.pItem = (SfxPoolItem*)-1; diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index fbaecd0ec75b..2fd600c84f9b 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -344,7 +344,7 @@ IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxZoomDialog, SpinHdl, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) { if ( !aUserBtn.IsChecked() ) return 0; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 582542172dbd..f4c570b33482 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -733,7 +733,7 @@ void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -IMPL_LINK( AbstractSvxNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG ) +IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameHdl) { if( aCheckNameHdl.IsSet() ) return aCheckNameHdl.Call(this); @@ -759,7 +759,7 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link& rLink, bool b } } -IMPL_LINK(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG) +IMPL_LINK_NOARG(AbstractSvxObjectNameDialog_Impl, CheckNameHdl) { if(aCheckNameHdl.IsSet()) { @@ -959,13 +959,13 @@ void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link& rLink ) else pDlg->SetPrevHdl( Link() ); } -IMPL_LINK( AbstractSvxPostItDialog_Impl, NextHdl, Window*, EMPTYARG ) +IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, NextHdl) { if( aNextHdl.IsSet() ) aNextHdl.Call(this); return 0; } -IMPL_LINK( AbstractSvxPostItDialog_Impl, PrevHdl, Window*, EMPTYARG ) +IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, PrevHdl) { if( aPrevHdl.IsSet() ) aPrevHdl.Call(this); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index a5a54335a4ea..0f25c25992a0 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -402,7 +402,7 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog virtual void SetText( const XubString& rStr ) ; private: Link aCheckNameHdl; - DECL_LINK( CheckNameHdl, Window*); + DECL_LINK(CheckNameHdl, void *); }; //for SvxNameDialog end @@ -421,7 +421,7 @@ class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog private: Link aCheckNameHdl; - DECL_LINK(CheckNameHdl, Window*); + DECL_LINK(CheckNameHdl, void *); }; class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog @@ -565,8 +565,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog private: Link aNextHdl; Link aPrevHdl; - DECL_LINK( NextHdl, Window*); - DECL_LINK( PrevHdl, Window*); + DECL_LINK(NextHdl, void *); + DECL_LINK(PrevHdl, void *); }; //add for SvxPostItDialog end diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 71d502c322b2..2d9383bf33c1 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -203,15 +203,15 @@ private: ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; LanguageType nOldLang; - DECL_LINK( ChangeHdl, Button * ); - DECL_LINK( ChangeAllHdl, Button * ); + DECL_LINK(ChangeHdl, void *); + DECL_LINK(ChangeAllHdl, void *); DECL_LINK( IgnoreAllHdl, Button * ); - DECL_LINK( IgnoreHdl, Button * ); + DECL_LINK(IgnoreHdl, void *); DECL_LINK( CheckGrammarHdl, CheckBox* ); DECL_LINK( ExtClickHdl, Button * ); - DECL_LINK( CancelHdl, Button * ); + DECL_LINK(CancelHdl, void *); DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *); - DECL_LINK( UndoHdl, Button * ); + DECL_LINK(UndoHdl, void *); DECL_LINK( AddToDictionaryHdl, MenuButton* ); DECL_LINK( LanguageSelectHdl, SvxLanguageBox* ); DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* ); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 7a6eb2540041..ec03c4a87095 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -162,16 +162,16 @@ private: ::rtl::OUString m_sModuleShortName; ::rtl::OUString m_sModuleUIName; - DECL_LINK( ChangeHdl, Button * ); - DECL_LINK( RemoveHdl, Button * ); + DECL_LINK(ChangeHdl, void *); + DECL_LINK(RemoveHdl, void *); DECL_LINK( SelectHdl, Control * ); - DECL_LINK( Save, Button * ); - DECL_LINK( Load, Button * ); - DECL_LINK( Default, PushButton * ); - DECL_LINK( RadioHdl, RadioButton* ); + DECL_LINK(Save, void *); + DECL_LINK(Load, void *); + DECL_LINK(Default, void *); + DECL_LINK(RadioHdl, void *); - DECL_LINK( LoadHdl, sfx2::FileDialogHelper* ); - DECL_LINK( SaveHdl, sfx2::FileDialogHelper* ); + DECL_LINK(LoadHdl, void *); + DECL_LINK(SaveHdl, void *); String GetLabel4Command(const String& sCommand); void InitAccCfg(); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 30437396b784..99e1115c2ac9 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -178,7 +178,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; DECL_LINK(SelectHdl, OfaACorrCheckListBox*); - DECL_LINK(EditHdl, PushButton*); + DECL_LINK(EditHdl, void *); SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol); @@ -446,7 +446,7 @@ public: virtual void ActivatePage( const SfxItemSet& ); void CopyToClipboard() const; - DECL_LINK( DeleteHdl, PushButton* ); + DECL_LINK(DeleteHdl, void *); }; // class OfaSmartTagOptionsTabPage --------------------------------------------- @@ -486,21 +486,21 @@ private: Enables/disables all controls in the tab page (except from the check box. */ - DECL_LINK( CheckHdl, CheckBox* ); + DECL_LINK(CheckHdl, 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( ClickHdl, PushButton* ); + DECL_LINK(ClickHdl, void *); /** Handler for the list box Enables/disables the properties push button if selection in the smart tag types list box changes. */ - DECL_LINK( SelectHdl, SvxCheckListBox* ); + DECL_LINK(SelectHdl, void *); public: diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index d3cc4e589439..148248a6b040 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -148,11 +148,11 @@ private: void ResetFromWallpaperItem( const SfxItemSet& rSet ); DECL_LINK( LoadTimerHdl_Impl, Timer* ); - DECL_LINK( SelectHdl_Impl, ListBox* ); - DECL_LINK( BrowseHdl_Impl, PushButton* ); + DECL_LINK(SelectHdl_Impl, void *); + DECL_LINK(BrowseHdl_Impl, void *); DECL_LINK( RadioClickHdl_Impl, RadioButton* ); DECL_LINK( FileClickHdl_Impl, CheckBox* ); - DECL_LINK( BackgroundColorHdl_Impl, ValueSet* ); + DECL_LINK(BackgroundColorHdl_Impl, void *); DECL_LINK( TblDestinationHdl_Impl, ListBox* ); DECL_LINK( ParaDestinationHdl_Impl, ListBox* ); #endif diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index f6a6a6361bdc..99274bdb4921 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -152,7 +152,7 @@ private: sal_Bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); void ResetColor_Impl( const SfxItemSet& rSet ); - DECL_LINK( UpdateHdl_Impl, Timer* ); + DECL_LINK(UpdateHdl_Impl, void *); DECL_LINK( FontModifyHdl_Impl, void* ); DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); @@ -242,9 +242,9 @@ private: sal_Bool FillItemSetColor_Impl( SfxItemSet& rSet ); DECL_LINK( SelectHdl_Impl, ListBox* ); - DECL_LINK( CbClickHdl_Impl, CheckBox* ); - DECL_LINK( TristClickHdl_Impl, TriStateBox* ); - DECL_LINK( UpdatePreview_Impl, ListBox* ); + DECL_LINK(CbClickHdl_Impl, void *); + DECL_LINK(TristClickHdl_Impl, void *); + DECL_LINK(UpdatePreview_Impl, void *); DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: @@ -313,14 +313,14 @@ private: DECL_LINK( PositionHdl_Impl, RadioButton* ); DECL_LINK( RotationHdl_Impl, RadioButton* ); - DECL_LINK( FontModifyHdl_Impl, MetricField* ); + DECL_LINK(FontModifyHdl_Impl, void *); DECL_LINK( AutoPositionHdl_Impl, CheckBox* ); DECL_LINK( FitToLineHdl_Impl, CheckBox* ); - DECL_LINK( KerningSelectHdl_Impl, ListBox* ); - DECL_LINK( KerningModifyHdl_Impl, MetricField* ); - DECL_LINK( PairKerningHdl_Impl, CheckBox* ); + DECL_LINK(KerningSelectHdl_Impl, void *); + DECL_LINK(KerningModifyHdl_Impl, void *); + DECL_LINK(PairKerningHdl_Impl, void *); DECL_LINK( LoseFocusHdl_Impl, MetricField* ); - DECL_LINK( ScaleWidthModifyHdl_Impl, MetricField* ); + DECL_LINK(ScaleWidthModifyHdl_Impl, void *); public: using SfxTabPage::ActivatePage; @@ -365,7 +365,7 @@ private: void SelectCharacter( ListBox* pBox ); void SetBracket( sal_Unicode cBracket, sal_Bool bStart ); - DECL_LINK( TwoLinesHdl_Impl, CheckBox* ); + DECL_LINK(TwoLinesHdl_Impl, void *); DECL_LINK( CharacterMapHdl_Impl, ListBox* ); public: diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index a7f6370b4bb5..070c7499d4f2 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -104,14 +104,14 @@ friend class SvxCharacterMap; sal_Bool bOne; const SubsetMap* pSubsetMap; - DECL_LINK( OKHdl, OKButton* ); - DECL_LINK( FontSelectHdl, ListBox* ); - DECL_LINK( SubsetSelectHdl, ListBox* ); - DECL_LINK( CharDoubleClickHdl, Control* pControl ); - DECL_LINK( CharSelectHdl, Control* pControl ); - DECL_LINK( CharHighlightHdl, Control* pControl ); - DECL_LINK( CharPreSelectHdl, Control* pControl ); - DECL_LINK( DeleteHdl, PushButton* pBtn ); + DECL_LINK(OKHdl, void *); + DECL_LINK(FontSelectHdl, void *); + DECL_LINK(SubsetSelectHdl, void *); + DECL_LINK(CharDoubleClickHdl, void *); + DECL_LINK(CharSelectHdl, void *); + DECL_LINK(CharHighlightHdl, void *); + DECL_LINK(CharPreSelectHdl, void *); + DECL_LINK(DeleteHdl, void *); }; class SvxCharacterMap : public SfxModalDialog diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 218a56f20661..04c9d1380c5e 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -179,10 +179,10 @@ protected: private: // Handler for the Controls DECL_LINK( OnClickedFieldRadios, Button* ); - DECL_LINK( OnClickedSearchAgain, Button* ); + DECL_LINK(OnClickedSearchAgain, void *); DECL_LINK( OnClickedSpecialSettings, Button* ); - DECL_LINK( OnSearchTextModified, ComboBox* ); + DECL_LINK(OnSearchTextModified, void *); DECL_LINK( OnPositionSelected, ListBox* ); DECL_LINK( OnFieldSelected, ListBox* ); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 15742acd9c63..77e94a981050 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -365,7 +365,7 @@ class TPGalleryThemeProperties : public SfxTabPage DECL_LINK( SelectFileTypeHdl, void* ); DECL_LINK( DClickFoundHdl, void* ); DECL_LINK( PreviewTimerHdl, void* ); - DECL_LINK( EndSearchProgressHdl, SearchProgress* ); + DECL_LINK(EndSearchProgressHdl, void *); DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); public: diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 0c6061068261..05b0eec9a984 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -74,7 +74,7 @@ private: double mfScaleY; Size maSizePixel; - DECL_LINK( ImplPreviewTimeoutHdl, Timer* pTimer ); + DECL_LINK(ImplPreviewTimeoutHdl, void *); DECL_LINK( ImplModifyHdl, void* p ); protected: diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 0f7c2e5cf722..5c1d3dd8b27b 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -262,7 +262,7 @@ private: FieldUnit eFUnit; #ifdef _SVX_TPAREA_CXX - DECL_LINK( SelectDialogTypeHdl_Impl, ListBox * ); + DECL_LINK(SelectDialogTypeHdl_Impl, void *); DECL_LINK( ClickInvisibleHdl_Impl, void * ); DECL_LINK( ClickColorHdl_Impl, void * ); DECL_LINK( ModifyColorHdl_Impl, void * ); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 65ebd9422e5f..a7c31ea3fa35 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -71,7 +71,7 @@ namespace svx DECL_LINK( EditHdl, void * ); DECL_LINK( DeleteHdl, void * ); - DECL_LINK( PathSelect_Impl, SvTabListBox* ); + DECL_LINK(PathSelect_Impl, void *); DECL_LINK( HeaderSelect_Impl, HeaderBar * ); DECL_LINK( HeaderEndDrag_Impl, HeaderBar * ); diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 835feccd200f..77b175dd43f2 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -53,7 +53,7 @@ private: Link aCheckNameHdl; #if _SOLAR__PRIVATE - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK(ModifyHdl, void *); #endif public: @@ -109,7 +109,7 @@ private: // callback link for name uniqueness Link aCheckNameHdl; #if _SOLAR__PRIVATE - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK(ModifyHdl, void *); #endif public: @@ -180,8 +180,8 @@ private: FixedImage aFtImage; Image* pImage; #if _SOLAR__PRIVATE - DECL_LINK( Button1Hdl, Button * ); - DECL_LINK( Button2Hdl, Button * ); + DECL_LINK(Button1Hdl, void *); + DECL_LINK(Button2Hdl, void *); #endif public: SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL ); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 4840442ccb83..7be560c0b91a 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -115,8 +115,8 @@ class SvxGrfCropPage : public SfxTabPage DECL_LINK( CropHdl, const MetricField * ); DECL_LINK( CropLoseFocusHdl, MetricField * ); DECL_LINK( CropModifyHdl, MetricField * ); - DECL_LINK( OrigSizeHdl, PushButton * ); - DECL_LINK( Timeout, Timer * ); + DECL_LINK(OrigSizeHdl, void *); + DECL_LINK(Timeout, void *); void CalcZoom(); void CalcMinMaxBorder(); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 1c7a7a155da8..0f3f0606dfac 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -63,7 +63,7 @@ private: DECL_LINK (LostFocusPathHdl_Impl, void * ); // Combobox "path" lost its focus - DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout + DECL_LINK(TimeoutHdl_Impl , 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 b4cd859c5b15..d0e4f7d921f5 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -67,7 +67,7 @@ private: DECL_LINK (LostFocusTargetHdl_Impl , void * ); // Combobox "Target" lost its focus DECL_LINK (ModifiedTargetHdl_Impl , void * ); // Contens of editfield "Target" modified - DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout + DECL_LINK(TimeoutHdl_Impl , void *); // Handler for timer -timeout void SetScheme( const String& aScheme ); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index c76a87b4b570..496e375092cf 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -184,9 +184,9 @@ private : sal_Bool bItemsReset; DECL_LINK ( ChosePageHdl_Impl, void * ); - DECL_LINK ( OkHdl, Button * ); - DECL_LINK ( ResetHdl, Button * ); - DECL_LINK ( CancelHdl, Button * ); + DECL_LINK(OkHdl, void *); + DECL_LINK(ResetHdl, void *); + DECL_LINK(CancelHdl, void *); IconChoicePageData* GetPageData ( sal_uInt16 nId ); void Start_Impl(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 4f323b5bbb3d..b66737304d21 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -78,9 +78,9 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl ::com::sun::star::uno::Sequence< sal_Int8 > m_aIconMetaFile; ::rtl::OUString m_aIconMediaType; - DECL_LINK( DoubleClickHdl, ListBox* ); - DECL_LINK( BrowseHdl, PushButton* ); - DECL_LINK( RadioHdl, RadioButton* ); + DECL_LINK( DoubleClickHdl, void* ); + DECL_LINK(BrowseHdl, void *); + DECL_LINK(RadioHdl, void *); void SelectDefault(); ListBox& GetObjectTypes() { return aLbObjecttype; } @@ -114,7 +114,7 @@ private: INetURLObject* m_pURL; String m_aCommands; - DECL_LINK( BrowseHdl, PushButton * ); + DECL_LINK(BrowseHdl, void *); String GetPlugInFile() const { return aEdFileurl.GetText(); } String GetPlugInOptions() const { return aEdPluginsOptions.GetText(); } diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index e7d1d555c188..f64c26d880fc 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -87,7 +87,7 @@ class SvBaseLinksDlg : public ModalDialog DECL_LINK( LinksDoubleClickHdl, SvTabListBox * ); DECL_LINK( AutomaticClickHdl, RadioButton * ); DECL_LINK( ManualClickHdl, RadioButton * ); - DECL_LINK( UpdateNowClickHdl, PushButton * ); + DECL_LINK(UpdateNowClickHdl, void *); DECL_LINK( OpenSourceClickHdl, PushButton * ); DECL_LINK( ChangeSourceClickHdl, PushButton * ); DECL_LINK( BreakLinkClickHdl, PushButton * ); diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx index 21ae9e53946e..a55f029b12d2 100644 --- a/cui/source/inc/multifil.hxx +++ b/cui/source/inc/multifil.hxx @@ -45,7 +45,7 @@ private: std::map< String, ::ucbhelper::Content > aFileContentMap; DECL_LINK( AddHdl_Impl, PushButton * ); - DECL_LINK( DelHdl_Impl, PushButton * ); + DECL_LINK(DelHdl_Impl, void *); public: SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index ec6f8ef4e709..f8cbc06ef969 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -69,8 +69,8 @@ protected: MultiPath_Impl* pImpl; - DECL_LINK( AddHdl_Impl, PushButton * ); - DECL_LINK( DelHdl_Impl, PushButton * ); + DECL_LINK(AddHdl_Impl, void *); + DECL_LINK(DelHdl_Impl, void *); DECL_LINK( SelectHdl_Impl, void * ); DECL_LINK( CheckHdl_Impl, svx::SvxRadioButtonListBox * ); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index ccfea59c207d..a87940f8357c 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -166,7 +166,7 @@ private: DECL_LINK( ClickHdl_Impl, ImageButton* pIB ); DECL_LINK( EditHdl_Impl, Edit* pEdFormat ); DECL_LINK( OptHdl_Impl, void * ); - DECL_LINK( TimeHdl_Impl, Timer * ); + DECL_LINK(TimeHdl_Impl, void *); #endif }; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index c1ee078254e8..b0e9fa1dd57e 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -91,8 +91,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage sal_uInt16 nNumItemId; protected: - DECL_LINK( NumSelectHdl_Impl, ValueSet*); - DECL_LINK( DoubleClickHdl_Impl, ValueSet* ); + DECL_LINK(NumSelectHdl_Impl, void *); + DECL_LINK(DoubleClickHdl_Impl, void *); public: SvxSingleNumPickTabPage(Window* pParent, @@ -129,8 +129,8 @@ class SvxBulletPickTabPage : public SfxTabPage String sBulletCharFmtName; protected: - DECL_LINK(NumSelectHdl_Impl, ValueSet*); - DECL_LINK( DoubleClickHdl_Impl, ValueSet* ); + DECL_LINK(NumSelectHdl_Impl, void *); + DECL_LINK(DoubleClickHdl_Impl, void *); public: SvxBulletPickTabPage(Window* pParent, const SfxItemSet& rSet); @@ -174,8 +174,8 @@ class SvxNumPickTabPage : public SfxTabPage protected: - DECL_LINK(NumSelectHdl_Impl, ValueSet*); - DECL_LINK( DoubleClickHdl_Impl, ValueSet* ); + DECL_LINK(NumSelectHdl_Impl, void *); + DECL_LINK(DoubleClickHdl_Impl, void *); public: SvxNumPickTabPage(Window* pParent, @@ -220,9 +220,9 @@ class SvxBitmapPickTabPage : public SfxTabPage sal_Bool bPreset : 1; protected: - DECL_LINK( NumSelectHdl_Impl, ValueSet*); - DECL_LINK( DoubleClickHdl_Impl, ValueSet* ); - DECL_LINK( LinkBmpHdl_Impl, CheckBox* ); + DECL_LINK(NumSelectHdl_Impl, void *); + DECL_LINK(DoubleClickHdl_Impl, void *); + DECL_LINK(LinkBmpHdl_Impl, void *); public: SvxBitmapPickTabPage(Window* pParent, @@ -317,19 +317,19 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * ); DECL_LINK( LevelHdl_Impl, ListBox * ); - DECL_LINK( PopupActivateHdl_Impl, Menu * ); + DECL_LINK(PopupActivateHdl_Impl, void *); DECL_LINK( GraphicHdl_Impl, MenuButton * ); - DECL_LINK( BulletHdl_Impl, Button * ); + DECL_LINK(BulletHdl_Impl, void *); DECL_LINK( SizeHdl_Impl, MetricField * ); DECL_LINK( RatioHdl_Impl, CheckBox * ); - DECL_LINK( CharFmtHdl_Impl, ListBox * ); + DECL_LINK(CharFmtHdl_Impl, void *); DECL_LINK( EditModifyHdl_Impl, Edit * ); DECL_LINK( AllLevelHdl_Impl, NumericField * ); DECL_LINK( OrientHdl_Impl, ListBox * ); DECL_LINK( SameLevelHdl_Impl, CheckBox * ); DECL_LINK( BulColorHdl_Impl, ColorListBox* ); DECL_LINK( BulRelSizeHdl_Impl, MetricField *); - DECL_LINK( PreviewInvalidateHdl_Impl, Timer* ); + DECL_LINK(PreviewInvalidateHdl_Impl, void *); DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* ); @@ -415,15 +415,15 @@ class SvxNumPositionTabPage : public SfxTabPage void InitControls(); DECL_LINK( LevelHdl_Impl, ListBox * ); - DECL_LINK( EditModifyHdl_Impl, Edit*); + DECL_LINK(EditModifyHdl_Impl, void *); DECL_LINK( DistanceHdl_Impl, MetricField * ); DECL_LINK( RelativeHdl_Impl, CheckBox * ); - DECL_LINK( StandardHdl_Impl, PushButton * ); + DECL_LINK(StandardHdl_Impl, void *); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); - DECL_LINK( LabelFollowedByHdl_Impl, ListBox* ); + DECL_LINK(LabelFollowedByHdl_Impl, void *); DECL_LINK( ListtabPosHdl_Impl, MetricField* ); DECL_LINK( AlignAtHdl_Impl, MetricField* ); DECL_LINK( IndentAtHdl_Impl, MetricField* ); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index c526d23420a1..425a850ef2a9 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -61,7 +61,7 @@ class SvxAsianLayoutPage : public SfxTabPage SvxAsianLayoutPage_Impl* pImpl; - DECL_LINK(LanguageHdl, SvxLanguageBox*); + DECL_LINK(LanguageHdl, void *); DECL_LINK(ChangeStandardHdl, CheckBox*); DECL_LINK(ModifyHdl, Edit*); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 07d6308b534b..b1517609cd26 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -77,8 +77,8 @@ private: ::com::sun::star::linguistic2::XDictionary > xNewDic; #ifdef _SVX_OPTDICT_CXX - DECL_LINK( OKHdl_Impl, Button * ); - DECL_LINK( ModifyHdl_Impl, Edit * ); + DECL_LINK(OKHdl_Impl, void *); + DECL_LINK(ModifyHdl_Impl, void *); #endif public: @@ -150,8 +150,8 @@ private: sal_Bool bDicIsReadonly; #ifdef _SVX_OPTDICT_CXX - DECL_LINK( SelectBookHdl_Impl, ListBox * ); - DECL_LINK( SelectLangHdl_Impl, ListBox * ); + DECL_LINK(SelectBookHdl_Impl, void *); + DECL_LINK(SelectLangHdl_Impl, void *); DECL_LINK(SelectHdl, SvTabListBox*); DECL_LINK(NewDelHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 3a13365397d0..df428d997d7d 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -93,11 +93,11 @@ class SvxEditModulesDlg : public ModalDialog DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); DECL_LINK( UpDownHdl_Impl, PushButton * ); DECL_LINK( ClickHdl_Impl, PushButton * ); - DECL_LINK( BackHdl_Impl, PushButton * ); + DECL_LINK(BackHdl_Impl, void *); DECL_LINK( SelectHdlLB_Impl, ListBox * ); DECL_LINK( LangSelectHdl_Impl, ListBox* ); DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); - DECL_LINK( OpenURLHdl_Impl, svt::FixedHyperlink* ); + DECL_LINK(OpenURLHdl_Impl, void *); #endif public: @@ -160,8 +160,8 @@ private: DECL_LINK( ClickHdl_Impl, PushButton * ); DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * ); DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); - DECL_LINK( PostDblClickHdl_Impl, SvTreeListBox * ); - DECL_LINK( OpenURLHdl_Impl, svt::FixedHyperlink* ); + DECL_LINK(PostDblClickHdl_Impl, void *); + DECL_LINK(OpenURLHdl_Impl, void *); void UpdateModulesBox_Impl(); void UpdateDicBox_Impl(); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 2f9a428b9d37..7e8576152029 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -80,10 +80,10 @@ private: #ifdef _SVX_OPTPATH_CXX void ChangeCurrentEntry( const String& _rFolder ); - DECL_LINK( PathHdl_Impl, PushButton * ); - DECL_LINK( StandardHdl_Impl, PushButton * ); + DECL_LINK(PathHdl_Impl, void *); + DECL_LINK(StandardHdl_Impl, void *); - DECL_LINK( PathSelect_Impl, svx::OptHeaderTabListBox * ); + DECL_LINK(PathSelect_Impl, void *); DECL_LINK( HeaderSelect_Impl, HeaderBar * ); DECL_LINK( HeaderEndDrag_Impl, HeaderBar * ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index e524a7d21e5d..b1111cecf055 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -167,18 +167,18 @@ class SvxPageDescPage : public SfxTabPage #ifdef _SVX_PAGE_CXX void Init_Impl(); - DECL_LINK( LayoutHdl_Impl, ListBox* ); - DECL_LINK( PaperBinHdl_Impl, ListBox* ); + DECL_LINK(LayoutHdl_Impl, void *); + DECL_LINK(PaperBinHdl_Impl, void *); DECL_LINK( SwapOrientation_Impl, RadioButton* ); void SwapFirstValues_Impl( bool bSet ); - DECL_LINK( BorderModify_Impl, MetricField* ); + DECL_LINK(BorderModify_Impl, void *); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK( CenterHdl_Impl, CheckBox* ); + DECL_LINK(CenterHdl_Impl, void *); void UpdateExample_Impl( bool bResetbackground = false ); // Papiergroesse DECL_LINK( PaperSizeSelect_Impl, ListBox* ); - DECL_LINK( PaperSizeModify_Impl, Edit* ); + DECL_LINK(PaperSizeModify_Impl, void *); DECL_LINK( FrameDirectionModify_Impl, ListBox* ); @@ -186,7 +186,7 @@ class SvxPageDescPage : public SfxTabPage void ResetBackground_Impl( const SfxItemSet& rSet ); // Grenzwerte - DECL_LINK( RangeHdl_Impl, Edit* ); + DECL_LINK(RangeHdl_Impl, void *); void CalcMargin_Impl(); // Registerhaltigkeit diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 6332e2e41b7e..7a7af80ad4ea 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -112,7 +112,7 @@ private: void UpdateExample_Impl( sal_Bool bAll = sal_False ); DECL_LINK( LineDistHdl_Impl, ListBox* ); - DECL_LINK( ModifyHdl_Impl, SvxRelativeField* ); + DECL_LINK(ModifyHdl_Impl, void *); DECL_LINK( AutoHdl_Impl, CheckBox* ); #endif @@ -120,7 +120,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ); public: - DECL_LINK( ELRLoseFocusHdl, Edit* ); + DECL_LINK(ELRLoseFocusHdl, void *); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); @@ -169,9 +169,9 @@ class SvxParaAlignTabPage : public SfxTabPage svx::FrameDirectionListBox aTextDirectionLB; #ifdef _SVX_PARAGRPH_CXX - DECL_LINK( AlignHdl_Impl, RadioButton* ); - DECL_LINK( LastLineHdl_Impl, ListBox* ); - DECL_LINK( TextDirectionHdl_Impl, ListBox* ); + DECL_LINK(AlignHdl_Impl, void *); + DECL_LINK(LastLineHdl_Impl, void *); + DECL_LINK(TextDirectionHdl_Impl, void *); void UpdateExample_Impl( sal_Bool bAll = sal_False ); #endif @@ -273,12 +273,12 @@ private: sal_uInt16 nStdPos; #ifdef _SVX_PARAGRPH_CXX - DECL_LINK( PageBreakHdl_Impl, TriStateBox* ); - DECL_LINK( KeepTogetherHdl_Impl, TriStateBox* ); - DECL_LINK( WidowHdl_Impl, TriStateBox* ); - DECL_LINK( OrphanHdl_Impl, TriStateBox* ); - DECL_LINK( HyphenClickHdl_Impl, TriStateBox* ); - DECL_LINK( ApplyCollClickHdl_Impl, TriStateBox* ); + DECL_LINK(PageBreakHdl_Impl, void *); + DECL_LINK(KeepTogetherHdl_Impl, void *); + DECL_LINK(WidowHdl_Impl, void *); + DECL_LINK(OrphanHdl_Impl, void *); + DECL_LINK(HyphenClickHdl_Impl, void *); + DECL_LINK(ApplyCollClickHdl_Impl, void *); DECL_LINK( PageBreakPosHdl_Impl, ListBox* ); DECL_LINK( PageBreakTypeHdl_Impl, ListBox* ); #endif diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 651b5328e460..c98041c7d695 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -109,10 +109,10 @@ private: Link aNextHdlLink; #ifdef _SVX_POSTDLG_CXX - DECL_LINK( Stamp, Button* ); - DECL_LINK( OKHdl, Button* ); - DECL_LINK( PrevHdl, Button* ); - DECL_LINK( NextHdl, Button* ); + DECL_LINK(Stamp, void *); + DECL_LINK(OKHdl, void *); + DECL_LINK(PrevHdl, void *); + DECL_LINK(NextHdl, void *); #endif }; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 51170c12ac7d..d515c5371356 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -106,7 +106,7 @@ friend class SvxConfigGroupListBox_Impl; SvxGroupInfoArr_Impl aArr; SvLBoxEntry* m_pDraggingEntry; - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK(TimerHdl, void *); virtual void MouseMove( const MouseEvent& rMEvt ); public: diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index cb0dd228daba..e0c0e3f1cc7c 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -58,7 +58,7 @@ public: void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); protected: - DECL_LINK( OnClickedOk, Button* ); + DECL_LINK(OnClickedOk, void *); }; #endif // _SVX_SHOWCOLS_HXX diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 72457dd9869f..7fd0cedd4670 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -70,7 +70,7 @@ private: SearchAttrItemList& rList; - DECL_LINK( OKHdl, Button * ); + DECL_LINK(OKHdl, void *); }; // class SvxSearchSimilarityDialog --------------------------------------- diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 7fff39c09611..a002a03e7272 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -124,14 +124,14 @@ private: // Handler DECL_LINK( NewHdl_Impl, Button* ); - DECL_LINK( DelHdl_Impl, Button* ); - DECL_LINK( DelAllHdl_Impl, Button* ); + DECL_LINK(DelHdl_Impl, void *); + DECL_LINK(DelAllHdl_Impl, void *); DECL_LINK( FillTypeCheckHdl_Impl, RadioButton* ); DECL_LINK( TabTypeCheckHdl_Impl, RadioButton* ); - DECL_LINK( SelectHdl_Impl, MetricBox* ); - DECL_LINK( ModifyHdl_Impl, MetricBox* ); + DECL_LINK(SelectHdl_Impl, void *); + DECL_LINK(ModifyHdl_Impl, void *); DECL_LINK( GetFillCharHdl_Impl, Edit* ); DECL_LINK( GetDezCharHdl_Impl, Edit* ); #endif diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 90777c870558..aa3af77ab09a 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -199,9 +199,9 @@ private: protected: DECL_LINK(ExpandedHdl_Impl, SvTreeListBox* ); - DECL_LINK(ShowPageHdl_Impl, SvTreeListBox* ); - DECL_LINK(BackHdl_Impl, PushButton* ); - DECL_LINK( OKHdl_Impl, Button * ); + DECL_LINK(ShowPageHdl_Impl, void *); + DECL_LINK(BackHdl_Impl, void *); + DECL_LINK(OKHdl_Impl, void *); DECL_LINK( HintHdl_Impl, Timer * ); void SelectHdl_Impl(); diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 11ac633c5ab1..d8e12c4221d1 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -64,7 +64,7 @@ private: #ifdef _SVX_ZOOM_CXX DECL_LINK( UserHdl, RadioButton* ); - DECL_LINK( SpinHdl, MetricField* ); + DECL_LINK(SpinHdl, void *); DECL_LINK( ViewLayoutUserHdl, RadioButton* ); DECL_LINK( ViewLayoutSpinHdl, MetricField* ); DECL_LINK( ViewLayoutCheckHdl, CheckBox* ); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 717d58975675..a17d4f88f4e2 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -283,7 +283,7 @@ void DbRegistrationOptionsPage::FillUserData() } // ----------------------------------------------------------------------- -IMPL_LINK( DbRegistrationOptionsPage, DeleteHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl) { SvLBoxEntry* pEntry = pPathBox->FirstSelected(); if ( pEntry ) @@ -295,7 +295,7 @@ IMPL_LINK( DbRegistrationOptionsPage, DeleteHdl, void *, EMPTYARG ) return 0; } // ----------------------------------------------------------------------- -IMPL_LINK( DbRegistrationOptionsPage, NewHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl) { String sNewName,sNewLocation; openLinkDialog(sNewName,sNewLocation); @@ -304,7 +304,7 @@ IMPL_LINK( DbRegistrationOptionsPage, NewHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( DbRegistrationOptionsPage, EditHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl) { SvLBoxEntry* pEntry = pPathBox->GetCurEntry(); if ( !pEntry ) @@ -383,7 +383,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) } // ----------------------------------------------------------------------- -IMPL_LINK( DbRegistrationOptionsPage, PathSelect_Impl, SvTabListBox *, EMPTYARG ) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl) { SvLBoxEntry* pEntry = pPathBox->FirstSelected(); diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 529bc1a247e5..320385cbf13e 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -109,7 +109,7 @@ namespace svx } //------------------------------------------------------------------ - IMPL_LINK( ODocumentLinkDialog, OnOk, void*, EMPTYARG ) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk) { // get the current URL ::rtl::OUString sURL = m_aURL.GetText(); @@ -167,7 +167,7 @@ namespace svx } //------------------------------------------------------------------ - IMPL_LINK( ODocumentLinkDialog, OnBrowseFile, void*, EMPTYARG ) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); @@ -213,7 +213,7 @@ namespace svx } //------------------------------------------------------------------ - IMPL_LINK( ODocumentLinkDialog, OnTextModified, Control*, EMPTYARG ) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnTextModified) { validate( ); return 0L; diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 044fba2d37d4..3d8e668c79cd 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -77,7 +77,7 @@ namespace svx void get( String& _rName, String& _rURL ) const; protected: - DECL_LINK( OnTextModified, Control* ); + DECL_LINK(OnTextModified, void *); DECL_LINK( OnBrowseFile, void* ); DECL_LINK( OnOk, void* ); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 28bcb7402cf3..035aa7fa0fad 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -317,7 +317,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) LanguageHdl(&aLanguageLB); } -IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl) { //set current value Locale aLocale; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 9200d647cf31..da24c88a08e7 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -184,7 +184,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) // ResetToDefaults // --------------- -IMPL_LINK( SvxDefaultColorOptPage, ResetToDefaults, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults) { if( pColorConfig ) { @@ -204,7 +204,7 @@ IMPL_LINK( SvxDefaultColorOptPage, ResetToDefaults, void *, EMPTYARG ) // AddChartColor // ------------ -IMPL_LINK( SvxDefaultColorOptPage, AddChartColor, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor) { if( pColorConfig ) { @@ -274,7 +274,7 @@ IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ChartColorLB*, _pColorList ) return 0L; } -IMPL_LINK( SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, EMPTYARG ) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl) { sal_uInt16 nIdx = aLbChartColors.GetSelectEntryPos(); if( nIdx != LISTBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 3d9bd772f657..f54c9b530d11 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -73,7 +73,7 @@ private: DECL_LINK( AddChartColor, void * ); DECL_LINK( RemoveChartColor, PushButton * ); DECL_LINK( ListClickedHdl, ChartColorLB * ); - DECL_LINK( BoxClickedHdl, ValueSet * ); + DECL_LINK(BoxClickedHdl, void *); void FillColorBox(); long GetColorIndex( const Color& rCol ); diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index d6e87b1ae310..ead33dd169cd 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -34,7 +34,7 @@ // class SvxCTLOptionsPage ----------------------------------------------------- -IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl) { sal_Bool bIsSequenceChecking = m_aSequenceCheckingCB.IsChecked(); m_aRestrictedCB.Enable( bIsSequenceChecking ); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index d56ec090f1fc..d33fa83723a7 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -127,7 +127,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, // ----------------------------------------------------------------------- -IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) { String sDict = aNameEdit.GetText(); sDict.EraseTrailingChars(); @@ -204,7 +204,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SvxNewDictionaryDialog, ModifyHdl_Impl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl) { if ( aNameEdit.GetText().Len() ) aOKBtn.Enable(); @@ -212,7 +212,7 @@ IMPL_LINK_INLINE_START( SvxNewDictionaryDialog, ModifyHdl_Impl, Edit *, EMPTYARG aOKBtn.Disable(); return 0; } -IMPL_LINK_INLINE_END( SvxNewDictionaryDialog, ModifyHdl_Impl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog, ModifyHdl_Impl) //========================================================================== // @@ -425,7 +425,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvLBoxEntry* pEntry) // ----------------------------------------------------------------------- -IMPL_LINK( SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl) { sal_uInt16 nPos = aAllDictsLB.GetSelectEntryPos(); @@ -450,7 +450,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl) { sal_uInt16 nDicPos = aAllDictsLB.GetSelectEntryPos(); sal_uInt16 nLang = aLangLB.GetSelectLanguage(); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index b5f33837ae1f..1e612df6b53f 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -72,13 +72,13 @@ OfaMSFilterTabPage::~OfaMSFilterTabPage() { } -IMPL_LINK( OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl) { aWBasicWbctblCB.Enable( aWBasicCodeCB.IsChecked() ); return 0; } -IMPL_LINK( OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl) { aEBasicExectblCB.Enable( aEBasicCodeCB.IsChecked() ); return 0; diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index aab983270fb6..83a6dfdd4b44 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -53,8 +53,8 @@ class OfaMSFilterTabPage : public SfxTabPage OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); - DECL_LINK( LoadWordBasicCheckHdl_Impl, CheckBox* ); - DECL_LINK( LoadExcelBasicCheckHdl_Impl, CheckBox* ); + DECL_LINK(LoadWordBasicCheckHdl_Impl, void *); + DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *); public: static SfxTabPage* Create( Window* pParent, diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index d3b92551819c..aacdd564aa4e 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -348,7 +348,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : } #ifdef WNT -IMPL_LINK( OfaMiscTabPage, OnFileDlgToggled, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(OfaMiscTabPage, OnFileDlgToggled) { aODMADlgCB.Enable( !aFileDlgCB.IsChecked() ); return 0; @@ -543,7 +543,7 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd ) // ----------------------------------------------------------------------- -IMPL_LINK( OfaMiscTabPage, HelpCheckHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl) { aExtHelpCB.Enable( aToolTipsCB.IsChecked() ); aHelpAgentResetBtn.Enable( aHelpAgentCB.IsChecked() ); @@ -552,7 +552,7 @@ IMPL_LINK( OfaMiscTabPage, HelpCheckHdl_Impl, CheckBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( OfaMiscTabPage, HelpAgentResetHdl_Impl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OfaMiscTabPage, HelpAgentResetHdl_Impl) { SvtHelpOptions().resetAgentIgnoreURLCounter(); return 0; diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index d875100a7236..cf69c7d2ee0b 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -77,8 +77,8 @@ private: DECL_LINK( TwoFigureHdl, NumericField* ); DECL_LINK( TwoFigureConfigHdl, NumericField* ); - DECL_LINK( HelpCheckHdl_Impl, CheckBox* ); - DECL_LINK( HelpAgentResetHdl_Impl, PushButton* ); + DECL_LINK(HelpCheckHdl_Impl, void *); + DECL_LINK(HelpAgentResetHdl_Impl, void *); #ifdef WNT DECL_LINK( OnFileDlgToggled, CheckBox* ); #endif diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 9df47726e1ab..24d6a00a6108 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -691,7 +691,7 @@ SvxSecurityTabPage::~SvxSecurityTabPage() delete mpSecOptDlg; } -IMPL_LINK( SvxSecurityTabPage, SecurityOptionsHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl) { if ( !mpSecOptDlg ) mpSecOptDlg = new svx::SecurityOptionsDialog( this, mpSecOptions ); @@ -699,7 +699,7 @@ IMPL_LINK( SvxSecurityTabPage, SecurityOptionsHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( SvxSecurityTabPage, SavePasswordHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) { try { @@ -756,7 +756,7 @@ IMPL_LINK( SvxSecurityTabPage, SavePasswordHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( SvxSecurityTabPage, MasterPasswordHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl) { try { @@ -774,7 +774,7 @@ IMPL_LINK( SvxSecurityTabPage, MasterPasswordHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( SvxSecurityTabPage, MasterPasswordCBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl) { try { @@ -820,7 +820,7 @@ IMPL_LINK( SvxSecurityTabPage, MasterPasswordCBHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( SvxSecurityTabPage, ShowPasswordsHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl) { try { @@ -840,7 +840,7 @@ IMPL_LINK( SvxSecurityTabPage, ShowPasswordsHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( SvxSecurityTabPage, MacroSecPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl) { try { diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index a7eefd6e72a1..05550057c71b 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -184,11 +184,11 @@ private: String msPasswordStoringDeactivateStr; - DECL_LINK( SecurityOptionsHdl, PushButton* ); + DECL_LINK(SecurityOptionsHdl, void *); DECL_LINK( SavePasswordHdl, void* ); - DECL_LINK( MasterPasswordHdl, PushButton* ); + DECL_LINK(MasterPasswordHdl, void *); DECL_LINK( MasterPasswordCBHdl, void* ); - DECL_LINK( ShowPasswordsHdl, PushButton* ); + DECL_LINK(ShowPasswordsHdl, void *); DECL_LINK( MacroSecPBHdl, void* ); void InitControls(); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 25d6b5a29cd6..0540511f2b19 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -196,7 +196,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaOptionsPage, EnableHdl_Impl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl) { sal_Bool bEnable = m_aJavaEnableCB.IsChecked(); m_aJavaFoundLabel.Enable( bEnable ); @@ -223,7 +223,7 @@ IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvxSimpleTable *, pList ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaOptionsPage, SelectHdl_Impl, SvxSimpleTable *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl) { // set installation directory info SvLBoxEntry* pEntry = m_aJavaList.FirstSelected(); @@ -239,7 +239,7 @@ IMPL_LINK( SvxJavaOptionsPage, SelectHdl_Impl, SvxSimpleTable *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl) { try { @@ -267,7 +267,7 @@ IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaOptionsPage, ParameterHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) { Sequence< ::rtl::OUString > aParameterList; if ( !m_pParamDlg ) @@ -315,7 +315,7 @@ IMPL_LINK( SvxJavaOptionsPage, ParameterHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaOptionsPage, ClassPathHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl) { String sClassPath; @@ -359,7 +359,7 @@ IMPL_LINK( SvxJavaOptionsPage, ClassPathHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaOptionsPage, ResetHdl_Impl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl) { LoadJREs(); return 0; @@ -367,7 +367,7 @@ IMPL_LINK( SvxJavaOptionsPage, ResetHdl_Impl, Timer *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaOptionsPage, StartFolderPickerHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl) { try { @@ -745,7 +745,7 @@ SvxJavaParameterDlg::~SvxJavaParameterDlg() // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaParameterDlg, ModifyHdl_Impl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) { String sParam = STRIM( m_aParameterEdit.GetText() ); m_aAssignBtn.Enable( sParam.Len() > 0 ); @@ -755,7 +755,7 @@ IMPL_LINK( SvxJavaParameterDlg, ModifyHdl_Impl, Edit *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaParameterDlg, AssignHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl) { String sParam = STRIM( m_aParameterEdit.GetText() ); if ( sParam.Len() > 0 ) @@ -774,7 +774,7 @@ IMPL_LINK( SvxJavaParameterDlg, AssignHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaParameterDlg, SelectHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl) { EnableRemoveButton(); return 0; @@ -782,7 +782,7 @@ IMPL_LINK( SvxJavaParameterDlg, SelectHdl_Impl, ListBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaParameterDlg, DblClickHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl) { sal_uInt16 nPos = m_aAssignedList.GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -792,7 +792,7 @@ IMPL_LINK( SvxJavaParameterDlg, DblClickHdl_Impl, ListBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaParameterDlg, RemoveHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl) { sal_uInt16 nPos = m_aAssignedList.GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -909,7 +909,7 @@ SvxJavaClassPathDlg::~SvxJavaClassPathDlg() // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl) { sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 ); aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); @@ -946,7 +946,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl) { rtl::OUString sService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" ) ); Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); @@ -984,7 +984,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaClassPathDlg, RemoveHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl) { sal_uInt16 nPos = m_aPathList.GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -1005,7 +1005,7 @@ IMPL_LINK( SvxJavaClassPathDlg, RemoveHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaClassPathDlg, SelectHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl) { EnableRemoveButton(); return 0; diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 3bbfbb67d4e2..47df743d9293 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -82,13 +82,13 @@ private: ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker; - DECL_LINK( EnableHdl_Impl, CheckBox * ); + DECL_LINK(EnableHdl_Impl, void *); DECL_LINK( CheckHdl_Impl, SvxSimpleTable * ); - DECL_LINK( SelectHdl_Impl, SvxSimpleTable * ); - DECL_LINK( AddHdl_Impl, PushButton * ); - DECL_LINK( ParameterHdl_Impl, PushButton * ); - DECL_LINK( ClassPathHdl_Impl, PushButton * ); - DECL_LINK( ResetHdl_Impl, Timer * ); + DECL_LINK(SelectHdl_Impl, void *); + DECL_LINK(AddHdl_Impl, void *); + DECL_LINK(ParameterHdl_Impl, void *); + DECL_LINK(ClassPathHdl_Impl, void *); + DECL_LINK(ResetHdl_Impl, void *); DECL_LINK( StartFolderPickerHdl, void * ); DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); @@ -130,11 +130,11 @@ private: CancelButton m_aCancelBtn; HelpButton m_aHelpBtn; - DECL_LINK( ModifyHdl_Impl, Edit * ); - DECL_LINK( AssignHdl_Impl, PushButton * ); - DECL_LINK( SelectHdl_Impl, ListBox * ); - DECL_LINK( DblClickHdl_Impl, ListBox * ); - DECL_LINK( RemoveHdl_Impl, PushButton * ); + DECL_LINK(ModifyHdl_Impl, void *); + DECL_LINK(AssignHdl_Impl, void *); + DECL_LINK(SelectHdl_Impl, void *); + DECL_LINK(DblClickHdl_Impl, void *); + DECL_LINK(RemoveHdl_Impl, void *); inline void EnableRemoveButton() { m_aRemoveBtn.Enable( @@ -170,10 +170,10 @@ private: String m_sOldPath; - DECL_LINK( AddArchiveHdl_Impl, PushButton * ); - DECL_LINK( AddPathHdl_Impl, PushButton * ); - DECL_LINK( RemoveHdl_Impl, PushButton * ); - DECL_LINK( SelectHdl_Impl, ListBox * ); + DECL_LINK(AddArchiveHdl_Impl, void *); + DECL_LINK(AddPathHdl_Impl, void *); + DECL_LINK(RemoveHdl_Impl, void *); + DECL_LINK(SelectHdl_Impl, void *); bool IsPathDuplicate( const String& _rPath ); inline void EnableRemoveButton() diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 3319c321ff00..034216a0fc81 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1623,7 +1623,7 @@ IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxLinguTabPage, PostDblClickHdl_Impl, SvTreeListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl) { ClickHdl_Impl(&aLinguModulesEditPB); return 0; @@ -1631,7 +1631,7 @@ IMPL_LINK( SvxLinguTabPage, PostDblClickHdl_Impl, SvTreeListBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxLinguTabPage, OpenURLHdl_Impl, svt::FixedHyperlink *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl) { ::rtl::OUString sURL( aMoreDictsLink.GetURL() ); lcl_OpenURL( sURL ); @@ -2463,7 +2463,7 @@ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn ) return 0; } -IMPL_LINK( SvxEditModulesDlg, BackHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl) { rLinguData = *pDefaultLinguData; LangSelectHdl_Impl(0); @@ -2472,7 +2472,7 @@ IMPL_LINK( SvxEditModulesDlg, BackHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxEditModulesDlg, OpenURLHdl_Impl, svt::FixedHyperlink *, EMPTYARG ) +IMPL_LINK_NOARG(SvxEditModulesDlg, OpenURLHdl_Impl) { ::rtl::OUString sURL( aMoreDictsLink.GetURL() ); lcl_OpenURL( sURL ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index ffe2a4dc17ab..ec1ca167a622 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -280,7 +280,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) // ----------------------------------------------------------------------- -IMPL_LINK( OfaMemoryOptionsPage, GraphicCacheConfigHdl, NumericField*, EMPTYARG ) +IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl) { sal_Int32 n = GetNfGraphicCacheVal(); SetNfGraphicObjectCacheMax( n ); diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 1724b5e7505c..65b9a1431006 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -64,7 +64,7 @@ private: FixedLine aQuickLaunchFL; CheckBox aQuickLaunchCB; - DECL_LINK( GraphicCacheConfigHdl, NumericField* ); + DECL_LINK(GraphicCacheConfigHdl, void *); sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes inline void SetNfGraphicCacheVal( long nSizeInBytes ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 4d8f8a94eddd..ad03c209b649 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -400,7 +400,7 @@ void SvxPathTabPage::FillUserData() // ----------------------------------------------------------------------- -IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) { sal_uInt16 nSelCount = 0; SvLBoxEntry* pEntry = pPathBox->FirstSelected(); @@ -423,7 +423,7 @@ IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG // ----------------------------------------------------------------------- -IMPL_LINK( SvxPathTabPage, StandardHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) { SvLBoxEntry* pEntry = pPathBox->FirstSelected(); while ( pEntry ) @@ -544,7 +544,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) { SvLBoxEntry* pEntry = pPathBox->GetCurEntry(); sal_uInt16 nPos = ( pEntry != NULL ) ? ( (PathUserData_Impl*)pEntry->GetUserData() )->nRealId : 0; diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 57534fcb1a27..e2138e7d2f80 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -635,7 +635,7 @@ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox ) return 0; }; -IMPL_LINK( SfxSaveTabPage, ODFVersionHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SfxSaveTabPage, ODFVersionHdl_Impl) { long nVersion = long( aODFVersionLB.GetEntryData( aODFVersionLB.GetSelectEntryPos() ) ); bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST; diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 509221cd66f5..c3d64ccb1b82 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -86,7 +86,7 @@ private: #ifdef _SVX_OPTSAVE_CXX DECL_LINK( AutoClickHdl_Impl, CheckBox * ); DECL_LINK( FilterHdl_Impl, ListBox * ); - DECL_LINK( ODFVersionHdl_Impl, ListBox * ); + DECL_LINK(ODFVersionHdl_Impl, void *); void DetectHiddenControls(); #endif diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 7e7beceaa88f..28d20f1c2b70 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -310,7 +310,7 @@ IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxOnlineUpdateTabPage, FileDialogHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl) { uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); uno::Reference < dialogs::XFolderPicker > xFolderPicker( @@ -336,7 +336,7 @@ IMPL_LINK( SvxOnlineUpdateTabPage, FileDialogHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxOnlineUpdateTabPage, CheckNowHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) { uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index c9846d5931b7..c21999fdb4fd 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -54,8 +54,8 @@ private: rtl::OUString m_aNeverChecked; rtl::OUString m_aLastCheckedTemplate; - DECL_LINK( FileDialogHdl_Impl, PushButton* ) ; - DECL_LINK( CheckNowHdl_Impl, PushButton* ) ; + DECL_LINK(FileDialogHdl_Impl, void *) ; + DECL_LINK(CheckNowHdl_Impl, void *) ; DECL_LINK( AutoCheckHdl_Impl, CheckBox* ) ; void CalcButtonWidth(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 96a5999ca491..ed19976d0f79 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -639,13 +639,13 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, return nRet - 1; } -IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl) { SelectHdl_Impl(); return 0; } -IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl) { if ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) ) { @@ -665,7 +665,7 @@ IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( OfaTreeOptionsDialog, OKHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) { aTreeLB.EndSelection(); if ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) ) diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index d14141fc788c..3775b71021d7 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -234,7 +234,7 @@ void WebConnectionInfoDialog::FillPasswordList() } // ----------------------------------------------------------------------- -IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl) { try { @@ -271,7 +271,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( WebConnectionInfoDialog, RemoveAllPasswordsHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl) { try { @@ -300,7 +300,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemoveAllPasswordsHdl, PushButton*, EMPTYARG } // ----------------------------------------------------------------------- -IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) { try { @@ -344,7 +344,7 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( WebConnectionInfoDialog, EntrySelectedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl) { SvLBoxEntry* pEntry = m_aPasswordsLB.GetCurEntry(); if ( !pEntry ) diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 08aadd6b3858..0bcbfc88a1a2 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -67,9 +67,9 @@ namespace svx sal_Int32 m_nPos; DECL_LINK( HeaderBarClickedHdl, SvxSimpleTable* ); - DECL_LINK( RemovePasswordHdl, PushButton* ); - DECL_LINK( RemoveAllPasswordsHdl, PushButton* ); - DECL_LINK( ChangePasswordHdl, PushButton* ); + DECL_LINK(RemovePasswordHdl, void *); + DECL_LINK(RemoveAllPasswordsHdl, void *); + DECL_LINK(ChangePasswordHdl, void *); DECL_LINK( EntrySelectedHdl, void* ); void FillPasswordList(); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index f90f57d1c914..dcfbd93b9db3 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -388,7 +388,7 @@ bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 n return eMethodOld != eMethodNew; } -IMPL_LINK( AlignmentTabPage, UpdateEnableHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(AlignmentTabPage, UpdateEnableHdl) { UpdateEnableControls(); return 0; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index cdd56d039a1d..d7adfb915fac 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -761,7 +761,7 @@ IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, OfaACorrCheckListBox*, pBox) /* */ /*********************************************************************/ -IMPL_LINK(OfaSwAutoFmtOptionsPage, EditHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl) { sal_uLong nSelEntryPos = aCheckLB.GetSelectEntryPos(); if( nSelEntryPos == REPLACE_BULLETS || @@ -2396,7 +2396,7 @@ void OfaAutoCompleteTabPage::ActivatePage( const SfxItemSet& ) ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage( sal_False ); } -IMPL_LINK( OfaAutoCompleteTabPage, DeleteHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl) { sal_uInt16 nSelCnt = pAutoCmpltList ? aLBEntries.GetSelectEntryCount() : 0; while( nSelCnt ) @@ -2592,7 +2592,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) /** Handler for the push button */ -IMPL_LINK( OfaSmartTagOptionsTabPage, ClickHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl) { const sal_uInt16 nPos = m_aSmartTagTypesLB.GetSelectEntryPos(); const SvLBoxEntry* pEntry = m_aSmartTagTypesLB.GetEntry(nPos); @@ -2609,7 +2609,7 @@ IMPL_LINK( OfaSmartTagOptionsTabPage, ClickHdl, PushButton*, EMPTYARG ) /** Handler for the check box */ -IMPL_LINK( OfaSmartTagOptionsTabPage, CheckHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl) { const sal_Bool bEnable = m_aMainCB.IsChecked(); m_aSmartTagTypesLB.Enable( bEnable ); @@ -2628,7 +2628,7 @@ IMPL_LINK( OfaSmartTagOptionsTabPage, CheckHdl, CheckBox*, EMPTYARG ) /** Handler for the list box */ -IMPL_LINK(OfaSmartTagOptionsTabPage, SelectHdl, SvxCheckListBox*, EMPTYARG) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl) { if ( m_aSmartTagTypesLB.GetEntryCount() < 1 ) return 0; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index b466ea8908b7..8adf23a8b833 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1348,7 +1348,7 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() // Handler //----------------------------------------------------------------------- -IMPL_LINK( SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, EMPTYARG ) +IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl) /* Handler, called when color selection is changed */ @@ -1365,7 +1365,7 @@ IMPL_LINK( SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl) { if ( 0 == aLbSelect.GetSelectEntryPos() ) { @@ -1446,7 +1446,7 @@ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) //------------------------------------------------------------------------ -IMPL_LINK( SvxBackgroundTabPage, BrowseHdl_Impl, PushButton* , EMPTYARG ) +IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) /* [Beschreibung] diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index d6c474f7c247..390d60ad4530 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -754,7 +754,7 @@ void SvxBorderTabPage::HideShadowControls() // ----------------------------------------------------------------------- -IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl) { const svx::FrameBorderState SHOW = svx::FRAMESTATE_SHOW; const svx::FrameBorderState HIDE = svx::FRAMESTATE_HIDE; @@ -826,7 +826,7 @@ IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxBorderTabPage, SelSdwHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl) { sal_Bool bEnable = aWndShadows.GetSelectItemId() > 1; aFtShadowSize.Enable(bEnable); @@ -851,7 +851,7 @@ IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb ) return 0; } -IMPL_LINK( SvxBorderTabPage, ModifyWidthHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl) { sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( aLineWidthMF.GetValue( ), @@ -1073,7 +1073,7 @@ void SvxBorderTabPage::FillLineListBox_Impl() } // ----------------------------------------------------------------------- -IMPL_LINK( SvxBorderTabPage, LinesChanged_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl) { if(!mbUseMarginItem && aLeftMF.IsVisible()) { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 7efd9654e09d..f6fb8794e970 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1257,7 +1257,7 @@ void SvxCharNamePage::ResetColor_Impl( const SfxItemSet& rSet ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharNamePage, UpdateHdl_Impl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl) { UpdatePreview_Impl(); return 0; @@ -1820,7 +1820,7 @@ IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharEffectsPage, UpdatePreview_Impl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl) { bool bEnable = ( ( m_aUnderlineLB.GetSelectEntryPos() > 0 ) || ( m_aOverlineLB.GetSelectEntryPos() > 0 ) || @@ -1833,7 +1833,7 @@ IMPL_LINK( SvxCharEffectsPage, UpdatePreview_Impl, ListBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharEffectsPage, CbClickHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharEffectsPage, CbClickHdl_Impl) { UpdatePreview_Impl(); return 0; @@ -1841,7 +1841,7 @@ IMPL_LINK( SvxCharEffectsPage, CbClickHdl_Impl, CheckBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharEffectsPage, TristClickHdl_Impl, TriStateBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharEffectsPage, TristClickHdl_Impl) { UpdatePreview_Impl(); return 0; @@ -2881,7 +2881,7 @@ IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharPositionPage, FontModifyHdl_Impl, MetricField*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl) { sal_uInt8 nEscProp = (sal_uInt8)m_aFontSizeEdit.GetValue(); short nEsc = (short)m_aHighLowEdit.GetValue(); @@ -2924,7 +2924,7 @@ IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, CheckBox*, pBox ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharPositionPage, KerningSelectHdl_Impl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharPositionPage, KerningSelectHdl_Impl) { if ( m_aKerningLB.GetSelectEntryPos() > 0 ) { @@ -2959,7 +2959,7 @@ IMPL_LINK( SvxCharPositionPage, KerningSelectHdl_Impl, ListBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharPositionPage, KerningModifyHdl_Impl, MetricField*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) { long nVal = static_cast<long>(m_aKerningEdit.GetValue()); nVal = LogicToLogic( nVal, MAP_POINT, MAP_TWIP ); @@ -2982,7 +2982,7 @@ IMPL_LINK( SvxCharPositionPage, KerningModifyHdl_Impl, MetricField*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharPositionPage, PairKerningHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharPositionPage, PairKerningHdl_Impl) { return 0; } @@ -3016,7 +3016,7 @@ IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharPositionPage, ScaleWidthModifyHdl_Impl, MetricField*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharPositionPage, ScaleWidthModifyHdl_Impl) { m_aPreviewWin.SetFontWidthScale( sal_uInt16( m_aScaleWidthMF.GetValue() ) ); @@ -3594,7 +3594,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxCharTwoLinesPage, TwoLinesHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl) { sal_Bool bChecked = m_aTwoLinesBtn.IsChecked(); m_aStartBracketFT.Enable( bChecked ); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index af27a6cde508..b2f594068bfb 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -538,7 +538,7 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) Beschreibung: Originalgroesse einstellen --------------------------------------------------------------------*/ -IMPL_LINK( SvxGrfCropPage, OrigSizeHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -717,7 +717,7 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound ) aOrigSizeFT .Enable(bFound); } -IMPL_LINK( SvxGrfCropPage, Timeout, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGrfCropPage, Timeout) { DBG_ASSERT(pLastCropField,"Timeout ohne Feld?"); CropHdl(pLastCropField); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index b56d494fdcd8..fa7384a13574 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -498,12 +498,12 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton ) //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( SvxCaptionTabPage, SelectCaptTypeHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxCaptionTabPage, SelectCaptTypeHdl_Impl) { SetupType_Impl( aCT_CAPTTYPE.GetSelectItemId() ); return 0; } -IMPL_LINK_INLINE_END( SvxCaptionTabPage, SelectCaptTypeHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxCaptionTabPage, SelectCaptTypeHdl_Impl) //------------------------------------------------------------------------ diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 350764495c9a..8f07d6424347 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1600,7 +1600,7 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) return 0; } -IMPL_LINK( SvxNumberFormatTabPage, TimeHdl_Impl, Timer*, EMPTYARG) +IMPL_LINK_NOARG(SvxNumberFormatTabPage, TimeHdl_Impl) { pLastActivWindow=NULL; return 0; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 22928500d2e0..b2de3205981d 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -349,7 +349,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) *pActNum = *pSaveNum; } -IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl) { if(pActNum) { @@ -391,7 +391,7 @@ IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl) { NumSelectHdl_Impl(pExamplesVS); OKButton& rOk = GetTabDialog()->GetOKButton(); @@ -512,7 +512,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) *pActNum = *pSaveNum; } -IMPL_LINK(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl) { if(pActNum) { @@ -546,7 +546,7 @@ IMPL_LINK(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) } -IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(SvxBulletPickTabPage, DoubleClickHdl_Impl) { NumSelectHdl_Impl(pExamplesVS); OKButton& rOk = GetTabDialog()->GetOKButton(); @@ -717,7 +717,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) } // Hier werden alle Ebenen veraendert -IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl) { if(pActNum) { @@ -803,7 +803,7 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(SvxNumPickTabPage, DoubleClickHdl_Impl) { NumSelectHdl_Impl(pExamplesVS); OKButton& rOk = GetTabDialog()->GetOKButton(); @@ -980,7 +980,7 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) } } -IMPL_LINK(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl) { if(pActNum) { @@ -1023,7 +1023,7 @@ IMPL_LINK(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -IMPL_LINK(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl) { NumSelectHdl_Impl(pExamplesVS); OKButton& rOk = GetTabDialog()->GetOKButton(); @@ -1031,7 +1031,7 @@ IMPL_LINK(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, LinkBmpHdl_Impl) { if(!pExamplesVS->IsNoSelection()) { @@ -1732,7 +1732,7 @@ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox ) return 0; } -IMPL_LINK( SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl) { pPreviewWIN->Invalidate(); return 0; @@ -2015,7 +2015,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) return 0; } -IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, EMPTYARG ) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl) { if(!bMenuButtonInitialized) { @@ -2069,7 +2069,7 @@ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, EMPTYARG ) return 0; } -IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl) { SvxCharacterMap* pMap = new SvxCharacterMap( this, sal_True ); @@ -2210,7 +2210,7 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox ) return 0; } -IMPL_LINK( SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl) { bAutomaticCharStyles = sal_False; sal_uInt16 nEntryPos = aCharFmtLB.GetSelectEntryPos(); @@ -3176,7 +3176,7 @@ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) aIndentAtMF.SetUnit( eMetric ); } -IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -3362,7 +3362,7 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) return 0; } -IMPL_LINK( SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl) { // determine value to be set at the chosen list levels SvxNumberFormat::SvxNumLabelFollowedBy eLabelFollowedBy = @@ -3505,7 +3505,7 @@ IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) return 0; } -IMPL_LINK( SvxNumPositionTabPage, StandardHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxNumPositionTabPage, StandardHdl_Impl) { sal_uInt16 nMask = 1; SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(), diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 21600dab58df..a0b5cc87d160 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -901,7 +901,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxPageDescPage, LayoutHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl) { // innen au\sen umschalten const sal_uInt16 nPos = PosToPageUsage_Impl( aLayoutBox.GetSelectEntryPos() ); @@ -928,7 +928,7 @@ IMPL_LINK( SvxPageDescPage, LayoutHdl_Impl, ListBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxPageDescPage, PaperBinHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl) { if ( aPaperTrayBox.GetEntryCount() > 1 ) // schon gef"ullt @@ -1040,7 +1040,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxPageDescPage, PaperSizeModify_Impl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl) { sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich ); @@ -1164,14 +1164,14 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) // ----------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SvxPageDescPage, BorderModify_Impl, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, BorderModify_Impl) { if ( !bBorderModified ) bBorderModified = sal_True; UpdateExample_Impl(); return 0; } -IMPL_LINK_INLINE_END( SvxPageDescPage, BorderModify_Impl, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, BorderModify_Impl) // ----------------------------------------------------------------------- @@ -1456,7 +1456,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxPageDescPage, RangeHdl_Impl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl) { // Aktuelle Header-Breite/H"ohe aus dem Bsp long nHHeight = aBspWin.GetHdHeight(); @@ -1574,14 +1574,14 @@ void SvxPageDescPage::CalcMargin_Impl() // ----------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SvxPageDescPage, CenterHdl_Impl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, CenterHdl_Impl) { aBspWin.SetHorz( aHorzBox.IsChecked() ); aBspWin.SetVert( aVertBox.IsChecked() ); UpdateExample_Impl(); return 0; } -IMPL_LINK_INLINE_END( SvxPageDescPage, CenterHdl_Impl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, CenterHdl_Impl) // ----------------------------------------------------------------------- diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 4191ee0b00cd..597f753cb2b1 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -176,7 +176,7 @@ sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet) // class SvxStdParagraphTabPage ------------------------------------------ -IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -872,12 +872,12 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox ) // ----------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SvxStdParagraphTabPage, ModifyHdl_Impl, SvxRelativeField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxStdParagraphTabPage, ModifyHdl_Impl) { UpdateExample_Impl(); return 0; } -IMPL_LINK_INLINE_END( SvxStdParagraphTabPage, ModifyHdl_Impl, SvxRelativeField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxStdParagraphTabPage, ModifyHdl_Impl) // ----------------------------------------------------------------------- @@ -1316,7 +1316,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) UpdateExample_Impl(sal_True); } -IMPL_LINK( SvxParaAlignTabPage, AlignHdl_Impl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl) { sal_Bool bJustify = aJustify.IsChecked(); aLastLineFT.Enable(bJustify); @@ -1326,13 +1326,13 @@ IMPL_LINK( SvxParaAlignTabPage, AlignHdl_Impl, RadioButton*, EMPTYARG ) return 0; } -IMPL_LINK( SvxParaAlignTabPage, LastLineHdl_Impl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl) { UpdateExample_Impl(sal_False); return 0; } -IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxParaAlignTabPage, TextDirectionHdl_Impl) { SvxFrameDirection eDir = aTextDirectionLB.GetSelectEntryValue(); switch ( eDir ) @@ -2018,7 +2018,7 @@ sal_uInt16* SvxExtParagraphTabPage::GetRanges() // ----------------------------------------------------------------------- -IMPL_LINK( SvxExtParagraphTabPage, PageBreakHdl_Impl, TriStateBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl) { switch ( aPageBreakBox.GetState() ) { @@ -2062,7 +2062,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakHdl_Impl, TriStateBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxExtParagraphTabPage, KeepTogetherHdl_Impl, TriStateBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, KeepTogetherHdl_Impl) { sal_Bool bEnable = aKeepTogetherBox.GetState() == STATE_NOCHECK; aWidowBox.Enable(bEnable); @@ -2073,7 +2073,7 @@ IMPL_LINK( SvxExtParagraphTabPage, KeepTogetherHdl_Impl, TriStateBox *, EMPTYARG // ----------------------------------------------------------------------- -IMPL_LINK( SvxExtParagraphTabPage, WidowHdl_Impl, TriStateBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl) { switch ( aWidowBox.GetState() ) { @@ -2098,7 +2098,7 @@ IMPL_LINK( SvxExtParagraphTabPage, WidowHdl_Impl, TriStateBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxExtParagraphTabPage, OrphanHdl_Impl, TriStateBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl) { switch( aOrphanBox.GetState() ) { @@ -2123,7 +2123,7 @@ IMPL_LINK( SvxExtParagraphTabPage, OrphanHdl_Impl, TriStateBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxExtParagraphTabPage, HyphenClickHdl_Impl, TriStateBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, HyphenClickHdl_Impl) { sal_Bool bEnable = aHyphenBox.GetState() == STATE_CHECK; @@ -2140,7 +2140,7 @@ IMPL_LINK( SvxExtParagraphTabPage, HyphenClickHdl_Impl, TriStateBox *, EMPTYARG // ----------------------------------------------------------------------- -IMPL_LINK( SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, TriStateBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl) { sal_Bool bEnable = sal_False; if ( aApplyCollBtn.GetState() == STATE_CHECK && diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 2ca6d3986623..b15a294d4499 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1034,7 +1034,7 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) return nRet; } -IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl) { if(m_bPositioningDisabled) return 0; @@ -1118,7 +1118,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) return 0; } -IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl) { m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection); @@ -1139,7 +1139,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG ) return 0; } -IMPL_LINK( SvxSwPosSizeTabPage, MirrorHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, MirrorHdl) { short nId = GetAnchorType(); InitPos( nId, USHRT_MAX, 0, USHRT_MAX, 0, LONG_MAX, LONG_MAX); @@ -1307,7 +1307,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit ) return 0; } -IMPL_LINK( SvxSwPosSizeTabPage, ProtectHdl, TriStateBox *, EMPTYARG) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl) { m_aSizeCB.Enable(m_aPositionCB.IsEnabled() && !m_aPositionCB.IsChecked()); return 0; diff --git a/cui/source/tabpages/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx index 76a197705cff..eac4894bd9b9 100644 --- a/cui/source/tabpages/swpossizetabpage.hxx +++ b/cui/source/tabpages/swpossizetabpage.hxx @@ -114,13 +114,13 @@ class SvxSwPosSizeTabPage : public SfxTabPage - DECL_LINK( RangeModifyHdl, Edit * ); - DECL_LINK( AnchorTypeHdl, RadioButton * ); + DECL_LINK(RangeModifyHdl, void *); + DECL_LINK(AnchorTypeHdl, void *); DECL_LINK( PosHdl, ListBox * ); DECL_LINK( RelHdl, ListBox * ); - DECL_LINK( MirrorHdl, CheckBox * ); + DECL_LINK(MirrorHdl, void *); DECL_LINK( ModifyHdl, Edit * ); - DECL_LINK( ProtectHdl, TriStateBox *); + DECL_LINK(ProtectHdl, void *); void InitPos(short nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, sal_uInt16 nV, sal_uInt16 nVRel, diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 4814f15454d6..1d270e581392 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -221,7 +221,7 @@ short SvxAreaTabDialog::Ok() // ----------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SvxAreaTabDialog, CancelHdlImpl, void *, EMPTYARG) +IMPL_LINK_NOARG_INLINE_START(SvxAreaTabDialog, CancelHdlImpl) { SavePalettes(); diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 1e14d9d5a326..5a978ff1ff13 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -194,14 +194,14 @@ short SvxLineTabDialog::Ok() // ----------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SvxLineTabDialog, CancelHdlImpl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxLineTabDialog, CancelHdlImpl) { SavePalettes(); EndDialog( RET_CANCEL ); return 0; } -IMPL_LINK_INLINE_END( SvxLineTabDialog, CancelHdlImpl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxLineTabDialog, CancelHdlImpl) // ----------------------------------------------------------------------- diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index b0f9cdea4ce2..517ff45e1efd 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -555,7 +555,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxTabulatorTabPage, DelHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl) { sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue() ); @@ -599,7 +599,7 @@ IMPL_LINK( SvxTabulatorTabPage, DelHdl_Impl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxTabulatorTabPage, DelAllHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl) { if ( aNewTabs.Count() ) { @@ -715,7 +715,7 @@ IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxTabulatorTabPage, SelectHdl_Impl, MetricBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl) { sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) @@ -729,7 +729,7 @@ IMPL_LINK( SvxTabulatorTabPage, SelectHdl_Impl, MetricBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxTabulatorTabPage, ModifyHdl_Impl, MetricBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl) { sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 44051fcee53e..c4f5ca7b44bc 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -532,7 +532,7 @@ SfxTabPage* SvxTextAnimationPage::Create( Window* pWindow, |* \************************************************************************/ -IMPL_LINK( SvxTextAnimationPage, SelectEffectHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) { sal_uInt16 nPos = aLbEffect.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -630,7 +630,7 @@ IMPL_LINK( SvxTextAnimationPage, SelectEffectHdl_Impl, void *, EMPTYARG ) |* \************************************************************************/ -IMPL_LINK( SvxTextAnimationPage, ClickEndlessHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl) { if( eAniKind != SDRTEXTANI_SLIDE ) @@ -656,7 +656,7 @@ IMPL_LINK( SvxTextAnimationPage, ClickEndlessHdl_Impl, void *, EMPTYARG ) |* \************************************************************************/ -IMPL_LINK( SvxTextAnimationPage, ClickAutoHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl) { TriState eState = aTsbAuto.GetState(); if( eState != STATE_NOCHECK ) @@ -679,7 +679,7 @@ IMPL_LINK( SvxTextAnimationPage, ClickAutoHdl_Impl, void *, EMPTYARG ) |* \************************************************************************/ -IMPL_LINK( SvxTextAnimationPage, ClickPixelHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl) { TriState eState = aTsbPixel.GetState(); if( eState == STATE_CHECK ) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index ba83ce16c707..75cc28c4a4eb 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -624,7 +624,7 @@ void SvxTextAttrPage::PointChanged( Window*, RECT_POINT 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( SvxTextAttrPage, ClickFullWidthHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl) { if( aTsbFullWidth.GetState() == STATE_CHECK ) { @@ -682,7 +682,7 @@ IMPL_LINK( SvxTextAttrPage, ClickFullWidthHdl_Impl, void *, EMPTYARG ) |* \************************************************************************/ -IMPL_LINK( SvxTextAttrPage, ClickHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) { sal_Bool bAutoGrowWidth = aTsbAutoGrowWidth.GetState() == STATE_CHECK; sal_Bool bAutoGrowHeight = aTsbAutoGrowHeight.GetState() == STATE_CHECK; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 93244a3a8e6a..c27af1978d25 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -83,7 +83,7 @@ static sal_uInt16 pTransparenceRanges[] = |* \************************************************************************/ -IMPL_LINK(SvxTransparenceTabPage, ClickTransOffHdl_Impl, void *, EMPTYARG) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl) { // disable all other controls ActivateLinear(sal_False); @@ -100,7 +100,7 @@ IMPL_LINK(SvxTransparenceTabPage, ClickTransOffHdl_Impl, void *, EMPTYARG) return( 0L ); } -IMPL_LINK(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, void *, EMPTYARG) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl) { // enable linear, disable other ActivateLinear(sal_True); @@ -113,7 +113,7 @@ IMPL_LINK(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, void *, EMPTYARG) return( 0L ); } -IMPL_LINK(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, void *, EMPTYARG) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) { // enable gradient, disable other ActivateLinear(sal_False); @@ -131,7 +131,7 @@ void SvxTransparenceTabPage::ActivateLinear(sal_Bool bActivate) aMtrTransparent.Enable(bActivate); } -IMPL_LINK(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, void*, EMPTYARG) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifyTransparentHdl_Impl) { sal_uInt16 nPos = (sal_uInt16)aMtrTransparent.GetValue(); XFillTransparenceItem aItem(nPos); @@ -197,7 +197,7 @@ void SvxTransparenceTabPage::ActivateGradient(sal_Bool bActivate) } } -IMPL_LINK(SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl) { return( 0L ); } @@ -1754,7 +1754,7 @@ sal_uInt16* SvxAreaTabPage::GetRanges() } //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, SelectDialogTypeHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl) { switch( (XFillStyle)aTypeLB.GetSelectEntryPos() ) { @@ -1768,7 +1768,7 @@ IMPL_LINK( SvxAreaTabPage, SelectDialogTypeHdl_Impl, ListBox *, EMPTYARG ) return 0; } -IMPL_LINK( SvxAreaTabPage, ClickInvisibleHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ClickInvisibleHdl_Impl) { aTsbTile.Hide(); aTsbStretch.Hide(); @@ -1817,7 +1817,7 @@ IMPL_LINK( SvxAreaTabPage, ClickInvisibleHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ClickColorHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ClickColorHdl_Impl) { aTsbTile.Hide(); aTsbStretch.Hide(); @@ -1877,7 +1877,7 @@ IMPL_LINK( SvxAreaTabPage, ClickColorHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ModifyColorHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; sal_uInt16 _nPos = aLbColor.GetSelectEntryPos(); @@ -1905,7 +1905,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyColorHdl_Impl, void *, EMPTYARG ) } //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ClickGradientHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ClickGradientHdl_Impl) { aTsbTile.Hide(); aTsbStretch.Hide(); @@ -1968,7 +1968,7 @@ IMPL_LINK( SvxAreaTabPage, ClickGradientHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ModifyGradientHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; sal_uInt16 _nPos = aLbGradient.GetSelectEntryPos(); @@ -1997,7 +1997,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyGradientHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ClickHatchingHdl_Impl) { aLbColor.Hide(); aLbGradient.Hide(); @@ -2062,7 +2062,7 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ModifyHatchingHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; sal_uInt16 _nPos = aLbHatching.GetSelectEntryPos(); @@ -2090,7 +2090,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyHatchingHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; sal_uInt16 _nPos = aLbHatchBckgrdColor.GetSelectEntryPos(); @@ -2116,7 +2116,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl) { // switch on/off backgroundcolor for hatches aLbHatchBckgrdColor.Enable( aCbxHatchBckgrd.IsChecked() ); @@ -2141,7 +2141,7 @@ IMPL_LINK( SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ClickBitmapHdl_Impl) { aLbColor.Hide(); aLbGradient.Hide(); @@ -2221,7 +2221,7 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ModifyBitmapHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; sal_uInt16 _nPos = aLbBitmap.GetSelectEntryPos(); @@ -2280,7 +2280,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ModifyTileHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) { TriState eState = aTsbTile.GetState(); if( eState == STATE_CHECK ) @@ -2469,7 +2469,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxAreaTabPage, ClickScaleHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) { if( aTsbScale.GetState() == STATE_CHECK ) { diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 2de889a80afe..0786df4da713 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -324,7 +324,7 @@ SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) { XOBitmap* pXOBitmap = NULL; int nPos = aLbBitmaps.GetSelectEntryPos(); @@ -577,7 +577,7 @@ long SvxBitmapTabPage::CheckChanges_Impl() //------------------------------------------------------------------------ -IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) { ResMgr& rMgr = CUI_MGR(); String aNewName( SVX_RES( RID_SVXSTR_BITMAP ) ); @@ -706,7 +706,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) #pragma optimize ( "", off ) #endif -IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) { ResMgr& rMgr = CUI_MGR(); SvxOpenGraphicDialog aDlg( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Import" ) ) ); @@ -807,7 +807,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) { sal_uInt16 nPos = aLbBitmaps.GetSelectEntryPos(); @@ -877,7 +877,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl) { sal_uInt16 nPos = aLbBitmaps.GetSelectEntryPos(); @@ -913,7 +913,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) { sal_uInt16 nReturn = RET_YES; ResMgr& rMgr = CUI_MGR(); @@ -1007,7 +1007,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl) { ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -1069,7 +1069,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxBitmapTabPage, ChangePixelColorHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapTabPage, ChangePixelColorHdl_Impl) { aCtlPixel.SetPixelColor( aLbColor.GetSelectEntryColor() ); aCtlPixel.Invalidate(); @@ -1088,7 +1088,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangePixelColorHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl) { aCtlPixel.SetBackgroundColor( aLbBackgroundColor.GetSelectEntryColor() ); aCtlPixel.Invalidate(); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 579b9ed896f2..7c45d0451a51 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -125,7 +125,7 @@ bool SvxLoadSaveEmbed::GetEmbed() return pList.is() ? pList->IsEmbedInDocument() : 0; } -IMPL_LINK( SvxLoadSaveEmbed, EmbedToggleHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLoadSaveEmbed, EmbedToggleHdl_Impl) { SetEmbed( maBoxEmbed.IsChecked() ); return 0; @@ -164,7 +164,7 @@ void SvxLoadSaveEmbed::UpdateTableName() // ----------------------------------------------------------------------- -IMPL_LINK( SvxLoadSaveEmbed, ClickLoadHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLoadSaveEmbed, ClickLoadHdl_Impl) { ResMgr& rMgr = CUI_MGR(); sal_uInt16 nReturn = RET_YES; @@ -236,7 +236,7 @@ void SvxLoadSaveEmbed::EnableSave( bool bCanSave ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxLoadSaveEmbed, ClickSaveHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLoadSaveEmbed, ClickSaveHdl_Impl) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -658,7 +658,7 @@ SfxTabPage* SvxColorTabPage::Create( Window* pWindow, // // Wird aufgerufen, wenn Inhalt der MtrFileds f�r Farbwerte ver�ndert wird // -IMPL_LINK( SvxColorTabPage, ModifiedHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl) { // lese aktuelle MtrFields aus, wenn cmyk, dann k-Wert als Trans.-Farbe aAktuellColor.SetColor ( Color( (sal_uInt8)PercentToColor_Impl( (sal_uInt16) aMtrFldColorModel4.GetValue() ), @@ -680,7 +680,7 @@ IMPL_LINK( SvxColorTabPage, ModifiedHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) { Window *pWindow = this; while( pWindow ) @@ -758,7 +758,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) { sal_uInt16 nPos = aLbColor.GetSelectEntryPos(); @@ -834,7 +834,7 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxColorTabPage, ClickWorkOnHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl) { SvColorDialog* pColorDlg = new SvColorDialog( GetParentDialog() ); @@ -872,7 +872,7 @@ IMPL_LINK( SvxColorTabPage, ClickWorkOnHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) { sal_uInt16 nPos = aLbColor.GetSelectEntryPos(); @@ -909,7 +909,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxColorTabPage, SelectColorLBHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl) { sal_uInt16 nPos = aLbColor.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -932,7 +932,7 @@ IMPL_LINK( SvxColorTabPage, SelectColorLBHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxColorTabPage, SelectValSetHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl) { sal_uInt16 nPos = aValSetColorList.GetSelectItemId(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -982,7 +982,7 @@ void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell) // // Auswahl Listbox 'Farbmodell' (RGB/CMY) // -IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl) { int nPos = aLbColorModel.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index d82567009d8f..a974b11bcd69 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -416,7 +416,7 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl ) //------------------------------------------------------------------------ -IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl) { ResMgr& rMgr = CUI_MGR(); String aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) ); @@ -522,7 +522,7 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl) { sal_uInt16 nPos = aLbGradients.GetSelectEntryPos(); @@ -594,7 +594,7 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxGradientTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl) { sal_uInt16 nPos = aLbGradients.GetSelectEntryPos(); @@ -629,7 +629,7 @@ IMPL_LINK( SvxGradientTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) { ResMgr& rMgr = CUI_MGR(); sal_uInt16 nReturn = RET_YES; @@ -726,7 +726,7 @@ IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl) { ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -788,7 +788,7 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxGradientTabPage, ChangeGradientHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl) { XGradient* pGradient = NULL; int nPos = aLbGradients.GetSelectEntryPos(); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 9568061c1195..b08c156e2af4 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -396,7 +396,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p ) //------------------------------------------------------------------------ -IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl) { XHatch* pHatch = NULL; int nPos = aLbHatchings.GetSelectEntryPos(); @@ -470,7 +470,7 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl) { ResMgr& rMgr = CUI_MGR(); String aNewName( SVX_RES( RID_SVXSTR_HATCH ) ); @@ -570,7 +570,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl) { sal_uInt16 nPos = aLbHatchings.GetSelectEntryPos(); @@ -642,7 +642,7 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxHatchTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl) { sal_uInt16 nPos = aLbHatchings.GetSelectEntryPos(); @@ -677,7 +677,7 @@ IMPL_LINK( SvxHatchTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) { ResMgr& rMgr = CUI_MGR(); sal_uInt16 nReturn = RET_YES; @@ -765,7 +765,7 @@ IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxHatchTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) { ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 63700aacfc6e..e97468498193 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1331,7 +1331,7 @@ IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p ) //------------------------------------------------------------------------ // #116827# -IMPL_LINK( SvxLineTabPage, ChangeEdgeStyleHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl) { ChangePreviewHdl_Impl( this ); @@ -1340,7 +1340,7 @@ IMPL_LINK( SvxLineTabPage, ChangeEdgeStyleHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineTabPage, ClickInvisibleHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) { if( aLbLineStyle.GetSelectEntryPos() == 0 ) // unsichtbar { @@ -1417,7 +1417,7 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineTabPage, ChangeTransparentHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) { sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue(); XLineTransparenceItem aItem( nVal ); diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 9b5876a28ed7..962caebfd872 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -390,18 +390,18 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p ) //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( SvxLineDefTabPage, ChangePreviewHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl) { FillDash_Impl(); aCtlPreview.Invalidate(); return( 0L ); } -IMPL_LINK_INLINE_END( SvxLineDefTabPage, ChangePreviewHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxLineDefTabPage, ChangePreviewHdl_Impl) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineDefTabPage, ChangeNumber1Hdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl) { if( aNumFldNumber1.GetValue() == 0L ) { @@ -421,7 +421,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeNumber1Hdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineDefTabPage, ChangeNumber2Hdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl) { if( aNumFldNumber2.GetValue() == 0L ) { @@ -547,7 +547,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) { ResMgr& rMgr = CUI_MGR(); String aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) ); @@ -637,7 +637,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) { sal_uInt16 nPos = aLbLineStyles.GetSelectEntryPos(); @@ -711,7 +711,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl) { sal_uInt16 nPos = aLbLineStyles.GetSelectEntryPos(); @@ -748,7 +748,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) { ResMgr& rMgr = CUI_MGR(); sal_uInt16 nReturn = RET_YES; @@ -825,7 +825,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) { ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 25d8eafbe315..16f7f3b2a5dd 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -289,7 +289,7 @@ SfxTabPage* SvxLineEndDefTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -IMPL_LINK( SvxLineEndDefTabPage, SelectLineEndHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl) { if( pLineEndList->Count() > 0 ) { @@ -324,7 +324,7 @@ long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) { sal_uInt16 nPos = aLbLineEnds.GetSelectEntryPos(); @@ -396,7 +396,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) { if( pPolyObj ) { @@ -515,7 +515,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineEndDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl) { sal_uInt16 nPos = aLbLineEnds.GetSelectEntryPos(); @@ -551,7 +551,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) { ResMgr& rMgr = CUI_MGR(); sal_uInt16 nReturn = RET_YES; @@ -625,7 +625,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl) { ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index bada2c2f0eb6..11973094b84e 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -498,7 +498,7 @@ sal_uInt16* SvxShadowTabPage::GetRanges() //------------------------------------------------------------------------ -IMPL_LINK( SvxShadowTabPage, ClickShadowHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl) { if( aTsbShowShadow.GetState() == STATE_NOCHECK ) { @@ -531,7 +531,7 @@ IMPL_LINK( SvxShadowTabPage, ClickShadowHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxShadowTabPage, ModifyShadowHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) { if( aTsbShowShadow.GetState() == STATE_CHECK ) rXFSet.Put( XFillStyleItem( XFILL_SOLID ) ); diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 9755f51a8f22..03b5e34d0f22 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -493,7 +493,7 @@ void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP) //------------------------------------------------------------------------ -IMPL_LINK( SvxAngleTabPage, ModifiedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxAngleTabPage, ModifiedHdl) { switch(aMtrAngle.GetValue()) { @@ -1156,7 +1156,7 @@ int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) //------------------------------------------------------------------------ -IMPL_LINK( SvxPositionSizeTabPage, ChangePosProtectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl) { // #106572# Remember user's last choice maTsbSizeProtect.SetState( maTsbPosProtect.GetState() == STATE_CHECK ? STATE_CHECK : mnProtectSizeState ); @@ -1204,7 +1204,7 @@ void SvxPositionSizeTabPage::UpdateControlStates() //------------------------------------------------------------------------ -IMPL_LINK( SvxPositionSizeTabPage, ChangeSizeProtectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl) { if( maTsbSizeProtect.IsEnabled() ) { @@ -1606,7 +1606,7 @@ Rectangle SvxPositionSizeTabPage::GetRect() //------------------------------------------------------------------------ -IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl) { if( maCbxScale.IsChecked() && maCbxScale.IsEnabled() ) { @@ -1631,7 +1631,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxPositionSizeTabPage, ChangeHeightHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) { if( maCbxScale.IsChecked() && maCbxScale.IsEnabled() ) { @@ -1656,7 +1656,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeHeightHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxPositionSizeTabPage, ClickSizeProtectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl) { UpdateControlStates(); return( 0L ); @@ -1664,7 +1664,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ClickSizeProtectHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SvxPositionSizeTabPage, ClickAutoHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl) { if( maCbxScale.IsChecked() ) { |