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 | |
| 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.
812 files changed, 2429 insertions, 2426 deletions
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 45f0fdf55f88..5570eb1a8bde 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -89,10 +89,10 @@ private: DECL_LINK( implTimeHdl, Slider* ); DECL_LINK( implTimeEndHdl, Slider* ); DECL_LINK( implVolumeHdl, Slider* ); - DECL_LINK( implVolumeEndHdl, Slider* ); + DECL_LINK(implVolumeEndHdl, void *); DECL_LINK( implSelectHdl, ToolBox* ); DECL_LINK( implZoomSelectHdl, ListBox* ); - DECL_LINK( implTimeoutHdl, Timer* ); + DECL_LINK(implTimeoutHdl, void *); ImageList maImageList; Timer maTimer; diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index cdfce1ae0bff..decf7be8f6ee 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -480,7 +480,7 @@ IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p ) // ------------------------------------------------------------------------------ -IMPL_LINK( MediaControl, implVolumeEndHdl, Slider*, EMPTYARG ) +IMPL_LINK_NOARG(MediaControl, implVolumeEndHdl) { return 0; } @@ -603,7 +603,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p ) // ------------------------------------------------------------------------------ -IMPL_LINK( MediaControl, implTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MediaControl, implTimeoutHdl) { update(); maTimer.Start(); diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index f5403136ab3f..4c8a502e3995 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -445,7 +445,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL& @onerror - @threadsafe yes *//*-*************************************************************************************************************/ -IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG ) +IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify) { // SAFE { ::osl::ClearableMutexGuard aLock( m_aLock ); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index a44e02b8e796..0be4bb76d2b5 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -110,7 +110,7 @@ private: SyntaxHighlighter aHighlighter; Timer aSyntaxIdleTimer; Table aSyntaxLineTable; - DECL_LINK( SyntaxTimerHdl, Timer * ); + DECL_LINK(SyntaxTimerHdl, void *); ProgressInfo* pProgress; ModulWindow* pModulWindow; @@ -248,7 +248,7 @@ protected: virtual void Paint( const Rectangle& rRect ); DECL_LINK( ButtonHdl, ImageButton * ); - DECL_LINK( TreeListHdl, SvTreeListBox * ); + DECL_LINK(TreeListHdl, void *); DECL_LINK( implEndDragHdl, HeaderBar * ); DECL_LINK( EditAccHdl, Accelerator * ); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index d42a407a405f..b7e394c91cb3 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -876,7 +876,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara ) } } -IMPL_LINK( EditorWindow, SyntaxTimerHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl) { DBG_ASSERT( pEditView, "Noch keine View, aber Syntax-Highlight ?!" ); @@ -1454,7 +1454,7 @@ IMPL_LINK_INLINE_END( WatchWindow, ButtonHdl, ImageButton *, pButton ) -IMPL_LINK_INLINE_START( WatchWindow, TreeListHdl, SvTreeListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl) { SvLBoxEntry* pCurEntry = aTreeListBox.GetCurEntry(); if ( pCurEntry && pCurEntry->GetUserData() ) @@ -1462,7 +1462,7 @@ IMPL_LINK_INLINE_START( WatchWindow, TreeListHdl, SvTreeListBox *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_END( WatchWindow, TreeListHdl, SvTreeListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(WatchWindow, TreeListHdl) IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar ) diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 791732153352..f4a0d0e29e8d 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -58,12 +58,12 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; namespace css = ::com::sun::star; -IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(BasicIDEShell, ObjectDialogCancelHdl) { ShowObjectDialog( sal_False, sal_True ); return 0; } -IMPL_LINK_INLINE_END( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(BasicIDEShell, ObjectDialogCancelHdl) Reference< view::XRenderable > BasicIDEShell::GetRenderable() { diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx index bc27eaa6cf90..c3e978073c74 100644 --- a/basctl/source/basicide/bastype3.hxx +++ b/basctl/source/basicide/bastype3.hxx @@ -48,8 +48,8 @@ private: protected: DECL_LINK( EditAccHdl, Accelerator * ); - DECL_LINK( ImplGetFocusHdl, Control* ); - DECL_LINK( ImplLoseFocusHdl, Control* ); + DECL_LINK(ImplGetFocusHdl, void *); + DECL_LINK(ImplLoseFocusHdl, void *); public: ExtendedEdit( Window* pParent, IDEResId nRes ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 67244eac269c..7cffc4b2cea7 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -344,7 +344,7 @@ ExtendedEdit::ExtendedEdit( Window* pParent, IDEResId nRes ) : Control::SetLoseFocusHdl( LINK( this, ExtendedEdit, ImplLoseFocusHdl ) ); } -IMPL_LINK( ExtendedEdit, ImplGetFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl) { Application::InsertAccel( &aAcc ); aLoseFocusHdl.Call( this ); @@ -352,7 +352,7 @@ IMPL_LINK( ExtendedEdit, ImplGetFocusHdl, Control*, EMPTYARG ) } -IMPL_LINK( ExtendedEdit, ImplLoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl) { Application::RemoveAccel( &aAcc ); return 0; diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index dea7cc0f711d..05e27d37f4b1 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -497,7 +497,7 @@ void MacroChooser::CheckButtons() -IMPL_LINK_INLINE_START( MacroChooser, MacroDoubleClickHdl, SvTreeListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(MacroChooser, MacroDoubleClickHdl) { StoreMacroDescription(); if ( nMode == MACROCHOOSER_RECORDING ) @@ -510,7 +510,7 @@ IMPL_LINK_INLINE_START( MacroChooser, MacroDoubleClickHdl, SvTreeListBox *, EMPT EndDialog( MACRO_OK_RUN ); return 0; } -IMPL_LINK_INLINE_END( MacroChooser, MacroDoubleClickHdl, SvTreeListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(MacroChooser, MacroDoubleClickHdl) IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox ) { diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index 85cce75898e9..ef4f3bf24a33 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -79,7 +79,7 @@ private: sal_uInt16 nMode; DECL_LINK( MacroSelectHdl, SvTreeListBox * ); - DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * ); + DECL_LINK(MacroDoubleClickHdl, void *); DECL_LINK( BasicSelectHdl, SvTreeListBox * ); DECL_LINK( EditModifyHdl, Edit * ); DECL_LINK( ButtonHdl, Button * ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 0f7a1ce0d65d..ebb113765fc7 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -380,7 +380,7 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText // NewObjectDialog //---------------------------------------------------------------------------- -IMPL_LINK(NewObjectDialog, OkButtonHandler, Button *, EMPTYARG) +IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler) { if (BasicIDE::IsValidSbxName(aEdit.GetText())) EndDialog(1); @@ -455,7 +455,7 @@ sal_Int32 GotoLineDialog::GetLineNumber() return rtl::OUString( aEdit.GetText() ).toInt32(); } -IMPL_LINK(GotoLineDialog, OkButtonHandler, Button *, EMPTYARG) +IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler) { if ( GetLineNumber() ) EndDialog(1); @@ -469,7 +469,7 @@ IMPL_LINK(GotoLineDialog, OkButtonHandler, Button *, EMPTYARG) // ExportDialog //---------------------------------------------------------------------------- -IMPL_LINK(ExportDialog, OkButtonHandler, Button *, EMPTYARG) +IMPL_LINK_NOARG(ExportDialog, OkButtonHandler) { mbExportAsPackage = maExportAsPackageButton.IsChecked(); EndDialog(1); diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index dd4e03a86946..0626bab789ff 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -62,7 +62,7 @@ private: OKButton aOKButton; CancelButton aCancelButton; - DECL_LINK(OkButtonHandler, Button *); + DECL_LINK(OkButtonHandler, void *); public: NewObjectDialog(Window * pParent, NewObjectMode nMode, bool bCheckName = false); @@ -78,7 +78,7 @@ class GotoLineDialog : public ModalDialog Edit aEdit; OKButton aOKButton; CancelButton aCancelButton; - DECL_LINK(OkButtonHandler, Button *); + DECL_LINK(OkButtonHandler, void *); public: GotoLineDialog( Window * pParent ); sal_Int32 GetLineNumber(); @@ -94,7 +94,7 @@ private: sal_Bool mbExportAsPackage; - DECL_LINK(OkButtonHandler, Button *); + DECL_LINK(OkButtonHandler, void *); public: ExportDialog( Window * pParent ); diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 2769145074cb..c90e0f2e036c 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -507,7 +507,7 @@ void DlgEditor::Paint( const Rectangle& rRect ) } -IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(DlgEditor, PaintTimeout) { if( !pDlgEdView ) return 0; @@ -618,7 +618,7 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG ) } -IMPL_LINK( DlgEditor, MarkTimeout, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(DlgEditor, MarkTimeout) { BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell(); diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index c224f85e0424..01935d5d1046 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -203,7 +203,7 @@ void ManageLanguageDialog::ClearLanguageBox() m_aLanguageLB.Clear(); } -IMPL_LINK( ManageLanguageDialog, AddHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl) { SetDefaultLanguageDialog aDlg( this, m_pLocalizationMgr ); if ( RET_OK == aDlg.Execute() ) @@ -222,7 +222,7 @@ IMPL_LINK( ManageLanguageDialog, AddHdl, Button *, EMPTYARG ) return 1; } -IMPL_LINK( ManageLanguageDialog, DeleteHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl) { QueryBox aQBox( this, IDEResId( RID_QRYBOX_LANGUAGE ) ); aQBox.SetButtonText( RET_OK, m_sDeleteStr ); @@ -253,7 +253,7 @@ IMPL_LINK( ManageLanguageDialog, DeleteHdl, Button *, EMPTYARG ) return 1; } -IMPL_LINK( ManageLanguageDialog, MakeDefHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl) { sal_uInt16 nPos = m_aLanguageLB.GetSelectEntryPos(); LanguageEntry* pSelectEntry = (LanguageEntry*)( m_aLanguageLB.GetEntryData( nPos ) ); @@ -272,7 +272,7 @@ IMPL_LINK( ManageLanguageDialog, MakeDefHdl, Button *, EMPTYARG ) return 1; } -IMPL_LINK( ManageLanguageDialog, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl) { sal_uInt16 nCount = m_aLanguageLB.GetEntryCount(); bool bEmpty = ( !nCount || diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 3f1b757df62b..2978eed81849 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -118,7 +118,7 @@ friend class ContainerListenerImpl; void ImplStartListening( StarBASIC* pBasic ); DECL_LINK( TabBarHdl, TabBar* ); - DECL_LINK( ObjectDialogCancelHdl, ObjectCatalog * ); + DECL_LINK(ObjectDialogCancelHdl, void *); DECL_LINK( TabBarSplitHdl, TabBar * ); #endif diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 1d7b1f98e2a4..ae7483ec1c33 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -96,8 +96,8 @@ class Window; class DlgEditor: public SfxBroadcaster { private: - DECL_LINK( PaintTimeout, Timer * ); - DECL_LINK( MarkTimeout, Timer * ); + DECL_LINK(PaintTimeout, void *); + DECL_LINK(MarkTimeout, void *); void Print( Printer* pPrinter, const ::rtl::OUString& rTitle ); diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 3ff9db6fe324..4828bf9002b5 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -79,10 +79,10 @@ private: void FillLanguageBox(); void ClearLanguageBox(); - DECL_LINK( AddHdl, Button * ); - DECL_LINK( DeleteHdl, Button * ); - DECL_LINK( MakeDefHdl, Button * ); - DECL_LINK( SelectHdl, ListBox * ); + DECL_LINK(AddHdl, void *); + DECL_LINK(DeleteHdl, void *); + DECL_LINK(MakeDefHdl, void *); + DECL_LINK(SelectHdl, void *); public: ManageLanguageDialog( Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr ); diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index af6794b11cd5..98247b916614 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -1218,7 +1218,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref } } -IMPL_LINK( CombiColumnLineChartDialogController, ChangeLineCountHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(CombiColumnLineChartDialogController, ChangeLineCountHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 182a36f22ecc..c518e642eae2 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -356,13 +356,13 @@ void SeriesHeader::SetEditChangedHdl( const Link & rLink ) m_aChangeLink = rLink; } -IMPL_LINK( SeriesHeader, SeriesNameChanged, void * , EMPTYARG ) +IMPL_LINK_NOARG(SeriesHeader, SeriesNameChanged) { notifyChanges(); return 0; } -IMPL_LINK( SeriesHeader, SeriesNameEdited, void * , EMPTYARG ) +IMPL_LINK_NOARG(SeriesHeader, SeriesNameEdited) { m_bSeriesNameChangePending = true; return 0; diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index ae490b653697..7b33086aea88 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -58,7 +58,7 @@ void TimerTriggeredControllerLock::startTimer() m_apControllerLockGuard = std::auto_ptr< ControllerLockGuard >( new ControllerLockGuard(m_xModel) ); m_aTimer.Start(); } -IMPL_LINK( TimerTriggeredControllerLock, TimerTimeout, void*, EMPTYARG ) +IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout) { m_apControllerLockGuard.reset(); return 0; diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index dea3e88f60e1..05a578d5423d 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -128,7 +128,7 @@ DataEditor::~DataEditor() } // react on click (or keypress) on toolbar icon -IMPL_LINK( DataEditor, ToolboxHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataEditor, ToolboxHdl) { switch( m_aTbxData.GetCurItemId() ) { @@ -159,7 +159,7 @@ IMPL_LINK( DataEditor, ToolboxHdl, void *, EMPTYARG ) } // refresh toolbar icons according to currently selected cell in brwose box -IMPL_LINK( DataEditor, BrowserCursorMovedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataEditor, BrowserCursorMovedHdl) { if( m_bReadOnly ) return 0; @@ -196,7 +196,7 @@ void DataEditor::SetReadOnly( bool bReadOnly ) m_apBrwData->SetReadOnly( m_bReadOnly ); } -IMPL_LINK( DataEditor, MiscHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DataEditor, MiscHdl) { SvtMiscOptions aMiscOptions; sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() ); @@ -206,7 +206,7 @@ IMPL_LINK( DataEditor, MiscHdl, void*, EMPTYARG ) return 0L; } -IMPL_LINK( DataEditor, CellModified, void*, EMPTYARG ) +IMPL_LINK_NOARG(DataEditor, CellModified) { return 0; } diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index e3a6d22dcb7b..0b586c6ad11c 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -640,7 +640,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) } } -IMPL_LINK( SchAttribTabDlg, OKPressed, void * , EMPTYARG ) +IMPL_LINK_NOARG(SchAttribTabDlg, OKPressed) { m_bOKPressed = true; return m_aOriginalOKClickHdl.Call( this ); diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index e05c5195966e..49359d456f21 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -418,14 +418,14 @@ IMPL_LINK( ErrorBarResources, CategoryChosen, void *, ) return 0; } -IMPL_LINK( ErrorBarResources, SynchronizePosAndNeg, void *, EMPTYARG ) +IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg) { UpdateControlStates(); PosValueChanged( 0 ); return 0; } -IMPL_LINK( ErrorBarResources, PosValueChanged, void *, EMPTYARG ) +IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged) { if( m_aCbSyncPosNeg.IsChecked()) { @@ -441,7 +441,7 @@ IMPL_LINK( ErrorBarResources, PosValueChanged, void *, EMPTYARG ) return 0; } -IMPL_LINK( ErrorBarResources, IndicatorChanged, void *, EMPTYARG ) +IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged) { m_bIndicatorUnique = true; if( m_aRbBoth.IsChecked()) diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 4755e0477603..30e207cb8642 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -182,7 +182,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen } } -IMPL_LINK( LegendPositionResources, PositionEnableHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl) { sal_Bool bEnable = m_aCbxShow.IsChecked(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index db3c0c4c38e0..d46083141eaf 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -298,7 +298,7 @@ void ThreeD_SceneAppearance_TabPage::updateScheme() } } -IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl) { if( !m_bUpdateOtherControls ) return 0; @@ -324,7 +324,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectShading, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading) { if( !m_bUpdateOtherControls ) return 0; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 53802dd33725..18f4481020ca 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -200,7 +200,7 @@ void ThreeD_SceneGeometry_TabPage::applyAnglesToModel() m_bAngleChangePending = false; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, AngleEdited, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleEdited) { m_nXRotation = m_aMFXRotation.GetValue(); m_nYRotation = m_aMFYRotation.GetValue(); @@ -209,7 +209,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, AngleEdited, void*, EMPTYARG ) return 0; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, AngleChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleChanged) { applyAnglesToModel(); return 0; @@ -236,26 +236,26 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel() m_bPerspectiveChangePending = false; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveEdited, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveEdited) { m_bPerspectiveChangePending = true; return 0; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveChanged) { applyPerspectiveToModel(); return 0; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveToggled, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled) { m_aMFPerspective.Enable( m_aCbxPerspective.IsChecked() ); applyPerspectiveToModel(); return 0; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled) { ControllerLockHelperGuard aGuard( m_rControllerLockHelper ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 3d58744a315e..b094fb90d950 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -372,7 +372,7 @@ void ThreeD_SceneIllumination_TabPage::commitPendingChanges() { } -IMPL_LINK( ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void *, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, fillControlsFromModel) { if( m_bInCommitToModel )//don't read own changes return 0; @@ -408,7 +408,7 @@ void ThreeD_SceneIllumination_TabPage::applyLightSourcesToModel() m_aTimerTriggeredControllerLock.startTimer(); } -IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl) { m_aTimerTriggeredControllerLock.startTimer(); @@ -460,7 +460,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl) { sal_uInt32 nLightNumber = m_aCtl_Preview.GetSvx3DLightControl().GetSelectedLight(); if(nLightNumber<8) diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index ab071603e503..e0892c3837bf 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -303,7 +303,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories ) // event handling routines // ----------------------- -IMPL_LINK ( SchAxisLabelTabPage, ToggleShowLabel, void *, EMPTYARG ) +IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel) { sal_Bool bEnable = ( aCbShowDescription.GetState() != STATE_NOCHECK ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index b51b30319868..d60b44c38ac4 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -459,7 +459,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning m_bSupportAxisPositioning = bSupportAxisPositioning; } -IMPL_LINK ( AxisPositionsTabPage, CrossesAtSelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl) { sal_uInt16 nPos = m_aLB_CrossesAt.GetSelectEntryPos(); m_aED_CrossesAt.Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis ); @@ -474,7 +474,7 @@ IMPL_LINK ( AxisPositionsTabPage, CrossesAtSelectHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK ( AxisPositionsTabPage, PlaceLabelsSelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl) { sal_uInt16 nLabelPos = m_aLB_PlaceLabels.GetSelectEntryPos(); diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index dbe13b7e3248..3c95ec19e353 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -95,7 +95,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK( AxisTypeCheckHdl, CheckBox* ); + DECL_LINK( AxisTypeCheckHdl, void* ); private: CheckBox m_aCB_XAxis_Categories; }; @@ -132,7 +132,7 @@ void AxisTypeResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { rParameter.bXAxisWithValues = !m_aCB_XAxis_Categories.IsChecked(); } -IMPL_LINK( AxisTypeResourceGroup, AxisTypeCheckHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(AxisTypeResourceGroup, AxisTypeCheckHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -157,7 +157,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK( Dim3DLookCheckHdl, CheckBox* ); + DECL_LINK( Dim3DLookCheckHdl, void* ); DECL_LINK( SelectSchemeHdl, void* ); private: @@ -225,13 +225,13 @@ void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter ) else rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown; } -IMPL_LINK( Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); return 0; } -IMPL_LINK( Dim3DLookResourceGroup, SelectSchemeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -254,7 +254,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK( SortByXValuesCheckHdl, CheckBox* ); + DECL_LINK( SortByXValuesCheckHdl, void* ); private: CheckBox m_aCB_XValueSorting; @@ -288,7 +288,7 @@ void SortByXValuesResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { rParameter.bSortByXValues = m_aCB_XValueSorting.IsChecked(); } -IMPL_LINK( SortByXValuesResourceGroup, SortByXValuesCheckHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -428,7 +428,7 @@ IMPL_LINK( StackingResourceGroup, StackingChangeHdl, RadioButton*, pRadio ) m_pChangeListener->stateChanged(this); return 0; } -IMPL_LINK( StackingResourceGroup, StackingEnableHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -447,7 +447,7 @@ public: virtual void StateChanged( StateChangedType nType ); private: - DECL_LINK( SplineModeRadioHdl, RadioButton* ); + DECL_LINK( SplineModeRadioHdl, void* ); void adjustControlPositions(); void adjustSize(); @@ -583,7 +583,7 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool rParameter.nCurveResolution = static_cast< sal_Int32 >( m_aMF_SplineResolution.GetValue()); rParameter.nSplineOrder = static_cast< sal_Int32 >( m_aMF_SplineOrder.GetValue()); } -IMPL_LINK( SplinePropertiesDialog, SplineModeRadioHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(SplinePropertiesDialog, SplineModeRadioHdl) { m_aFT_SplineOrder.Enable(m_aRB_Splines_B.IsChecked()); m_aMF_SplineOrder.Enable(m_aRB_Splines_B.IsChecked()); @@ -686,14 +686,14 @@ void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { getSplinePropertiesDialog().fillParameter( rParameter, m_aCB_Splines.IsChecked() ); } -IMPL_LINK( SplineResourceGroup, SplineChangeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SplineResourceGroup, SplineChangeHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); return 0; } -IMPL_LINK( SplineResourceGroup, SplineDetailsDialogHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl) { ChartTypeParameter aOldParameter; @@ -770,7 +770,7 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter ) if( m_aGeometryResources.GetSelectEntryCount() ) rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos(); } -IMPL_LINK( GeometryResourceGroup, GeometryChangeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -964,7 +964,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType() pTypeController = m_aChartTypeDialogControllerList[nM]; return pTypeController; } -IMPL_LINK( ChartTypeTabPage, SelectSubTypeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl) { if( m_pCurrentMainType ) { @@ -977,7 +977,7 @@ IMPL_LINK( ChartTypeTabPage, SelectSubTypeHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ChartTypeTabPage, SelectMainTypeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl) { ChartTypeParameter aParameter( this->getCurrentParamter() ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 3d99e97aac80..0c66967661d1 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -594,7 +594,7 @@ void DataSourceTabPage::updateControlState() isValid(); } -IMPL_LINK( DataSourceTabPage, SeriesSelectionChangedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl) { m_rDialogModel.startControllerLockTimer(); if( m_apLB_SERIES->FirstSelected()) @@ -607,7 +607,7 @@ IMPL_LINK( DataSourceTabPage, SeriesSelectionChangedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, RoleSelectionChangedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl) { m_rDialogModel.startControllerLockTimer(); SvLBoxEntry * pEntry = m_aLB_ROLE.FirstSelected(); @@ -634,7 +634,7 @@ IMPL_LINK( DataSourceTabPage, RoleSelectionChangedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, MainRangeButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl) { OSL_ASSERT( m_pCurrentRangeChoosingField == 0 ); m_pCurrentRangeChoosingField = & m_aEDT_RANGE; @@ -678,7 +678,7 @@ IMPL_LINK( DataSourceTabPage, MainRangeButtonClickedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, CategoriesRangeButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl) { OSL_ASSERT( m_pCurrentRangeChoosingField == 0 ); m_pCurrentRangeChoosingField = & m_aEDT_CATEGORIES; @@ -693,7 +693,7 @@ IMPL_LINK( DataSourceTabPage, CategoriesRangeButtonClickedHdl, void *, EMPTYARG return 0; } -IMPL_LINK( DataSourceTabPage, AddButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); @@ -733,7 +733,7 @@ IMPL_LINK( DataSourceTabPage, AddButtonClickedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, RemoveButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); @@ -778,7 +778,7 @@ IMPL_LINK( DataSourceTabPage, RemoveButtonClickedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, UpButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); @@ -795,7 +795,7 @@ IMPL_LINK( DataSourceTabPage, UpButtonClickedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, DownButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 67889c3408a9..fb064f9fb0d3 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -344,14 +344,14 @@ bool RangeChooserTabPage::isValid() return bIsValid; } -IMPL_LINK( RangeChooserTabPage, ControlEditedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl) { setDirty(); isValid(); return 0; } -IMPL_LINK( RangeChooserTabPage, ControlChangedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl) { setDirty(); if( isValid()) @@ -359,7 +359,7 @@ IMPL_LINK( RangeChooserTabPage, ControlChangedHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( RangeChooserTabPage, ChooseRangeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl) { rtl::OUString aRange = m_aED_Range.GetText(); // using assignment for broken gcc 3.3 diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index fd456ff2c490..7bcdb925f2ed 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -392,7 +392,7 @@ enum AxisTypeListBoxEntry TYPE_DATE=2 }; -IMPL_LINK( ScaleTabPage, SelectAxisTypeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl) { sal_uInt16 nPos = m_aLB_AxisType.GetSelectEntryPos(); if( nPos==TYPE_DATE ) diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 5b3b32099371..daa9baf5fd16 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -80,7 +80,7 @@ SchOptionTabPage::~SchOptionTabPage() { } -IMPL_LINK( SchOptionTabPage, EnableHdl, RadioButton *, EMPTYARG ) +IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl) { if( m_nAllSeriesAxisIndex == 0 ) aCBAxisSideBySide.Enable( aRbtAxis2.IsChecked()); diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index f09b24814511..034b7b7b462b 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -78,7 +78,7 @@ private: //member CheckBox m_aCBIncludeHiddenCells; - DECL_LINK(EnableHdl, RadioButton * ); + DECL_LINK(EnableHdl, void * ); sal_Int32 m_nAllSeriesAxisIndex; diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index e40d59b6794c..eb70c70ea838 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -165,7 +165,7 @@ void TitlesAndObjectsTabPage::commitToModel() } } -IMPL_LINK( TitlesAndObjectsTabPage, ChangeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeHdl) { if( m_bCommitToModel ) commitToModel(); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 54345303f9f5..6a2a18bd0aaa 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -580,7 +580,7 @@ void ChartController::stopDoubleClickWaiting() m_bWaitingForDoubleClick = false; } -IMPL_LINK( ChartController, DoubleClickWaitingHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl) { m_bWaitingForDoubleClick = false; 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() ) { diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index b3f34f325871..1ee3d1b77dd1 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2312,7 +2312,7 @@ void OApplicationController::showPreviewFor(const ElementType _eType,const ::rtl } //------------------------------------------------------------------------------ -IMPL_LINK( OApplicationController, OnClipboardChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(OApplicationController, OnClipboardChanged) { OnInvalidateClipboard(); return 0L; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index a68416cfb5be..758ca7247b76 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -158,7 +158,7 @@ namespace return nRet; } // ----------------------------------------------------------------------------- - IMPL_LINK(OTablePreviewWindow, OnDisableInput, void*, EMPTYARG) + IMPL_LINK_NOARG(OTablePreviewWindow, OnDisableInput) { EnableInput(sal_False); return 0L; diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 13e7cdcc94fb..9d8ab1a51708 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -186,7 +186,7 @@ IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pCo return 1L; } //------------------------------------------------------------------------------ -IMPL_LINK(OApplicationSwapWindow, ChangeToLastSelected, void*, EMPTYARG) +IMPL_LINK_NOARG(OApplicationSwapWindow, ChangeToLastSelected) { selectContainer(m_eLastType); return 0L; diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index aee125c8493a..c68923c24079 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2486,7 +2486,7 @@ void SbaXDataBrowserController::CellDeactivated() } //------------------------------------------------------------------------------ -IMPL_LINK( SbaXDataBrowserController, OnClipboardChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(SbaXDataBrowserController, OnClipboardChanged) { SolarMutexGuard aGuard; return OnInvalidateClipboard( NULL ); @@ -2657,7 +2657,7 @@ IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformatio } //------------------------------------------------------------------------------ -IMPL_LINK(SbaXDataBrowserController, OnAsyncGetCellFocus, void*, EMPTYARG) +IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus) { SbaGridControl* pVclGrid = getBrowserView() ? getBrowserView()->getVclControl() : NULL; // if we have a controller, but the window for the controller doesn't have the focus, we correct this diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index da549604f723..d05d8903e562 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -277,7 +277,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/) return sal_True; } //------------------------------------------------------------------------------ -IMPL_LINK(OGenericUnoController, OnAsyncInvalidateAll, void*, EMPTYARG) +IMPL_LINK_NOARG(OGenericUnoController, OnAsyncInvalidateAll) { if ( !OGenericUnoController_Base::rBHelper.bInDispose && !OGenericUnoController_Base::rBHelper.bDisposed ) InvalidateFeature_Impl(); @@ -1125,7 +1125,7 @@ void OGenericUnoController::closeTask() m_aAsyncCloseTask.Call(); } // ----------------------------------------------------------------------------- -IMPL_LINK(OGenericUnoController, OnAsyncCloseTask, void*, EMPTYARG) +IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask) { if ( !OGenericUnoController_Base::rBHelper.bInDispose ) { diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 4ba048dd9b3e..2201637f0f43 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -211,14 +211,14 @@ namespace dbaui } //------------------------------------------------------------------------------ - IMPL_LINK(ORelationControl, AsynchActivate, void*, EMPTYARG) + IMPL_LINK_NOARG(ORelationControl, AsynchActivate) { ActivateCell(); return 0L; } //------------------------------------------------------------------------------ - IMPL_LINK(ORelationControl, AsynchDeactivate, void*, EMPTYARG) + IMPL_LINK_NOARG(ORelationControl, AsynchDeactivate) { DeactivateCell(); return 0L; diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index ea942b5ef10e..c9589e030702 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -186,7 +186,7 @@ long OTableGrantControl::PreNotify(NotifyEvent& rNEvt) } //------------------------------------------------------------------------------ -IMPL_LINK(OTableGrantControl, AsynchActivate, void*, EMPTYARG) +IMPL_LINK_NOARG(OTableGrantControl, AsynchActivate) { m_nDeactivateEvent = 0; ActivateCell(); @@ -194,7 +194,7 @@ IMPL_LINK(OTableGrantControl, AsynchActivate, void*, EMPTYARG) } //------------------------------------------------------------------------------ -IMPL_LINK(OTableGrantControl, AsynchDeactivate, void*, EMPTYARG) +IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate) { m_nDeactivateEvent = 0; DeactivateCell(); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index afa0e7fb2ed4..765d6a78074b 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -179,7 +179,7 @@ void OSqlEdit::GetFocus() } //------------------------------------------------------------------------------ -IMPL_LINK(OSqlEdit, OnUndoActionTimer, void*, EMPTYARG) +IMPL_LINK_NOARG(OSqlEdit, OnUndoActionTimer) { String aText =GetText(); if(aText != m_strOrigText) @@ -200,7 +200,7 @@ IMPL_LINK(OSqlEdit, OnUndoActionTimer, void*, EMPTYARG) return 0L; } //------------------------------------------------------------------------------ -IMPL_LINK(OSqlEdit, OnInvalidateTimer, void*, EMPTYARG) +IMPL_LINK_NOARG(OSqlEdit, OnInvalidateTimer) { OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController(); rController.InvalidateFeature(SID_CUT); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index a41a36603915..432ea32561e2 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -124,7 +124,7 @@ Reference< XContent> OCollectionView::getSelectedFolder() const return m_xContent; } // ----------------------------------------------------------------------------- -IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCollectionView, Save_Click) { ::rtl::OUString sName = m_aName.GetText(); if ( sName.isEmpty() ) @@ -221,7 +221,7 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG ) return 0; } // ----------------------------------------------------------------------------- -IMPL_LINK( OCollectionView, NewFolder_Click, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCollectionView, NewFolder_Click) { try { @@ -240,7 +240,7 @@ IMPL_LINK( OCollectionView, NewFolder_Click, PushButton*, EMPTYARG ) return 0; } // ----------------------------------------------------------------------------- -IMPL_LINK( OCollectionView, Up_Click, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCollectionView, Up_Click) { try { @@ -265,7 +265,7 @@ IMPL_LINK( OCollectionView, Up_Click, PushButton*, EMPTYARG ) return 0; } // ----------------------------------------------------------------------------- -IMPL_LINK( OCollectionView, Dbl_Click_FileView, SvtFileView*, EMPTYARG ) +IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) { try { diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 8155dbeadd32..520b5cfa021f 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -74,7 +74,7 @@ class OPasswordDialog : public ModalDialog HelpButton aHelpBtn; - DECL_LINK( OKHdl_Impl, OKButton * ); + DECL_LINK( OKHdl_Impl, void * ); DECL_LINK( ModifiedHdl, Edit * ); public: @@ -112,7 +112,7 @@ OPasswordDialog::OPasswordDialog(Window* _pParent,const String& _sUserName) : aEDOldPassword.SetModifyHdl( LINK( this, OPasswordDialog, ModifiedHdl ) ); } // ----------------------------------------------------------------------------- -IMPL_LINK( OPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl) { if( aEDPassword.GetText() == aEDPasswordRepeat.GetText() ) EndDialog( RET_OK ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index c1c4cd2b8491..c8bbc1386165 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -140,7 +140,7 @@ namespace dbaui // ----------------------------------------------------------------------- - IMPL_LINK(OGenericAdministrationPage, OnControlModified, Control*, EMPTYARG) + IMPL_LINK_NOARG(OGenericAdministrationPage, OnControlModified) { callModifiedHdl(); return 0L; diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index dd258de98be9..756fbaf02975 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -251,7 +251,7 @@ namespace dbaui /** This link be used for controls where the tabpage does not need to take any special action when the control is modified. The implementation just calls callModifiedHdl. */ - DECL_LINK(OnControlModified, Control*); + DECL_LINK(OnControlModified, void*); DECL_LINK(OnTestConnectionClickHdl,PushButton*); /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method> diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 3e450c1f0f17..baee01c37736 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -111,7 +111,7 @@ sal_Bool ODatasourceSelectDialog::Close() // ----------------------------------------------------------------------- #ifdef HAVE_ODBC_ADMINISTRATION -IMPL_LINK( ODatasourceSelectDialog, ManageClickHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl) { if ( !m_pODBCManagement.get() ) m_pODBCManagement.reset( new OOdbcManagement( LINK( this, ODatasourceSelectDialog, ManageProcessFinished ) ) ); diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index bc123122e91c..89c9ccfa8914 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -397,7 +397,7 @@ OExceptionChainDialog::~OExceptionChainDialog() } //------------------------------------------------------------------------------ -IMPL_LINK(OExceptionChainDialog, OnExceptionSelected, void*, EMPTYARG) +IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected) { SvLBoxEntry* pSelected = m_aExceptionList.FirstSelected(); OSL_ENSURE(!pSelected || !m_aExceptionList.NextSelected(pSelected), "OExceptionChainDialog::OnExceptionSelected : multi selection ?"); diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 395ad71f3e0c..95e84c89b5c1 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -62,10 +62,10 @@ namespace dbaui sal_Int32 m_nFixDeltaHeight; sal_Bool m_bCreateForm; - DECL_LINK(Up_Click,PushButton*); - DECL_LINK(NewFolder_Click,PushButton*); - DECL_LINK(Save_Click,PushButton*); - DECL_LINK(Dbl_Click_FileView,SvtFileView*); + DECL_LINK(Up_Click,void*); + DECL_LINK(NewFolder_Click,void*); + DECL_LINK(Save_Click,void*); + DECL_LINK(Dbl_Click_FileView,void*); /// sets the fixedtext to the right content void initCurrentPath(); diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 7249dcdc1104..ca7f272ff1e0 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -284,10 +284,10 @@ namespace dbaui sal_Bool m_bUseHeaderLine; private: - DECL_LINK( ImplPrevHdl , PushButton* ); - DECL_LINK( ImplNextHdl , PushButton* ); - DECL_LINK( ImplOKHdl , OKButton* ); - DECL_LINK( ImplActivateHdl, WizardDialog* ); + DECL_LINK( ImplPrevHdl , void* ); + DECL_LINK( ImplNextHdl , void* ); + DECL_LINK( ImplOKHdl , void* ); + DECL_LINK( ImplActivateHdl, void* ); sal_Bool CheckColumns(sal_Int32& _rnBreakPos); void loadData( const ICopyTableSourceObject& _rSourceObject, ODatabaseExport::TColumns& _rColumns, diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index f5eea9010188..3672d1a49eef 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -766,7 +766,7 @@ OCopyTableWizard::~OCopyTableWizard() m_aDestTypeInfoIndex.clear(); } // ----------------------------------------------------------------------- -IMPL_LINK( OCopyTableWizard, ImplPrevHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl) { m_ePressed = WIZARD_PREV; if ( GetCurLevel() ) @@ -786,7 +786,7 @@ IMPL_LINK( OCopyTableWizard, ImplPrevHdl, PushButton*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( OCopyTableWizard, ImplNextHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl) { m_ePressed = WIZARD_NEXT; if ( GetCurLevel() < MAX_PAGES ) @@ -889,7 +889,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) return bRet; } // ----------------------------------------------------------------------- -IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) { m_ePressed = WIZARD_FINISH; sal_Bool bFinish = DeactivatePage() != 0; @@ -1002,7 +1002,7 @@ void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUStri } // ----------------------------------------------------------------------- -IMPL_LINK( OCopyTableWizard, ImplActivateHdl, WizardDialog*, EMPTYARG ) +IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl) { OWizardPage* pCurrent = (OWizardPage*)GetPage(GetCurLevel()); if(pCurrent) diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 60e8e7cfae40..9343309e9df2 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1163,7 +1163,7 @@ sal_Bool OJoinTableView::ScrollWhileDragging() } //------------------------------------------------------------------------ -IMPL_LINK(OJoinTableView, OnDragScrollTimer, void*, EMPTYARG) +IMPL_LINK_NOARG(OJoinTableView, OnDragScrollTimer) { ScrollWhileDragging(); return 0L; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index b7cf65ee35fc..35a08f5228df 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2594,7 +2594,7 @@ void OSelectionBrowseBox::appendUndoAction(const String& _rOldValue,const String } } // ----------------------------------------------------------------------------- -IMPL_LINK(OSelectionBrowseBox, OnInvalidateTimer, void*, EMPTYARG) +IMPL_LINK_NOARG(OSelectionBrowseBox, OnInvalidateTimer) { static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_CUT); static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_COPY); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index e18d0d791410..afc4c9934a68 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -123,7 +123,7 @@ OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator() } //------------------------------------------------------------------ -IMPL_LINK(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, void*, EMPTYARG) +IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate) { m_pOwner->GetView()->getController().InvalidateFeature(SID_CUT); m_pOwner->GetView()->getController().InvalidateFeature(SID_COPY); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 454fb00d0ed9..e1bd1e0015f4 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2055,7 +2055,7 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* ) } // ======================================================================== -IMPL_LINK( Desktop, AsyncInitFirstRun, void*, EMPTYARG ) +IMPL_LINK_NOARG(Desktop, AsyncInitFirstRun) { DoFirstRunInitializations(); return 0L; @@ -2077,7 +2077,7 @@ class ExitTimer : public Timer } }; -IMPL_LINK( Desktop, OpenClients_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Desktop, OpenClients_Impl) { RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE - DesktopOpenClients_Impl()" ); @@ -2100,7 +2100,7 @@ IMPL_LINK( Desktop, OpenClients_Impl, void*, EMPTYARG ) } // enable acceptos -IMPL_LINK( Desktop, EnableAcceptors_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Desktop, EnableAcceptors_Impl) { enableAcceptors(); return 0; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 39606f10af96..95b90c9f0b86 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -493,7 +493,7 @@ IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar ) } // ----------------------------------------------------------------------- -IMPL_LINK( ExtBoxWithBtns_Impl, HandleOptionsBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn) { const sal_Int32 nActive = getSelIndex(); @@ -516,7 +516,7 @@ IMPL_LINK( ExtBoxWithBtns_Impl, HandleOptionsBtn, void*, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( ExtBoxWithBtns_Impl, HandleEnableBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn) { const sal_Int32 nActive = getSelIndex(); @@ -537,7 +537,7 @@ IMPL_LINK( ExtBoxWithBtns_Impl, HandleEnableBtn, void*, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( ExtBoxWithBtns_Impl, HandleRemoveBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn) { const sal_Int32 nActive = getSelIndex(); @@ -994,7 +994,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() } //------------------------------------------------------------------------------ -IMPL_LINK( ExtMgrDialog, HandleCancelBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(ExtMgrDialog, HandleCancelBtn) { if ( m_xAbortChannel.is() ) { @@ -1092,7 +1092,7 @@ void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage } // ----------------------------------------------------------------------- -IMPL_LINK( ExtMgrDialog, HandleAddBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn) { setBusy( true ); @@ -1108,14 +1108,14 @@ IMPL_LINK( ExtMgrDialog, HandleAddBtn, void*, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( ExtMgrDialog, HandleExtTypeCbx, void*, EMPTYARG ) +IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx) { // re-creates the list of packages with addEntry selecting the packages m_pManager->createPackageList(); return 1; } // ----------------------------------------------------------------------- -IMPL_LINK( ExtMgrDialog, HandleUpdateBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn) { m_pManager->checkUpdates( false, true ); @@ -1131,7 +1131,7 @@ IMPL_LINK( ExtMgrDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink ) } // ----------------------------------------------------------------------- -IMPL_LINK( ExtMgrDialog, TimeOutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl) { if ( m_bStopProgress ) { @@ -1469,7 +1469,7 @@ bool UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPac } //------------------------------------------------------------------------------ -IMPL_LINK( UpdateRequiredDialog, HandleCancelBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn) { if ( m_xAbortChannel.is() ) { @@ -1575,7 +1575,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment:: } // ----------------------------------------------------------------------- -IMPL_LINK( UpdateRequiredDialog, HandleUpdateBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -1596,7 +1596,7 @@ IMPL_LINK( UpdateRequiredDialog, HandleUpdateBtn, void*, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( UpdateRequiredDialog, HandleCloseBtn, void*, EMPTYARG ) +IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1622,7 +1622,7 @@ IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperli } // ----------------------------------------------------------------------- -IMPL_LINK( UpdateRequiredDialog, TimeOutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl) { if ( m_bStopProgress ) { diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 0867faa8dac5..a06b75e8b5e1 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -147,7 +147,7 @@ class ExtMgrDialog : public ModelessDialog, DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * ); DECL_DLLPRIVATE_LINK( HandleExtTypeCbx, void * ); DECL_DLLPRIVATE_LINK( HandleHyperlink, svt::FixedHyperlink * ); - DECL_DLLPRIVATE_LINK( TimeOutHdl, Timer* ); + DECL_DLLPRIVATE_LINK(TimeOutHdl, void *); DECL_DLLPRIVATE_LINK( startProgress, void * ); public: @@ -213,7 +213,7 @@ class UpdateRequiredDialog : public ModalDialog, DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * ); DECL_DLLPRIVATE_LINK( HandleCloseBtn, void * ); DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * ); - DECL_DLLPRIVATE_LINK( TimeOutHdl, Timer* ); + DECL_DLLPRIVATE_LINK(TimeOutHdl, void *); DECL_DLLPRIVATE_LINK( startProgress, void * ); DECL_DLLPRIVATE_LINK( HandleHyperlink, svt::FixedHyperlink * ); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 6805719ad951..13f2df1cdd7d 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -1228,7 +1228,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, //------------------------------------------------------------------------------ -IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) +IMPL_LINK_NOARG(UpdateDialog, selectionHandler) { rtl::OUStringBuffer b; bool bInserted = false; @@ -1328,7 +1328,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) return 0; } -IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG) +IMPL_LINK_NOARG(UpdateDialog, allHandler) { if (m_all.IsChecked()) { @@ -1371,7 +1371,7 @@ IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG) return 0; } -IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG) +IMPL_LINK_NOARG(UpdateDialog, okHandler) { //If users are going to update a shared extension then we need //to warn them @@ -1397,7 +1397,7 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG) return 0; } -IMPL_LINK(UpdateDialog, closeHandler, void *, EMPTYARG) { +IMPL_LINK_NOARG(UpdateDialog, closeHandler) { m_thread->stop(); EndDialog(RET_CANCEL); return 0; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 20172ddd10e8..6c090845e3c7 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -332,7 +332,7 @@ void UpdateInstallDialog::setError(OUString const & exceptionMessage) m_mle_info.InsertText(exceptionMessage + OUSTR("\n")); } -IMPL_LINK(UpdateInstallDialog, cancelHandler, void *, EMPTYARG) +IMPL_LINK_NOARG(UpdateInstallDialog, cancelHandler) { m_thread->stop(); EndDialog(RET_CANCEL); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 131d18674aea..2a76bba34659 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -104,9 +104,9 @@ struct LicenseDialogImpl : public ModalDialog OKButton m_acceptButton; CancelButton m_declineButton; - DECL_LINK(PageDownHdl, PushButton*); - DECL_LINK(ScrolledHdl, LicenseView*); - DECL_LINK(EndReachedHdl, LicenseView*); + DECL_LINK(PageDownHdl, void *); + DECL_LINK(ScrolledHdl, void *); + DECL_LINK(EndReachedHdl, void *); bool m_bLicenseRead; @@ -255,7 +255,7 @@ void LicenseDialogImpl::Activate() } } -IMPL_LINK( LicenseDialogImpl, ScrolledHdl, LicenseView *, EMPTYARG ) +IMPL_LINK_NOARG(LicenseDialogImpl, ScrolledHdl) { if (m_mlLicense.IsEndReached()) @@ -266,13 +266,13 @@ IMPL_LINK( LicenseDialogImpl, ScrolledHdl, LicenseView *, EMPTYARG ) return 0; } -IMPL_LINK( LicenseDialogImpl, PageDownHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(LicenseDialogImpl, PageDownHdl) { m_mlLicense.ScrollDown( SCROLL_PAGEDOWN ); return 0; } -IMPL_LINK( LicenseDialogImpl, EndReachedHdl, LicenseView *, EMPTYARG ) +IMPL_LINK_NOARG(LicenseDialogImpl, EndReachedHdl) { m_acceptButton.Enable(); m_acceptButton.GrabFocus(); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index d02a95989a0b..2076d29231da 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -671,9 +671,9 @@ private: inline VirtualDevice* GetVirtualDevice( const MapMode& rMapMode, sal_uLong nDrawMode ); inline void EraseVirtualDevice(); - DECL_LINK( StatusTimerHdl, Timer * ); - DECL_LINK( IdleFormatHdl, Timer * ); - DECL_LINK( OnlineSpellHdl, Timer * ); + DECL_LINK(StatusTimerHdl, void *); + DECL_LINK(IdleFormatHdl, void *); + DECL_LINK(OnlineSpellHdl, void *); DECL_LINK( DocModified, void* ); void CheckIdleFormatter(); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 313f54c03694..80f2710b050d 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -4423,7 +4423,7 @@ void ImpEditEngine::LeaveBlockNotifications() } } -IMPL_LINK( ImpEditEngine, DocModified, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpEditEngine, DocModified) { aModifyHdl.Call( NULL /*GetEditEnginePtr()*/ ); // NULL, because also used for Outliner return 0; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 719a8753472b..350a5d12f857 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -322,7 +322,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView ) CallStatusHdl(); } -IMPL_LINK( ImpEditEngine, OnlineSpellHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(ImpEditEngine, OnlineSpellHdl) { if ( !Application::AnyInput( VCL_INPUT_KEYBOARD ) && GetUpdateMode() && IsFormatted() ) DoOnlineSpelling(); @@ -332,7 +332,7 @@ IMPL_LINK( ImpEditEngine, OnlineSpellHdl, Timer *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_START( ImpEditEngine, IdleFormatHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ImpEditEngine, IdleFormatHdl) { aIdleFormatter.ResetRestarts(); @@ -350,7 +350,7 @@ IMPL_LINK_INLINE_START( ImpEditEngine, IdleFormatHdl, Timer *, EMPTYARG ) } return 0; } -IMPL_LINK_INLINE_END( ImpEditEngine, IdleFormatHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ImpEditEngine, IdleFormatHdl) void ImpEditEngine::CheckIdleFormatter() { @@ -3884,12 +3884,12 @@ void ImpEditEngine::InvalidateFromParagraph( sal_uInt16 nFirstInvPara ) pTmpPortion->ResetHeight(); } -IMPL_LINK_INLINE_START( ImpEditEngine, StatusTimerHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ImpEditEngine, StatusTimerHdl) { CallStatusHdl(); return 0; } -IMPL_LINK_INLINE_END( ImpEditEngine, StatusTimerHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ImpEditEngine, StatusTimerHdl) void ImpEditEngine::CallStatusHdl() { diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 6e0eb21d1f14..86bf60a38ffd 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -844,7 +844,7 @@ namespace editeng m_pAntiImpl->HandleNewUnit( m_nCurrentStartIndex - m_nReplacementBaseIndex, m_nCurrentEndIndex - m_nReplacementBaseIndex ); } - IMPL_LINK( HangulHanjaConversion_Impl, OnOptionsChanged, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnOptionsChanged) { //options and dictionaries might have been changed //-> update our internal settings and the dialog @@ -853,14 +853,14 @@ namespace editeng return 0L; } - IMPL_LINK( HangulHanjaConversion_Impl, OnIgnore, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnore) { // simply ignore, and proceed implProceed( sal_False ); return 0L; } - IMPL_LINK( HangulHanjaConversion_Impl, OnIgnoreAll, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnoreAll) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnIgnoreAll: no dialog! How this?" ); @@ -880,7 +880,7 @@ namespace editeng return 0L; } - IMPL_LINK( HangulHanjaConversion_Impl, OnChange, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChange) { // change DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); @@ -892,7 +892,7 @@ namespace editeng return 0L; } - IMPL_LINK( HangulHanjaConversion_Impl, OnChangeAll, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChangeAll) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnChangeAll: no dialog! How this?" ); if ( m_pConversionDialog ) @@ -925,7 +925,7 @@ namespace editeng return 0L; } - IMPL_LINK( HangulHanjaConversion_Impl, OnConversionTypeChanged, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged) { DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); if( m_pConversionDialog ) @@ -933,7 +933,7 @@ namespace editeng return 0L; } - IMPL_LINK( HangulHanjaConversion_Impl, OnFind, void*, EMPTYARG ) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnFind) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnFind: where did this come from?" ); if ( m_pConversionDialog ) diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 8b86352811f4..b1690e93d8bd 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1825,7 +1825,7 @@ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara ) return 0; } -IMPL_LINK( Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo*, EMPTYARG ) +IMPL_LINK_NOARG(Outliner, BeginMovingParagraphsHdl) { DBG_CHKTHIS(Outliner,0); diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 3a5229e291df..4df35081def6 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -210,7 +210,7 @@ namespace abp } // ----------------------------------------------------------------------------- - IMPL_LINK( FinalPage, OnRegister, CheckBox*, EMPTYARG ) + IMPL_LINK_NOARG(FinalPage, OnRegister) { sal_Bool bEnable = m_aRegisterName.IsChecked(); m_aNameLabel.Enable(bEnable); diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index 036b4fa543b4..f6ab3ce357c2 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -78,7 +78,7 @@ namespace abp private: DECL_LINK( OnNameModified, Edit* ); - DECL_LINK( OnRegister, CheckBox* ); + DECL_LINK(OnRegister, void *); sal_Bool isValidName() const; void implCheckName(); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 6fe89fe136f3..27369e9cbc1a 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -291,7 +291,7 @@ class MappingDialog_Impl : public ModalDialog - DECL_LINK(OkHdl, OKButton*); + DECL_LINK(OkHdl, void *); DECL_LINK(ListBoxSelectHdl, ListBox*); public: @@ -519,7 +519,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox) return 0; } -IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG) +IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl) { if(bModified) { diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 674555fb07a8..1face92fcd43 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -507,7 +507,7 @@ namespace dbp } //--------------------------------------------------------------------- - IMPL_LINK(OLinkFieldsPage, OnSelectionModified, void*, EMPTYARG) + IMPL_LINK_NOARG(OLinkFieldsPage, OnSelectionModified) { implCheckFinish(); return 0L; diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm index 55d3c573478b..6797f2ae5743 100644 --- a/extensions/source/plugin/aqua/sysplug.mm +++ b/extensions/source/plugin/aqua/sysplug.mm @@ -381,7 +381,7 @@ sal_Bool MacPluginComm::retrieveFunction( const char* i_pName, void** o_ppFunc ) return (*o_ppFunc != NULL); } -IMPL_LINK( MacPluginComm, NullTimerHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacPluginComm, NullTimerHdl) { // note: this is a Timer handler, we are already protected by the SolarMutex diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 34ca93767984..31a98fe12748 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -62,7 +62,7 @@ namespace pcr } //------------------------------------------------------------------------ - IMPL_LINK(OPropertyBrowserView, OnPageActivation, void*, EMPTYARG) + IMPL_LINK_NOARG(OPropertyBrowserView, OnPageActivation) { m_nActivePage = m_pPropBox->GetCurPage(); if (m_aPageActivationHandler.IsSet()) diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index a2c27fab52f3..4f625778e384 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -656,7 +656,7 @@ namespace pcr } //------------------------------------------------------------------------ - IMPL_LINK(OPropertyBrowserController, OnPageActivation, void*, EMPTYARG) + IMPL_LINK_NOARG(OPropertyBrowserController, OnPageActivation) { updateViewDataFromActivePage(); return 0L; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 4b80cf5608b3..3bf59dc1039c 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -511,7 +511,7 @@ namespace pcr } //------------------------------------------------------------------ - IMPL_LINK(OPropertyEditor, OnPageActivate, TabControl*, EMPTYARG) + IMPL_LINK_NOARG(OPropertyEditor, OnPageActivate) { if (m_aPageActivationHandler.IsSet()) m_aPageActivationHandler.Call(NULL); @@ -519,7 +519,7 @@ namespace pcr } //------------------------------------------------------------------ - IMPL_LINK(OPropertyEditor, OnPageDeactivate, TabControl*, EMPTYARG) + IMPL_LINK_NOARG(OPropertyEditor, OnPageDeactivate) { // commit the data on the current (to-be-decativated) tab page // (79404) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 6f9217f7329c..0a43a2f4cd79 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -151,8 +151,8 @@ namespace pcr void setHelpLineLimits( OBrowserPage& _rPage, const void* ); protected: - DECL_LINK(OnPageDeactivate, TabControl*); - DECL_LINK(OnPageActivate, TabControl*); + DECL_LINK(OnPageDeactivate, void *); + DECL_LINK(OnPageActivate, void *); }; //............................................................................ diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index da90b4b33fa1..ceb5691ad93e 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -152,11 +152,11 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper3 sal_uInt16 mnIconID; private: - DECL_LINK( ClickHdl, sal_uInt16* ); + DECL_LINK(ClickHdl, void *); DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* ); - DECL_LINK( WaitTimeOutHdl, Timer* ); - DECL_LINK( TimeOutHdl, Timer* ); - DECL_LINK( UserEventHdl, UpdateCheckUI* ); + DECL_LINK(WaitTimeOutHdl, void *); + DECL_LINK(TimeOutHdl, void *); + DECL_LINK(UserEventHdl, void *); DECL_LINK( WindowEventHdl, VclWindowEvent* ); DECL_LINK( ApplicationEventHdl, VclSimpleEvent* ); @@ -633,7 +633,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) } // ----------------------------------------------------------------------- -IMPL_LINK( UpdateCheckUI, ClickHdl, sal_uInt16*, EMPTYARG ) +IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl) { SolarMutexGuard aGuard; @@ -667,7 +667,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pDat } // ----------------------------------------------------------------------- -IMPL_LINK( UpdateCheckUI, WaitTimeOutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl) { SolarMutexGuard aGuard; @@ -682,7 +682,7 @@ IMPL_LINK( UpdateCheckUI, WaitTimeOutHdl, Timer*, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( UpdateCheckUI, TimeOutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl) { RemoveBubbleWindow( false ); @@ -690,7 +690,7 @@ IMPL_LINK( UpdateCheckUI, TimeOutHdl, Timer*, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( UpdateCheckUI, UserEventHdl, UpdateCheckUI*, EMPTYARG ) +IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl) { SolarMutexGuard aGuard; diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 583b96bb876d..5024c30226c3 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -265,7 +265,7 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent, ///////////////// } -IMPL_LINK( ImpPDFTabDialog, CancelHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl) { EndDialog( sal_False ); return 0; @@ -665,7 +665,7 @@ SfxTabPage* ImpPDFTabGeneralPage::Create( Window* pParent, } // ----------------------------------------------------------------------------- -IMPL_LINK( ImpPDFTabGeneralPage, TogglePagesHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl) { maEdPages.Enable( maRbRange.IsChecked() ); if ( maRbRange.IsChecked() ) @@ -674,7 +674,7 @@ IMPL_LINK( ImpPDFTabGeneralPage, TogglePagesHdl, void*, EMPTYARG ) } // ----------------------------------------------------------------------------- -IMPL_LINK( ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl) { maLbFormsFormat.Enable( maCbExportFormFields.IsChecked() ); maCbAllowDuplicateFieldNames.Enable( maCbExportFormFields.IsChecked() ); @@ -682,21 +682,21 @@ IMPL_LINK( ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, void*, EMPTYARG ) } // ----------------------------------------------------------------------------- -IMPL_LINK( ImpPDFTabGeneralPage, ToggleCompressionHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl) { maNfQuality.Enable( maRbJPEGCompression.IsChecked() ); return 0; } // ----------------------------------------------------------------------------- -IMPL_LINK( ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl) { maCoReduceImageResolution.Enable( maCbReduceImageResolution.IsChecked() ); return 0; } // ----------------------------------------------------------------------------- -IMPL_LINK( ImpPDFTabGeneralPage, ToggleAddStreamHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl) { if( maCbAddStream.IsVisible() ) { @@ -719,7 +719,7 @@ IMPL_LINK( ImpPDFTabGeneralPage, ToggleAddStreamHdl, void*, EMPTYARG ) } // ----------------------------------------------------------------------------- -IMPL_LINK( ImpPDFTabGeneralPage, ToggleExportPDFAHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl) { ImpPDFTabSecurityPage* pSecPage = NULL; //set the security page status (and its controls as well) @@ -935,7 +935,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent } } -IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl) { maCbPgLyFirstOnLeft.Enable( maRbPgLyContinueFacing.IsChecked() ); return 0; @@ -1217,7 +1217,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen !( ( ImpPDFTabGeneralPage* )paParent->GetTabPage( RID_PDF_TAB_GENER ) )->IsPdfaSelected() ); } -IMPL_LINK( ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl) { SfxPasswordDialog aPwdDialog( this, &msUserPwdTitle ); aPwdDialog.SetMinLen( 0 ); @@ -1479,7 +1479,7 @@ void ImpPDFTabLinksPage::ImplPDFALinkControl( sal_Bool bEnableLaunch ) // ----------------------------------------------------------------------------- // reset the memory of Launch action present // when PDF/A-1 was requested -IMPL_LINK( ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl) { mbOpnLnksDefaultUserState = maRbOpnLnksDefault.IsChecked(); mbOpnLnksLaunchUserState = maRbOpnLnksLaunch.IsChecked(); @@ -1490,7 +1490,7 @@ IMPL_LINK( ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------------- // reset the memory of a launch action present // when PDF/A-1 was requested -IMPL_LINK( ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl) { mbOpnLnksDefaultUserState = maRbOpnLnksDefault.IsChecked(); mbOpnLnksLaunchUserState = maRbOpnLnksLaunch.IsChecked(); @@ -1594,7 +1594,7 @@ ImplErrorDialog::~ImplErrorDialog() delete (String*)maErrors.GetEntryData( n ); } -IMPL_LINK( ImplErrorDialog, SelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl) { String* pStr = reinterpret_cast<String*>(maErrors.GetEntryData( maErrors.GetSelectEntryPos() )); maExplanation.SetText( pStr ? *pStr : String() ); diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index ffa08b02f45e..7ee03ffcb696 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -72,7 +72,7 @@ class ImplErrorDialog : public ModalDialog OKButton maButton; - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK(SelectHdl, void *); public: ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& ); ~ImplErrorDialog(); @@ -89,7 +89,7 @@ private: Any maSelection; - DECL_LINK( CancelHdl, Button * ); + DECL_LINK(CancelHdl, void *); protected: //the following data are the configuration used throughout the dialog and pages diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index f9c081eb32c7..0bc05d6b7a2f 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -168,7 +168,7 @@ IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, PushButton *, pButton ) // ----------------------------------------------------------------------- -IMPL_LINK(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl) { updateStates(); return 0; @@ -176,7 +176,7 @@ IMPL_LINK(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK(XMLFilterSettingsDialog, DoubleClickHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl) { onEdit(); return 0; diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 8279fa2cf46e..f45d8da4b7da 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -336,7 +336,7 @@ filter_info_impl* XMLFilterTabDialog::getNewFilterInfo() const // ----------------------------------------------------------------------- -IMPL_LINK( XMLFilterTabDialog, OkHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl) { if( onOk() ) EndDialog(1); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 06386f8f93e2..04439a7a4b6a 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -57,7 +57,7 @@ private: DECL_LINK( ActivatePageHdl, TabControl * ); DECL_LINK( DeactivatePageHdl, TabControl * ); - DECL_LINK( OkHdl, Button * ); + DECL_LINK(OkHdl, void *); ResMgr& mrResMgr; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index 1a581736b05f..80474742481f 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -199,7 +199,7 @@ OUString XMLFilterTabPageXSLT::GetURL( SvtURLBox& rURLBox ) return aURL; } -IMPL_LINK ( XMLFilterTabPageXSLT, ToggleXSLTImplHdl, void *, EMPTYARG) { +IMPL_LINK_NOARG(XMLFilterTabPageXSLT, ToggleXSLTImplHdl) { return (0L); } diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index c69772142325..0ae1f87ff53c 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -446,7 +446,7 @@ void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::co } //------------------------------------------------------------------------------ -IMPL_LINK( OButtonControl, OnClick, void*, EMPTYARG ) +IMPL_LINK_NOARG(OButtonControl, OnClick) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); m_nClickEvent = 0; diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 559a29e7c70e..7a6e75881fee 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2672,7 +2672,7 @@ void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( Runt } //------------------------------------------------------------------------------ -IMPL_LINK( ODatabaseForm, OnTimeout, void*, EMPTYARG ) +IMPL_LINK_NOARG(ODatabaseForm, OnTimeout) { reload_impl(sal_True); return 1; diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 63c0a7eebebf..0cc96d284abe 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -60,7 +60,7 @@ private: Link aSelChangedLink; Selection aOldSel; sal_Bool bMouseFlag; - DECL_LINK( ChangedHdl, EditBox* ); + DECL_LINK(ChangedHdl, void *); protected: diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 23febccef72f..3789538a3d80 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -142,15 +142,15 @@ namespace formula DECL_LINK( ModifyHdl, ParaWin* ); DECL_LINK( FxHdl, ParaWin* ); - DECL_LINK( MatrixHdl, CheckBox *); - DECL_LINK( FormulaHdl, MultiLineEdit* ); - DECL_LINK( FormulaCursorHdl, EditBox*); + DECL_LINK(MatrixHdl, void *); + DECL_LINK(FormulaHdl, void *); + DECL_LINK(FormulaCursorHdl, void *); DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( GetEdFocusHdl, ArgInput* ); DECL_LINK( GetFxFocusHdl, ArgInput* ); - DECL_LINK( DblClkHdl, FuncPage* ); - DECL_LINK( FuncSelHdl, FuncPage*); - DECL_LINK( StructSelHdl, StructPage * ); + DECL_LINK(DblClkHdl, void *); + DECL_LINK(FuncSelHdl, void *); + DECL_LINK(StructSelHdl, void *); public: OModuleClient m_aModuleClient; mutable uno::Reference< sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; @@ -1029,7 +1029,7 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) // Handler for Listboxes -IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG ) +IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl) { sal_uInt16 nFunc = pFuncPage->GetFunction(); @@ -1242,7 +1242,7 @@ IMPL_LINK( FormulaDlg_Impl, ModifyHdl, ParaWin*, pPtr ) return 0; } -IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG ) +IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl) { FormEditData* pData = m_pHelper->getFormEditData(); @@ -1307,7 +1307,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG ) return 0; } -IMPL_LINK( FormulaDlg_Impl, FormulaCursorHdl, EditBox*, EMPTYARG ) +IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaCursorHdl) { FormEditData* pData = m_pHelper->getFormEditData(); if (!pData) return 0; @@ -1537,7 +1537,7 @@ sal_Bool FormulaDlg_Impl::CheckMatrix(String& aFormula) aTabCtrl.SetCurPageId(TP_STRUCT); return bMatrix; } -IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, EMPTYARG ) +IMPL_LINK_NOARG(FormulaDlg_Impl, StructSelHdl) { bStructUpdate=sal_False; if(pStructPage->IsVisible()) aBtnForward.Enable(sal_False); //@New @@ -1545,13 +1545,13 @@ IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, EMPTYARG ) bStructUpdate=sal_True; return 0; } -IMPL_LINK( FormulaDlg_Impl, MatrixHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(FormulaDlg_Impl, MatrixHdl) { bUserMatrixFlag=sal_True; return 0; } -IMPL_LINK( FormulaDlg_Impl, FuncSelHdl, FuncPage*, EMPTYARG ) +IMPL_LINK_NOARG(FormulaDlg_Impl, FuncSelHdl) { sal_uInt16 nCat = pFuncPage->GetCategory(); if ( nCat == LISTBOX_ENTRY_NOTFOUND ) nCat = 0; @@ -1872,7 +1872,7 @@ void FormulaDlg::SetEdSelection() { m_pImpl->SetEdSelection(); } -IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl) { FormEditData* pData = m_pImpl->m_pHelper->getFormEditData(); diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 22ea529b5003..46696e7f87c1 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -201,7 +201,7 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) return 0; } -IMPL_LINK( FuncPage, DblClkHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(FuncPage, DblClkHdl) { aDoubleClickLink.Call(this); return 0; diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index b71dd4aee5cd..a6542ebed536 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -88,7 +88,7 @@ private: void impl_addFunctions(const IFunctionCategory* _pCategory); DECL_LINK( SelHdl, ListBox* ); - DECL_LINK( DblClkHdl, ListBox* ); + DECL_LINK(DblClkHdl, void *); protected: diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index d13a4b6dd62a..36115d0f6a4a 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -873,7 +873,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt ) #* Output: --- #* #************************************************************************/ -IMPL_LINK( EditBox, ChangedHdl, EditBox*, EMPTYARG ) +IMPL_LINK_NOARG(EditBox, ChangedHdl) { if(pMEdit!=NULL) { @@ -999,7 +999,7 @@ void RefEdit::LoseFocus() pAnyRefDlg->HideReference(); } -IMPL_LINK( RefEdit, UpdateHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(RefEdit, UpdateHdl) { if( pAnyRefDlg ) pAnyRefDlg->ShowReference( GetText() ); diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 7eeaf21c8597..f3a0a2343437 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -555,7 +555,7 @@ IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput*, pPtr ) } -IMPL_LINK( ParaWin, ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ParaWin, ScrollHdl) { SliderMoved(); diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index e8c031857c20..968de863c9a6 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -102,7 +102,7 @@ private: ::std::vector<String> aParaArray; - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK(ScrollHdl, void *); DECL_LINK( ModifyHdl, ArgInput* ); DECL_LINK( GetEdFocusHdl, ArgInput* ); DECL_LINK( GetFxFocusHdl, ArgInput* ); diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index df317e47a1f1..b7664c9731da 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -401,7 +401,7 @@ namespace svt } //--------------------------------------------------------------------- - IMPL_LINK( OCommonPicker, OnCancelPicker, void*, EMPTYARG ) + IMPL_LINK_NOARG(OCommonPicker, OnCancelPicker) { // By definition, the solar mutex is locked when we arrive here. Note that this // is important, as for instance the consistency of m_pDlg depends on this mutex. diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 4e801caace73..9ea83da4b3e1 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -968,7 +968,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const String& _rFilter ) } //----------------------------------------------------------------------------- -IMPL_LINK( SvtFileDialog, CancelHdl_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl) { if ( m_pCurrentAsyncAction.is() ) { @@ -1623,7 +1623,7 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox ) //***************************************************************************** -IMPL_LINK( SvtFileDialog, DblClickHdl_Impl, SvTabListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvtFileDialog, DblClickHdl_Impl) { _pImp->_bDoubleClick = sal_True; OpenHdl_Impl( this, NULL ); @@ -1634,7 +1634,7 @@ IMPL_LINK( SvtFileDialog, DblClickHdl_Impl, SvTabListBox*, EMPTYARG ) //***************************************************************************** -IMPL_LINK( SvtFileDialog, EntrySelectHdl_Impl, ComboBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvtFileDialog, EntrySelectHdl_Impl) { FileSelect(); @@ -1668,7 +1668,7 @@ IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView ) //***************************************************************************** -IMPL_LINK( SvtFileDialog, AutoExtensionHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl) { if ( _pFileNotifier ) _pFileNotifier->notify( CTRL_STATE_CHANGED, @@ -1710,7 +1710,7 @@ IMPL_LINK( SvtFileDialog, ClickHdl_Impl, CheckBox*, pCheckBox ) //***************************************************************************** -IMPL_LINK( SvtFileDialog, PlayButtonHdl_Impl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl) { if ( _pFileNotifier ) _pFileNotifier->notify( CTRL_STATE_CHANGED, @@ -3348,7 +3348,7 @@ QueryFolderNameDialog::QueryFolderNameDialog }; // ----------------------------------------------------------------------- -IMPL_LINK( QueryFolderNameDialog, OKHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl) { // trim the strings aNameEdit.SetText( aNameEdit.GetText().EraseLeadingChars().EraseTrailingChars() ); @@ -3357,7 +3357,7 @@ IMPL_LINK( QueryFolderNameDialog, OKHdl, Button *, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( QueryFolderNameDialog, NameHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl) { // trim the strings String aName = aNameEdit.GetText(); diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 3a2a28cfae90..9a9da4b047d8 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -151,12 +151,12 @@ private: void AddControls_Impl( ); DECL_LINK( SelectHdl_Impl, SvTabListBox* ); - DECL_LINK( DblClickHdl_Impl, SvTabListBox* ); - DECL_LINK( EntrySelectHdl_Impl, ComboBox* ); + DECL_LINK(DblClickHdl_Impl, void *); + DECL_LINK(EntrySelectHdl_Impl, void *); DECL_LINK( OpenDoneHdl_Impl, SvtFileView* ); - DECL_LINK( AutoExtensionHdl_Impl, CheckBox* ); + DECL_LINK(AutoExtensionHdl_Impl, void *); DECL_LINK( ClickHdl_Impl, CheckBox* ); - DECL_LINK( PlayButtonHdl_Impl, PushButton* ); + DECL_LINK(PlayButtonHdl_Impl, void *); // removes a filter with wildcards from the path and returns it sal_Bool IsolateFilterFromPath_Impl( String& rPath, String& rFilter ); diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx index d1c7cad7f1e2..ecc6400fdbbe 100644 --- a/framework/inc/classes/fwktabwindow.hxx +++ b/framework/inc/classes/fwktabwindow.hxx @@ -114,8 +114,8 @@ private: TabEntry* FindEntry( sal_Int32 nIndex ) const; bool RemoveEntry( sal_Int32 nIndex ); - DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * ); - DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * ); + DECL_DLLPRIVATE_LINK(ActivatePageHdl, void *); + DECL_DLLPRIVATE_LINK(DeactivatePageHdl, void *); public: FwkTabWindow( Window* pParent ); diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index 3920890e02c7..3ac4588879b4 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -106,7 +106,7 @@ class MenuManager : public ThreadHelpBase , ); protected: - DECL_LINK( Highlight, Menu * ); + DECL_LINK(Highlight, void *); DECL_LINK( Activate, Menu * ); DECL_LINK( Deactivate, Menu * ); diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 84931a3ed952..e9eea8d85455 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -205,7 +205,7 @@ namespace framework virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException); - DECL_LINK( MenuBarClose, MenuBar * ); + DECL_LINK(MenuBarClose, void *); DECL_LINK( WindowEventListener, VclSimpleEvent* ); //--------------------------------------------------------------------------------------------------------- @@ -214,7 +214,7 @@ namespace framework virtual void requestLayout( Hint eHint ); protected: - DECL_LINK( AsyncLayoutHdl, Timer * ); + DECL_LINK(AsyncLayoutHdl, void *); private: //--------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx index 9e6018ad1f86..a3bba4518337 100644 --- a/framework/inc/services/licensedlg.hxx +++ b/framework/inc/services/licensedlg.hxx @@ -90,11 +90,11 @@ class LicenseDialog : public ModalDialog void EnableControls(); - DECL_LINK( PageDownHdl, PushButton * ); - DECL_LINK( EndReachedHdl, LicenseView * ); - DECL_LINK( ScrolledHdl, LicenseView * ); - DECL_LINK( AcceptBtnHdl, PushButton * ); - DECL_LINK( DeclineBtnHdl, PushButton * ); + DECL_LINK(PageDownHdl, void *); + DECL_LINK(EndReachedHdl, void *); + DECL_LINK(ScrolledHdl, void *); + DECL_LINK(AcceptBtnHdl, void *); + DECL_LINK(DeclineBtnHdl, void *); public: LicenseDialog(const rtl::OUString& aLicense, ResMgr *pResMgr); diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 009c4210ce32..d0fe52b762e8 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -256,7 +256,7 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); protected: - DECL_LINK( implts_ConfigurationNotify, SubstitutePathNotify* ); + DECL_LINK(implts_ConfigurationNotify, void *); void SetPredefinedPathVariables( PredefinedPathVariables& ); rtl::OUString ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const; diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index 883e0d7c936e..662b6ab7a2ed 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -81,12 +81,12 @@ class AddonsToolBarManager : public ToolBarManager void FillToolbar( const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonToolbar ); protected: - DECL_LINK( Click, ToolBox * ); - DECL_LINK( DoubleClick, ToolBox * ); - DECL_LINK( Command, CommandEvent * ); - DECL_LINK( Select, ToolBox * ); - DECL_LINK( Activate, ToolBox * ); - DECL_LINK( Deactivate, ToolBox * ); + DECL_LINK(Click, void *); + DECL_LINK(DoubleClick, void *); + DECL_LINK(Command, void *); + DECL_LINK(Select, void *); + DECL_LINK(Activate, void *); + DECL_LINK(Deactivate, void *); DECL_LINK( StateChanged, StateChangedType* ); DECL_LINK( DataChanged, DataChangedEvent* ); diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 34b8ae093f07..683670782718 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -180,7 +180,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener void GetPopupController( PopupControllerCache& rPopupController ); protected: - DECL_LINK( Highlight, Menu * ); + DECL_LINK(Highlight, void *); DECL_LINK( Activate, Menu * ); DECL_LINK( Deactivate, Menu * ); DECL_LINK( AsyncSettingsHdl, Timer * ); diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index bcd952f1b690..247a42ec00f0 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -111,8 +111,8 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener void MouseMove( const MouseEvent& rMEvt ); void MouseButtonDown( const MouseEvent& rMEvt ); void MouseButtonUp( const MouseEvent& rMEvt ); - DECL_LINK( Click, StatusBar* ); - DECL_LINK( DoubleClick, StatusBar* ); + DECL_LINK(Click, void *); + DECL_LINK(DoubleClick, void *); void RemoveControllers(); rtl::OUString RetrieveLabelFromCommand( const rtl::OUString& aCmdURL ); diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 2f8ad0564f3b..98430b97b286 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -165,19 +165,19 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener DECL_LINK( Command, CommandEvent * ); PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar); //end - DECL_LINK( Click, ToolBox * ); - DECL_LINK( DropdownClick, ToolBox * ); - DECL_LINK( DoubleClick, ToolBox * ); - DECL_LINK( Select, ToolBox * ); - DECL_LINK( Activate, ToolBox * ); - DECL_LINK( Deactivate, ToolBox * ); + DECL_LINK(Click, void *); + DECL_LINK(DropdownClick, void *); + DECL_LINK(DoubleClick, void *); + DECL_LINK(Select, void *); + DECL_LINK(Activate, void *); + DECL_LINK(Deactivate, void *); DECL_LINK( StateChanged, StateChangedType* ); DECL_LINK( DataChanged, DataChangedEvent* ); DECL_LINK( MenuButton, ToolBox * ); DECL_LINK( MenuSelect, Menu * ); DECL_LINK( MenuDeactivate, Menu * ); - DECL_LINK( AsyncUpdateControllersHdl, Timer * ); + DECL_LINK(AsyncUpdateControllersHdl, void *); DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo* ); virtual bool MenuItemAllowed( sal_uInt16 ) const; diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index 2f89d8ded3f8..e46fc441a4b7 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -286,7 +286,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const // ----------------------------------------------------------------------- -IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG ) +IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl) { const sal_uInt16 nId = m_aTabCtrl.GetCurPageId(); FwkTabPage* pTabPage = static_cast< FwkTabPage* >( m_aTabCtrl.GetTabPage( nId ) ); @@ -310,7 +310,7 @@ IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( FwkTabWindow, DeactivatePageHdl, TabControl *, EMPTYARG ) +IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl) { m_aTabCtrl.BroadcastEvent( VCLEVENT_TABPAGE_DEACTIVATE ); return 1; diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index e2a08deb13db..8f015638737b 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -956,7 +956,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) } -IMPL_LINK( MenuManager, Highlight, Menu *, EMPTYARG ) +IMPL_LINK_NOARG(MenuManager, Highlight) { return 0; } diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 2a8d20b02abf..01523d2e4f06 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -266,7 +266,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& - decide then, if we must close this frame only, establish the backing mode or shutdown the whole application. */ -IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) +IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) { try { diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index e25d74b7de18..3b4774ca2948 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2666,7 +2666,7 @@ sal_Bool LayoutManager::implts_resetMenuBar() return sal_False; } -IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG ) +IMPL_LINK_NOARG(LayoutManager, MenuBarClose) { ReadGuard aReadLock( m_aLock ); uno::Reference< frame::XDispatchProvider > xProvider(m_xFrame, uno::UNO_QUERY); @@ -2689,7 +2689,7 @@ IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG ) return 0; } -IMPL_LINK( LayoutManager, SettingsChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(LayoutManager, SettingsChanged) { return 1; } @@ -2832,7 +2832,7 @@ void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) thr } } -IMPL_LINK( LayoutManager, AsyncLayoutHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl) { ReadGuard aReadLock( m_aLock ); m_aAsyncLayoutTimer.Stop(); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 343671030c17..eb534842cf15 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1536,7 +1536,7 @@ void AutoRecovery::implts_stopTimer() } //----------------------------------------------- -IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG) +IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) { try { @@ -1637,7 +1637,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG) } //----------------------------------------------- -IMPL_LINK(AutoRecovery, implts_asyncDispatch, void*, EMPTYARG) +IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) { // SAFE -> WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 2db5879071bd..0b8976981840 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -893,7 +893,7 @@ void BackingWindow::Resize() maTemplateButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) ); } -IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(BackingWindow, ToolboxHdl) { const char* pNodePath = NULL; const char* pNode = NULL; diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 3b2ef61eed7c..fdf60e270349 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -463,13 +463,13 @@ LicenseDialog::~LicenseDialog() { } -IMPL_LINK( LicenseDialog, PageDownHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(LicenseDialog, PageDownHdl) { aLicenseML.ScrollDown( SCROLL_PAGEDOWN ); return 0; } -IMPL_LINK( LicenseDialog, EndReachedHdl, LicenseView *, EMPTYARG ) +IMPL_LINK_NOARG(LicenseDialog, EndReachedHdl) { bEndReached = sal_True; @@ -478,19 +478,19 @@ IMPL_LINK( LicenseDialog, EndReachedHdl, LicenseView *, EMPTYARG ) return 0; } -IMPL_LINK( LicenseDialog, ScrolledHdl, LicenseView *, EMPTYARG ) +IMPL_LINK_NOARG(LicenseDialog, ScrolledHdl) { EnableControls(); return 0; } -IMPL_LINK( LicenseDialog, DeclineBtnHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(LicenseDialog, DeclineBtnHdl) { EndDialog(0); return 0; } -IMPL_LINK( LicenseDialog, AcceptBtnHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(LicenseDialog, AcceptBtnHdl) { EndDialog(1); return 0; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 7ef9502114dc..b96bb715b87a 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -678,7 +678,7 @@ throw ( NoSuchElementException, RuntimeException ) // protected methods //_________________________________________________________________________________________________________________ -IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNotify*, EMPTYARG ) +IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 6ae3d09cbe5c..4f698299e820 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -421,7 +421,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue AddFrameActionListener(); } -IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(AddonsToolBarManager, Click) { if ( m_bDisposed ) return 1; @@ -439,7 +439,7 @@ IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, EMPTYARG ) return 1; } -IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(AddonsToolBarManager, DoubleClick) { if ( m_bDisposed ) return 1; @@ -457,7 +457,7 @@ IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, EMPTYARG ) return 1; } -IMPL_LINK( AddonsToolBarManager, Command, CommandEvent*, EMPTYARG ) +IMPL_LINK_NOARG(AddonsToolBarManager, Command) { ResetableGuard aGuard( m_aLock ); @@ -467,7 +467,7 @@ IMPL_LINK( AddonsToolBarManager, Command, CommandEvent*, EMPTYARG ) return 0; } -IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(AddonsToolBarManager, Select) { if ( m_bDisposed ) return 1; @@ -486,12 +486,12 @@ IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG ) return 1; } -IMPL_LINK( AddonsToolBarManager, Activate, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(AddonsToolBarManager, Activate) { return 1; } -IMPL_LINK( AddonsToolBarManager, Deactivate, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(AddonsToolBarManager, Deactivate) { return 1; } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 64e86f995595..0ff34d6d097b 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1125,7 +1125,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) } -IMPL_LINK( MenuBarManager, Highlight, Menu *, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarManager, Highlight) { return 0; } diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 95ed4c1d57b1..3093ec77ad0e 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -664,7 +664,7 @@ void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt ) MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonUp); } -IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG ) +IMPL_LINK_NOARG(StatusBarManager, Click) { ResetableGuard aGuard( m_aLock ); @@ -683,7 +683,7 @@ IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG ) return 1; } -IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG ) +IMPL_LINK_NOARG(StatusBarManager, DoubleClick) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 0104b65fd531..067dbe4eacb1 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1613,12 +1613,12 @@ long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )( return 1; } -IMPL_LINK( ToolBarManager, Click, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBarManager, Click) { return HandleClick(&XToolbarController::click); } -IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBarManager, DropdownClick) { ResetableGuard aGuard( m_aLock ); @@ -1641,7 +1641,7 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG ) return 1; } -IMPL_LINK( ToolBarManager, DoubleClick, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBarManager, DoubleClick) { return HandleClick(&XToolbarController::doubleClick); } @@ -2056,7 +2056,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) return 1; } -IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBarManager, Select) { if ( m_bDisposed ) return 1; @@ -2076,12 +2076,12 @@ IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG ) return 1; } -IMPL_LINK( ToolBarManager, Activate, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBarManager, Activate) { return 1; } -IMPL_LINK( ToolBarManager, Deactivate, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBarManager, Deactivate) { return 1; } @@ -2139,7 +2139,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) return 1; } -IMPL_LINK( ToolBarManager, AsyncUpdateControllersHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(ToolBarManager, AsyncUpdateControllersHdl) { // The guard must be in its own context as the we can get destroyed when our // own xInterface reference get destroyed! diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 544dc03ecc39..724ea2f8e8df 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -214,7 +214,7 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId) } } // ----------------------------------------------------------------------------- -IMPL_LINK( OColorPopup, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(OColorPopup, SelectHdl) { sal_uInt16 nItemId = m_aColorSet.GetSelectItemId(); Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet.GetItemColor( nItemId ) ); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 75ad612b7b35..53711b8b46d9 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -409,14 +409,14 @@ IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ ) return 0L; } //------------------------------------------------------------------------------ -IMPL_LINK(OFieldExpressionControl, AsynchActivate, void*, EMPTYARG) +IMPL_LINK_NOARG(OFieldExpressionControl, AsynchActivate) { ActivateCell(); return 0L; } //------------------------------------------------------------------------------ -IMPL_LINK(OFieldExpressionControl, AsynchDeactivate, void*, EMPTYARG) +IMPL_LINK_NOARG(OFieldExpressionControl, AsynchDeactivate) { DeactivateCell(); return 0L; diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 78ddf3530dfa..70fe37859d44 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -420,7 +420,7 @@ void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel ) } } //------------------------------------------------------------------------ -IMPL_LINK( NavigatorTree, OnDropActionTimer, void*, EMPTYARG ) +IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) { if (--m_nTimerCounter > 0) return 0L; diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index a85f500de4df..6c2fad9e4d4a 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -94,7 +94,7 @@ namespace rptui sal_Bool m_bDeleted; - DECL_LINK( MarkTimeout, Timer * ); + DECL_LINK(MarkTimeout, void *); DECL_LINK( SplitHdl, void* ); void ImplInitSettings(); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index e757083ed951..f66e4b75dc86 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -296,7 +296,7 @@ void ODesignView::setReadOnly(sal_Bool /*_bReadOnly*/) { } //---------------------------------------------------------------------------- -IMPL_LINK( ODesignView, MarkTimeout, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(ODesignView, MarkTimeout) { if ( m_pPropWin && m_pPropWin->IsVisible() ) { diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index bde3c7ff4d1a..9b55494b0c69 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2367,7 +2367,7 @@ void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGr } } //------------------------------------------------------------------------------ -IMPL_LINK( OReportController, OnClipboardChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(OReportController, OnClipboardChanged) { OnInvalidateClipboard(); return 0; diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index e5574f4a8b4b..3343d8b3e561 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -85,7 +85,7 @@ public: const String& GetSource() const { return aSourceArea; } const ScRange& GetDestArea() const { return aDestArea; } - DECL_LINK( RefreshHdl, ScAreaLink* ); + DECL_LINK( RefreshHdl, void* ); DECL_LINK( AreaEndEditHdl, void* ); }; diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index c602f242a062..3a925192a01e 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -166,7 +166,7 @@ private: Timer aTimer; ScDocument* pDoc; - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK(TimerHdl, void *); // not implemented ScChartListenerCollection& operator=( const ScChartListenerCollection& ); diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index 16afcc78ced0..eec446f9ae27 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -77,7 +77,7 @@ private: Timer maTimer; std::auto_ptr< ScChartLockGuard > mapScChartLockGuard; - DECL_LINK( TimeoutHdl, Timer* ); + DECL_LINK(TimeoutHdl, void *); ScTemporaryChartLock(); ScTemporaryChartLock( const ScTemporaryChartLock& ); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 8634847023c3..0a98818c7f42 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1618,7 +1618,7 @@ private: bool OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, sal_uInt16 nMaxTest ); - DECL_LINK( TrackTimeHdl, Timer* ); + DECL_LINK(TrackTimeHdl, void *); static ScRecursionHelper* CreateRecursionHelperInstance(); diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index c44c8f1dc623..d5f6720f835c 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -83,7 +83,7 @@ private: ScExternalRefLink(); // disabled ScExternalRefLink(const ScExternalRefLink&); // disabled - DECL_LINK( ExternalRefEndEditHdl, ::sfx2::SvBaseLink* ); + DECL_LINK( ExternalRefEndEditHdl, void* ); sal_uInt16 mnFileId; String maFilterName; diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 70af96a0b65d..823eabaf932e 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -134,8 +134,8 @@ public: // moved by the application - DECL_LINK( IdleHandler, Timer* ); // Timer instead of idle - DECL_LINK( SpellTimerHdl, Timer* ); + DECL_LINK( IdleHandler, void* ); // Timer instead of idle + DECL_LINK( SpellTimerHdl, void* ); DECL_LINK( CalcFieldValueHdl, EditFieldInfo* ); void Execute( SfxRequest& rReq ); diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 3e2b542a59a0..216bccd1c1c0 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -75,7 +75,7 @@ public: sal_Bool IsUsed() const; - DECL_LINK( RefreshHdl, ScTableLink* ); + DECL_LINK( RefreshHdl, void* ); DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink* ); }; diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 7cd70c86b910..ab4abd016147 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -324,7 +324,7 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) } -IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScDocument, TrackTimeHdl) { if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln { diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index a9315720d1aa..9b0e48f0f3b4 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -796,7 +796,7 @@ ScAppCfg::ScAppCfg() : aFormulaItem.SetCommitLink( LINK(this, ScAppCfg, FormulaCommitHdl) ); } -IMPL_LINK( ScAppCfg, LayoutCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, LayoutCommitHdl) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -828,7 +828,7 @@ IMPL_LINK( ScAppCfg, LayoutCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, InputCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, InputCommitHdl) { Sequence<OUString> aNames = GetInputPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -854,7 +854,7 @@ IMPL_LINK( ScAppCfg, InputCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, RevisionCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, RevisionCommitHdl) { Sequence<OUString> aNames = GetRevisionPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -883,7 +883,7 @@ IMPL_LINK( ScAppCfg, RevisionCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, ContentCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, ContentCommitHdl) { Sequence<OUString> aNames = GetContentPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -903,7 +903,7 @@ IMPL_LINK( ScAppCfg, ContentCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, SortListCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, SortListCommitHdl) { Sequence<OUString> aNames = GetSortListPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -923,7 +923,7 @@ IMPL_LINK( ScAppCfg, SortListCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, MiscCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, MiscCommitHdl) { Sequence<OUString> aNames = GetMiscPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -949,7 +949,7 @@ IMPL_LINK( ScAppCfg, MiscCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, CompatCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, CompatCommitHdl) { Sequence<OUString> aNames = GetCompatPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -968,7 +968,7 @@ IMPL_LINK( ScAppCfg, CompatCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, FormulaCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, FormulaCommitHdl) { Sequence<OUString> aNames = GetFormulaPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 28f2a86f9eb7..79da0c96faa8 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -661,7 +661,7 @@ void ScChartListenerCollection::StartTimer() aTimer.Start(); } -IMPL_LINK( ScChartListenerCollection, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl) { if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) ) { diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index 39f1e58472f7..139ddbaa3b38 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.cxx @@ -187,7 +187,7 @@ void ScTemporaryChartLock::AlsoLockThisChart( const Reference< frame::XModel >& mapScChartLockGuard->AlsoLockThisChart( xModel ); } -IMPL_LINK( ScTemporaryChartLock, TimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScTemporaryChartLock, TimeoutHdl) { mapScChartLockGuard.reset(); return 0; diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index db5f952abbd0..e5d42b76756e 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -398,7 +398,7 @@ ScDocCfg::ScDocCfg() : aDefaultsItem.SetCommitLink( LINK(this, ScDocCfg, DefaultsCommitHdl) ); } -IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDocCfg, CalcCommitHdl) { Sequence<OUString> aNames = GetCalcPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -454,7 +454,7 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDocCfg, LayoutCommitHdl) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -477,7 +477,7 @@ IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScDocCfg, DefaultsCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDocCfg, DefaultsCommitHdl) { Sequence<OUString> aNames = GetDefaultsPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 4de68ce02c8a..7c40d2287a20 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -586,7 +586,7 @@ ScViewCfg::ScViewCfg() : aGridItem.SetCommitLink( LINK( this, ScViewCfg, GridCommitHdl ) ); } -IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -633,7 +633,7 @@ IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScViewCfg, DisplayCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScViewCfg, DisplayCommitHdl) { Sequence<OUString> aNames = GetDisplayPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -677,7 +677,7 @@ IMPL_LINK( ScViewCfg, DisplayCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScViewCfg, GridCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl) { const ScGridOptions& rGrid = GetGridOptions(); diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index bc52b65bcd3c..d5a08684c65c 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2142,7 +2142,7 @@ void ScInputHandler::SyncViews( EditView* pSourceView ) } } -IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScInputHandler, ModifyHdl) { if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) && pEngine && pEngine->GetUpdateMode() && pInputWin ) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index ccfde4806877..3a53bb076348 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1035,7 +1035,7 @@ void ScInputBarGroup::DecrementVerticalSize() } } -IMPL_LINK( ScInputBarGroup, ClickHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl) { Window *w=GetParent(); ScInputWindow *pParent; @@ -1110,7 +1110,7 @@ void ScInputBarGroup::TriggerToolboxLayout() } } -IMPL_LINK( ScInputBarGroup, Impl_ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScInputBarGroup, Impl_ScrollHdl) { aMultiTextWnd.DoScroll(); return 0; @@ -1792,7 +1792,7 @@ void ScTextWnd::StartEditEngine() pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT ); } -IMPL_LINK(ScTextWnd, NotifyHdl, EENotify*, EMPTYARG) +IMPL_LINK_NOARG(ScTextWnd, NotifyHdl) { if (pEditView && !bInputMode) { diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 3752b7c7df6c..dbddbe023429 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1894,7 +1894,7 @@ void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) } } -IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScModule, IdleHandler) { if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD ) ) { @@ -1949,7 +1949,7 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG ) return 0; } -IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScModule, SpellTimerHdl) { if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) ) { diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index c7501487a429..2e22761b9a1f 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -125,7 +125,7 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) // ----------------------------------------------------------------------- -IMPL_LINK( ScAttrDlg, OkHandler, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScAttrDlg, OkHandler) { ((Link&)GetOKButton().GetClickHdl()).Call( NULL ); diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index 4687bb804e31..54d7a4bf69ca 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.cxx @@ -595,7 +595,7 @@ sal_Bool ScConditionalFormatDlg::Close() // Handler: //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ScrollHdl) { SliderMoved(); return 0; @@ -619,7 +619,7 @@ sal_uInt16 ScConditionalFormatDlg::GetSliderPos() //---------------------------------------------------------------------------- // Enabled/Disabled Condition1-Controls -IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ClickCond1Hdl) { sal_Bool bChecked = aCbxCond1.IsChecked(); CondChecked( bChecked, aCbxCond1, aLbCond11, aLbCond12, aEdtCond11, aRbCond11, aFtCond1And, aEdtCond12, aRbCond12, @@ -630,7 +630,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Zellwert/Formel -IMPL_LINK( ScConditionalFormatDlg, ChangeCond11Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond11Hdl) { sal_uInt16 nPos = aLbCond11.GetSelectEntryPos(); @@ -657,7 +657,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond11Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // zwischen, gleich, groesser, ... -IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond12Hdl) { if( aLbCond12.IsVisible() ) { @@ -696,7 +696,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, ChangeCond1TemplateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond1TemplateHdl) { String aStyleName = aLbCond1Template.GetSelectEntry(); SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); @@ -714,7 +714,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond1TemplateHdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Enabled/Disabled Condition2-Controls -IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ClickCond2Hdl) { sal_Bool bChecked = aCbxCond2.IsChecked(); CondChecked( bChecked, aCbxCond2, aLbCond21, aLbCond22, aEdtCond21, aRbCond21, aFtCond2And, aEdtCond22, aRbCond22, @@ -725,7 +725,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Zellwert/Formel -IMPL_LINK( ScConditionalFormatDlg, ChangeCond21Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond21Hdl) { sal_uInt16 nPos = aLbCond21.GetSelectEntryPos(); @@ -752,7 +752,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond21Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // zwischen, gleich, groesser, ... -IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond22Hdl) { if( aLbCond22.IsVisible() ) { @@ -791,7 +791,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, ChangeCond2TemplateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond2TemplateHdl) { String aStyleName = aLbCond2Template.GetSelectEntry(); SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); @@ -809,7 +809,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond2TemplateHdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Enabled/Disabled Condition3-Controls -IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ClickCond3Hdl) { sal_Bool bChecked = aCbxCond3.IsChecked(); CondChecked( bChecked, aCbxCond3, aLbCond31, aLbCond32, aEdtCond31, aRbCond31, aFtCond3And, aEdtCond32, aRbCond32, @@ -822,7 +822,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Zellwert/Formel -IMPL_LINK( ScConditionalFormatDlg, ChangeCond31Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond31Hdl) { sal_uInt16 nPos = aLbCond31.GetSelectEntryPos(); @@ -849,7 +849,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond31Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // zwischen, gleich, groesser, ... -IMPL_LINK( ScConditionalFormatDlg, ChangeCond32Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond32Hdl) { if( aLbCond32.IsVisible() ) { @@ -888,7 +888,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond32Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, ChangeCond3TemplateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond3TemplateHdl) { String aStyleName = aLbCond3Template.GetSelectEntry(); SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); @@ -930,7 +930,7 @@ IMPL_LINK( ScConditionalFormatDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); return 0; diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 9b2319735b81..fc6dd9a30d11 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -73,7 +73,7 @@ void ScMenuFloatingWindow::SubMenuItemData::reset() maTimer.Stop(); } -IMPL_LINK( ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) { mpParent->handleMenuTimeout(this); return 0; @@ -1018,7 +1018,7 @@ IMPL_LINK( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn ) return 0; } -IMPL_LINK( ScCheckListMenuWindow, TriStateHdl, TriStateBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScCheckListMenuWindow, TriStateHdl) { switch (mePrevToggleAllState) { diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 6d5c8d75dde8..0daed040853f 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -407,7 +407,7 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) { sal_uInt16 nDataAreaCount = aLbConsAreas.GetEntryCount(); diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index ea8c47fe57f7..1f482031f9a0 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -139,7 +139,7 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc ) rDesc.bNative = ( nSelect == DP_TYPELIST_SQLNAT ); } -IMPL_LINK( ScDataPilotDatabaseDlg, SelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataPilotDatabaseDlg, SelectHdl) { FillObjects(); return 0; diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index d5bffbe6763d..18850f80a1e7 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -432,7 +432,7 @@ sal_Bool ScDbNameDlg::IsRefInputMode() const // Handler: // ======== -IMPL_LINK( ScDbNameDlg, OkBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) { AddBtnHdl( 0 ); @@ -449,16 +449,16 @@ IMPL_LINK( ScDbNameDlg, OkBtnHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScDbNameDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl) { Close(); return 0; } -IMPL_LINK_INLINE_END( ScDbNameDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScDbNameDlg, CancelBtnHdl) //------------------------------------------------------------------------ -IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) { String aNewName = aEdName.GetText(); String aNewArea = aEdAssign.GetText(); @@ -557,7 +557,7 @@ public: } -IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) { ::rtl::OUString aStrEntry = aEdName.GetText(); ScDBCollection::NamedDBs& rDBs = aLocalDbCol.getNamedDBs(); @@ -610,7 +610,7 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) { String theName = aEdName.GetText(); sal_Bool bNameFound = (COMBOBOX_ENTRY_NOTFOUND @@ -695,7 +695,7 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScDbNameDlg, AssModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl) { // hier parsen fuer Save() etc. diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index a69b7a1f9a53..089468746d9f 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -1027,13 +1027,13 @@ void ScDPHorFieldControl::HandleScroll() Redraw(); } -IMPL_LINK(ScDPHorFieldControl, ScrollHdl, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(ScDPHorFieldControl, ScrollHdl) { HandleScroll(); return 0; } -IMPL_LINK(ScDPHorFieldControl, EndScrollHdl, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(ScDPHorFieldControl, EndScrollHdl) { HandleScroll(); return 0; @@ -1303,13 +1303,13 @@ void ScDPRowFieldControl::HandleScroll() Redraw(); } -IMPL_LINK(ScDPRowFieldControl, ScrollHdl, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(ScDPRowFieldControl, ScrollHdl) { HandleScroll(); return 0; } -IMPL_LINK(ScDPRowFieldControl, EndScrollHdl, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(ScDPRowFieldControl, EndScrollHdl) { HandleScroll(); return 0; diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 94e23f8f1cff..d3dc9057dd26 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -762,7 +762,7 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) //---------------------------------------------------------------------------- -IMPL_LINK( ScFilterDlg, MoreClickHdl, MoreButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScFilterDlg, MoreClickHdl) { if ( aBtnMore.GetState() ) pTimer->Start(); @@ -1178,7 +1178,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) } //---------------------------------------------------------------------------- -IMPL_LINK( ScFilterDlg, ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScFilterDlg, ScrollHdl) { SliderMoved(); return 0; diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index ffd23f35fb3a..51b8c8b84fd6 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -421,7 +421,7 @@ IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox*, pLBox ) return 0; } -IMPL_LINK( ScDPFunctionDlg, DblClickHdl, MultiListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl) { maBtnOk.Click(); return 0; @@ -516,7 +516,7 @@ IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, RadioButton*, pBtn ) return 0; } -IMPL_LINK( ScDPSubtotalDlg, DblClickHdl, MultiListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl) { maBtnOk.Click(); return 0; diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index e3df3f0444eb..d4217659da86 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -1780,7 +1780,7 @@ IMPL_LINK( ScDPLayoutDlg, ClickHdl, PushButton *, pBtn ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, OkHdl) { rtl::OUString aOutPosStr = aEdOutPos.GetText(); ScAddress aAdrDest; @@ -1940,7 +1940,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, CancelHdl, CancelButton *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, CancelHdl) { Close(); return 0; @@ -1948,7 +1948,7 @@ IMPL_LINK( ScDPLayoutDlg, CancelHdl, CancelButton *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, MoreClickHdl) { if ( aBtnMore.GetState() ) { @@ -1979,7 +1979,7 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, EdModifyHdl) { rtl::OUString theCurPosStr = aEdOutPos.GetText(); sal_uInt16 nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); @@ -2005,7 +2005,7 @@ IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG ) return 0; } -IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, EdInModifyHdl) { UpdateSrcRange(); return 0; @@ -2013,7 +2013,7 @@ IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, SelAreaHdl) { rtl::OUString aString; sal_uInt16 nSelPos = aLbOutPos.GetSelectEntryPos(); diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 238c202327a2..d8465839057b 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -207,7 +207,7 @@ void ScNewScenarioDlg::SetScenarioData( const rtl::OUString& rName, const rtl::O //------------------------------------------------------------------------ -IMPL_LINK( ScNewScenarioDlg, OkHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) { String aName ( aEdName.GetText() ); ScDocument* pDoc = ((ScTabViewShell*)SfxViewShell::Current())-> diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 17d0b2a68563..93d5cfcf6b15 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -687,7 +687,7 @@ IMPL_LINK( ScImportAsciiDlg, LbColTypeHdl, ListBox*, pListBox ) return 0; } -IMPL_LINK( ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl) { sal_Int32 nBaseLine = maTableBox.GetFirstVisLine(); sal_Int32 nRead = maTableBox.GetVisLineCount(); diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 418e9f052562..122151d8d0fa 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -96,7 +96,7 @@ void ScTextImportOptionsDlg::init() maLbCustomLang.Disable(); } -IMPL_LINK( ScTextImportOptionsDlg, OKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl) { EndDialog(RET_OK); return 0; diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index aecb2080f076..f2cc430b38e8 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -986,7 +986,7 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) // ----------------------------------------------------------------------- -IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) { aLbAlgorithm.SetUpdateMode( false ); aLbAlgorithm.Clear(); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index f463b7d5b101..0de9c27b4428 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -579,7 +579,7 @@ void ScTPValidationValue::TidyListBoxes() } } -IMPL_LINK( ScTPValidationValue, EditSetFocusHdl, Edit *, EMPTYARG) +IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl) { sal_uInt16 nPos=maLbAllow.GetSelectEntryPos(); @@ -606,7 +606,7 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd ) // ---------------------------------------------------------------------------- -IMPL_LINK( ScTPValidationValue, SelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl) { sal_uInt16 nLbPos = maLbAllow.GetSelectEntryPos(); bool bEnable = (nLbPos != SC_VALIDDLG_ALLOW_ANY); @@ -660,7 +660,7 @@ IMPL_LINK( ScTPValidationValue, SelectHdl, ListBox*, EMPTYARG ) return 0; } -IMPL_LINK( ScTPValidationValue, CheckHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) { maCbSort.Enable( maCbShow.IsChecked() ); return 0; @@ -854,7 +854,7 @@ sal_Bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) // ----------------------------------------------------------------------- -IMPL_LINK( ScTPValidationError, SelectActionHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) { ScValidErrorStyle eStyle = (ScValidErrorStyle) aLbAction.GetSelectEntryPos(); sal_Bool bMacro = ( eStyle == SC_VALERR_MACRO ); @@ -868,7 +868,7 @@ IMPL_LINK( ScTPValidationError, SelectActionHdl, ListBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ScTPValidationError, ClickSearchHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) { Window* pOld = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 832036f2c95e..c28f6d25ff09 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -504,14 +504,14 @@ sal_Bool ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, } -IMPL_LINK( ScAreaLink, RefreshHdl, ScAreaLink*, EMPTYARG ) +IMPL_LINK_NOARG(ScAreaLink, RefreshHdl) { long nRes = Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() ) != 0; return nRes; } -IMPL_LINK( ScAreaLink, AreaEndEditHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl) { // #i76514# can't use link argument to access the dialog, // because it's the ScLinkedAreaDlg, not AbstractScLinkedAreaDlg diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 27138bc27a47..67a78ee81780 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -111,7 +111,7 @@ void ScAutoStyleList::AddInitial( const ScRange& rRange, const String& rStyle1, aInitTimer.Start(); } -IMPL_LINK( ScAutoStyleList, InitHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoStyleList, InitHdl) { boost::ptr_vector<ScAutoStyleInitData>::iterator iter; for (iter = aInitials.begin(); iter != aInitials.end(); ++iter) @@ -216,7 +216,7 @@ void ScAutoStyleList::StartTimer( sal_uLong nNow ) // Sekunden nTimerStart = nNow; } -IMPL_LINK( ScAutoStyleList, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl) { sal_uLong nNow = TimeNow(); AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 3dbc96f5beb6..746d5133ccf6 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1288,7 +1288,7 @@ void ScExternalRefLink::SetDoReferesh(bool b) mbDoRefresh = b; } -IMPL_LINK( ScExternalRefLink, ExternalRefEndEditHdl, ::sfx2::SvBaseLink*, EMPTYARG ) +IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) { return 0; } diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index f154f0affc00..1b65a7ea7585 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -438,7 +438,7 @@ sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, return true; } -IMPL_LINK( ScTableLink, RefreshHdl, ScTableLink*, EMPTYARG ) +IMPL_LINK_NOARG(ScTableLink, RefreshHdl) { long nRes = Refresh( aFileName, aFilterName, NULL, GetRefreshDelay() ) != 0; return nRes; diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 109a5e8771fa..7d0265104a63 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -164,7 +164,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) |* \************************************************************************/ -IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl) { Point aPosPixel = pWindow->GetPointerPosPixel(); @@ -285,7 +285,7 @@ void FuPoor::DoPaste() |* \************************************************************************/ -IMPL_LINK( FuPoor, DragTimerHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(FuPoor, DragTimerHdl) { // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer // aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei @@ -298,7 +298,7 @@ IMPL_LINK( FuPoor, DragTimerHdl, Timer *, EMPTYARG ) return 0; } -IMPL_LINK( FuPoor, DragHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(FuPoor, DragHdl) { SdrHdl* pHdl = pView->PickHandle(aMDPos); diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 357bdc037f9c..703b2181dbe1 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -1048,7 +1048,7 @@ void ScFunctionDockWin::ToggleFloatingMode() aTimer.Start(); } -IMPL_LINK( ScFunctionDockWin, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScFunctionDockWin, TimerHdl) { CheckAlignment(eSfxOldAlignment,eSfxNewAlignment); SetSize(); diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index b1d183a9f5b3..a104fadd05d8 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -160,21 +160,21 @@ private: void InitFilter(); DECL_LINK( FilterHandle, SvxTPFilter* ); - DECL_LINK( RefHandle, SvxTPFilter* ); - DECL_LINK( FilterModified, SvxTPFilter* ); + DECL_LINK( RefHandle, void* ); + DECL_LINK( FilterModified, void* ); DECL_LINK( MinSizeHandle, SvxAcceptChgCtr*); DECL_LINK( RejectHandle, SvxTPView*); DECL_LINK( AcceptHandle, SvxTPView*); - DECL_LINK( RejectAllHandle, SvxTPView*); - DECL_LINK( AcceptAllHandle, SvxTPView*); + DECL_LINK( RejectAllHandle, void*); + DECL_LINK( AcceptAllHandle, void*); DECL_LINK( ExpandingHandle, SvxRedlinTable*); - DECL_LINK( SelectHandle, SvxRedlinTable*); + DECL_LINK( SelectHandle, void*); DECL_LINK( RefInfoHandle, String*); - DECL_LINK( UpdateSelectionHdl, Timer*); + DECL_LINK( UpdateSelectionHdl, void*); DECL_LINK( ChgTrackModHdl, ScChangeTrack*); - DECL_LINK( CommandHdl, Control*); - DECL_LINK( ReOpenTimerHdl, Timer*); + DECL_LINK( CommandHdl, void*); + DECL_LINK( ReOpenTimerHdl, void*); DECL_LINK( ColCompareHdl, SvSortData*); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 383f6b3726a6..270735bd45e1 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -133,7 +133,7 @@ private: Timer aTimer; String aDocName; // document on which the dialog was opened - DECL_LINK( UpdateFocusHdl, Timer* ); + DECL_LINK( UpdateFocusHdl, void* ); protected: diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index 3ff5138e08d2..823e3b7e4286 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -54,8 +54,8 @@ private: void ExecuteEntries(); void AdjustEntries(sal_uLong nDiff); void StartTimer(sal_uLong nNow); - DECL_LINK( TimerHdl, Timer* ); - DECL_LINK( InitHdl, Timer* ); + DECL_LINK( TimerHdl, void* ); + DECL_LINK( InitHdl, void* ); public: ScAutoStyleList(ScDocShell* pShell); diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 26660292c58f..41739e3e12af 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -71,7 +71,7 @@ private: void ExecuteSubtotals(SfxRequest& rReq); DECL_LINK( ClipboardChanged, TransferableDataHelper* ); - DECL_LINK( DialogClosed, AbstractScLinkedAreaDlg* ); + DECL_LINK( DialogClosed, void* ); RotateTransliteration m_aRotateCase; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 4a1458aae95e..799308aca639 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -307,7 +307,7 @@ private: void cycleFocus(bool bReverse = false); DECL_LINK( ButtonHdl, Button* ); - DECL_LINK( TriStateHdl, TriStateBox* ); + DECL_LINK( TriStateHdl, void* ); DECL_LINK( CheckHdl, SvTreeListBox* ); private: diff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxx index 38e8807542a4..1bfaf7906312 100644 --- a/sc/source/ui/inc/condfrmt.hxx +++ b/sc/source/ui/inc/condfrmt.hxx @@ -165,10 +165,10 @@ private: DECL_LINK( ChangeCond3TemplateHdl, void * ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); + DECL_LINK( LoseFocusHdl, void* ); DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( NewBtnHdl, PushButton* ); - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( ScrollHdl, void* ); #endif // _CONDFRMT_CXX }; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 74cdc5ce3a51..b2b3739c355e 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -182,9 +182,9 @@ private: void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); - DECL_LINK( SelectHandle, SvxRedlinTable* ); - DECL_LINK( DeselectHandle, SvxRedlinTable* ); - DECL_LINK( UpdateSelectionHdl, Timer* ); + DECL_LINK( SelectHandle, void* ); + DECL_LINK( DeselectHandle, void* ); + DECL_LINK( UpdateSelectionHdl, void* ); DECL_LINK( KeepMineHandle, void* ); DECL_LINK( KeepOtherHandle, void* ); DECL_LINK( KeepAllMineHandle, void* ); diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 1de37c004126..90d7db25449e 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -113,7 +113,7 @@ class ScContentTree : public SvTreeListBox ScDocument* GetSourceDocument(); - DECL_LINK( ContentDoubleClickHdl, ScContentTree* ); + DECL_LINK( ContentDoubleClickHdl, void* ); DECL_STATIC_LINK( ScContentTree, ExecDragHdl, void* ); protected: diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index 648544ee117f..cacfd06b5233 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -54,7 +54,7 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - DECL_LINK( OkHdl, OKButton * ); + DECL_LINK(OkHdl, void *); }; diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 7c5c58b9bc5d..1519256e37c7 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -103,7 +103,7 @@ private: DECL_LINK( RowClickHdl, void * ); DECL_LINK( Range2DataModifyHdl, void * ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); + DECL_LINK( LoseFocusHdl, void* ); #endif }; diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index 588ef43cf72a..9c3159471731 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -56,7 +56,7 @@ private: void FillObjects(); - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK( SelectHdl, void* ); public: ScDataPilotDatabaseDlg( Window* pParent ); diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 5600d2ccb11e..bfa376972445 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -88,15 +88,15 @@ private: void SetButtonState(); // Handler: - DECL_LINK( Impl_NewHdl, PushButton* ); - DECL_LINK( Impl_PrevHdl, PushButton* ); - DECL_LINK( Impl_NextHdl, PushButton* ); + DECL_LINK(Impl_NewHdl, void *); + DECL_LINK(Impl_PrevHdl, void *); + DECL_LINK(Impl_NextHdl, void *); - DECL_LINK( Impl_RestoreHdl, PushButton* ); - DECL_LINK( Impl_DeleteHdl, PushButton* ); - DECL_LINK( Impl_CloseHdl, PushButton* ); + DECL_LINK(Impl_RestoreHdl, void *); + DECL_LINK(Impl_DeleteHdl, void *); + DECL_LINK(Impl_CloseHdl, void *); - DECL_LINK( Impl_ScrollHdl, ScrollBar* ); + DECL_LINK(Impl_ScrollHdl, void *); DECL_LINK( Impl_DataModifyHdl, Edit* ); }; #endif // SC_DATAFDLG_HXX diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 480246708cba..5e1849221100 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -108,7 +108,7 @@ private: DECL_LINK( SetSelectionHdl, void* ); DECL_LINK( SelHdl, ListBox* ); DECL_LINK(SetSplitHdl,ScPrivatSplit*); - DECL_LINK( TimerHdl, Timer*); + DECL_LINK( TimerHdl, void*); protected: diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index 9c7d704f11e3..5602051462aa 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -291,8 +291,8 @@ private: bool GetFieldBtnPosSize(size_t nPos, Point& rPos, Size& rSize); void HandleScroll(); - DECL_LINK(ScrollHdl, ScrollBar*); - DECL_LINK(EndScrollHdl, ScrollBar*); + DECL_LINK(ScrollHdl, void*); + DECL_LINK(EndScrollHdl, void*); private: @@ -363,8 +363,8 @@ private: bool GetFieldBtnPosSize(size_t nPos, Point& rPos, Size& rSize); void HandleScroll(); - DECL_LINK(ScrollHdl, ScrollBar*); - DECL_LINK(EndScrollHdl, ScrollBar*); + DECL_LINK(ScrollHdl, void*); + DECL_LINK(EndScrollHdl, void*); private: diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index d473b23488ef..805897cd9cd7 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -174,8 +174,8 @@ private: DECL_LINK( ValModifyHdl, ComboBox* ); DECL_LINK( CheckBoxHdl, CheckBox* ); DECL_LINK( EndDlgHdl, Button* ); - DECL_LINK( MoreClickHdl, MoreButton* ); - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( MoreClickHdl, void* ); + DECL_LINK( ScrollHdl, void* ); // Hack: RefInput control DECL_LINK( TimeOutHdl, Timer* ); diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 5638b3bc6f68..71a20ec02683 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -65,11 +65,11 @@ protected: Dialog* pDialog; Timer aScrollTimer; // fuer Autoscrolling - DECL_LINK( ScrollHdl, Timer * ); + DECL_LINK( ScrollHdl, void * ); void ForceScroll(const Point& aPixPos); Timer aDragTimer; // fuer Drag&Drop - DECL_LINK( DragTimerHdl, Timer * ); + DECL_LINK( DragTimerHdl, void * ); DECL_LINK( DragHdl, void * ); sal_Bool bIsInDragMode; Point aMDPos; // Position von MouseButtonDown diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 477536a6ad14..ef9170f96568 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -203,7 +203,7 @@ private: bool bAutoMarkVisible:1; bool bListValButton:1; - DECL_LINK( PopupModeEndHdl, FloatingWindow* ); + DECL_LINK( PopupModeEndHdl, void* ); DECL_LINK( PopupSpellingHdl, SpellCallbackInfo* ); bool TestMouse( const MouseEvent& rMEvt, bool bAction ); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index b0facf100455..da12b53911bc 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -97,7 +97,7 @@ public: virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); - DECL_LINK( NotifyHdl, EENotify* ); + DECL_LINK( NotifyHdl, void* ); protected: virtual void Paint( const Rectangle& rRec ); @@ -245,8 +245,8 @@ private: PushButton aButton; ScrollBar aScrollBar; long nVertOffset; - DECL_LINK( ClickHdl, PushButton* ); - DECL_LINK( Impl_ScrollHdl, ScrollBar* ); + DECL_LINK( ClickHdl, void* ); + DECL_LINK( Impl_ScrollHdl, void* ); }; diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 144fb2a7f381..2d2a3ec18355 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -106,12 +106,12 @@ private: void FillTables_Impl( ScDocument* pSrcDoc ); void DoEnable_Impl(); - DECL_LINK( BrowseHdl_Impl, PushButton* ); - DECL_LINK( ChoiceHdl_Impl, RadioButton* ); - DECL_LINK( SelectHdl_Impl, MultiListBox* ); - DECL_LINK( CountHdl_Impl, NumericField* ); - DECL_LINK( DoEnterHdl, PushButton* ); - DECL_LINK( BrowseTimeoutHdl, Timer* ); + DECL_LINK(BrowseHdl_Impl, void *); + DECL_LINK(ChoiceHdl_Impl, void *); + DECL_LINK(SelectHdl_Impl, void *); + DECL_LINK(CountHdl_Impl, void *); + DECL_LINK(DoEnterHdl, void *); + DECL_LINK(BrowseTimeoutHdl, void *); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); #endif }; diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index e3cf0e7c2d62..f441f469d022 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -68,10 +68,10 @@ private: SfxObjectShellRef aSourceRef; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > xSourceObject; - DECL_LINK( FileHdl, ComboBox* ); - DECL_LINK( BrowseHdl, PushButton* ); - DECL_LINK( RangeHdl, MultiListBox* ); - DECL_LINK( ReloadHdl, CheckBox* ); + DECL_LINK(FileHdl, void *); + DECL_LINK(BrowseHdl, void *); + DECL_LINK(RangeHdl, void *); + DECL_LINK(ReloadHdl, void *); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); void UpdateSourceRanges(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index c6e0e1b117e2..d3ca3ea09b87 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -65,8 +65,8 @@ private: long nCurrentValue; void CalcPositions(); - DECL_LINK( SetDefValHdl, CheckBox * ); - DECL_LINK( ModifyHdl, MetricField * ); + DECL_LINK(SetDefValHdl, void *); + DECL_LINK(ModifyHdl, void *); }; #endif // SC_MTRINDLG_HXX diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index b797bb370b08..783ed6b0dc7c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -216,7 +216,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); - DECL_LINK( ToolBoxDropdownClickHdl, ToolBox* ); + DECL_LINK( ToolBoxDropdownClickHdl, void* ); protected: virtual void Select(); diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index 01eeec8dbcd5..c8e78b1d4792 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -58,7 +58,7 @@ private: SdrObject* pObject; sal_Bool bVisible; - DECL_LINK( TimeHdl, Timer* ); + DECL_LINK( TimeHdl, void* ); public: ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 116097c30532..d46aefbc1b76 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -59,7 +59,7 @@ class ScRedlineOptionsTabPage : public SfxTabPage ColorListBox aMoveColorLB; FixedLine aChangedGB; String aAuthorStr; - DECL_LINK( ColorHdl, ColorListBox *pColorLB ); + DECL_LINK(ColorHdl, void *); public: diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index c7a06213c067..aaac8b81da98 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -209,13 +209,13 @@ private: DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( DelBtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( LoseFocusHdl, void* ); + DECL_LINK(ScrollHdl, void *); DECL_LINK( CursorUpHdl, ScCursorRefEdit* ); DECL_LINK( CursorDownHdl, ScCursorRefEdit* ); - DECL_LINK( CondModifyHdl, Edit* ); - DECL_LINK( TargetModifyHdl, Edit* ); - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK( CondModifyHdl, void* ); + DECL_LINK( TargetModifyHdl, void* ); + DECL_LINK( SelectHdl, void* ); }; diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 9fbedaffad07..434c474b5211 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -75,9 +75,9 @@ private: String maSelectLockedCells; String maSelectUnlockedCells; - DECL_LINK( OKHdl, OKButton* ); + DECL_LINK( OKHdl, void* ); DECL_LINK( CheckBoxHdl, CheckBox* ); - DECL_LINK( PasswordModifyHdl, Edit* ); + DECL_LINK( PasswordModifyHdl, void* ); }; #endif diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 8ccbe9c0fd14..76c60499ea11 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -87,7 +87,7 @@ private: sal_uInt16 FindBaseItemPos( const String& rEntry, sal_uInt16 nStartPos ) const; DECL_LINK( SelectHdl, ListBox* ); - DECL_LINK( DblClickHdl, MultiListBox* ); + DECL_LINK( DblClickHdl, void* ); private: FixedLine maFlFunc; @@ -131,7 +131,7 @@ public: private: void Init( const ScDPLabelData& rLabelData, const ScDPFuncData& rFuncData ); - DECL_LINK( DblClickHdl, MultiListBox* ); + DECL_LINK(DblClickHdl, void *); DECL_LINK( RadioClickHdl, RadioButton* ); DECL_LINK( ClickHdl, PushButton* ); diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 5f460a4b564a..b4e3ae436198 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -245,12 +245,12 @@ private: // Handler DECL_LINK( ClickHdl, PushButton * ); - DECL_LINK( SelAreaHdl, ListBox * ); - DECL_LINK( MoreClickHdl, MoreButton * ); - DECL_LINK( EdModifyHdl, Edit * ); - DECL_LINK( EdInModifyHdl, Edit * ); - DECL_LINK( OkHdl, OKButton * ); - DECL_LINK( CancelHdl, CancelButton * ); + DECL_LINK( SelAreaHdl, void * ); + DECL_LINK( MoreClickHdl, void * ); + DECL_LINK( EdModifyHdl, void * ); + DECL_LINK( EdInModifyHdl, void * ); + DECL_LINK( OkHdl, void * ); + DECL_LINK( CancelHdl, void * ); DECL_LINK( GetFocusHdl, Control* ); }; diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 19250a728068..80a7d97a7328 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -113,9 +113,9 @@ private: String maTextHashGood; String maTextHashRegen; - DECL_LINK( OKHdl, OKButton* ); + DECL_LINK( OKHdl, void* ); DECL_LINK( RetypeBtnHdl, PushButton* ); - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( ScrollHdl, void* ); struct TableItem { @@ -164,10 +164,10 @@ private: RadioButton maBtnRemovePassword; - DECL_LINK( OKHdl, OKButton* ); + DECL_LINK( OKHdl, void* ); DECL_LINK( RadioBtnHdl, RadioButton* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); - DECL_LINK( PasswordModifyHdl, Edit* ); + DECL_LINK( CheckBoxHdl, void* ); + DECL_LINK( PasswordModifyHdl, void* ); ScPassHashProtectable* mpProtected; }; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 4da9411f3477..35e01717c88f 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -71,7 +71,7 @@ private: const String aDefScenarioName; sal_Bool bIsEdit; - DECL_LINK( OkHdl, OKButton * ); + DECL_LINK(OkHdl, void *); DECL_LINK( EnableHdl, CheckBox * ); }; diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 133d310c664e..e63823010db7 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -126,7 +126,7 @@ private: DECL_LINK( RbSepFixHdl, RadioButton* ); DECL_LINK( SeparatorHdl, Control* ); DECL_LINK( LbColTypeHdl, ListBox* ); - DECL_LINK( UpdateTextHdl, ScCsvTableBox* ); + DECL_LINK(UpdateTextHdl, void *); DECL_LINK( ColTypeHdl, ScCsvTableBox* ); }; diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 0d28b9e6f5ea..6991346559ce 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -62,9 +62,9 @@ class ScSolverOptionsDialog : public ModalDialog String maEngine; com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; - DECL_LINK( EngineSelectHdl, ListBox* ); - DECL_LINK( SettingsSelHdl, SvxCheckListBox* ); - DECL_LINK( SettingsDoubleClickHdl, SvTreeListBox* ); + DECL_LINK( EngineSelectHdl, void* ); + DECL_LINK( SettingsSelHdl, void* ); + DECL_LINK( SettingsDoubleClickHdl, void* ); DECL_LINK( ButtonHdl, PushButton* ); void ReadFromComponent(); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 86eb96f15b70..a782c631cc25 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -101,7 +101,7 @@ private: DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); + DECL_LINK( LoseFocusHdl, void* ); #endif // _SOLVERDLG_CXX }; diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 7c1870aa6cad..538b1ef089ca 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -70,8 +70,8 @@ private: void FillColorValueSets_Impl(); - DECL_LINK( TabBgColorDblClickHdl_Impl, ValueSet* ); - DECL_LINK( TabBgColorOKHdl_Impl, OKButton* pBtn ); + DECL_LINK(TabBgColorDblClickHdl_Impl, void *); + DECL_LINK(TabBgColorOKHdl_Impl, void *); }; #endif // SC_TABBGCOLORDLG_HXX diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 4f43614adde8..8ab26f9d9282 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -105,7 +105,7 @@ private: DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); + DECL_LINK( LoseFocusHdl, void* ); #endif // _TABOPDLG_CXX }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 09244bb10fd9..8879b07dbf43 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -190,7 +190,7 @@ private: void DoHSplit(long nSplitPos); void DoVSplit(long nSplitPos); - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK( TimerHdl, void* ); void UpdateVarZoom(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 05e68387d8ba..585206544afd 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -200,11 +200,11 @@ private: void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rSettings ); - DECL_LINK( SimpleRefClose, String* ); + DECL_LINK( SimpleRefClose, void* ); DECL_LINK( SimpleRefDone, String* ); DECL_LINK( SimpleRefAborted, String* ); DECL_LINK( SimpleRefChange, String* ); - DECL_LINK( FormControlActivated, FmFormShell* ); + DECL_LINK( FormControlActivated, void* ); protected: virtual void Activate(sal_Bool bMDI); diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 82fa4a67fcb4..27be357cef3e 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -65,7 +65,7 @@ private: CheckBox maBtnConvertDate; - DECL_LINK( OKHdl, OKButton* ); + DECL_LINK(OKHdl, void *); DECL_LINK( RadioHdl, RadioButton* ); }; diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 7369988ee4c1..ff71a2542008 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -56,7 +56,7 @@ private: void CheckPrefix(Edit* pEdit); void OnFocusPrefixInput(Edit* pEdit); - DECL_LINK( NumModifiedHdl, NumericField* ); + DECL_LINK(NumModifiedHdl, void *); DECL_LINK( PrefixModifiedHdl, Edit* ); DECL_LINK( PrefixEditOnFocusHdl, Edit* ); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 171b1a56af90..56c700ae6df6 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -67,9 +67,9 @@ private: #ifdef _TPHF_CXX private: - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK(BtnHdl, void *); DECL_LINK( HFEditHdl, void* ); - DECL_LINK( TurnOnHdl, CheckBox* ); + DECL_LINK(TurnOnHdl, void *); #endif }; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 7c1a994e1080..da0931f2e2c1 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -111,7 +111,7 @@ private: Link aMLink; sal_uInt16 nSelected; - SC_DLLPRIVATE DECL_LINK( TimerHdl, Timer*); + SC_DLLPRIVATE DECL_LINK( TimerHdl, void*); protected: diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index d72b9f306e4e..91f59dba2e1c 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -106,9 +106,9 @@ private: private: //------------------------------------ // Handler: - DECL_LINK( PageDirHdl, RadioButton* ); + DECL_LINK(PageDirHdl, void *); DECL_LINK( PageNoHdl, CheckBox* ); - DECL_LINK( ScaleHdl, ListBox* ); + DECL_LINK(ScaleHdl, void *); }; #endif // SC_TPTABLE_HXX diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 015b9177a33f..8e915d19250c 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -141,7 +141,7 @@ class ScTpLayoutOptions : public SfxTabPage DECL_LINK( CBHdl, CheckBox* ); - DECL_LINK(MetricHdl, ListBox*); + DECL_LINK(MetricHdl, void *); DECL_LINK( AlignHdl, CheckBox* ); ScDocument *pDoc; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 4ec56be58d54..9598f3caba4e 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -196,8 +196,8 @@ private: void SetFirstFormula( const String& rFmlaStr ); void SetSecondFormula( const String& rFmlaStr ); - DECL_LINK( SelectHdl, ListBox* ); - DECL_LINK( CheckHdl, CheckBox* ); + DECL_LINK(SelectHdl, void *); + DECL_LINK(CheckHdl, void *); FixedText maFtAllow; ListBox maLbAllow; @@ -220,7 +220,7 @@ private: String maStrList; sal_Unicode mcFmlaSep; /// List separator in formulas. - DECL_LINK( EditSetFocusHdl, Edit *); + DECL_LINK(EditSetFocusHdl, void *); DECL_LINK( KillFocusHdl, Window *); void OnClick( Button *pBtn ); formula::RefEdit* m_pRefEdit; @@ -296,8 +296,8 @@ private: void Init(); // Handler ------------------------ - DECL_LINK( SelectActionHdl, ListBox * ); - DECL_LINK( ClickSearchHdl, PushButton * ); + DECL_LINK(SelectActionHdl, void *); + DECL_LINK(ClickSearchHdl, void *); public: ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet ); diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 402cdab0fb24..f2ba7d536b0e 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -228,7 +228,7 @@ private: bool bPagebreak:1; // Seitenumbruch-Vorschaumodus bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click - SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, EditStatus*); + SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, void*); SC_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*); SC_DLLPRIVATE void CalcPPT(); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index af74297043d1..488d1a20bb34 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -916,7 +916,7 @@ IMPL_LINK( ScAcceptChgDlg, MinSizeHandle, SvxAcceptChgCtr*, pCtr ) return 0; } -IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle) { sal_uInt16 nId =ScSimpleRefDlgWrapper::GetChildWindowId(); @@ -1106,7 +1106,7 @@ void ScAcceptChgDlg::AcceptFiltered() } } -IMPL_LINK( ScAcceptChgDlg, RejectAllHandle, SvxTPView*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle) { SetPointer(Pointer(POINTER_WAIT)); bIgnoreMsg=true; @@ -1135,7 +1135,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectAllHandle, SvxTPView*, EMPTYARG ) return 0; } -IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle) { SetPointer(Pointer(POINTER_WAIT)); @@ -1161,7 +1161,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG ) return 0; } -IMPL_LINK( ScAcceptChgDlg, SelectHandle, SvxRedlinTable*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle) { if(!bNoSelection) aSelectionTimer.Start(); @@ -1694,7 +1694,7 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack) return 0; } -IMPL_LINK( ScAcceptChgDlg, ReOpenTimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, ReOpenTimerHdl) { ScSimpleRefDlgWrapper::SetAutoReOpen(true); aAcceptChgCtr.ShowFilterPage(); @@ -1703,7 +1703,7 @@ IMPL_LINK( ScAcceptChgDlg, ReOpenTimerHdl, Timer*, EMPTYARG ) return 0; } -IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl) { ScTabView* pTabView = pViewData->GetView(); @@ -1753,7 +1753,7 @@ IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) return 0; } -IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl) { const CommandEvent aCEvt(pTheView->GetCommandEvent()); @@ -1929,7 +1929,7 @@ void ScAcceptChgDlg::InitFilter() } } -IMPL_LINK( ScAcceptChgDlg, FilterModified, SvxTPFilter*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, FilterModified) { return 0; } diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index b0a4ad68575f..275bae5ad31a 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -898,7 +898,7 @@ void ScRefHandler::stateChanged(const StateChangedType nStateChange, const bool } } -IMPL_LINK( ScRefHandler, UpdateFocusHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl) { if (pActiveWin) { diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 3ef5ad488a88..f602f8f0fef5 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -555,7 +555,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) } } -IMPL_LINK( ScConflictsDlg, SelectHandle, SvxRedlinTable*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, SelectHandle) { if ( mbInSelectHdl || mbInDeselectHdl ) { @@ -570,7 +570,7 @@ IMPL_LINK( ScConflictsDlg, SelectHandle, SvxRedlinTable*, EMPTYARG ) return 0; } -IMPL_LINK( ScConflictsDlg, DeselectHandle, SvxRedlinTable*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, DeselectHandle) { if ( mbInDeselectHdl || mbInSelectHdl ) { @@ -584,7 +584,7 @@ IMPL_LINK( ScConflictsDlg, DeselectHandle, SvxRedlinTable*, EMPTYARG ) return 0; } -IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl) { if ( !mpViewData || !mpOwnDoc ) { @@ -673,28 +673,28 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) EndDialog( RET_OK ); } -IMPL_LINK( ScConflictsDlg, KeepMineHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, KeepMineHandle) { KeepHandler( true ); return 0; } -IMPL_LINK( ScConflictsDlg, KeepOtherHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, KeepOtherHandle) { KeepHandler( false ); return 0; } -IMPL_LINK( ScConflictsDlg, KeepAllMineHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, KeepAllMineHandle) { KeepAllHandler( true ); return 0; } -IMPL_LINK( ScConflictsDlg, KeepAllOthersHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle) { KeepAllHandler( false ); diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index 8b3a9637ebe3..7cc948d6e0a8 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -75,12 +75,12 @@ ScColOrRowDlg::~ScColOrRowDlg() //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScColOrRowDlg, OkHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScColOrRowDlg, OkHdl) { EndDialog( aBtnCols.IsChecked() ? SCRET_COLS : SCRET_ROWS ); return 0; } -IMPL_LINK_INLINE_END( ScColOrRowDlg, OkHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScColOrRowDlg, OkHdl) diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 26d6a21ba4d2..1e933e3dc345 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -708,7 +708,7 @@ sal_Bool ScColRowNameRangesDlg::IsRefInputMode() const #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, OkBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl) { AddBtnHdl( 0 ); @@ -740,12 +740,12 @@ IMPL_LINK( ScColRowNameRangesDlg, OkBtnHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK_INLINE_START( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScColRowNameRangesDlg, CancelBtnHdl) { Close(); return 0; } -IMPL_LINK_INLINE_END( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScColRowNameRangesDlg, CancelBtnHdl) /************************************************************************* @@ -764,7 +764,7 @@ IMPL_LINK_INLINE_END( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl) { String aNewArea( aEdAssign.GetText() ); String aNewData( aEdAssign2.GetText() ); @@ -836,7 +836,7 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) { String aRangeStr = aLbRange.GetSelectEntry(); sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos(); @@ -914,7 +914,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl) { sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos(); sal_uInt16 nCnt = aLbRange.GetEntryCount(); @@ -999,7 +999,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl) { String aNewArea( aEdAssign.GetText() ); sal_Bool bValid = false; @@ -1048,7 +1048,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, Range2DataModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl) { String aNewData( aEdAssign2.GetText() ); if ( aNewData.Len() > 0 ) @@ -1086,7 +1086,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range2DataModifyHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl) { if ( !aBtnColHead.GetSavedValue() ) { @@ -1124,7 +1124,7 @@ IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, RowClickHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl) { if ( !aBtnRowHead.GetSavedValue() ) { @@ -1162,7 +1162,7 @@ IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl ) } -IMPL_LINK( ScColRowNameRangesDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); return 0; diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 698eb7bc674a..9f0f3189175f 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -277,7 +277,7 @@ IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl) { ScViewData* pViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -311,7 +311,7 @@ IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_PrevHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_PrevHdl) { if (pDoc) { @@ -324,7 +324,7 @@ IMPL_LINK( ScDataFormDlg, Impl_PrevHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_NextHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_NextHdl) { if (pDoc) { @@ -337,7 +337,7 @@ IMPL_LINK( ScDataFormDlg, Impl_NextHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_RestoreHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_RestoreHdl) { if (pDoc) { @@ -346,7 +346,7 @@ IMPL_LINK( ScDataFormDlg, Impl_RestoreHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_DeleteHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_DeleteHdl) { ScViewData* pViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -366,13 +366,13 @@ IMPL_LINK( ScDataFormDlg, Impl_DeleteHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_CloseHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_CloseHdl) { EndDialog( ); return 0; } -IMPL_LINK( ScDataFormDlg, Impl_ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_ScrollHdl) { long nOffset = aSlider.GetThumbPos(); nCurrentRow = nStartRow + nOffset + 1; diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index bdfd61a92b6d..7b0ec9af45f6 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -163,13 +163,13 @@ void ScDeleteContentsDlg::DisableObjects() //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScDeleteContentsDlg, DelAllHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl) { DisableChecks( aBtnDelAll.IsChecked() ); return 0; } -IMPL_LINK_INLINE_END( ScDeleteContentsDlg, DelAllHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScDeleteContentsDlg, DelAllHdl) ScDeleteContentsDlg::~ScDeleteContentsDlg() { diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 3ad18a385b45..c045587dcce5 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -319,7 +319,7 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) //---------------------------------------------------------------------------- -IMPL_LINK( ScFillSeriesDlg, OKHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) { if ( aBtnLeft.IsChecked() ) theFillDir = FILL_TO_LEFT; else if ( aBtnRight.IsChecked() ) theFillDir = FILL_TO_RIGHT; diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 180f16bb8647..ad88914d9fd9 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -317,14 +317,14 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) //------------------------------------------------------------------------ -IMPL_LINK( ScInsertContentsDlg, InsAllHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl) { DisableChecks( aBtnInsAll.IsChecked() ); return 0; } -IMPL_LINK( ScInsertContentsDlg, LinkBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl) { TestModes(); diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 70d681ceacdb..03119c05187b 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -272,7 +272,7 @@ const String* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) // Handler: //------------------------------------------------------------------------ -IMPL_LINK( ScInsertTableDlg, CountHdl_Impl, NumericField*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) { nTableCount = static_cast<SCTAB>(aNfCount.GetValue()); if ( nTableCount==1) @@ -297,7 +297,7 @@ IMPL_LINK( ScInsertTableDlg, CountHdl_Impl, NumericField*, EMPTYARG ) } //------------------------------------------------------------------------ -IMPL_LINK( ScInsertTableDlg, ChoiceHdl_Impl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) { if ( aBtnNew.IsChecked() ) SetNewTable_Impl(); @@ -310,7 +310,7 @@ IMPL_LINK( ScInsertTableDlg, ChoiceHdl_Impl, RadioButton*, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScInsertTableDlg, BrowseHdl_Impl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) { if ( pDocInserter ) delete pDocInserter; @@ -322,7 +322,7 @@ IMPL_LINK( ScInsertTableDlg, BrowseHdl_Impl, PushButton*, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScInsertTableDlg, SelectHdl_Impl, MultiListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl) { DoEnable_Impl(); return 0; @@ -338,7 +338,7 @@ void ScInsertTableDlg::DoEnable_Impl() aBtnOk.Disable(); } -IMPL_LINK( ScInsertTableDlg, DoEnterHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) { if(nTableCount > 1 || rDoc.ValidTabName(aEdName.GetText())) { @@ -352,7 +352,7 @@ IMPL_LINK( ScInsertTableDlg, DoEnterHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScInsertTableDlg, BrowseTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, BrowseTimeoutHdl) { bMustClose = true; BrowseHdl_Impl( &aBtnBrowse ); diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index c59719f6a8f5..fc8c6ce88190 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -80,12 +80,12 @@ String ScSelEntryDlg::GetSelectEntry() const //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScSelEntryDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScSelEntryDlg, DblClkHdl) { EndDialog( RET_OK ); return 0; } -IMPL_LINK_INLINE_END( ScSelEntryDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScSelEntryDlg, DblClkHdl) //------------------------------------------------------------------------ diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 6298afcc6146..234df1b5c273 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -107,7 +107,7 @@ short ScLinkedAreaDlg::Execute() #define FILTERNAME_HTML "HTML (StarCalc)" #define FILTERNAME_QUERY "calc_HTML_WebQuery" -IMPL_LINK( ScLinkedAreaDlg, BrowseHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( @@ -116,7 +116,7 @@ IMPL_LINK( ScLinkedAreaDlg, BrowseHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScLinkedAreaDlg, FileHdl, ComboBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) { rtl::OUString aEntered = aCbUrl.GetURL(); if (pSourceShell) @@ -210,13 +210,13 @@ void ScLinkedAreaDlg::InitFromOldLink( const String& rFile, const String& rFilte UpdateEnable(); } -IMPL_LINK( ScLinkedAreaDlg, RangeHdl, MultiListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl) { UpdateEnable(); return 0; } -IMPL_LINK( ScLinkedAreaDlg, ReloadHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl) { UpdateEnable(); return 0; diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index ae535590eec5..91eb54c7bec5 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -160,7 +160,7 @@ void ScMetricInputDlg::CalcPositions() //------------------------------------------------------------------------ // Handler: -IMPL_LINK( ScMetricInputDlg, SetDefValHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) { if ( aBtnDefVal.IsChecked() ) { @@ -174,12 +174,12 @@ IMPL_LINK( ScMetricInputDlg, SetDefValHdl, CheckBox *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScMetricInputDlg, ModifyHdl, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl) { aBtnDefVal.Check( nDefaultValue == aEdValue.GetValue() ); return 0; } -IMPL_LINK_INLINE_END( ScMetricInputDlg, ModifyHdl, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScMetricInputDlg, ModifyHdl) diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 831905d1ea55..4287e20fcbe1 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -283,7 +283,7 @@ IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, void *, pBtn ) return 0; } -IMPL_LINK( ScMoveTableDlg, OkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl) { sal_uInt16 nDocSel = aLbDoc.GetSelectEntryPos(); sal_uInt16 nDocLast = aLbDoc.GetEntryCount()-1; diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 0cb5e3a1707c..fb34d8584107 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -625,7 +625,7 @@ IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScOptSolverDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl) { mbDlgLostFocus = !IsActive(); return 0; @@ -663,7 +663,7 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) //---------------------------------------------------------------------------- -IMPL_LINK( ScOptSolverDlg, TargetModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl) { // modify handler for the target edit: // select "Value of" if something is input into the edit @@ -672,7 +672,7 @@ IMPL_LINK( ScOptSolverDlg, TargetModifyHdl, Edit*, EMPTYARG ) return 0; } -IMPL_LINK( ScOptSolverDlg, CondModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, CondModifyHdl) { // modify handler for the condition edits, just to enable/disable "delete" buttons ReadConditions(); @@ -680,7 +680,7 @@ IMPL_LINK( ScOptSolverDlg, CondModifyHdl, Edit*, EMPTYARG ) return 0; } -IMPL_LINK( ScOptSolverDlg, SelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, SelectHdl) { // select handler for operator list boxes, just to enable/disable "delete" buttons ReadConditions(); @@ -688,7 +688,7 @@ IMPL_LINK( ScOptSolverDlg, SelectHdl, ListBox*, EMPTYARG ) return 0; } -IMPL_LINK( ScOptSolverDlg, ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, ScrollHdl) { ReadConditions(); nScrollPos = maScrollBar.GetThumbPos(); diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 0d8ed83d701c..2ed31823c4a0 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -146,13 +146,13 @@ IMPL_LINK( ScTableProtectionDlg, CheckBoxHdl, CheckBox*, pBtn ) return 0; } -IMPL_LINK( ScTableProtectionDlg, OKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTableProtectionDlg, OKHdl) { EndDialog(RET_OK); return 0; } -IMPL_LINK( ScTableProtectionDlg, PasswordModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(ScTableProtectionDlg, PasswordModifyHdl) { String aPass1 = maPassword1Edit.GetText(); String aPass2 = maPassword2Edit.GetText(); diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index c18910293a1e..d12e5836c5db 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -332,7 +332,7 @@ void ScRetypePassDlg::CheckHashStatus() maBtnOk.Disable(); } -IMPL_LINK( ScRetypePassDlg, OKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassDlg, OKHdl) { EndDialog(RET_OK); return 0; @@ -394,7 +394,7 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) return 0; } -IMPL_LINK( ScRetypePassDlg, ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassDlg, ScrollHdl) { ResetTableRows(); return 0; @@ -498,7 +498,7 @@ void ScRetypePassInputDlg::CheckPasswordInput() maBtnOk.Enable(bPassGood); } -IMPL_LINK( ScRetypePassInputDlg, OKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassInputDlg, OKHdl) { EndDialog(RET_OK); return 0; @@ -530,13 +530,13 @@ IMPL_LINK( ScRetypePassInputDlg, RadioBtnHdl, RadioButton*, pBtn ) return 0; } -IMPL_LINK( ScRetypePassInputDlg, CheckBoxHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl) { CheckPasswordInput(); return 0; } -IMPL_LINK( ScRetypePassInputDlg, PasswordModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassInputDlg, PasswordModifyHdl) { CheckPasswordInput(); return 0; diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 074cbe392185..cb8198cb2dda 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -197,7 +197,7 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) { if ( bCoreDataChanged ) ScGlobal::GetOrCreateAutoFormat()->Save(); @@ -205,7 +205,7 @@ IMPL_LINK_INLINE_START( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG ) EndDialog( RET_OK ); return 0; } -IMPL_LINK_INLINE_END( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScAutoFormatDlg, DblClkHdl) //------------------------------------------------------------------------ @@ -240,7 +240,7 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) //------------------------------------------------------------------------ -IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) { if ( !bFmtInserted && pSelFmtData ) { @@ -314,7 +314,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScAutoFormatDlg, RemoveHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) { if ( (nIndex > 0) && (aLbFormat.GetEntryCount() > 0) ) { @@ -352,7 +352,7 @@ IMPL_LINK( ScAutoFormatDlg, RemoveHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) { sal_Bool bOk = false; while( !bOk ) @@ -439,7 +439,7 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScAutoFormatDlg, SelFmtHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) { nIndex = aLbFormat.GetSelectEntryPos(); UpdateChecks(); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 48911952bf76..8c5052042bda 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -100,7 +100,7 @@ ScShareDocumentDlg::~ScShareDocumentDlg() { } -IMPL_LINK( ScShareDocumentDlg, ToggleHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScShareDocumentDlg, ToggleHandle) { maFtWarning.Enable( maCbShare.IsChecked() ); diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 067ee1a510f7..e56f66024e60 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -95,12 +95,12 @@ sal_uInt16 ScShowTabDlg::GetSelectEntryPos(sal_uInt16 nPos) const //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScShowTabDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScShowTabDlg, DblClkHdl) { EndDialog( RET_OK ); return 0; } -IMPL_LINK_INLINE_END( ScShowTabDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScShowTabDlg, DblClkHdl) ScShowTabDlg::~ScShowTabDlg() { diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index bcf543efa1e3..982064e2ac3d 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -227,7 +227,7 @@ void ScSimpleRefDlg::RefInputDone( sal_Bool bForced) //------------------------------------------------------------------------ // Handler: // ======== -IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) { bAutoReOpen=false; String aResult=aEdAssign.GetText(); @@ -239,7 +239,7 @@ IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG ) } //------------------------------------------------------------------------ -IMPL_LINK( ScSimpleRefDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) { bAutoReOpen=false; String aResult=aEdAssign.GetText(); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index d3cd0989f8bb..06f1d75e87cb 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -371,13 +371,13 @@ IMPL_LINK( ScSolverOptionsDialog, ButtonHdl, PushButton*, pBtn ) return 0; } -IMPL_LINK( ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl) { EditOption(); return 0; } -IMPL_LINK( ScSolverOptionsDialog, EngineSelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl) { sal_uInt16 nSelectPos = maLbEngine.GetSelectEntryPos(); if ( nSelectPos < maImplNames.getLength() ) @@ -393,7 +393,7 @@ IMPL_LINK( ScSolverOptionsDialog, EngineSelectHdl, ListBox*, EMPTYARG ) return 0; } -IMPL_LINK( ScSolverOptionsDialog, SettingsSelHdl, SvxCheckListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) { sal_Bool bCheckbox = false; diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index d51785cf45db..caef25513e2f 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -304,7 +304,7 @@ IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScSolverDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); return 0; diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 7ca031d6049d..a3802f4f303b 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -140,7 +140,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl() aTabBgColorSet.Resize(); } -IMPL_LINK( ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl) /* Handler, called when color selection is changed */ @@ -152,7 +152,7 @@ IMPL_LINK( ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, EMPTYARG ) return 0; } -IMPL_LINK( ScTabBgColorDlg, TabBgColorOKHdl_Impl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl) { // Handler, called when the OK button is pushed diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 9fc476041e7f..e9fb8d6b9124 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -358,7 +358,7 @@ IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScTabOpDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); return 0; diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 4b989474085d..a9795d560a08 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -369,37 +369,37 @@ void ScNameDefDlg::MorePushed() MoveWindow(maFlDiv, nPixel); } -IMPL_LINK( ScNameDefDlg, CancelBtnHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScNameDefDlg, CancelBtnHdl) { CancelPushed(); return 0; } -IMPL_LINK( ScNameDefDlg, AddBtnHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScNameDefDlg, AddBtnHdl) { AddPushed(); return 0; }; -IMPL_LINK( ScNameDefDlg, NameModifyHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScNameDefDlg, NameModifyHdl) { IsNameValid(); return 0; } -IMPL_LINK( ScNameDefDlg, EdModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDefDlg, EdModifyHdl) { IsNameValid(); return 0; } -IMPL_LINK( ScNameDefDlg, AssignGetFocusHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDefDlg, AssignGetFocusHdl) { EdModifyHdl( &maEdRange ); return 0; } -IMPL_LINK( ScNameDefDlg, MoreBtnHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScNameDefDlg, MoreBtnHdl) { MorePushed(); return 0; diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 7baccb528f48..72d95ba88cff 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -544,54 +544,54 @@ void ScNameDlg::GetRangeNames(boost::ptr_map<rtl::OUString, ScRangeName>& rRange maRangeMap.swap(rRangeMap); } -IMPL_LINK( ScNameDlg, OkBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, OkBtnHdl) { Close(); return 0; } -IMPL_LINK( ScNameDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, CancelBtnHdl) { CancelPushed(); return 0; } -IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, AddBtnHdl) { return AddPushed(); } -IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, RemoveBtnHdl) { RemovePushed(); return 0; } -IMPL_LINK( ScNameDlg, EdModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl) { NameModified(); return 0; } -IMPL_LINK( ScNameDlg, AssignGetFocusHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, AssignGetFocusHdl) { EdModifyHdl( &maEdAssign ); return 0; } -IMPL_LINK( ScNameDlg, SelectionChangedHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, SelectionChangedHdl_Impl) { SelectionChanged(); return 0; } -IMPL_LINK( ScNameDlg, ScopeChangedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, ScopeChangedHdl) { ScopeChanged(); return 0; } -IMPL_LINK( ScNameDlg, MoreBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, MoreBtnHdl) { MorePushed(); return 0; diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index b94d8ae2db3d..d806d3bcdf6d 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -265,7 +265,7 @@ void CalculateItemSize(const long& rTableSize, long& rItemNameSize, long& rItemR } -IMPL_LINK( ScRangeManagerTable, HeaderEndDragHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScRangeManagerTable, HeaderEndDragHdl) { long aTableSize = maHeaderBar.GetSizePixel().Width(); long aItemNameSize = maHeaderBar.GetItemSize(ITEMID_NAME); @@ -289,7 +289,7 @@ IMPL_LINK( ScRangeManagerTable, HeaderEndDragHdl, void*, EMPTYARG) return 0; } -IMPL_LINK( ScRangeManagerTable, ScrollHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl) { CheckForFormulaString(); return 0; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 6b9b620af35c..0e4d4ac93b28 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -278,7 +278,7 @@ String lcl_GetDBAreaRange( ScDocument* pDoc, const String& rDBName ) return aRet; } -IMPL_LINK( ScContentTree, ContentDoubleClickHdl, ScContentTree *, EMPTYARG ) +IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl) { sal_uInt16 nType; sal_uLong nChild; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 7dc61361e085..c6d4afa0eed4 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -454,7 +454,7 @@ void CommandToolBox::Click() //------------------------------------------------------------------------ -IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl) { // Das Popupmenue fuer den Dropmodus muss im Click (Button Down) // statt im Select (Button Up) aufgerufen werden. diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index fa1ea3bc69ed..7e2d8031798e 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -216,7 +216,7 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ ) } -IMPL_LINK( ScRedlineOptionsTabPage, ColorHdl, ColorListBox *, EMPTYARG ) +IMPL_LINK_NOARG(ScRedlineOptionsTabPage, ColorHdl) { return 0; } diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index ba294c542377..73f046bee774 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -150,7 +150,7 @@ void ScTpDefaultsOptions::OnFocusPrefixInput(Edit* pEdit) } -IMPL_LINK( ScTpDefaultsOptions, NumModifiedHdl, NumericField*, EMPTYARG ) +IMPL_LINK_NOARG(ScTpDefaultsOptions, NumModifiedHdl) { CheckNumSheets(); return 0; diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index c237288e1b9b..0300020cc35e 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -655,7 +655,7 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) return SfxTabPage::LEAVE_PAGE; } -IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG) +IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl) { const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos(); if(nMPos != USHRT_MAX) diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 72fbfc28ebd7..cb0b575bda46 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -180,7 +180,7 @@ void ScHFPage::DeactivatePage() // Handler: //------------------------------------------------------------------ -IMPL_LINK( ScHFPage, TurnOnHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) { SvxHFPage::TurnOnHdl( &aTurnOnBox ); @@ -195,7 +195,7 @@ IMPL_LINK( ScHFPage, TurnOnHdl, CheckBox*, EMPTYARG ) //------------------------------------------------------------------ -IMPL_LINK( ScHFPage, BtnHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScHFPage, BtnHdl) { // Wenn der Bearbeiten-Dialog direkt aus dem Click-Handler des Buttons // aufgerufen wird, funktioniert im Bearbeiten-Dialog unter OS/2 das @@ -206,7 +206,7 @@ IMPL_LINK( ScHFPage, BtnHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScHFPage, HFEditHdl) { SfxViewShell* pViewSh = SfxViewShell::Current(); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 0d6211ac9da5..eb8ea2b625bc 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -429,7 +429,7 @@ long ScExtIButton::PreNotify( NotifyEvent& rNEvt ) return ImageButton::PreNotify(rNEvt ); } -IMPL_LINK( ScExtIButton, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScExtIButton, TimerHdl) { StartPopup(); return 0; diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 88d34347ed64..4c6a29b97eb0 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -422,7 +422,7 @@ void ScTablePage::DataChanged( const DataChangedEvent& rDCEvt ) // Handler: //------------------------------------------------------------------------ -IMPL_LINK( ScTablePage, PageDirHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTablePage, PageDirHdl) { ShowImage(); return 0; @@ -446,7 +446,7 @@ IMPL_LINK( ScTablePage, PageNoHdl, CheckBox*, pBtn ) //------------------------------------------------------------------------ -IMPL_LINK( ScTablePage, ScaleHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScTablePage, ScaleHdl) { // controls for "Reduce/enlarge" bool bPercent = (aLbScaleMode.GetSelectEntryPos() == SC_TPTABLE_SCALE_PERCENT); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 1e1f98308247..8f76bf6837c0 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2418,7 +2418,7 @@ void ScCellShell::ExecuteSubtotals(SfxRequest& rReq) delete pDlg; } -IMPL_LINK( ScCellShell, DialogClosed, AbstractScLinkedAreaDlg*, EMPTYARG ) +IMPL_LINK_NOARG(ScCellShell, DialogClosed) { OSL_ENSURE( pImpl->m_pLinkedDlg, "ScCellShell::DialogClosed(): invalid request" ); OSL_ENSURE( pImpl->m_pRequest, "ScCellShell::DialogClosed(): invalid request" ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 02200bbbc2bc..0d020fc6a5de 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -531,7 +531,7 @@ void ScGridWindow::ClickExtern() } } -IMPL_LINK( ScGridWindow, PopupModeEndHdl, FloatingWindow*, EMPTYARG ) +IMPL_LINK_NOARG(ScGridWindow, PopupModeEndHdl) { if (pFilterBox) pFilterBox->SetCancelled(); // nicht mehr auswaehlen diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 4d28f7c85442..233afcd811a7 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -82,7 +82,7 @@ ScNoteMarker::~ScNoteMarker() delete pModel; } -IMPL_LINK( ScNoteMarker, TimeHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScNoteMarker, TimeHdl) { if (!bVisible) { diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 8e8124aedc4f..a2784e14cfa9 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -359,7 +359,7 @@ void ScTabView::ResetTimer() pTimerWindow = NULL; } -IMPL_LINK( ScTabView, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabView, TimerHdl) { if (pTimerWindow) pTimerWindow->MouseMove( aTimerMEvt ); @@ -897,7 +897,7 @@ void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ ) ::std::swap( rBorder.Left(), rBorder.Right() ); } -IMPL_LINK( ScTabView, TabBarResize, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabView, TabBarResize) { sal_Bool bHScrollMode = aViewData.IsHScrollMode(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index f8e2ab84d788..cf93d15309bb 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1018,7 +1018,7 @@ void ScTabViewShell::SetFormShellAtTop( sal_Bool bSet ) } } -IMPL_LINK( ScTabViewShell, FormControlActivated, FmFormShell*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabViewShell, FormControlActivated) { // a form control got the focus, so the form shell has to be on top SetFormShellAtTop( sal_True ); @@ -1125,7 +1125,7 @@ void ScTabViewShell::StopEditShell() // close handler to ensure function of dialog: -IMPL_LINK( ScTabViewShell, SimpleRefClose, String*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose) { SfxInPlaceClient* pClient = GetIPClient(); if ( pClient && pClient->IsObjectInPlaceActive() ) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index a220fdf010f6..a0f4cdf987e8 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1088,11 +1088,11 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // needed, wenn position changed } -IMPL_LINK_INLINE_START( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScViewData, EmptyEditHdl) { return 0; } -IMPL_LINK_INLINE_END( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScViewData, EmptyEditHdl) IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus ) { diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 68abbec64ff9..c8a90e8081c5 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -1534,7 +1534,7 @@ void lcl_Pivot( FixedText& aTimeText ) // 30 } } -IMPL_LINK(MyWindow, CountHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, CountHdl) { long nCount = aCountField.GetValue(); @@ -1645,7 +1645,7 @@ IMPL_LINK(MyWindow, CountHdl, PushButton*, EMPTYARG) //----------------------------------------------------------------------- -IMPL_LINK(MyWindow, TextHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, TextHdl) { sal_uInt16 nCol = (sal_uInt16)aColField.GetValue(); sal_uInt16 nRow = (sal_uInt16)aRowField.GetValue(); @@ -1694,7 +1694,7 @@ IMPL_LINK(MyWindow, TextHdl, PushButton*, EMPTYARG) //----------------------------------------------------------------------- -IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, BlaHdl) { aTimeText.SetText("..."); @@ -1768,7 +1768,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG) //----------------------------------------------------------------------- -IMPL_LINK(MyWindow, TabHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, TabHdl) { String aResult; @@ -1861,7 +1861,7 @@ void lcl_FillCells(XCellCollectionRef xColl) } } -IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, ViewHdl) { XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model XInterfaceRef xInt = lcl_GetView(); diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 6acd804369cf..a55acd3fab22 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -436,7 +436,7 @@ protected: void lockRebuilds(); void unlockRebuilds(); - DECL_LINK( onTimerHdl, Timer * ); + DECL_LINK(onTimerHdl, void *); virtual void implRebuild(); diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 7e087f581681..1e4b739d5ed3 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -204,8 +204,8 @@ private: void FillOnlineSpellingList(SdPage* pPage); void SpellObject(SdrTextObj* pObj); - DECL_LINK(WorkStartupHdl, Timer*); - DECL_LINK(OnlineSpellingHdl, Timer*); + DECL_LINK(WorkStartupHdl, void *); + DECL_LINK(OnlineSpellingHdl, void *); DECL_LINK(OnlineSpellEventHdl, EditStatus*); std::vector< rtl::OUString > maAnnotationAuthors; diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index bffb1490dec3..9f99d1e7ab7b 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -3685,7 +3685,7 @@ bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const :: // -------------------------------------------------------------------- -IMPL_LINK( MainSequence, onTimerHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(MainSequence, onTimerHdl) { if( mbTimerMode ) { diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index be9f2d11ca49..fb928e81b0ea 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -957,7 +957,7 @@ LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const |* \************************************************************************/ -IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl) { if( mpDocSh ) mpDocSh->SetWaitCursor( sal_True ); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 232f65c63637..4fd109934688 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -868,7 +868,7 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage) |* \************************************************************************/ -IMPL_LINK(SdDrawDocument, OnlineSpellingHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl) { if (mpOnlineSpellingList!=NULL && ( !mbOnlineSpell || mpOnlineSpellingList->hasMore())) diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 94198132cef3..9a6681d5481f 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -382,7 +382,7 @@ public: SdDesignNameDlg(Window* pWindow, const String& aName ); String GetDesignName(); - DECL_LINK( ModifyHdl, Edit* ); + DECL_LINK(ModifyHdl, void *); }; // ********************************************************************* @@ -1012,7 +1012,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) // ===================================================================== // Clickhandler fuer die auswahl eines Designs // ===================================================================== -IMPL_LINK( SdPublishingDlg, DesignSelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl) { sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos(); m_pDesign = &m_aDesignList[nPos]; @@ -1029,7 +1029,7 @@ IMPL_LINK( SdPublishingDlg, DesignSelectHdl, ListBox *, EMPTYARG ) // ===================================================================== // Clickhandler fuer das loeschen eines Designs // ===================================================================== -IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl) { sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos(); @@ -1080,7 +1080,7 @@ IMPL_LINK( SdPublishingDlg, GfxFormatHdl, RadioButton *, pButton ) // ===================================================================== // Clickhandler fuer die Radiobuttons Stanrard/Frames // ===================================================================== -IMPL_LINK( SdPublishingDlg, BaseHdl, RadioButton *, EMPTYARG ) +IMPL_LINK_NOARG(SdPublishingDlg, BaseHdl) { UpdatePage(); @@ -1090,7 +1090,7 @@ IMPL_LINK( SdPublishingDlg, BaseHdl, RadioButton *, EMPTYARG ) // ===================================================================== // Clickhandler fuer die CheckBox der Titelseite // ===================================================================== -IMPL_LINK( SdPublishingDlg, ContentHdl, RadioButton *, EMPTYARG ) +IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl) { if(pPage2_Content->IsChecked()) { @@ -1126,7 +1126,7 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, RadioButton *, pButton ) // ===================================================================== // Clickhandler fuer das ValueSet mit den Bitmap Schaltflaechen // ===================================================================== -IMPL_LINK( SdPublishingDlg, ButtonsHdl, ValueSet *, EMPTYARG ) +IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl) { // wird eine Bitmap Schaltflaeche gewaehlt, TexOnly ausschalten pPage5_TextOnly->Check(sal_False); @@ -1178,7 +1178,7 @@ IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton) return 0; } -IMPL_LINK( SdPublishingDlg, SlideChgHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(SdPublishingDlg, SlideChgHdl) { UpdatePage(); return 0; @@ -1187,7 +1187,7 @@ IMPL_LINK( SdPublishingDlg, SlideChgHdl, RadioButton*, EMPTYARG ) // ===================================================================== // Clickhandler fuer den Ok Button // ===================================================================== -IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl) { //Ende SdPublishingDesign* pDesign = new SdPublishingDesign(); @@ -1436,7 +1436,7 @@ void SdPublishingDlg::LoadPreviewButtons() // ===================================================================== // Clickhandler fuer den Weiter Button // ===================================================================== -IMPL_LINK( SdPublishingDlg, NextPageHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SdPublishingDlg, NextPageHdl) { aAssistentFunc.NextPage(); ChangePage(); @@ -1589,7 +1589,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) // ===================================================================== // Clickhandler fuer den Zurueck Button // ===================================================================== -IMPL_LINK( SdPublishingDlg, LastPageHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl) { aAssistentFunc.PreviousPage(); ChangePage(); @@ -1708,7 +1708,7 @@ String SdDesignNameDlg::GetDesignName() return m_aEdit.GetText(); } -IMPL_LINK( SdDesignNameDlg, ModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(SdDesignNameDlg, ModifyHdl) { m_aBtnOK.Enable(m_aEdit.GetText().Len() != 0); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 2e834a158cbc..fca04ea80fa3 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -1069,7 +1069,7 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWin -IMPL_LINK(AccessibleSlideSorterView::Implementation, SelectionChangeListener, void*, EMPTYARG ) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, SelectionChangeListener) { if (mnSelectionChangeUserEventId == 0) mnSelectionChangeUserEventId = Application::PostUserEvent( @@ -1080,7 +1080,7 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, SelectionChangeListener, vo -IMPL_LINK(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange, void*, EMPTYARG ) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange) { mnSelectionChangeUserEventId = 0; mrAccessibleSlideSorter.FireAccessibleEvent( @@ -1093,7 +1093,7 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange, v -IMPL_LINK(AccessibleSlideSorterView::Implementation, FocusChangeListener, void*, EMPTYARG ) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener) { sal_Int32 nNewFocusedIndex ( mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex()); @@ -1126,7 +1126,7 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, FocusChangeListener, void*, -IMPL_LINK(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, void*, EMPTYARG ) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback) { mnUpdateChildrenUserEventId = 0; UpdateChildren(); @@ -1137,7 +1137,7 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, voi -IMPL_LINK(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, void*, EMPTYARG ) +IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, VisibilityChangeListener) { UpdateChildren(); return 1; diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 5ba91acf6b54..2d3933a92045 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -91,7 +91,7 @@ public: void SetDoubleClickLink( const Link& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; } - DECL_LINK( implDoubleClickHdl, Control* ); + DECL_LINK(implDoubleClickHdl, void *); private: virtual void UserDraw( const UserDrawEvent& rUDEvt ); @@ -153,7 +153,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) // -------------------------------------------------------------------- -IMPL_LINK( CategoryListBox, implDoubleClickHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(CategoryListBox, implDoubleClickHdl) { CaptureMouse(); return 0; @@ -609,14 +609,14 @@ double CustomAnimationCreateDialog::getSelectedDuration() const return getCurrentPage()->getDuration(); } -IMPL_LINK( CustomAnimationCreateDialog, implActivatePagekHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(CustomAnimationCreateDialog, implActivatePagekHdl) { getCurrentPage()->setDuration( mfDuration ); getCurrentPage()->setIsPreview( mbIsPreview ); return 1; } -IMPL_LINK( CustomAnimationCreateDialog, implDeactivatePagekHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(CustomAnimationCreateDialog, implDeactivatePagekHdl) { mfDuration = getCurrentPage()->getDuration(); mbIsPreview = getCurrentPage()->getIsPreview(); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index 5a425abeb882..45dee93f3363 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -63,8 +63,8 @@ private: void setPosition(); void storePosition(); - DECL_LINK( implActivatePagekHdl, Control* ); - DECL_LINK( implDeactivatePagekHdl, Control* ); + DECL_LINK(implActivatePagekHdl, void *); + DECL_LINK(implDeactivatePagekHdl, void *); private: CustomAnimationPane* mpPane; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index face5435e487..d1820317739e 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -551,7 +551,7 @@ public: virtual Control* getControl(); DECL_LINK( implMenuSelectHdl, MenuButton* ); - DECL_LINK( implModifyHdl, Control* ); + DECL_LINK(implModifyHdl, void *); void updateMenu(); @@ -610,7 +610,7 @@ void TransparencyPropertyBox::updateMenu() // -------------------------------------------------------------------- -IMPL_LINK( TransparencyPropertyBox, implModifyHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(TransparencyPropertyBox, implModifyHdl) { updateMenu(); maModifyHdl.Call(mpMetric); @@ -673,7 +673,7 @@ public: virtual Control* getControl(); DECL_LINK( implMenuSelectHdl, MenuButton* ); - DECL_LINK( implModifyHdl, Control* ); + DECL_LINK(implModifyHdl, void *); void updateMenu(); @@ -734,7 +734,7 @@ void RotationPropertyBox::updateMenu() // -------------------------------------------------------------------- -IMPL_LINK( RotationPropertyBox, implModifyHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(RotationPropertyBox, implModifyHdl) { updateMenu(); maModifyHdl.Call(mpMetric); @@ -814,7 +814,7 @@ public: virtual Control* getControl(); DECL_LINK( implMenuSelectHdl, MenuButton* ); - DECL_LINK( implModifyHdl, Control* ); + DECL_LINK(implModifyHdl, void *); void updateMenu(); @@ -874,7 +874,7 @@ void ScalePropertyBox::updateMenu() // -------------------------------------------------------------------- -IMPL_LINK( ScalePropertyBox, implModifyHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScalePropertyBox, implModifyHdl) { updateMenu(); maModifyHdl.Call(mpMetric); @@ -2211,7 +2211,7 @@ public: void update( STLPropertySet* pSet ); void updateControlStates(); - DECL_LINK( implSelectHdl, Control* ); + DECL_LINK(implSelectHdl, void *); private: FixedText maFTGroupText; @@ -2375,7 +2375,7 @@ void CustomAnimationTextAnimTabPage::updateControlStates() } } -IMPL_LINK( CustomAnimationTextAnimTabPage, implSelectHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl) { updateControlStates(); return 0; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 4b5df8b29761..5ce6b395dcdb 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2187,7 +2187,7 @@ void CustomAnimationPane::onChangeSpeed() } /// this link is called when the property box is modified by the user -IMPL_LINK( CustomAnimationPane, implPropertyHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl) { onChangeProperty(); return 0; @@ -2229,7 +2229,7 @@ IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl ) return 0; } -IMPL_LINK(CustomAnimationPane, lateInitCallback, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(CustomAnimationPane, lateInitCallback) { // Call getPresets() to initiate the (expensive) construction of the // presets list. diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index b3166080560c..0b59daf8b511 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -123,9 +123,9 @@ private: bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const ::com::sun::star::uno::Any& rValue ); DECL_LINK( implControlHdl, Control* ); - DECL_LINK( implPropertyHdl, Control* ); + DECL_LINK(implPropertyHdl, void *); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - DECL_LINK(lateInitCallback, Timer*); + DECL_LINK(lateInitCallback, void *); private: ViewShellBase& mrBase; diff --git a/sd/source/ui/animations/DialogListBox.cxx b/sd/source/ui/animations/DialogListBox.cxx index d80543072ce4..5bbe95cf06b2 100644 --- a/sd/source/ui/animations/DialogListBox.cxx +++ b/sd/source/ui/animations/DialogListBox.cxx @@ -100,7 +100,7 @@ void DialogListBox::Resize() // ----------------------------------------------------------------------- -IMPL_LINK( DialogListBox, ScrollBarHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(DialogListBox, ScrollBarHdl) { ImplResizeChild(); return 1; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 11eb95333732..ead2fb97b495 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -1165,7 +1165,7 @@ IMPL_LINK(SlideTransitionPane,EventMultiplexerListener, return 0; } -IMPL_LINK( SlideTransitionPane, ApplyToAllButtonClicked, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, ApplyToAllButtonClicked) { DBG_ASSERT( mpDrawDoc, "Invalid Draw Document!" ); if( !mpDrawDoc ) @@ -1193,44 +1193,44 @@ IMPL_LINK( SlideTransitionPane, ApplyToAllButtonClicked, void *, EMPTYARG ) } -IMPL_LINK( SlideTransitionPane, PlayButtonClicked, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked) { playCurrentEffect(); return 0; } -IMPL_LINK( SlideTransitionPane, SlideShowButtonClicked, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, SlideShowButtonClicked) { mrBase.StartPresentation(); return 0; } -IMPL_LINK( SlideTransitionPane, TransitionSelected, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected) { applyToSelectedPages(); return 0; } -IMPL_LINK( SlideTransitionPane, AdvanceSlideRadioButtonToggled, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, AdvanceSlideRadioButtonToggled) { updateControlState(); applyToSelectedPages(); return 0; } -IMPL_LINK( SlideTransitionPane, AdvanceTimeModified, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, AdvanceTimeModified) { applyToSelectedPages(); return 0; } -IMPL_LINK( SlideTransitionPane, SpeedListBoxSelected, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, SpeedListBoxSelected) { applyToSelectedPages(); return 0; } -IMPL_LINK( SlideTransitionPane, SoundListBoxSelected, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected) { if( maLB_SOUND.GetSelectEntryCount() ) { @@ -1246,20 +1246,20 @@ IMPL_LINK( SlideTransitionPane, SoundListBoxSelected, void *, EMPTYARG ) return 0; } -IMPL_LINK( SlideTransitionPane, LoopSoundBoxChecked, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, LoopSoundBoxChecked) { applyToSelectedPages(); return 0; } -IMPL_LINK( SlideTransitionPane, AutoPreviewClicked, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked) { SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); pOptions->SetPreviewTransitions( maCB_AUTO_PREVIEW.IsChecked() ? sal_True : sal_False ); return 0; } -IMPL_LINK( SlideTransitionPane, LateInitCallback, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback) { const TransitionPresetList& rPresetList = TransitionPreset::getTransitionPresetList(); TransitionPresetList::const_iterator aIter( rPresetList.begin() ); diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index af95e6dcf4ee..e5db4fba8751 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -101,7 +101,7 @@ private: DECL_LINK( SoundListBoxSelected, void * ); DECL_LINK( LoopSoundBoxChecked, void * ); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - DECL_LINK(LateInitCallback, Timer*); + DECL_LINK(LateInitCallback, void *); private: ViewShellBase & mrBase; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 972ba0aef700..ae39dfaed2cd 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -851,7 +851,7 @@ void AnnotationManagerImpl::UpdateTags( bool bSynchron ) } } -IMPL_LINK(AnnotationManagerImpl,UpdateTagsHdl, void *, EMPTYARG) +IMPL_LINK_NOARG(AnnotationManagerImpl, UpdateTagsHdl) { mnUpdateTagsEvent = 0; DisposeTags(); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index df491a489ce4..7a4ee0c0b248 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -753,7 +753,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) return sal_True; } -IMPL_LINK( AnnotationTag, ClosePopupHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AnnotationTag, ClosePopupHdl) { mnClosePopupEvent = 0; ClosePopup(); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 56470b875bf3..5c8083ed7690 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -519,7 +519,7 @@ IMPL_LINK(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll) return 0; } -IMPL_LINK(AnnotationWindow, ModifyHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(AnnotationWindow, ModifyHdl) { return 0; } diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 7d073321e545..f8adf5f75769 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -247,7 +247,7 @@ AnimationWindow::~AnimationWindow() // ----------------------------------------------------------------------- -IMPL_LINK( AnimationWindow, ClickFirstHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl) { aBmpExList.First(); pBitmapEx = static_cast< BitmapEx* >( aBmpExList.GetCurObject() ); @@ -258,7 +258,7 @@ IMPL_LINK( AnimationWindow, ClickFirstHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( AnimationWindow, ClickStopHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl) { bMovie = sal_False; return( 0L ); @@ -382,7 +382,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) // ----------------------------------------------------------------------- -IMPL_LINK( AnimationWindow, ClickLastHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) { aBmpExList.Last(); pBitmapEx = static_cast< BitmapEx* >( aBmpExList.GetCurObject() ); @@ -525,7 +525,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) // ----------------------------------------------------------------------- -IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) { // Code jetzt in CreatePresObj() SfxBoolItem aItem( SID_ANIMATOR_CREATE, sal_True ); @@ -537,7 +537,7 @@ IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( AnimationWindow, ModifyBitmapHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) { sal_uLong nBmp = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); @@ -556,7 +556,7 @@ IMPL_LINK( AnimationWindow, ModifyBitmapHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( AnimationWindow, ModifyTimeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) { sal_uLong nPos = static_cast<sal_uLong>(aNumFldBitmap.GetValue() - 1); diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index 77ff5bb711e8..f7a19688f972 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -96,7 +96,7 @@ BreakDlg::~BreakDlg() } // Control-Handler fuer den Abbruch Button -IMPL_LINK( BreakDlg, CancelButtonHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl) { bCancel = sal_True; aBtnCancel.Disable(); @@ -176,7 +176,7 @@ short BreakDlg::Execute() } // Linkmethode welche die Arbeitsfunktion startet -IMPL_LINK( BreakDlg, InitialUpdate, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(BreakDlg, InitialUpdate) { pDrView->DoImportMarkedMtf(pProgrInfo); EndDialog(sal_True); diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 45ae8d003498..fb3398a30f5d 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -163,7 +163,7 @@ CopyDlg::~CopyDlg() |* \************************************************************************/ -IMPL_LINK( CopyDlg, Reset, void*, EMPTYARG ) +IMPL_LINK_NOARG(CopyDlg, Reset) { const SfxPoolItem* pPoolItem = NULL; String aStr( GetExtraData() ); @@ -285,7 +285,7 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) |* \************************************************************************/ -IMPL_LINK( CopyDlg, SelectColorHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(CopyDlg, SelectColorHdl) { sal_uInt16 nPos = maLbStartColor.GetSelectEntryPos(); @@ -303,7 +303,7 @@ IMPL_LINK( CopyDlg, SelectColorHdl, void *, EMPTYARG ) |* Setzt Werte der Selektion \************************************************************************/ -IMPL_LINK( CopyDlg, SetViewData, void*, EMPTYARG ) +IMPL_LINK_NOARG(CopyDlg, SetViewData) { Rectangle aRect = mpView->GetAllMarkedRect(); @@ -327,7 +327,7 @@ IMPL_LINK( CopyDlg, SetViewData, void*, EMPTYARG ) |* Setzt Werte auf Standard \************************************************************************/ -IMPL_LINK( CopyDlg, SetDefault, void*, EMPTYARG ) +IMPL_LINK_NOARG(CopyDlg, SetDefault) { maNumFldCopies.SetValue( 1L ); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 210c44667e0b..42daba82446e 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -280,7 +280,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) /************************************************************************* |* StartShow-Hdl \************************************************************************/ -IMPL_LINK( SdCustomShowDlg, StartShowHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl) { EndDialog( RET_YES ); @@ -519,7 +519,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() /************************************************************************* |* OK-Hdl \************************************************************************/ -IMPL_LINK( SdDefineCustomShowDlg, OKHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl) { // Name ueberpruefen... sal_Bool bDifferent = sal_True; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 7bd7480cafa1..4e63d3aecdf2 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -270,20 +270,20 @@ public: Image GetUiIconForCommand (const ::rtl::OUString& aCommandURL); DECL_LINK( StartScanHdl, void * ); - DECL_LINK( SelectFileHdl, ListBox * ); + DECL_LINK( SelectFileHdl, void * ); DECL_LINK( SelectRegionHdl, ListBox * ); DECL_LINK( UpdatePreviewHdl, void * ); DECL_LINK( UpdatePageListHdl, void * ); DECL_LINK( StartTypeHdl, RadioButton * ); - DECL_LINK( SelectTemplateHdl, ListBox * ); - DECL_LINK( NextPageHdl, PushButton * ); - DECL_LINK( LastPageHdl, PushButton * ); - DECL_LINK( PreviewFlagHdl, CheckBox * ); - DECL_LINK( EffectPreviewHdl, Button * ); - DECL_LINK( SelectLayoutHdl, ListBox * ); - DECL_LINK( PageSelectHdl, Control * ); - DECL_LINK( PresTypeHdl, RadioButton * ); - DECL_LINK( UpdateUserDataHdl, Edit* ); + DECL_LINK( SelectTemplateHdl, void * ); + DECL_LINK( NextPageHdl, void * ); + DECL_LINK( LastPageHdl, void * ); + DECL_LINK( PreviewFlagHdl, void * ); + DECL_LINK( EffectPreviewHdl, void * ); + DECL_LINK( SelectLayoutHdl, void * ); + DECL_LINK( PageSelectHdl, void * ); + DECL_LINK( PresTypeHdl, void * ); + DECL_LINK( UpdateUserDataHdl, void * ); DECL_LINK( SelectEffectHdl, void* ); DECL_LINK( OpenButtonHdl, Button * ); @@ -1203,7 +1203,7 @@ IMPL_LINK( AssistentDlgImpl, SelectRegionHdl, ListBox *, pLB ) return 0; } -IMPL_LINK( AssistentDlgImpl, SelectEffectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, SelectEffectHdl) { maEffectPrevTimer.Start(); return 0; @@ -1216,7 +1216,7 @@ IMPL_LINK( AssistentDlgImpl, OpenButtonHdl, Button*, pButton ) return mpPage1OpenLB->GetDoubleClickHdl().Call(pButton); } -IMPL_LINK( AssistentDlgImpl, EffectPreviewHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, EffectPreviewHdl) { if(mbPreview && xDocShell.Is() ) { @@ -1237,7 +1237,7 @@ IMPL_LINK( AssistentDlgImpl, EffectPreviewHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK( AssistentDlgImpl, PreviewFlagHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, PreviewFlagHdl) { if( maPreviewFlag.IsChecked() != mbPreview ) @@ -1248,7 +1248,7 @@ IMPL_LINK( AssistentDlgImpl, PreviewFlagHdl, CheckBox *, EMPTYARG ) return 0; } -IMPL_LINK( AssistentDlgImpl, SelectTemplateHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, SelectTemplateHdl) { SetStartType( ST_TEMPLATE ); mpPage2Medium5RB->Check(); @@ -1257,20 +1257,20 @@ IMPL_LINK( AssistentDlgImpl, SelectTemplateHdl, ListBox *, EMPTYARG ) return 0; } -IMPL_LINK( AssistentDlgImpl, SelectLayoutHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, SelectLayoutHdl) { maPrevTimer.Start(); return 0; } -IMPL_LINK( AssistentDlgImpl, SelectFileHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, SelectFileHdl) { SetStartType( ST_OPEN ); maPrevTimer.Start(); return 0; } -IMPL_LINK( AssistentDlgImpl, PageSelectHdl, Control *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, PageSelectHdl) { sal_uInt16 nPage = mpPage5PageListCT->GetSelectedPage(); if( mnShowPage != nPage ) @@ -1282,13 +1282,13 @@ IMPL_LINK( AssistentDlgImpl, PageSelectHdl, Control *, EMPTYARG ) return 0; } -IMPL_LINK( AssistentDlgImpl, UpdatePageListHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, UpdatePageListHdl) { UpdatePageList(); return 0; } -IMPL_LINK( AssistentDlgImpl, UpdatePreviewHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, UpdatePreviewHdl) { UpdatePreview( sal_True ); return 0; @@ -1318,7 +1318,7 @@ IMPL_LINK( AssistentDlgImpl, StartTypeHdl, RadioButton *, pButton ) } -IMPL_LINK( AssistentDlgImpl, NextPageHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, NextPageHdl) { // When changing from the first to the second page make sure that the // templates are present. @@ -1332,7 +1332,7 @@ IMPL_LINK( AssistentDlgImpl, NextPageHdl, PushButton *, EMPTYARG ) return 0; } -IMPL_LINK( AssistentDlgImpl, LastPageHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, LastPageHdl) { LeavePage(); maAssistentFunc.PreviousPage(); @@ -1340,7 +1340,7 @@ IMPL_LINK( AssistentDlgImpl, LastPageHdl, PushButton *, EMPTYARG ) return 0; } -IMPL_LINK( AssistentDlgImpl, PresTypeHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, PresTypeHdl) { if(maDocFile.Len() == 0) { @@ -1356,7 +1356,7 @@ IMPL_LINK( AssistentDlgImpl, PresTypeHdl, RadioButton*, EMPTYARG ) return 0; } -IMPL_LINK( AssistentDlgImpl, UpdateUserDataHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlgImpl, UpdateUserDataHdl) { mbUserDataDirty = sal_True; String aTopic = mpPage4AskTopicEDT->GetText(); @@ -1869,7 +1869,7 @@ AssistentDlg::AssistentDlg(Window* pParent, sal_Bool bAutoPilot) : FreeResource(); } -IMPL_LINK( AssistentDlg, FinishHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(AssistentDlg, FinishHdl) { if( GetStartType() == ST_OPEN ) { diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index f1d37f6a82e7..321605ee59d2 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -59,7 +59,7 @@ SdPageListControl::SdPageListControl( SetCheckButtonHdl( LINK(this,SdPageListControl,CheckButtonClickHdl) ); } -IMPL_LINK( SdPageListControl, CheckButtonClickHdl, SvLBoxButtonData *, EMPTYARG ) +IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl) { SvLBoxTreeList* pTreeModel = GetModel(); SvLBoxEntry* pEntry = pTreeModel->First(); diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 3eeb40144ee8..aec9c1d8ce31 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -51,7 +51,7 @@ public: sal_uInt16 GetSelectedPage(); sal_Bool IsPageChecked( sal_uInt16 nPage ); - DECL_LINK( CheckButtonClickHdl, SvLBoxButtonData * ); + DECL_LINK( CheckButtonClickHdl, void * ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 5e32d637bb7c..83881fd4907d 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -330,7 +330,7 @@ void SdModifyFieldDlg::FillControls() } -IMPL_LINK( SdModifyFieldDlg, LanguageChangeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl) { FillFormatList(); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 5f74aa0191bd..a6f7859a82b3 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -118,7 +118,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil } // ------------------------------------------------------------------------ -IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) { maUpdateTimer.Stop(); mnPlaySoundEvent = 0; @@ -186,7 +186,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) } // ------------------------------------------------------------------------ -IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index e3e11d2305b2..4bdccaed38e0 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -295,7 +295,7 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) // ----------------------------------------------------------------------- -IMPL_LINK( HeaderFooterDialog, DeactivatePageHdl, TabControl *, EMPTYARG ) +IMPL_LINK_NOARG(HeaderFooterDialog, DeactivatePageHdl) { return sal_True; } @@ -559,7 +559,7 @@ HeaderFooterTabPage::~HeaderFooterTabPage() // ----------------------------------------------------------------------- -IMPL_LINK( HeaderFooterTabPage, LanguageChangeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl) { FillFormatList( (int)(sal_IntPtr)maCBDateTimeFormat.GetEntryData( maCBDateTimeFormat.GetSelectEntryPos() ) ); @@ -677,7 +677,7 @@ void HeaderFooterTabPage::update() // ----------------------------------------------------------------------- -IMPL_LINK( HeaderFooterTabPage, UpdateOnClickHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl) { update(); @@ -686,7 +686,7 @@ IMPL_LINK( HeaderFooterTabPage, UpdateOnClickHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( HeaderFooterTabPage, ClickApplyToAllHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(HeaderFooterTabPage, ClickApplyToAllHdl) { mpDialog->ApplyToAll( this ); return 0; @@ -694,7 +694,7 @@ IMPL_LINK( HeaderFooterTabPage, ClickApplyToAllHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( HeaderFooterTabPage, ClickApplyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(HeaderFooterTabPage, ClickApplyHdl) { mpDialog->Apply( this ); return 0; @@ -702,7 +702,7 @@ IMPL_LINK( HeaderFooterTabPage, ClickApplyHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( HeaderFooterTabPage, ClickCancelHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(HeaderFooterTabPage, ClickCancelHdl) { mpDialog->Cancel( this ); return 0; diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 457a23ffae64..4387afeafde9 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -170,7 +170,7 @@ sal_Bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const |* \************************************************************************/ -IMPL_LINK( SdInsertPagesObjsDlg, SelectObjectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl) { if( aLbTree.IsLinkableSelected() ) aCbxLink.Enable(); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 54c675c00ffb..a6db87b8b26d 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -229,7 +229,7 @@ NavigatorDragType SdNavigatorWin::GetNavigatorDragType() // ----------------------------------------------------------------------- -IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl) { sal_uInt16 nId = maToolbox.GetCurItemId(); sal_uInt16 nSId = 0; @@ -282,7 +282,7 @@ IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SdNavigatorWin, ClickToolboxHdl, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(SdNavigatorWin, ClickToolboxHdl) { return 0; } @@ -368,7 +368,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) // ----------------------------------------------------------------------- -IMPL_LINK( SdNavigatorWin, ClickObjectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) { if( !mbDocImported || maLbDocs.GetSelectEntryPos() != 0 ) { @@ -405,7 +405,7 @@ IMPL_LINK( SdNavigatorWin, ClickObjectHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SdNavigatorWin, SelectDocumentHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) { String aStrLb = maLbDocs.GetSelectEntry(); long nPos = maLbDocs.GetSelectEntryPos(); diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 305818cc553c..c087644a818a 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -66,7 +66,7 @@ private: NumericField maNewStartNF; bool mbModified; - DECL_LINK( ImplNewStartHdl, CheckBox* ); + DECL_LINK( ImplNewStartHdl, void* ); }; SdParagraphNumTabPage::SdParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) @@ -157,7 +157,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) mbModified = sal_False; } -IMPL_LINK( SdParagraphNumTabPage, ImplNewStartHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl) { sal_Bool bEnable = maNewStartCB.IsChecked(); maNewStartNumberCB.Enable(bEnable); diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 5e7032651c43..b012fb4de122 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -271,7 +271,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) /************************************************************************* |* Handler: Enabled/Disabled Listbox "Dias" \************************************************************************/ -IMPL_LINK( SdStartPresentationDlg, ChangeRangeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl) { aLbDias.Enable( aRbtAtDia.IsChecked() ); aLbCustomshow.Enable( aRbtCustomshow.IsChecked() ); @@ -282,7 +282,7 @@ IMPL_LINK( SdStartPresentationDlg, ChangeRangeHdl, void *, EMPTYARG ) /************************************************************************* |* Handler: Enabled/Disabled Checkbox "AlwaysOnTop" \************************************************************************/ -IMPL_LINK( SdStartPresentationDlg, ClickWindowPresentationHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) { const bool bAuto = aRbtAuto.IsChecked(); const bool bWindow = aRbtWindow.IsChecked(); @@ -309,7 +309,7 @@ IMPL_LINK( SdStartPresentationDlg, ClickWindowPresentationHdl, void *, EMPTYARG /************************************************************************* |* Handler: Enabled/Disabled Checkbox "AlwaysOnTop" \************************************************************************/ -IMPL_LINK( SdStartPresentationDlg, ChangePauseHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl) { aCbxAutoLogo.Enable( aRbtAuto.IsChecked() && ( aTmfPause.GetTime().GetMSFromTime() > 0 ) ); return( 0L ); diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index e85408b7ad6a..ed7976a53f12 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -241,7 +241,7 @@ IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx ) //----------------------------------------------------------------------- -IMPL_LINK( SdPrintOptions, ClickBookletHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl) { updateControls(); return 0; diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index db30dff577c2..419e97c4b6f0 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -209,7 +209,7 @@ void SdPresLayoutDlg::FillValueSet() |* \************************************************************************/ -IMPL_LINK(SdPresLayoutDlg, ClickLayoutHdl, void *, EMPTYARG) +IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl) { EndDialog(RET_OK); return 0; @@ -221,7 +221,7 @@ IMPL_LINK(SdPresLayoutDlg, ClickLayoutHdl, void *, EMPTYARG) |* \************************************************************************/ -IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) +IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) { SfxNewFileDialog* pDlg = new SfxNewFileDialog(this, SFXWB_PREVIEW); pDlg->SetText(String(SdResId(STR_LOAD_PRESENTATION_LAYOUT))); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index f557a4f738d2..507739a585ee 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -502,7 +502,7 @@ void SdTPAction::OpenFileDialog() //------------------------------------------------------------------------ -IMPL_LINK( SdTPAction, ClickSearchHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl) { OpenFileDialog(); @@ -511,7 +511,7 @@ IMPL_LINK( SdTPAction, ClickSearchHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SdTPAction, ClickActionHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) { presentation::ClickAction eCA = GetActualClickAction(); @@ -688,7 +688,7 @@ IMPL_LINK( SdTPAction, ClickActionHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SdTPAction, SelectTreeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl) { aEdtBookmark.SetText( aLbTree.GetSelectEntry() ); return( 0L ); @@ -696,7 +696,7 @@ IMPL_LINK( SdTPAction, SelectTreeHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SdTPAction, CheckFileHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) { String aFile( GetEditText() ); diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 970289fac1d3..d7552c837ed0 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -564,7 +564,7 @@ SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow, } //------------------------------------------------------------------------ -IMPL_LINK( SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl) { sal_uInt16 nPos = aLbMetric.GetSelectEntryPos(); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 32f36d79ad2f..25beb956f953 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -293,7 +293,7 @@ IMPL_LINK( SdVectorizeDlg, ProgressHdl, void*, pData ) // ----------------------------------------------------------------------------- -IMPL_LINK( SdVectorizeDlg, ClickPreviewHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl) { Calculate( aBmp, aMtf ); aMtfWin.SetGraphic( aMtf ); @@ -304,7 +304,7 @@ IMPL_LINK( SdVectorizeDlg, ClickPreviewHdl, PushButton*, EMPTYARG ) // ----------------------------------------------------------------------------- -IMPL_LINK( SdVectorizeDlg, ClickOKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl) { if( aBtnPreview.IsEnabled() ) Calculate( aBmp, aMtf ); @@ -337,7 +337,7 @@ IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox*, pCb ) // ----------------------------------------------------------------------------- -IMPL_LINK( SdVectorizeDlg, ModifyHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl) { aBtnPreview.Enable(); return 0L; diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 880aafd7903e..a691b77a7665 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -448,7 +448,7 @@ void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue) -IMPL_LINK(ConfigurationUpdater, TimeoutHandler, Timer*, EMPTYARG) +IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler) { OSL_TRACE("configuration update timer"); if ( ! mbUpdateBeingProcessed diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index 64ff5380ca7a..0f6b6f4c689c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -208,7 +208,7 @@ private: */ void UnlockUpdates (void); - DECL_LINK(TimeoutHandler, Timer*); + DECL_LINK(TimeoutHandler, void *); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 6d2baed7e8b3..6dd674c78332 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -218,7 +218,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) |* \************************************************************************/ -IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl) { Point aPnt(mpWindow->GetPointerPosPixel()); @@ -998,7 +998,7 @@ void FuPoor::DoPaste() |* \************************************************************************/ -IMPL_LINK( FuPoor, DragHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(FuPoor, DragHdl) { if( mpView ) { @@ -1033,7 +1033,7 @@ sal_Bool FuPoor::Command(const CommandEvent& rCEvt) |* \************************************************************************/ -IMPL_LINK_INLINE_START( FuPoor, DelayHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(FuPoor, DelayHdl) { aDelayToScrollTimer.Stop (); bScrollable = sal_True; diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index dd43694aa436..5e7f415bb0b1 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -87,7 +87,7 @@ private: DECL_LINK( CancelButtonHdl, void* ); DECL_LINK( UpDate, void* ); - DECL_LINK( InitialUpdate, Timer* ); + DECL_LINK( InitialUpdate, void* ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/DialogListBox.hxx b/sd/source/ui/inc/DialogListBox.hxx index 4b1e0cea8178..5d62b14350b5 100644 --- a/sd/source/ui/inc/DialogListBox.hxx +++ b/sd/source/ui/inc/DialogListBox.hxx @@ -57,7 +57,7 @@ protected: void ImplInitScrollBars(); void ImplResizeChild(); - DECL_LINK( ScrollBarHdl, ScrollBar* ); + DECL_LINK(ScrollBarHdl, void *); public: DialogListBox( ::Window* pParent, WinBits nWinStyle ); diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index 54b20ddfcfea..5dcb1f50e0d6 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -129,7 +129,7 @@ private: /** This call back is called by the form shell when it gets the focus. In this case the form shell is moved to the top of the shell stack. */ - DECL_LINK(FormControlActivated, FmFormShell*); + DECL_LINK(FormControlActivated, void *); /** This method is called by the form shell when that is destroyed. It acts as a last resort against referencing a dead form shell. With diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 82eba378fb72..71439b7fe35d 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -113,10 +113,10 @@ public: DECL_LINK( ParagraphInsertedHdl, Outliner * ); DECL_LINK( ParagraphRemovingHdl, Outliner * ); DECL_LINK( DepthChangedHdl, Outliner * ); - DECL_LINK( StatusEventHdl, EditStatus * ); + DECL_LINK( StatusEventHdl, void * ); DECL_LINK( BeginMovingHdl, Outliner * ); DECL_LINK( EndMovingHdl, Outliner * ); - DECL_LINK( RemovingPagesHdl, OutlinerView * ); + DECL_LINK(RemovingPagesHdl, void *); DECL_LINK( IndentingPagesHdl, OutlinerView * ); DECL_LINK( BeginDropHdl, void * ); DECL_LINK( EndDropHdl, void * ); diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index bbad2c5e901a..92ba1d1ee71a 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -230,8 +230,8 @@ protected: boost::ptr_vector<SdViewRedrawRec> maLockedRedraws; bool mbIsDropAllowed; - DECL_LINK( DropErrorHdl, Timer* ); - DECL_LINK( DropInsertFileHdl, Timer* ); + DECL_LINK( DropErrorHdl, void* ); + DECL_LINK( DropInsertFileHdl, void* ); DECL_LINK( ExecuteNavigatorDrop, SdNavigatorDropEvent* pSdNavigatorDropEvent ); void ImplClearDrawDropMarker(); diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index aad225fba1d0..0efa987180f8 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -86,7 +86,7 @@ public: when IsUICaptured() returns <TRUE/>. */ void Release (bool bForce = false); - DECL_LINK(TimeoutCallback,Timer*); + DECL_LINK(TimeoutCallback, void *); private: ::std::auto_ptr<ToolBarManager::UpdateLock> mpLock; /** The timer is used both as a safe guard to unlock the update lock diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 18cb8d44cf10..cb077e06fd21 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -63,7 +63,7 @@ private: void CheckState(); DECL_LINK( ClickButtonHdl, void * ); - DECL_LINK( StartShowHdl, Button* ); + DECL_LINK( StartShowHdl, void* ); public: SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); @@ -100,7 +100,7 @@ private: void CheckCustomShow(); DECL_LINK( ClickButtonHdl, void * ); - DECL_LINK( OKHdl, Button* ); + DECL_LINK( OKHdl, void * ); public: diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 4f05ce775518..27a006409241 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -53,7 +53,7 @@ public: AssistentDlg(Window* pParent, sal_Bool bAutoPilot); ~AssistentDlg(); - DECL_LINK( FinishHdl, OKButton * ); + DECL_LINK( FinishHdl, void * ); SfxObjectShellLock GetDocument(); OutputType GetOutputMedium() const; diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 598ca1c7e3b7..b77ec9ca239a 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -139,7 +139,7 @@ protected: SfxRequest& rReq); virtual ~FuPoor (void); - DECL_LINK( DelayHdl, Timer * ); + DECL_LINK( DelayHdl, void * ); void ImpForceQuadratic(Rectangle& rRect); @@ -173,11 +173,11 @@ protected: Dialog* pDialog; Timer aScrollTimer; // fuer Autoscrolling - DECL_LINK( ScrollHdl, Timer * ); + DECL_LINK( ScrollHdl, void * ); void ForceScroll(const Point& aPixPos); Timer aDragTimer; // fuer Drag&Drop - DECL_LINK( DragHdl, Timer * ); + DECL_LINK(DragHdl, void *); sal_Bool bIsInDragMode; Point aMDPos; // Position von MouseButtonDown diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index b3f188e130d3..9439160bad61 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -49,7 +49,7 @@ class HeaderFooterDialog : public TabDialog { private: DECL_LINK( ActivatePageHdl, TabControl * ); - DECL_LINK( DeactivatePageHdl, TabControl * ); + DECL_LINK( DeactivatePageHdl, void * ); TabControl maTabCtrl; diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 97ee713edf1f..7ddee515c86e 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -145,7 +145,7 @@ private: DECL_LINK( GetFocusObjectsHdl, void * ); DECL_LINK( SelectToolboxHdl, void * ); - DECL_LINK( ClickToolboxHdl, ToolBox * ); + DECL_LINK(ClickToolboxHdl, void *); DECL_LINK( DropdownClickToolBoxHdl, ToolBox * ); DECL_LINK( ClickPageHdl, void * ); DECL_LINK( ClickObjectHdl, void * ); diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index a3ed535d61cb..6526d4bd961e 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -83,7 +83,7 @@ private: const SfxItemSet& rOutAttrs; DECL_LINK( ClickCheckboxHdl, CheckBox * ); - DECL_LINK( ClickBookletHdl, CheckBox * ); + DECL_LINK( ClickBookletHdl, void * ); void updateControls(); diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index be8436207a2c..c8e80384ae1f 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -196,21 +196,21 @@ private: void LoadPreviewButtons(); - DECL_LINK( FinishHdl, OKButton * ); - DECL_LINK( NextPageHdl, PushButton * ); - DECL_LINK( LastPageHdl, PushButton * ); + DECL_LINK( FinishHdl, void * ); + DECL_LINK( NextPageHdl, void * ); + DECL_LINK( LastPageHdl, void * ); DECL_LINK( DesignHdl, RadioButton * ); - DECL_LINK( DesignSelectHdl, ListBox * ); - DECL_LINK( DesignDeleteHdl, PushButton * ); - DECL_LINK( BaseHdl, RadioButton * ); - DECL_LINK( ContentHdl, RadioButton * ); + DECL_LINK( DesignSelectHdl, void * ); + DECL_LINK( DesignDeleteHdl, void * ); + DECL_LINK( BaseHdl, void * ); + DECL_LINK( ContentHdl, void * ); DECL_LINK( GfxFormatHdl, RadioButton * ); DECL_LINK( ResolutionHdl, RadioButton * ); - DECL_LINK( ButtonsHdl, ValueSet* ); + DECL_LINK( ButtonsHdl, void * ); DECL_LINK( ColorHdl, PushButton * ); DECL_LINK( WebServerHdl, RadioButton * ); - DECL_LINK( SlideChgHdl, RadioButton* ); + DECL_LINK( SlideChgHdl, void * ); public: diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index 0667eb0f58fc..64be5bee862f 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -175,7 +175,7 @@ private: sal_Int32 SetupVerticalScrollBar (bool bShow, sal_Int32 nRange); sal_Int32 SetupHorizontalScrollBar (bool bShow, sal_Int32 nRange); - DECL_LINK(ScrollBarHandler, ScrollBar*); + DECL_LINK(ScrollBarHandler, void *); DECL_LINK(WindowEventListener, VclSimpleEvent*); using Window::GetWindow; diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index d37aa44d4550..b5beb9501a58 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -92,7 +92,7 @@ private: class Deleter; friend class Deleter; - DECL_LINK(TimerCallback,Timer*); + DECL_LINK(TimerCallback, void *); }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index bc080604b069..776714c45ba7 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -144,7 +144,7 @@ private: String GetScale( sal_Int32 nX, sal_Int32 nY ); sal_Bool SetScale( const String& aScale, sal_Int32& rX, sal_Int32& rY ); - DECL_LINK( SelectMetricHdl_Impl, ListBox * ); + DECL_LINK( SelectMetricHdl_Impl, void * ); /** Enable or disable the controls in the compatibility section of the 'general' tab page depending on whether there is at least one diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index de71a72fe257..0806a39ce276 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -91,8 +91,8 @@ class SdVectorizeDlg : public ModalDialog long nPosX, long nPosY, long nWidth, long nHeight ); DECL_LINK( ProgressHdl, void* ); - DECL_LINK( ClickPreviewHdl, PushButton* ); - DECL_LINK( ClickOKHdl, OKButton* ); + DECL_LINK( ClickPreviewHdl, void* ); + DECL_LINK( ClickOKHdl, void* ); DECL_LINK( ToggleHdl, CheckBox* ); DECL_LINK( ModifyHdl, void* ); diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index fdc763118e4e..aa38c5373abd 100644 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -358,11 +358,11 @@ void EditWindow::Command(const CommandEvent& rCEvt) Window::Command (rCEvt); } -IMPL_LINK_INLINE_START( EditWindow, MenuSelectHdl, Menu *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(EditWindow, MenuSelectHdl) { return 0; } -IMPL_LINK_INLINE_END( EditWindow, MenuSelectHdl, Menu *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(EditWindow, MenuSelectHdl) void EditWindow::KeyInput(const KeyEvent& ) { @@ -423,7 +423,7 @@ void EditWindow::CreateEditView (void) -IMPL_LINK( EditWindow, EditStatusHdl, EditStatus *, EMPTYARG ) +IMPL_LINK_NOARG(EditWindow, EditStatusHdl) { if (!mpEditView) return 1; @@ -434,7 +434,7 @@ IMPL_LINK( EditWindow, EditStatusHdl, EditStatus *, EMPTYARG ) } } -IMPL_LINK_INLINE_START( EditWindow, ScrollHdl, ScrollBar *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(EditWindow, ScrollHdl) { DBG_ASSERT(mpEditView, "EditView missing"); if (mpEditView) @@ -446,7 +446,7 @@ IMPL_LINK_INLINE_START( EditWindow, ScrollHdl, ScrollBar *, EMPTYARG ) } return 0; } -IMPL_LINK_INLINE_END( EditWindow, ScrollHdl, ScrollBar *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(EditWindow, ScrollHdl) Rectangle EditWindow::AdjustScrollBars() { diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index abeee2751ec8..933f83e32347 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -112,7 +112,7 @@ void CanvasUpdateRequester::RequestUpdate (const sal_Bool bUpdateAll) -IMPL_LINK(CanvasUpdateRequester, Callback, void*, EMPTYARG) +IMPL_LINK_NOARG(CanvasUpdateRequester, Callback) { mnUserEventId = 0; if (mxCanvas.is()) diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index b017ce807636..725c0ffe04da 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -105,7 +105,7 @@ sal_Int32 SlideShowRestarter::GetDisplayCount (void) return xIndexAccess->getCount(); } -IMPL_LINK(SlideShowRestarter, EndPresentation, void*, EMPTYARG) +IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation) { mnEventId = 0; if (mpSlideShow.is()) diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 22ff18f04cd2..d637f501f0e0 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -652,7 +652,7 @@ IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer ) return 0L; } -IMPL_LINK( ShowWindow, MouseTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl) { if( mbMouseCursorHidden ) { diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 31a447a630c9..aec9926cd5ee 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -129,7 +129,7 @@ private: sal_uLong mnFirstMouseMove; DECL_LINK( PauseTimeoutHdl, Timer* pTimer ); - DECL_LINK( MouseTimeoutHdl, Timer* pTimer ); + DECL_LINK(MouseTimeoutHdl, void *); DECL_LINK( EventHdl, VclWindowEvent* pEvent ); ::rtl::Reference< SlideshowImpl > mxController; diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 7c3fb09c3eb0..06247cbb6db4 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1165,7 +1165,7 @@ void SlideShow::StartInPlacePresentationConfigurationCallback() // --------------------------------------------------------- -IMPL_LINK( SlideShow, StartInPlacePresentationConfigurationHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) { mnInPlaceConfigEvent = 0; StartInPlacePresentation(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index d61899415384..bc8b3bae51e4 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1448,7 +1448,7 @@ void SlideshowImpl::endPresentation() // --------------------------------------------------------- -IMPL_LINK( SlideshowImpl, endPresentationHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) { mnEndShowEvent = 0; @@ -1834,7 +1834,7 @@ void SlideshowImpl::startUpdateTimer() This is used to unfreeze user input that was disabled after slide change to skip input that was buffered during slide transition preperation */ -IMPL_LINK( SlideshowImpl, ReadyForNextInputHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl) { mbInputFreeze = false; return 0; @@ -1846,7 +1846,7 @@ IMPL_LINK( SlideshowImpl, ReadyForNextInputHdl, Timer*, EMPTYARG ) and not by using the timer, I will personaly punish this person seriously, even if this person is me. */ -IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SlideshowImpl, updateHdl) { mnUpdateEvent = 0; @@ -1856,7 +1856,7 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG ) -IMPL_LINK( SlideshowImpl, PostYieldListener, void*, EMPTYARG ) +IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener) { // prevent me from deletion when recursing (App::Reschedule does) const rtl::Reference<SlideshowImpl> this_(this); @@ -2162,7 +2162,7 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) // --------------------------------------------------------- -IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) { mnContextMenuEvent = 0; @@ -2764,7 +2764,7 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException) // ----------------------------------------------------------------------------- -IMPL_LINK( SlideshowImpl, deactivateHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) { if( mbActive && mxShow.is() ) { diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index f84553a30b29..15086ea0e1c4 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -296,13 +296,13 @@ private: void setActiveXToolbarsVisible( sal_Bool bVisible ); - DECL_LINK( updateHdl, Timer* ); + DECL_LINK(updateHdl, void *); DECL_LINK( PostYieldListener, void* ); - DECL_LINK( ReadyForNextInputHdl, Timer* ); + DECL_LINK(ReadyForNextInputHdl, void *); DECL_LINK( endPresentationHdl, void* ); DECL_LINK( ContextMenuSelectHdl, Menu * ); DECL_LINK( ContextMenuHdl, void* ); - DECL_LINK( deactivateHdl, Timer* ); + DECL_LINK(deactivateHdl, void *); DECL_LINK( EventListenerHdl, VclSimpleEvent* ); // helper diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 522b20cb99e8..c940db8e25b8 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -165,7 +165,7 @@ CacheCompactor::CacheCompactor( -IMPL_LINK(CacheCompactor, CompactionCallback, Timer*, EMPTYARG) +IMPL_LINK_NOARG(CacheCompactor, CompactionCallback) { mbIsCompactionRunning = true; diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index eef11a947011..0c79b5e235e0 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -92,7 +92,7 @@ private: */ Timer maCompactionTimer; bool mbIsCompactionRunning; - DECL_LINK(CompactionCallback, Timer*); + DECL_LINK(CompactionCallback, void *); }; diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 1f78d8e263a4..fce57b114170 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -166,7 +166,7 @@ Any CacheConfiguration::GetValue (const ::rtl::OUString& rName) -IMPL_LINK(CacheConfiguration,TimerCallback, Timer*,EMPTYARG) +IMPL_LINK_NOARG(CacheConfiguration, TimerCallback) { CacheConfigSharedPtr &rInstancePtr = theInstance::get(); // Release out reference to the instance. diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index b6b113140e50..ceba770ecb8d 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -66,7 +66,7 @@ private: CacheConfiguration (void); - DECL_LINK(TimerCallback, Timer*); + DECL_LINK(TimerCallback, void *); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 44ce6c5f2124..7b841652fdb0 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -149,7 +149,7 @@ void QueueProcessor::SetPreviewSize ( -IMPL_LINK(QueueProcessor, ProcessRequestHdl, Timer*, EMPTYARG) +IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl) { ProcessRequests(); return 1; diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 55139a300fe3..643b8db17b5a 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -115,7 +115,7 @@ private: ::osl::Mutex maMutex; Timer maTimer; - DECL_LINK(ProcessRequestHdl, Timer*); + DECL_LINK(ProcessRequestHdl, void *); sal_uInt32 mnTimeBetweenHighPriorityRequests; sal_uInt32 mnTimeBetweenLowPriorityRequests; sal_uInt32 mnTimeBetweenRequestsWhenNotIdle; diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 47a1d173312f..e7a5916ef612 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -262,7 +262,7 @@ void Animator::RequestNextFrame (const double nFrameStart) -IMPL_LINK(Animator, TimeoutHandler, Timer*, EMPTYARG) +IMPL_LINK_NOARG(Animator, TimeoutHandler) { if (mbIsDisposed) return 0; diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 61684124ae0f..cc642dc69ad7 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -298,7 +298,7 @@ void CurrentSlideManager::HandleModelChange (void) -IMPL_LINK(CurrentSlideManager, SwitchPageCallback, void*, EMPTYARG) +IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback) { if (mpCurrentSlide) { diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 7abd6e46f6af..a45f640ac1ca 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -625,7 +625,7 @@ bool ScrollBarManager::RepeatAutoScroll (void) -IMPL_LINK(ScrollBarManager, AutoScrollTimeoutHandler, Timer *, EMPTYARG) +IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler) { RepeatAutoScroll(); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index af18213f0b4e..9f36369304b5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -114,7 +114,7 @@ private: AnimationId mnNextAnimationId; - DECL_LINK(TimeoutHandler, Timer*); + DECL_LINK(TimeoutHandler, void *); /** Execute one step of every active animation. @param nTime diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 2ce505727fb8..18807c128ab0 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -268,7 +268,7 @@ private: DECL_LINK(HorizontalScrollBarHandler, ScrollBar*); DECL_LINK(VerticalScrollBarHandler, ScrollBar*); - DECL_LINK(AutoScrollTimeoutHandler, Timer*); + DECL_LINK(AutoScrollTimeoutHandler, void *); void PlaceHorizontalScrollBar (const Rectangle& aArea); void PlaceVerticalScrollBar (const Rectangle& aArea); diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 48a805c25a5e..4c7a6184709d 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -204,7 +204,7 @@ bool ToolTip::Hide (void) -IMPL_LINK(ToolTip, DelayTrigger, void*, EMPTYARG) +IMPL_LINK_NOARG(ToolTip, DelayTrigger) { DoShow(); diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 3af9df4b78a7..276049b2d9dd 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -204,7 +204,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) // -------------------------------------------------------------------- -IMPL_LINK( TableDesignPane, implValueSetHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(TableDesignPane, implValueSetHdl) { mbStyleSelected = true; if( !mbModal ) @@ -266,7 +266,7 @@ void TableDesignPane::ApplyStyle() // -------------------------------------------------------------------- -IMPL_LINK( TableDesignPane, implCheckBoxHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(TableDesignPane, implCheckBoxHdl) { mbOptionsChanged = true; diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index a2c71284c75a..37ffe1d1ea66 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -83,8 +83,8 @@ private: void FillDesignPreviewControl(); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - DECL_LINK(implValueSetHdl, Control* ); - DECL_LINK(implCheckBoxHdl, Control* ); + DECL_LINK(implValueSetHdl, void *); + DECL_LINK(implCheckBoxHdl, void *); private: ViewShellBase& mrBase; diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 68bf0f350d75..ae3719118999 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -618,7 +618,7 @@ int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount) -IMPL_LINK(LayoutMenu, ClickHandler, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(LayoutMenu, ClickHandler) { AssignLayoutToSelectedSlides (GetSelectedAutoLayout()); return 0; @@ -901,7 +901,7 @@ void LayoutMenu::Command (const CommandEvent& rEvent) -IMPL_LINK(LayoutMenu, StateChangeHandler, ::rtl::OUString*, EMPTYARG) +IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler) { InvalidateContent(); return 0; diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index 1b1af8ceff3e..6f544defb313 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -227,9 +227,9 @@ private: /** When clicked then set the current page of the view in the center pane. */ - DECL_LINK(ClickHandler, ValueSet*); + DECL_LINK(ClickHandler, void *); DECL_LINK(RightClickHandler, MouseEvent*); - DECL_LINK(StateChangeHandler, ::rtl::OUString*); + DECL_LINK(StateChangeHandler, void *); DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent*); }; diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index 7c43aa473698..1793ff435e04 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -637,7 +637,7 @@ sal_Int32 ScrollPanel::SetupHorizontalScrollBar (bool bShow, sal_Int32 nRange) } -IMPL_LINK(ScrollPanel, ScrollBarHandler, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(ScrollPanel, ScrollBarHandler) { maScrollOffset.X() -= maHorizontalScrollBar.GetDelta(); maScrollOffset.Y() -= maVerticalScrollBar.GetDelta(); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index e2c4b581bf0c..55d313bf820e 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -235,7 +235,7 @@ ResId MasterPagesSelector::GetContextMenuResId (void) const -IMPL_LINK(MasterPagesSelector, ClickHandler, PreviewValueSet*, EMPTYARG) +IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler) { // We use the framework to assign the clicked-on master page because we // so use the same mechanism as the context menu does (where we do not diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index 24a78cddb0ba..74a549172e60 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -216,7 +216,7 @@ private: last seen. This value is used heuristically to speed up the lookup of an index for a token. */ - DECL_LINK(ClickHandler, PreviewValueSet*); + DECL_LINK(ClickHandler, void *); DECL_LINK(RightClickHandler, MouseEvent*); DECL_LINK(ContextMenuCallback, CommandEvent*); DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent*); diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx index 3f059a3a2dda..84b02eacfab0 100644 --- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx @@ -75,7 +75,7 @@ void RecentMasterPagesSelector::LateInit (void) -IMPL_LINK(RecentMasterPagesSelector,MasterPageListListener, void*, EMPTYARG) +IMPL_LINK_NOARG(RecentMasterPagesSelector, MasterPageListListener) { MasterPagesSelector::Fill(); return 0; diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index aaa000aec65d..d6a2953fbed8 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -797,7 +797,7 @@ void EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent& rEv -IMPL_LINK(EventMultiplexer::Implementation, SlideSorterSelectionChangeListener, void*, EMPTYARG) +IMPL_LINK_NOARG(EventMultiplexer::Implementation, SlideSorterSelectionChangeListener) { CallListeners (EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION); return 0; diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 06061af5a251..33812c9e3c51 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -138,7 +138,7 @@ void TimerBasedTaskExecution::SetSelf ( -IMPL_LINK(TimerBasedTaskExecution,TimerCallback, Timer*,EMPTYARG) +IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback) { if (mpTask.get() != NULL) { diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index d0d87b8fcf11..3681ef99f070 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -217,7 +217,7 @@ void FormShellManager::UnregisterAtCenterPane (void) -IMPL_LINK(FormShellManager, FormControlActivated, FmFormShell*, EMPTYARG) +IMPL_LINK_NOARG(FormShellManager, FormControlActivated) { // The form shell has been actived. To give it priority in reacting to // slot calls the form shell is moved to the top of the object bar shell diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 80edeef3a69e..5980f73da7e4 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -352,7 +352,7 @@ private: ::rtl::OUString GetToolBarResourceName (const ::rtl::OUString& rsBaseName) const; bool CheckPlugInMode (const ::rtl::OUString& rsName) const; - DECL_LINK(UpdateCallback,bool*); + DECL_LINK(UpdateCallback, void *); DECL_LINK(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent*); DECL_LINK(SetValidCallback,void*); }; @@ -1005,7 +1005,7 @@ ToolBarRules& ToolBarManager::Implementation::GetToolBarRules (void) -IMPL_LINK(ToolBarManager::Implementation,UpdateCallback,bool*,EMPTYARG) +IMPL_LINK_NOARG(ToolBarManager::Implementation, UpdateCallback) { mnPendingUpdateCall = 0; if (mnLockCount == 0) @@ -1051,7 +1051,7 @@ IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback, -IMPL_LINK(ToolBarManager::Implementation, SetValidCallback,void*,EMPTYARG) +IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback) { mnPendingSetValidCall = 0; SetValid(true); diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 5eac1b2dbb67..c83267ef5131 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -395,7 +395,7 @@ ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock ( -IMPL_LINK(ViewShell::Implementation::ToolBarManagerLock,TimeoutCallback,Timer*,EMPTYARG) +IMPL_LINK_NOARG(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback) { // If possible then release the lock now. Otherwise start the timer // and try again later. diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index f4c9dfe03671..433c64d02a4c 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -866,7 +866,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) |* \************************************************************************/ -IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG ) +IMPL_LINK_NOARG(OutlineView, StatusEventHdl) { ::sd::Window* pWin = mrOutlineViewShell.GetActiveWindow(); OutlinerView* pOutlinerView = GetViewByWindow(pWin); @@ -891,7 +891,7 @@ IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG ) return 0; } -IMPL_LINK( OutlineView, BeginDropHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(OutlineView, BeginDropHdl) { DBG_ASSERT(maDragAndDropModelGuard.get() == 0, "sd::OutlineView::BeginDropHdl(), prior drag operation not finished correctly!" ); @@ -899,7 +899,7 @@ IMPL_LINK( OutlineView, BeginDropHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( OutlineView, EndDropHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(OutlineView, EndDropHdl) { maDragAndDropModelGuard.reset(0); InvalidateSlideNumberArea(); @@ -1297,7 +1297,7 @@ void OutlineView::FillOutliner() |* \************************************************************************/ -IMPL_LINK( OutlineView, RemovingPagesHdl, OutlinerView *, EMPTYARG ) +IMPL_LINK_NOARG(OutlineView, RemovingPagesHdl) { sal_uInt16 nNumOfPages = mrOutliner.GetSelPageCount(); @@ -1594,7 +1594,7 @@ void OutlineView::onUpdateStyleSettings( bool bForceUpdate /* = false */ ) } } -IMPL_LINK( OutlineView, AppEventListenerHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(OutlineView, AppEventListenerHdl) { onUpdateStyleSettings(); return 0; diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index d953f73f21ad..e109d8b0dcea 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -374,7 +374,7 @@ SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAc |* \************************************************************************/ -IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(View, DropInsertFileHdl) { DBG_ASSERT( mpViewSh, "sd::View::DropInsertFileHdl(), I need a view shell to work!" ); if( !mpViewSh ) @@ -566,7 +566,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) |* \************************************************************************/ -IMPL_LINK( View, DropErrorHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(View, DropErrorHdl) { InfoBox( mpViewSh ? mpViewSh->GetActiveWindow() : 0, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); return 0; diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 5bd33dd46405..081655f9cd91 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -535,7 +535,7 @@ void ViewOverlayManager::UpdateTags() mnUpdateTagsEvent = Application::PostUserEvent( LINK( this, ViewOverlayManager, UpdateTagsHdl ) ); } -IMPL_LINK(ViewOverlayManager,UpdateTagsHdl, void *, EMPTYARG) +IMPL_LINK_NOARG(ViewOverlayManager, UpdateTagsHdl) { OSL_TRACE("ViewOverlayManager::UpdateTagsHdl"); diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index c668c4e39780..503b2098c5f8 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -122,7 +122,7 @@ public: SfxBindings& GetBindings() { return *pBindings; } - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK(TimerHdl, void *); }; @@ -160,7 +160,7 @@ public: virtual void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo* pInfo); - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK(TimerHdl, void *); }; @@ -204,7 +204,7 @@ private: SingleTabDlgImpl* pImpl; - DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); + DECL_DLLPRIVATE_LINK(OKHdl_Impl, void *); }; #endif diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx index 115a6dfe34c9..8e1dbee971d0 100644 --- a/sfx2/inc/sfx2/dinfdlg.hxx +++ b/sfx2/inc/sfx2/dinfdlg.hxx @@ -212,9 +212,9 @@ private: sal_Bool bEnableUseUserData : 1, bHandleDelete : 1; - DECL_LINK( DeleteHdl, PushButton * ); - DECL_LINK( SignatureHdl, PushButton * ); - DECL_LINK( ChangePassHdl, PushButton * ); + DECL_LINK(DeleteHdl, void *); + DECL_LINK(SignatureHdl, void *); + DECL_LINK(ChangePassHdl, void *); void ImplUpdateSignatures(); void ImplCheckPasswordState(); @@ -300,8 +300,8 @@ private: DECL_LINK( ClickHdlNoUpdate, Control* ); DECL_LINK( ClickHdlReload, Control* ); DECL_LINK( ClickHdlForward, Control* ); - DECL_LINK( ClickHdlBrowseURL, PushButton* ); - DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); + DECL_LINK(ClickHdlBrowseURL, void *); + DECL_LINK(DialogClosedHdl, void *); using TabPage::DeactivatePage; @@ -404,7 +404,7 @@ public: CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); ~CustomPropertiesEditButton(); - DECL_LINK(ClickHdl, PushButton*); + DECL_LINK(ClickHdl, void *); }; class CustomPropertiesRemoveButton : public ImageButton @@ -494,8 +494,8 @@ private: DECL_LINK( BoxLoseFocusHdl, CustomPropertiesTypeBox* ); //add lose focus handlers of Date/TimeField? - DECL_LINK( EditTimeoutHdl, Timer* ); - DECL_LINK( BoxTimeoutHdl, Timer* ); + DECL_LINK(EditTimeoutHdl, void *); + DECL_LINK(BoxTimeoutHdl, void *); bool IsLineValid( CustomPropertyLine* pLine ) const; void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox ); @@ -553,7 +553,7 @@ private: PushButton m_aAddBtn; FixedText m_aPropertiesFT; // Sym2_5121----, Moved by Steve Yin - DECL_LINK( AddHdl, PushButton* ); + DECL_LINK(AddHdl, void *); using TabPage::DeactivatePage; diff --git a/sfx2/inc/sfx2/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx index 6ec962764a73..28e4de832ab6 100644 --- a/sfx2/inc/sfx2/docinsert.hxx +++ b/sfx2/inc/sfx2/docinsert.hxx @@ -58,7 +58,7 @@ private: SfxItemSet* m_pItemSet; std::vector<rtl::OUString> m_pURLList; - DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); + DECL_LINK(DialogClosedHdl, void *); public: DocumentInserter(const String& rFactory, diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx index e1436ab7f346..b4313c7348ba 100644 --- a/sfx2/inc/sfx2/dockwin.hxx +++ b/sfx2/inc/sfx2/dockwin.hxx @@ -110,7 +110,7 @@ public: virtual long Notify( NotifyEvent& rNEvt ); virtual void FadeIn( sal_Bool ); void AutoShow( sal_Bool bShow = sal_True ); - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK(TimerHdl, void *); SAL_DLLPRIVATE void Initialize_Impl(); SAL_DLLPRIVATE sal_uInt16 GetWinBits_Impl() const; diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index 5a014c14ace7..2e07153973c1 100644 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -77,7 +77,7 @@ private: bool mbAsciiOnly; DECL_DLLPRIVATE_LINK( EditModifyHdl, Edit* ); - DECL_DLLPRIVATE_LINK( OKHdl, OKButton* ); + DECL_DLLPRIVATE_LINK(OKHdl, void *); void SetPasswdText(); diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index 7db8f7a39b4b..36d78911a649 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -93,11 +93,11 @@ friend class SfxTabDialogController; DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * ); DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * ); - DECL_DLLPRIVATE_LINK( OkHdl, Button * ); - DECL_DLLPRIVATE_LINK( ResetHdl, Button * ); - DECL_DLLPRIVATE_LINK( BaseFmtHdl, Button * ); - DECL_DLLPRIVATE_LINK( UserHdl, Button * ); - DECL_DLLPRIVATE_LINK( CancelHdl, Button * ); + DECL_DLLPRIVATE_LINK(OkHdl, void *); + DECL_DLLPRIVATE_LINK(ResetHdl, void *); + DECL_DLLPRIVATE_LINK(BaseFmtHdl, void *); + DECL_DLLPRIVATE_LINK(UserHdl, void *); + DECL_DLLPRIVATE_LINK(CancelHdl, void *); SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *); protected: diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 11891202cc56..8174f38b7097 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -66,8 +66,8 @@ private: void LoadConfig(); void SaveConfig(); - DECL_LINK( FindHdl, PushButton* ); - DECL_LINK( ToggleHdl, CheckBox* ); + DECL_LINK(FindHdl, void *); + DECL_LINK(ToggleHdl, void *); public: SearchDialog( Window* pWindow, const ::rtl::OUString& rConfigName ); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 0f0c2f1b57b9..2ea1687f3074 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -754,7 +754,7 @@ void IndexTabPage_Impl::ClearIndex() // ----------------------------------------------------------------------- -IMPL_LINK( IndexTabPage_Impl, OpenHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl) { aIndexCB.GetDoubleClickHdl().Call( &aIndexCB ); return 0; @@ -1072,7 +1072,7 @@ void SearchTabPage_Impl::RememberSearchText( const String& rSearchText ) // ----------------------------------------------------------------------- -IMPL_LINK( SearchTabPage_Impl, SearchHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) { String aSearchText = TRIM( aSearchED.GetText() ); if ( aSearchText.Len() > 0 ) @@ -1117,7 +1117,7 @@ IMPL_LINK( SearchTabPage_Impl, SearchHdl, PushButton*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SearchTabPage_Impl, OpenHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SearchTabPage_Impl, OpenHdl) { aResultsLB.GetDoubleClickHdl().Call( &aResultsLB ); return 0; @@ -1125,7 +1125,7 @@ IMPL_LINK( SearchTabPage_Impl, OpenHdl, PushButton*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SearchTabPage_Impl, ModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl) { String aSearchText = TRIM( aSearchED.GetText() ); aSearchBtn.Enable( aSearchText.Len() > 0 ); @@ -1401,7 +1401,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindo // ----------------------------------------------------------------------- -IMPL_LINK( BookmarksTabPage_Impl, OpenHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl) { aBookmarksBox.GetDoubleClickHdl().Call( &aBookmarksBox ); return 0; @@ -1707,7 +1707,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl ) // ----------------------------------------------------------------------- -IMPL_LINK( SfxHelpIndexWindow_Impl, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl) { aTimer.Start(); @@ -1716,7 +1716,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, SelectHdl, ListBox *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SfxHelpIndexWindow_Impl, InitHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl) { bIsInitDone = true; Initialize(); @@ -1730,7 +1730,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, InitHdl, Timer *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SfxHelpIndexWindow_Impl, SelectFactoryHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl) { String* pFactory = (String*)(sal_uIntPtr)aActiveLB.GetEntryData( aActiveLB.GetSelectEntryPos() ); if ( pFactory ) @@ -1746,7 +1746,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, SelectFactoryHdl, Timer *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl *, EMPTYARG ) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl) { // keyword found on index? sal_Bool bIndex = pIPage->HasKeyword(); @@ -2348,7 +2348,7 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode& _rKeyCode ) // ----------------------------------------------------------------------- -IMPL_LINK( SfxHelpTextWindow_Impl, SelectHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl) { try { @@ -3049,7 +3049,7 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox ) //------------------------------------------------------------------------- -IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG ) +IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl) { pIndexWin->SelectExecutableEntry(); String aEntry = pIndexWin->GetSelectEntry(); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 492cb1346965..2b07f86f62b9 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -168,7 +168,7 @@ private: void InitializeIndex(); void ClearIndex(); - DECL_LINK( OpenHdl, PushButton* ); + DECL_LINK(OpenHdl, void *); DECL_LINK( TimeoutHdl, Timer* ); public: @@ -240,9 +240,9 @@ private: void ClearSearchResults(); void RememberSearchText( const String& rSearchText ); - DECL_LINK( SearchHdl, PushButton* ); - DECL_LINK( OpenHdl, PushButton* ); - DECL_LINK( ModifyHdl, Edit* ); + DECL_LINK(SearchHdl, void *); + DECL_LINK(OpenHdl, void *); + DECL_LINK(ModifyHdl, void *); public: SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); @@ -286,7 +286,7 @@ private: long nMinWidth; - DECL_LINK( OpenHdl, PushButton* ); + DECL_LINK(OpenHdl, void *); public: BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); @@ -340,10 +340,10 @@ private: inline BookmarksTabPage_Impl* GetBookmarksPage(); DECL_LINK( ActivatePageHdl, TabControl* ); - DECL_LINK( SelectHdl, ListBox* ); - DECL_LINK( InitHdl, Timer* ); - DECL_LINK( SelectFactoryHdl, Timer* ); - DECL_LINK( KeywordHdl, IndexTabPage_Impl* ); + DECL_LINK(SelectHdl, void *); + DECL_LINK(InitHdl, void *); + DECL_LINK(SelectFactoryHdl, void *); + DECL_LINK(KeywordHdl, void *); public: SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent ); @@ -477,7 +477,7 @@ private: getCursor() const; bool isHandledKey( const KeyCode& _rKeyCode ); - DECL_LINK( SelectHdl, Timer* ); + DECL_LINK(SelectHdl, void *); DECL_LINK( NotifyHdl, SvtMiscOptions* ); DECL_LINK( FindHdl, sfx2::SearchDialog* ); DECL_LINK( CloseHdl, sfx2::SearchDialog* ); @@ -547,7 +547,7 @@ friend class SfxHelpIndexWindow_Impl; void ShowStartPage(); DECL_LINK( SelectHdl, ToolBox* ); - DECL_LINK( OpenHdl, SfxHelpIndexWindow_Impl* ); + DECL_LINK(OpenHdl, void *); DECL_LINK( SelectFactoryHdl, SfxHelpIndexWindow_Impl* ); DECL_LINK( ChangeHdl, HelpListener_Impl* ); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 81c404cfd526..8cb8a0741492 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -324,7 +324,7 @@ void SfxModelessDialog::Move() Implements a timer event that is triggered by a move or resize of the window This will save config information to Views.xcu with a small delay */ -IMPL_LINK( SfxModelessDialog, TimerHdl, Timer*, EMPTYARG) +IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl) { pImp->aMoveTimer.Stop(); if ( pImp->bConstructed && pImp->pMgr ) @@ -612,7 +612,7 @@ void SfxFloatingWindow::Move() Implements a timer event that is triggered by a move or resize of the window This will save config information to Views.xcu with a small delay */ -IMPL_LINK( SfxFloatingWindow, TimerHdl, Timer*, EMPTYARG) +IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl) { pImp->aMoveTimer.Stop(); if ( pImp->bConstructed && pImp->pMgr ) @@ -677,7 +677,7 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const // SfxSingleTabDialog ---------------------------------------------------- -IMPL_LINK( SfxSingleTabDialog, OKHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) /* [Description] diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 215212140aa9..8d9a3b0c0b38 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -877,7 +877,7 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const SfxItemSet& rItemSet ) //------------------------------------------------------------------------ -IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl) { String aName; if ( bEnableUseUserData && aUseUserDataCB.IsChecked() ) @@ -898,7 +898,7 @@ IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( SfxDocumentPage, SignatureHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl) { SfxObjectShell* pDoc = SfxObjectShell::Current(); if( pDoc ) @@ -911,7 +911,7 @@ IMPL_LINK( SfxDocumentPage, SignatureHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( SfxDocumentPage, ChangePassHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl) { SfxObjectShell* pShell = SfxObjectShell::Current(); do @@ -1371,7 +1371,7 @@ IMPL_LINK( SfxInternetPage, ClickHdlForward, Control*, pCtrl ) //------------------------------------------------------------------------ -IMPL_LINK( SfxInternetPage, ClickHdlBrowseURL, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SfxInternetPage, ClickHdlBrowseURL) { if ( !pFileDlg ) pFileDlg = new sfx2::FileDialogHelper( @@ -1384,7 +1384,7 @@ IMPL_LINK( SfxInternetPage, ClickHdlBrowseURL, PushButton*, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SfxInternetPage, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG ) +IMPL_LINK_NOARG(SfxInternetPage, DialogClosedHdl) { DBG_ASSERT( pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" ); @@ -1756,7 +1756,7 @@ CustomPropertiesEditButton::~CustomPropertiesEditButton() { } -IMPL_LINK( CustomPropertiesEditButton, ClickHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(CustomPropertiesEditButton, ClickHdl) { DurationDialog_Impl* pDurationDlg = new DurationDialog_Impl( this, m_pLine->m_aDurationField.GetDuration() ); if( RET_OK == pDurationDlg->Execute() ) @@ -1941,13 +1941,13 @@ IMPL_LINK( CustomPropertiesWindow, BoxLoseFocusHdl, CustomPropertiesTypeBox*, pB return 0; } -IMPL_LINK( CustomPropertiesWindow, EditTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(CustomPropertiesWindow, EditTimeoutHdl) { ValidateLine( m_pCurrentLine, false ); return 0; } -IMPL_LINK( CustomPropertiesWindow, BoxTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(CustomPropertiesWindow, BoxTimeoutHdl) { ValidateLine( m_pCurrentLine, true ); return 0; @@ -2371,7 +2371,7 @@ IMPL_LINK( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar ) return 0; } -IMPL_LINK( CustomPropertiesControl, RemovedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CustomPropertiesControl, RemovedHdl) { m_aVertScroll.SetRangeMax( m_aPropertiesWin.GetVisibleLineCount() + 1 ); if ( m_aPropertiesWin.GetOutputSizePixel().Height() < m_aPropertiesWin.GetVisibleLineCount() * m_aPropertiesWin.GetLineHeight() ) @@ -2402,7 +2402,7 @@ SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItem m_aAddBtn.SetClickHdl( LINK( this, SfxCustomPropertiesPage, AddHdl ) ); } -IMPL_LINK( SfxCustomPropertiesPage, AddHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl) { Any aAny; m_aPropertiesCtrl.AddLine( ::rtl::OUString(), aAny, true ); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 4fa2f035f466..cfaa5ffd58bf 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1939,7 +1939,7 @@ void SfxDockingWindow::Move() pImp->aMoveTimer.Start(); } -IMPL_LINK( SfxDockingWindow, TimerHdl, Timer*, EMPTYARG) +IMPL_LINK_NOARG(SfxDockingWindow, TimerHdl) { pImp->aMoveTimer.Stop(); if ( IsReallyVisible() && IsFloatingMode() ) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index cb24cffbb7df..8da6138caa3b 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -694,7 +694,7 @@ void FileDialogHelper_Impl::updateVersions() } // ----------------------------------------------------------------------- -IMPL_LINK( FileDialogHelper_Impl, TimeOutHdl_Impl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl) { if ( !mbHasPreview ) return 0; @@ -2298,7 +2298,7 @@ void FileDialogHelper::SetContext( Context _eNewContext ) } // ------------------------------------------------------------------------ -IMPL_LINK( FileDialogHelper, ExecuteSystemFilePicker, void*, EMPTYARG ) +IMPL_LINK_NOARG(FileDialogHelper, ExecuteSystemFilePicker) { m_nError = mpImp->execute(); if ( m_aDialogClosedLink.IsSet() ) diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 5bfce3c8db42..4f4e86d7089d 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -156,7 +156,7 @@ namespace sfx2 std::vector<rtl::OUString>& rpURLList, const SfxFilter* pFilter ); - DECL_LINK( TimeOutHdl_Impl, Timer* ); + DECL_LINK(TimeOutHdl_Impl, void *); DECL_LINK( HandleEvent, FileDialogHelper* ); DECL_LINK( InitControls, void* ); diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index d66d14281dfd..681d3683bb0a 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -73,11 +73,11 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit ) maOKBtn.Enable( bEnable ); return 0; } -IMPL_LINK_INLINE_END( SfxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit) // ----------------------------------------------------------------------- -IMPL_LINK( SfxPasswordDialog, OKHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) { bool bConfirmFailed = ( ( mnExtras & SHOWEXTRAS_CONFIRM ) == SHOWEXTRAS_CONFIRM ) && ( GetConfirm() != GetPassword() ); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index d30b8d64ce22..22efcf333ebb 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -387,7 +387,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & ) } -IMPL_LINK( SfxSecurityPage_Impl, RecordChangesCBToggleHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl) { // when change recording gets disabled protection must be disabled as well if (!m_aRecordChangesCB.IsChecked()) // the new check state is already present, thus the '!' @@ -437,7 +437,7 @@ IMPL_LINK( SfxSecurityPage_Impl, RecordChangesCBToggleHdl, void*, EMPTYARG ) } -IMPL_LINK( SfxSecurityPage_Impl, ChangeProtectionPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl) { if (m_eRedlingMode == RL_NONE) return 0; diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 5ea75dd7f385..0d5528a7398b 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -141,7 +141,7 @@ void SearchDialog::SaveConfig() aViewOpt.SetUserItem( USERITEM_NAME, aUserItem ); } -IMPL_LINK( SearchDialog, FindHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SearchDialog, FindHdl) { String sSrchTxt = m_aSearchEdit.GetText(); sal_uInt16 nPos = m_aSearchEdit.GetEntryPos( sSrchTxt ); @@ -153,7 +153,7 @@ IMPL_LINK( SearchDialog, FindHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( SearchDialog, ToggleHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SearchDialog, ToggleHdl) { String sTemp = m_aWrapAroundBox.GetText(); m_aWrapAroundBox.SetText( m_sToggleText ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 8fd76ed79929..64d28b731c10 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -945,7 +945,7 @@ short SfxTabDialog::Ok() // ----------------------------------------------------------------------- -IMPL_LINK( SfxTabDialog, CancelHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(SfxTabDialog, CancelHdl) { EndDialog( RET_USER_CANCEL ); return 0; @@ -984,7 +984,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet() // ----------------------------------------------------------------------- -IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SfxTabDialog, OkHdl) /* [Description] @@ -1048,7 +1048,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() // ----------------------------------------------------------------------- -IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SfxTabDialog, UserHdl) /* [Description] @@ -1074,7 +1074,7 @@ IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SfxTabDialog, ResetHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SfxTabDialog, ResetHdl) /* [Description] @@ -1101,7 +1101,7 @@ IMPL_LINK( SfxTabDialog, ResetHdl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl) /* [Description] diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index a24cb892d859..b5809ba5018d 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -332,7 +332,7 @@ sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt ) } -IMPL_LINK( DropListBox_Impl, OnAsyncExecuteDrop, SvLBoxEntry*, EMPTYARG ) +IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop) { pDialog->ActionSelect( SID_STYLE_NEW_BY_EXAMPLE ); return 0; diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index f6ae242d7373..b43c6faa6bd3 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -353,13 +353,13 @@ void SfxVersionDialog::RecalcDateColumn() } } -IMPL_LINK( SfxVersionDialog, DClickHdl_Impl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl) { Open_Impl(); return 0L; } -IMPL_LINK( SfxVersionDialog, SelectHdl_Impl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) { bool bEnable = ( aVersionBox.FirstSelected() != NULL ); SfxObjectShell* pObjShell = pViewFrame->GetObjectShell(); diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 2969f4a39cd6..8ad6af137945 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -172,7 +172,7 @@ void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, std::vector<rtl::OUStr } } -IMPL_LINK( DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG ) +IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl) { DBG_ASSERT( m_pFileDlg, "DocumentInserter::DialogClosedHdl(): no file dialog" ); diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index d137aa462ace..91ea159fb286 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -172,9 +172,9 @@ friend class SfxOrganizeListBox_Impl; DECL_LINK( AddFiles_Impl, Button * ); DECL_LINK( OnAddressTemplateClicked, Button * ); - DECL_LINK( ImportHdl, sfx2::FileDialogHelper* ); - DECL_LINK( ExportHdl, sfx2::FileDialogHelper* ); - DECL_LINK( AddFilesHdl, sfx2::FileDialogHelper* ); + DECL_LINK(ImportHdl, void *); + DECL_LINK(ExportHdl, void *); + DECL_LINK(AddFilesHdl, void *); sal_Bool DontDelete_Impl( SvLBoxEntry* pEntry ); @@ -2230,7 +2230,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AddFiles_Impl, Button *, pButton ) //------------------------------------------------------------------------- -IMPL_LINK( SfxOrganizeDlg_Impl, ImportHdl, sfx2::FileDialogHelper *, EMPTYARG ) +IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ImportHdl) { DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ImportHdl(): no file dialog" ); @@ -2267,7 +2267,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, ImportHdl, sfx2::FileDialogHelper *, EMPTYARG ) //------------------------------------------------------------------------- -IMPL_LINK( SfxOrganizeDlg_Impl, ExportHdl, sfx2::FileDialogHelper *, EMPTYARG ) +IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ExportHdl) { DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ImportHdl(): no file dialog" ); ::com::sun::star::uno::Sequence< ::rtl::OUString > aPaths; @@ -2318,7 +2318,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, ExportHdl, sfx2::FileDialogHelper *, EMPTYARG ) //------------------------------------------------------------------------- -IMPL_LINK( SfxOrganizeDlg_Impl, AddFilesHdl, sfx2::FileDialogHelper *, EMPTYARG ) +IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, AddFilesHdl) { if ( ERRCODE_NONE == pFileDlg->GetError() ) { diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 3be70a36973f..2696882f154d 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -178,12 +178,12 @@ class SfxNewFileDialog_Impl DECL_LINK( Update, void * ); DECL_LINK( RegionSelect, ListBox * ); - DECL_LINK( TemplateSelect, ListBox * ); + DECL_LINK(TemplateSelect, void *); DECL_LINK( DoubleClick, ListBox * ); void TogglePreview(CheckBox *); - DECL_LINK( Expand, MoreButton * ); + DECL_LINK( Expand, void * ); DECL_LINK( PreviewClick, CheckBox * ); - DECL_LINK( LoadFile, PushButton* ); + DECL_LINK(LoadFile, void *); sal_uInt16 GetSelectedTemplatePos() const; public: @@ -215,7 +215,7 @@ void SfxNewFileDialog_Impl::ClearInfo() //------------------------------------------------------------------------- -IMPL_LINK( SfxNewFileDialog_Impl, Update, void *, EMPTYARG ) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update) { if ( xDocShell.Is() ) { @@ -317,12 +317,12 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox ) //------------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, Expand, MoreButton *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, Expand) { TemplateSelect(&aTemplateLb); return 0; } -IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, Expand, MoreButton *, pMoreButton ) +IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, Expand) //------------------------------------------------------------------------- @@ -348,7 +348,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, PreviewClick, CheckBox *, pBox ) //------------------------------------------------------------------------- -IMPL_LINK( SfxNewFileDialog_Impl, TemplateSelect, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect) { // Still loading if ( xDocShell && xDocShell->GetProgress() ) @@ -376,12 +376,12 @@ IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox ) //------------------------------------------------------------------------- -IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, LoadFile, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, LoadFile) { pAntiImpl->EndDialog(RET_TEMPLATE_LOAD); return 0; } -IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, LoadFile, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, LoadFile) //------------------------------------------------------------------------- sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index ea797bed53aa..ea05d074b4cd 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -63,7 +63,7 @@ namespace com { namespace sun { namespace star { namespace frame { class XModule class DropListBox_Impl : public SvTreeListBox { private: - DECL_LINK( OnAsyncExecuteDrop, SvLBoxEntry* ); + DECL_LINK(OnAsyncExecuteDrop, void *); protected: SfxCommonTemplateDialog_Impl* pDialog; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index d70e9046f3f4..2edeb5ece89c 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -70,8 +70,8 @@ class SfxVersionDialog : public SfxModalDialog LocaleDataWrapper* mpLocaleWrapper; sal_Bool mbIsSaveVersionOnClose; - DECL_LINK( DClickHdl_Impl, Control* ); - DECL_LINK( SelectHdl_Impl, Control* ); + DECL_LINK(DClickHdl_Impl, void *); + DECL_LINK(SelectHdl_Impl, void *); DECL_LINK( ButtonHdl_Impl, Button* ); void Init_Impl(); void Open_Impl(); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 12e895f6578c..b7a68ec1b434 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -173,7 +173,7 @@ Window* SfxURLToolBoxControl_Impl::CreateItemWindow( Window* pParent ) return pURLBox; } -IMPL_LINK( SfxURLToolBoxControl_Impl, SelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, SelectHdl) { SvtURLBox* pURLBox = GetURLBox(); String aName( pURLBox->GetURL() ); @@ -184,7 +184,7 @@ IMPL_LINK( SfxURLToolBoxControl_Impl, SelectHdl, void*, EMPTYARG ) return 1L; } -IMPL_LINK( SfxURLToolBoxControl_Impl, OpenHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl) { SvtURLBox* pURLBox = GetURLBox(); OpenURL( pURLBox->GetURL(), pURLBox->IsCtrlOpen() ); diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 0098ee534d4c..d7eb8516477b 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -528,7 +528,7 @@ IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu ) return sal_True; } -IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) { sal_uInt16 nItemCount = pSVMenu->GetItemCount(); SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame(); diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 068368733f06..75de3629797b 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -247,7 +247,7 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) //------------------------------------------------------------------------- -IMPL_LINK( SfxImageManager_Impl, OptionsChanged_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl) { SetSymbolsSize_Impl( m_aOpt.GetCurrentSymbolsSize() ); return 0L; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 1cc71f228c51..53bfee21fddb 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -888,7 +888,7 @@ void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow ) //-------------------------------------------------------------------- -IMPL_LINK( SfxToolBoxControl, PopupModeEndHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl) { if ( pImpl->mpPopupWindow->IsVisible() ) { @@ -1403,7 +1403,7 @@ void SfxPopupWindow::StateChanged( //-------------------------------------------------------------------- -IMPL_LINK( SfxPopupWindow, Delete, void *, EMPTYARG ) +IMPL_LINK_NOARG(SfxPopupWindow, Delete) { if ( m_aDeleteLink.IsSet() ) m_aDeleteLink.Call( this ); diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 28906a9bf25e..cb3bc575bb34 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -133,7 +133,7 @@ public: ~SfxInPlaceClient_Impl(); void SizeHasChanged(); - DECL_LINK (TimerHdl, Timer*); + DECL_LINK(TimerHdl, void *); uno::Reference < frame::XFrame > GetFrame() const; // XEmbeddedClient @@ -618,7 +618,7 @@ void SfxInPlaceClient_Impl::SizeHasChanged() } //-------------------------------------------------------------------- -IMPL_LINK( SfxInPlaceClient_Impl, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl) { if ( m_pClient && m_xObject.is() ) m_pClient->GetViewShell()->CheckIPClient_Impl( m_pClient, m_pClient->GetViewShell()->GetObjectShell()->GetVisArea() ); diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index ddffcc2393de..97a5f06b81df 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -449,7 +449,7 @@ SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSe //-------------------------------------------------------------------- -IMPL_LINK( SfxDialogExecutor_Impl, Execute, void *, EMPTYARG ) +IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute) { // Options noted locally if ( !_pOptions ) diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 692251edbeb0..315822064a50 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -481,7 +481,7 @@ void DemoWindow::init() } } -IMPL_LINK( DemoWindow, updateHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(DemoWindow, updateHdl) { init(); diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 41f6b70a84bd..de3a02feebb1 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -446,7 +446,7 @@ class SmSymDefineDialog : public ModalDialog DECL_LINK(FontChangeHdl, ListBox *); DECL_LINK(SubsetChangeHdl, ListBox*); DECL_LINK(StyleChangeHdl, ComboBox *); - DECL_LINK(CharHighlightHdl, Control* pControl); + DECL_LINK(CharHighlightHdl, void *); DECL_LINK(AddClickHdl, Button *); DECL_LINK(ChangeClickHdl, Button *); DECL_LINK(DeleteClickHdl, Button *); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 5781e26c09f0..5e9da554c097 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -93,7 +93,7 @@ protected: private: void RepaintViewShellDoc(); - DECL_LINK(CaretBlinkTimerHdl, AutoTimer *); + DECL_LINK(CaretBlinkTimerHdl, void *); void CaretBlinkInit(); void CaretBlinkStart(); void CaretBlinkStop(); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index acf8c5f44b5c..ff8670589046 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1848,7 +1848,7 @@ IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, EMPTYARG pComboBox ) } -IMPL_LINK( SmSymDefineDialog, CharHighlightHdl, Control *, EMPTYARG ) +IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl) { sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter(); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index d75b78b7e37e..21cc4090273b 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -272,7 +272,7 @@ void SmGraphicWindow::RepaintViewShellDoc() rDoc.Repaint(); } -IMPL_LINK( SmGraphicWindow, CaretBlinkTimerHdl, AutoTimer *, EMPTYARG ) +IMPL_LINK_NOARG(SmGraphicWindow, CaretBlinkTimerHdl) { if (IsCursorVisible()) SetIsCursorVisible(false); diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 9a4a7b2b2df7..44b5f64aded1 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1447,7 +1447,7 @@ IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar) //------------------------------------------------------------------- -IMPL_LINK( BrowseBox,EndScrollHdl,ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(BrowseBox, EndScrollHdl) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 9390602dd85f..73364e45011b 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -521,12 +521,12 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) //------------------------------------------------------------------- -IMPL_LINK_INLINE_START( BrowserDataWin, RepeatedMouseMove, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(BrowserDataWin, RepeatedMouseMove) { GetParent()->MouseMove( BrowserMouseEvent( this, aRepeatEvt ) ); return 0; } -IMPL_LINK_INLINE_END( BrowserDataWin, RepeatedMouseMove, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(BrowserDataWin, RepeatedMouseMove) //------------------------------------------------------------------- diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 1078e366f6e8..1d7b0253fa29 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -281,7 +281,7 @@ namespace svt } //------------------------------------------------------------------ - IMPL_LINK( CheckBoxControl, OnClick, void*, EMPTYARG ) + IMPL_LINK_NOARG(CheckBoxControl, OnClick) { m_aClickLink.Call(pBox); return m_aModifyLink.Call(pBox); diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 65756c1bf996..85700a777703 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -256,7 +256,7 @@ namespace svt } //------------------------------------------------------------------------------ - IMPL_LINK(EditBrowseBox, StartEditHdl, void*, EMPTYARG) + IMPL_LINK_NOARG(EditBrowseBox, StartEditHdl) { nStartEvent = 0; if (IsEditing()) @@ -1114,7 +1114,7 @@ namespace svt } //------------------------------------------------------------------------------ - IMPL_LINK(EditBrowseBox, EndEditHdl, void*, EMPTYARG) + IMPL_LINK_NOARG(EditBrowseBox, EndEditHdl) { nEndEvent = 0; ReleaseController(aOldController, nOldEditRow, nOldEditCol); @@ -1127,7 +1127,7 @@ namespace svt } //------------------------------------------------------------------------------ - IMPL_LINK(EditBrowseBox, ModifyHdl, void*, EMPTYARG) + IMPL_LINK_NOARG(EditBrowseBox, ModifyHdl) { if (nCellModifiedEvent) Application::RemoveUserEvent(nCellModifiedEvent); @@ -1136,7 +1136,7 @@ namespace svt } //------------------------------------------------------------------------------ - IMPL_LINK(EditBrowseBox, CellModifiedHdl, void*, EMPTYARG) + IMPL_LINK_NOARG(EditBrowseBox, CellModifiedHdl) { nCellModifiedEvent = 0; CellModified(); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index dc3f727ce175..4e1ff6e51081 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -209,7 +209,7 @@ public: Reference< XCommandEnvironment > GetCommandEnvironment() const { return mxCmdEnv; } - DECL_LINK( ResetQuickSearch_Impl, Timer * ); + DECL_LINK(ResetQuickSearch_Impl, void *); virtual PopupMenu* CreateContextMenu( void ); virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopentry ); @@ -781,7 +781,7 @@ ViewTabListBox_Impl::~ViewTabListBox_Impl() // ----------------------------------------------------------------------- -IMPL_LINK( ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl) { ::osl::MutexGuard aGuard( maMutex ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 7c7b0af768e6..0393f8c935a9 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -232,7 +232,7 @@ class SvxIconChoiceCtrl_Impl DECL_LINK( ScrollUpDownHdl, ScrollBar * ); DECL_LINK( ScrollLeftRightHdl, ScrollBar * ); - DECL_LINK( EditTimeoutHdl, Timer* ); + DECL_LINK(EditTimeoutHdl, void *); DECL_LINK( UserEventHdl, void* ); DECL_LINK( EndScrollHdl, void* ); DECL_LINK( AutoArrangeHdl, void* ); @@ -320,7 +320,7 @@ class SvxIconChoiceCtrl_Impl void VisRectChanged() { aVisRectChangedTimer.Start(); } void SetOrigin( const Point&, sal_Bool bDoNotUpdateWallpaper = sal_False ); - DECL_LINK( TextEditEndedHdl, IcnViewEdit_Impl* ); + DECL_LINK(TextEditEndedHdl, void *); void ShowFocus ( Rectangle& rRect ); void DrawFocusRect ( OutputDevice* pOut ); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index ca6d393218d4..b0edba9d3628 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -80,7 +80,7 @@ class IcnViewEdit_Impl : public MultiLineEdit sal_Bool bGrabFocus; void CallCallBackHdl_Impl(); - DECL_LINK( Timeout_Impl, Timer * ); + DECL_LINK(Timeout_Impl, void *); DECL_LINK( ReturnHdl_Impl, Accelerator * ); DECL_LINK( EscapeHdl_Impl, Accelerator * ); @@ -265,7 +265,7 @@ IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar ) return 0; } -IMPL_LINK( SvxIconChoiceCtrl_Impl, EndScrollHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EndScrollHdl) { if( pView->HasBackground() && !pView->GetBackground().IsScrollable() && bEndScrollInvalidate ) @@ -2940,21 +2940,21 @@ void SvxIconChoiceCtrl_Impl::ClearSelectedRectList() aSelectedRectList.Remove( 0, aSelectedRectList.Count() ); } -IMPL_LINK(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, AutoArrangeHdl) { aAutoArrangeTimer.Stop(); Arrange( IsAutoArrange() ); return 0; } -IMPL_LINK(SvxIconChoiceCtrl_Impl, VisRectChangedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, VisRectChangedHdl) { aVisRectChangedTimer.Stop(); pView->VisibleRectChanged(); return 0; } -IMPL_LINK(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl) { aDocRectChangedTimer.Stop(); pView->DocumentRectChanged(); @@ -2969,7 +2969,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::IsTextHit( SvxIconChoiceCtrlEntry* pEntry, cons return sal_False; } -IMPL_LINK(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl) { SvxIconChoiceCtrlEntry* pEntry = GetCurEntry(); if( bEntryEditingEnabled && pEntry && @@ -3229,7 +3229,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry ) LINK( this, SvxIconChoiceCtrl_Impl, TextEditEndedHdl ) ); } -IMPL_LINK( SvxIconChoiceCtrl_Impl, TextEditEndedHdl, IcnViewEdit_Impl*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl) { DBG_ASSERT(pEdit,"TextEditEnded: pEdit not set"); if( !pEdit ) @@ -3389,7 +3389,7 @@ void IcnViewEdit_Impl::CallCallBackHdl_Impl() } } -IMPL_LINK( IcnViewEdit_Impl, Timeout_Impl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(IcnViewEdit_Impl, Timeout_Impl) { CallCallBackHdl_Impl(); return 0; @@ -3860,7 +3860,7 @@ void SvxIconChoiceCtrl_Impl::CallSelectHandler( SvxIconChoiceCtrlEntry* ) aCallSelectHdlTimer.Start(); } -IMPL_LINK( SvxIconChoiceCtrl_Impl, CallSelectHdlHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, CallSelectHdlHdl) { pHdlEntry = 0; pView->ClickIcon(); diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 7f6665bc1c2f..e1fdab322a83 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -309,7 +309,7 @@ void SvImpLBox::Clear() // Painten, Navigieren, Scrollen // ********************************************************************* -IMPL_LINK_INLINE_START( SvImpLBox, EndScrollHdl, ScrollBar *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvImpLBox, EndScrollHdl) { if( nFlags & F_ENDSCROLL_SET_VIS_SIZE ) { @@ -319,7 +319,7 @@ IMPL_LINK_INLINE_START( SvImpLBox, EndScrollHdl, ScrollBar *, EMPTYARG ) EndScroll(); return 0; } -IMPL_LINK_INLINE_END( SvImpLBox, EndScrollHdl, ScrollBar *, pScrollBar ) +IMPL_LINK_NOARG_INLINE_END(SvImpLBox, EndScrollHdl) // Handler vertikale ScrollBar @@ -3030,7 +3030,7 @@ void SvImpLBox::BeginDrag() } } -IMPL_LINK( SvImpLBox, BeginDragHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl) { pView->StartDrag( 0, aAsyncBeginDragPos ); return 0; @@ -3245,7 +3245,7 @@ void SvImpLBox::SetCurEntry( SvLBoxEntry* pEntry ) pView->Select( pEntry, sal_True ); } -IMPL_LINK( SvImpLBox, EditTimerCall, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SvImpLBox, EditTimerCall) { if( pView->IsInplaceEditingEnabled() ) { diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index 1ecfcf0f61cc..f212136fabb9 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -187,23 +187,23 @@ void SvInplaceEdit2::Hide() } -IMPL_LINK_INLINE_START( SvInplaceEdit2, ReturnHdl_Impl, Accelerator *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, ReturnHdl_Impl) { DBG_CHKTHIS(SvInplaceEdit2,0); bCanceled = sal_False; CallCallBackHdl_Impl(); return 1; } -IMPL_LINK_INLINE_END( SvInplaceEdit2, ReturnHdl_Impl, Accelerator *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, ReturnHdl_Impl) -IMPL_LINK_INLINE_START( SvInplaceEdit2, EscapeHdl_Impl, Accelerator *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, EscapeHdl_Impl) { DBG_CHKTHIS(SvInplaceEdit2,0); bCanceled = sal_True; CallCallBackHdl_Impl(); return 1; } -IMPL_LINK_INLINE_END( SvInplaceEdit2, EscapeHdl_Impl, Accelerator *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, EscapeHdl_Impl) sal_Bool SvInplaceEdit2::KeyInput( const KeyEvent& rKEvt ) @@ -251,13 +251,13 @@ void SvInplaceEdit2::LoseFocus() } } -IMPL_LINK_INLINE_START( SvInplaceEdit2, Timeout_Impl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, Timeout_Impl) { DBG_CHKTHIS(SvInplaceEdit2,0); CallCallBackHdl_Impl(); return 0; } -IMPL_LINK_INLINE_END( SvInplaceEdit2, Timeout_Impl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, Timeout_Impl) void SvInplaceEdit2::CallCallBackHdl_Impl() { @@ -1290,7 +1290,7 @@ void SvLBox::EditText( const String& rStr, const Rectangle& rRect, rSel, bMulti ); } -IMPL_LINK( SvLBox, TextEditEndedHdl_Impl, SvInplaceEdit2 *, EMPTYARG ) +IMPL_LINK_NOARG(SvLBox, TextEditEndedHdl_Impl) { DBG_CHKTHIS(SvLBox,0); if ( nImpFlags & SVLBOX_EDTEND_CALLED ) // Nesting verhindern diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index b1b2bd17737f..f2c54a7b43bc 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -699,7 +699,7 @@ void SvHeaderTabListBox::Clear() // ----------------------------------------------------------------------- -IMPL_LINK( SvHeaderTabListBox, ScrollHdl_Impl, SvTabListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl) { m_pImpl->m_pHeaderBar->SetOffset( -GetXOffset() ); return 0; @@ -707,7 +707,7 @@ IMPL_LINK( SvHeaderTabListBox, ScrollHdl_Impl, SvTabListBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, EMPTYARG ) +IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl) { Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - accessible parent not found" ); diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index de5529d00e03..d23862db2ce5 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -1082,7 +1082,7 @@ SvtTemplateWindow::~SvtTemplateWindow() // ------------------------------------------------------------------------ -IMPL_LINK ( SvtTemplateWindow , IconClickHdl_Impl, SvtIconChoiceCtrl *, EMPTYARG ) +IMPL_LINK_NOARG(SvtTemplateWindow , IconClickHdl_Impl) { String aURL = pIconWin->GetSelectedIconURL(); if ( !aURL.Len() ) @@ -1098,7 +1098,7 @@ IMPL_LINK ( SvtTemplateWindow , IconClickHdl_Impl, SvtIconChoiceCtrl *, EMPTYARG // ------------------------------------------------------------------------ -IMPL_LINK ( SvtTemplateWindow , FileSelectHdl_Impl, SvtFileView *, EMPTYARG ) +IMPL_LINK_NOARG(SvtTemplateWindow , FileSelectHdl_Impl) { aSelectTimer.Start(); return 0; @@ -1106,7 +1106,7 @@ IMPL_LINK ( SvtTemplateWindow , FileSelectHdl_Impl, SvtFileView *, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK ( SvtTemplateWindow , FileDblClickHdl_Impl, SvtFileView *, EMPTYARG ) +IMPL_LINK_NOARG(SvtTemplateWindow , FileDblClickHdl_Impl) { if ( aSelectTimer.IsActive() ) aSelectTimer.Stop(); @@ -1125,7 +1125,7 @@ IMPL_LINK ( SvtTemplateWindow , FileDblClickHdl_Impl, SvtFileView *, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK ( SvtTemplateWindow , NewFolderHdl_Impl, SvtFileView *, EMPTYARG ) +IMPL_LINK_NOARG(SvtTemplateWindow , NewFolderHdl_Impl) { pFrameWin->OpenFile( String(), sal_True, sal_False, sal_False ); aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, sal_False ); @@ -1140,7 +1140,7 @@ IMPL_LINK ( SvtTemplateWindow , NewFolderHdl_Impl, SvtFileView *, EMPTYARG ) // ------------------------------------------------------------------------ -IMPL_LINK ( SvtTemplateWindow , TimeoutHdl_Impl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SvtTemplateWindow , TimeoutHdl_Impl) { aSelectHdl.Call( this ); String sURL = pFileWin->GetSelectedFile(); @@ -1170,7 +1170,7 @@ IMPL_LINK ( SvtTemplateWindow , ClickHdl_Impl, ToolBox *, pToolBox ) // ------------------------------------------------------------------------ -IMPL_LINK ( SvtTemplateWindow , ResizeHdl_Impl, SplitWindow *, EMPTYARG ) +IMPL_LINK_NOARG(SvtTemplateWindow , ResizeHdl_Impl) { Resize(); return 0; @@ -1736,7 +1736,7 @@ sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const // ------------------------------------------------------------------------ -IMPL_LINK ( SvtDocumentTemplateDialog , SelectHdl_Impl, SvtTemplateWindow *, EMPTYARG ) +IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SelectHdl_Impl) { aEditBtn.Enable( pImpl->pWin->IsTemplateFolderOpen() && CanEnableEditBtn() ); aOKBtn.Enable( pImpl->pWin->IsFileSelected() ); @@ -1745,7 +1745,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , SelectHdl_Impl, SvtTemplateWindow *, EMP // ------------------------------------------------------------------------ -IMPL_LINK ( SvtDocumentTemplateDialog , DoubleClickHdl_Impl, SvtTemplateWindow *, EMPTYARG ) +IMPL_LINK_NOARG(SvtDocumentTemplateDialog , DoubleClickHdl_Impl) { EndDialog( RET_OK ); @@ -1756,7 +1756,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , DoubleClickHdl_Impl, SvtTemplateWindow * // ------------------------------------------------------------------------ -IMPL_LINK ( SvtDocumentTemplateDialog , NewFolderHdl_Impl, SvtTemplateWindow *, EMPTYARG ) +IMPL_LINK_NOARG(SvtDocumentTemplateDialog , NewFolderHdl_Impl) { String aNewTitle( pImpl->aTitle ); aNewTitle += String( ASCII_STR(" - ") ); @@ -1769,7 +1769,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , NewFolderHdl_Impl, SvtTemplateWindow *, // ------------------------------------------------------------------------ -IMPL_LINK ( SvtDocumentTemplateDialog , SendFocusHdl_Impl, SvtTemplateWindow *, EMPTYARG ) +IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SendFocusHdl_Impl) { if ( pImpl->pWin->HasIconWinFocus() ) aHelpBtn.GrabFocus(); @@ -1802,7 +1802,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , OKHdl_Impl, PushButton *, pBtn ) // ------------------------------------------------------------------------ -IMPL_LINK ( SvtDocumentTemplateDialog , OrganizerHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvtDocumentTemplateDialog , OrganizerHdl_Impl) { Window* pOldDefWin = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); @@ -1877,7 +1877,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource ) // ------------------------------------------------------------------------ -IMPL_LINK ( SvtDocumentTemplateDialog, OpenLinkHdl_Impl, svt::FixedHyperlink*, EMPTYARG ) +IMPL_LINK_NOARG(SvtDocumentTemplateDialog, OpenLinkHdl_Impl) { ::rtl::OUString sURL( aMoreTemplatesLink.GetURL() ); if ( !sURL.isEmpty() ) diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index 6963f333540d..7e2c7506b48e 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -256,13 +256,13 @@ private: virtual void Resize(); - DECL_LINK( IconClickHdl_Impl, SvtIconChoiceCtrl* ); - DECL_LINK( FileSelectHdl_Impl, SvtFileView* ); - DECL_LINK( FileDblClickHdl_Impl, SvtFileView* ); - DECL_LINK( NewFolderHdl_Impl, SvtFileView* ); - DECL_LINK( TimeoutHdl_Impl, Timer* ); + DECL_LINK(IconClickHdl_Impl, void *); + DECL_LINK(FileSelectHdl_Impl, void *); + DECL_LINK(FileDblClickHdl_Impl, void *); + DECL_LINK(NewFolderHdl_Impl, void *); + DECL_LINK(TimeoutHdl_Impl, void *); DECL_LINK( ClickHdl_Impl, ToolBox* ); - DECL_LINK( ResizeHdl_Impl, SplitWindow* ); // used for split and initial setting of toolbar pos + DECL_LINK(ResizeHdl_Impl, void *); // used for split and initial setting of toolbar pos void PrintFile( const String& rURL ); void AppendHistoryURL( const String& rURL, sal_uLong nGroup ); diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 2a06db143eaa..c82b29f98c77 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -2505,7 +2505,7 @@ IMPL_LINK( CalendarField, ImplClickHdl, PushButton*, pBtn ) // ----------------------------------------------------------------------- -IMPL_LINK( CalendarField, ImplPopupModeEndHdl, FloatingWindow*, EMPTYARG ) +IMPL_LINK_NOARG(CalendarField, ImplPopupModeEndHdl) { EndDropDown(); GrabFocus(); diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index d3ec1770d4a8..e5d6197731f9 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -182,7 +182,7 @@ void FileControl::Resize() // ----------------------------------------------------------------------- -IMPL_LINK( FileControl, ButtonHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(FileControl, ButtonHdl) { ImplBrowseFile( ); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 7d4ffe57ee4e..ad5897de3ef8 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1036,7 +1036,7 @@ long SvtURLBox::PreNotify( NotifyEvent& rNEvt ) } //------------------------------------------------------------------------- -IMPL_LINK( SvtURLBox, AutoCompleteHdl_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl) { if ( GetSubEdit()->GetAutocompleteAction() == AUTOCOMPLETE_KEYINPUT ) { diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index d014cbbc2d4d..3222452380cf 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2082,7 +2082,7 @@ void Ruler::ImplEndDrag() // ----------------------------------------------------------------------- -IMPL_LINK( Ruler, ImplUpdateHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Ruler, ImplUpdateHdl) { mnUpdateEvtId = 0; diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 54476afe0838..e05590ac9405 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -336,7 +336,7 @@ IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel ) // ----------------------------------------------------------------------- -IMPL_LINK( TabBarEdit, ImplEndTimerHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(TabBarEdit, ImplEndTimerHdl) { if ( HasFocus() ) return 0; diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 80acfcac22b9..3c25d0f8c5d3 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -158,7 +158,7 @@ TaskStatusBar::~TaskStatusBar() // ----------------------------------------------------------------------- -IMPL_LINK( TaskStatusBar, ImplTimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(TaskStatusBar, ImplTimerHdl) { sal_Bool bUpdate = ImplUpdateClock(); if ( ImplUpdateFlashItems() ) diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index e22ec21cc605..715040252dc5 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1137,7 +1137,7 @@ IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar ) // ----------------------------------------------------------------------- -IMPL_LINK( ValueSet,ImplTimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ValueSet, ImplTimerHdl) { ImplTracking( GetPointerPosPixel(), true ); return 0; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index b295a73e871e..8a7f238e4ff4 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -1146,7 +1146,7 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - IMPL_LINK(AddressBookSourceDialog, OnDelayedInitialize, void*, EMPTYARG) + IMPL_LINK_NOARG(AddressBookSourceDialog, OnDelayedInitialize) { // load the initial data from the configuration loadConfiguration(); @@ -1191,7 +1191,7 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - IMPL_LINK(AddressBookSourceDialog, OnOkClicked, Button*, EMPTYARG) + IMPL_LINK_NOARG(AddressBookSourceDialog, OnOkClicked) { String sSelectedDS = lcl_getSelectedDataSource( m_aDatasource ); if ( m_pImpl->bWorkingPersistent ) @@ -1215,7 +1215,7 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - IMPL_LINK(AddressBookSourceDialog, OnAdministrateDatasources, void*, EMPTYARG) + IMPL_LINK_NOARG(AddressBookSourceDialog, OnAdministrateDatasources) { // collect some initial arguments for the dialog Sequence< Any > aArgs(1); diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index d26d58ee4520..a383af839c70 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -300,7 +300,7 @@ void PrinterSetupDialog::ImplSetInfo() // ----------------------------------------------------------------------- -IMPL_LINK( PrinterSetupDialog, ImplStatusHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl) { QueueInfo aInfo; ImplPrnDlgUpdateQueueInfo( &maLbName, aInfo ); @@ -311,7 +311,7 @@ IMPL_LINK( PrinterSetupDialog, ImplStatusHdl, Timer*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( PrinterSetupDialog, ImplPropertiesHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl) { if ( !mpTempPrinter ) mpTempPrinter = new Printer( mpPrinter->GetJobSetup() ); @@ -322,7 +322,7 @@ IMPL_LINK( PrinterSetupDialog, ImplPropertiesHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( PrinterSetupDialog, ImplChangePrinterHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl) { mpTempPrinter = ImplPrnDlgListBoxSelect( &maLbName, &maBtnProperties, mpPrinter, mpTempPrinter ); diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 4fc594b0d5d8..3771a0c92a88 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -533,7 +533,7 @@ namespace svt } //-------------------------------------------------------------------- - IMPL_LINK( RoadmapWizard, OnRoadmapItemSelected, void*, EMPTYARG ) + IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 1ff0b9d268be..bf7f67df4a8e 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -418,7 +418,7 @@ namespace svt } //--------------------------------------------------------------------- - IMPL_LINK(OWizardMachine, OnFinish, PushButton*, EMPTYARG) + IMPL_LINK_NOARG(OWizardMachine, OnFinish) { if ( isTravelingSuspended() ) return 0; @@ -635,7 +635,7 @@ namespace svt } //--------------------------------------------------------------------- - IMPL_LINK(OWizardMachine, OnPrevPage, PushButton*, EMPTYARG) + IMPL_LINK_NOARG(OWizardMachine, OnPrevPage) { if ( isTravelingSuspended() ) return 0; @@ -645,7 +645,7 @@ namespace svt } //--------------------------------------------------------------------- - IMPL_LINK(OWizardMachine, OnNextPage, PushButton*, EMPTYARG) + IMPL_LINK_NOARG(OWizardMachine, OnNextPage) { if ( isTravelingSuspended() ) return 0; diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index e64de75560e0..69de5c617789 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -1089,7 +1089,7 @@ void MultiLineEdit::Modify() pUpdateDataTimer->Start(); } -IMPL_LINK( MultiLineEdit, ImpUpdateDataHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MultiLineEdit, ImpUpdateDataHdl) { UpdateData(); return 0; diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 74c41198dc62..8b13fcdbd46d 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -1581,7 +1581,7 @@ void TextEngine::UpdateViews( TextView* pCurView ) maInvalidRec = Rectangle(); } -IMPL_LINK( TextEngine, IdleFormatHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(TextEngine, IdleFormatHdl) { FormatAndUpdate( mpIdleFormatter->GetView() ); return 0; diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 7b8eff56a51a..ed197e9018c8 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -1402,13 +1402,13 @@ ExportDialog::~ExportDialog() |* Speichert eingestellte Werte in ini-Datei |* \************************************************************************/ -IMPL_LINK( ExportDialog, UpdateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExportDialog, UpdateHdl) { updateControls(); return 0; } -IMPL_LINK( ExportDialog, UpdateHdlMtfSizeX, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX) { double fRatio = static_cast< double >( maOriginalSize.Height ) / maOriginalSize.Width; @@ -1442,7 +1442,7 @@ IMPL_LINK( ExportDialog, UpdateHdlMtfSizeX, void *, EMPTYARG ) return 0; } -IMPL_LINK( ExportDialog, UpdateHdlMtfSizeY, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY) { double fRatio = static_cast< double >( maOriginalSize.Width ) / maOriginalSize.Height; @@ -1476,7 +1476,7 @@ IMPL_LINK( ExportDialog, UpdateHdlMtfSizeY, void *, EMPTYARG ) return 0; } -IMPL_LINK( ExportDialog, UpdateHdlNfResolution, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExportDialog, UpdateHdlNfResolution) { sal_Int32 nResolution = maNfResolution.GetValue(); if ( maLbResolution.GetSelectEntryPos() == 0 ) // pixels / cm @@ -1490,14 +1490,14 @@ IMPL_LINK( ExportDialog, UpdateHdlNfResolution, void *, EMPTYARG ) return 0; } -IMPL_LINK( ExportDialog, SbCompressionUpdateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExportDialog, SbCompressionUpdateHdl) { maNfCompression.SetValue( maSbCompression.GetThumbPos() ); updateControls(); return 0; } -IMPL_LINK( ExportDialog, OK, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExportDialog, OK) { // writing config parameter diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 7c2de86b9767..bd83f38e201c 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1085,7 +1085,7 @@ void GraphicObject::SetSwapState() } } -IMPL_LINK( GraphicObject, ImplAutoSwapOutHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl) { if( !IsSwappedOut() ) { diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 2c3e9d3fae73..094c59de3429 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -175,7 +175,7 @@ private: // #97680# -------------------- std::vector< short > aContextBmpWidthVector; - DECL_LINK( EditTimerCall, Timer * ); + DECL_LINK(EditTimerCall, void *); DECL_LINK( BeginDragHdl, void* ); DECL_LINK( MyUserEvent,void*); @@ -202,7 +202,7 @@ private: // ScrollBar-Handler DECL_LINK( ScrollUpDownHdl, ScrollBar * ); DECL_LINK( ScrollLeftRightHdl, ScrollBar * ); - DECL_LINK( EndScrollHdl, ScrollBar * ); + DECL_LINK( EndScrollHdl, void * ); void SetNodeBmpYOffset( const Image& ); void SetNodeBmpTabDistance(); diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 5b5667aad85e..c8ff4b078826 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -126,7 +126,7 @@ public: class VCLXFileControl : ::com::sun::star::awt::XTextComponent, public ::com::sun::star::awt::XTextLayoutConstrains, public VCLXWindow { protected: - DECL_LINK( ModifyHdl, Edit* ); + DECL_LINK(ModifyHdl, void *); TextListenerMultiplexer maTextListeners; public: diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 283d34a2a01b..b8cd25a74ee8 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -461,7 +461,7 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge } //----------------------------------------------- -IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, EMPTYARG) +IMPL_LINK_NOARG(AcceleratorExecute, impl_ts_asyncCallback) { // replaced by AsyncAccelExec! return 0; diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx index 50d73da26d9d..824e598b96d9 100644 --- a/svtools/source/misc/filechangedchecker.cxx +++ b/svtools/source/misc/filechangedchecker.cxx @@ -95,7 +95,7 @@ bool FileChangedChecker::hasFileChanged() return false; } -IMPL_LINK(FileChangedChecker, TimerHandler, Timer *, EMPTYARG) +IMPL_LINK_NOARG(FileChangedChecker, TimerHandler) { // If the file has changed, then update the graphic in the doc OSL_TRACE("Timeout Called"); diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 4ff4af2a6bfb..243619d3a465 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -101,7 +101,7 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl() } // ------------------------------------------------------------------------ -IMPL_LINK( SfxItemDesruptor_Impl, Delete, void *, EMPTYARG ) +IMPL_LINK_NOARG(SfxItemDesruptor_Impl, Delete) { {DBG_CHKTHIS(SfxItemDesruptor_Impl, 0);} delete this; diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index a5792aabfa07..3cdc5455abb9 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -548,7 +548,7 @@ namespace svt { namespace table } //------------------------------------------------------------------------------------------------------------------ - IMPL_LINK( TableControl, ImplSelectHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(TableControl, ImplSelectHdl) { Select(); return 1; diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 7b943857e3e2..f656a249cdb4 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -103,9 +103,9 @@ public: virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& ); virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); - DECL_LINK( OnSelectionChangeHdl, UnoTreeListBoxImpl* ); - DECL_LINK( OnExpandingHdl, UnoTreeListBoxImpl* ); - DECL_LINK( OnExpandedHdl, UnoTreeListBoxImpl* ); + DECL_LINK(OnSelectionChangeHdl, void *); + DECL_LINK(OnExpandingHdl, void *); + DECL_LINK(OnExpandedHdl, void *); private: rtl::Reference< TreeControlPeer > mxPeer; @@ -1537,7 +1537,7 @@ UnoTreeListBoxImpl::~UnoTreeListBoxImpl() // -------------------------------------------------------------------- -IMPL_LINK( UnoTreeListBoxImpl, OnSelectionChangeHdl, UnoTreeListBoxImpl*, EMPTYARG ) +IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnSelectionChangeHdl) { if( mxPeer.is() ) mxPeer->onSelectionChanged(); @@ -1546,7 +1546,7 @@ IMPL_LINK( UnoTreeListBoxImpl, OnSelectionChangeHdl, UnoTreeListBoxImpl*, EMPTYA // -------------------------------------------------------------------- -IMPL_LINK(UnoTreeListBoxImpl, OnExpandingHdl, UnoTreeListBoxImpl*, EMPTYARG ) +IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandingHdl) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); @@ -1559,7 +1559,7 @@ IMPL_LINK(UnoTreeListBoxImpl, OnExpandingHdl, UnoTreeListBoxImpl*, EMPTYARG ) // -------------------------------------------------------------------- -IMPL_LINK(UnoTreeListBoxImpl, OnExpandedHdl, UnoTreeListBoxImpl*, EMPTYARG ) +IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); if( pEntry && mxPeer.is() ) diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index c00f0749146c..7602e3942ffc 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -729,7 +729,7 @@ sal_Int16 VCLXFileControl::getMaxTextLen() throw(::com::sun::star::uno::RuntimeE } -IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(VCLXFileControl, ModifyHdl) { ::com::sun::star::awt::TextEvent aEvent; aEvent.Source = (::cppu::OWeakObject*)this; diff --git a/svtools/workben/svdem.cxx b/svtools/workben/svdem.cxx index 3989a0c8d029..abb28ac584cc 100644 --- a/svtools/workben/svdem.cxx +++ b/svtools/workben/svdem.cxx @@ -474,7 +474,7 @@ MyFontDialog::MyFontDialog( Window* pParent ) : // ----------------------------------------------------------------------- -IMPL_LINK( MyFontDialog, SelectFont, ComboBox*, EMPTYARG ) +IMPL_LINK_NOARG(MyFontDialog, SelectFont) { aStyleBox.Fill( aFontBox.GetText(), pList ); FontInfo aInfo = pList->Get( aFontBox.GetText(), aStyleBox.GetText() ); @@ -485,7 +485,7 @@ IMPL_LINK( MyFontDialog, SelectFont, ComboBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( MyFontDialog, SelectStyle, ComboBox*, EMPTYARG ) +IMPL_LINK_NOARG(MyFontDialog, SelectStyle) { FontInfo aInfo = pList->Get( aFontBox.GetText(), aStyleBox.GetText() ); aSizeBox.Fill( &aInfo, pList ); @@ -495,7 +495,7 @@ IMPL_LINK( MyFontDialog, SelectStyle, ComboBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( MyFontDialog, AttrHdl, Window*, EMPTYARG ) +IMPL_LINK_NOARG(MyFontDialog, AttrHdl) { SetAttr(); return 0; @@ -643,7 +643,7 @@ MyCalendar::~MyCalendar() // ----------------------------------------------------------------------- -IMPL_LINK( MyCalendar, RequestDateInfoHdl, Calendar*, EMPTYARG ) +IMPL_LINK_NOARG(MyCalendar, RequestDateInfoHdl) { sal_uInt16 nRequestYear = aCalendar.GetRequestYear(); if ( (nRequestYear >= 1954) && (nRequestYear <= 1989) ) @@ -655,7 +655,7 @@ IMPL_LINK( MyCalendar, RequestDateInfoHdl, Calendar*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( MyCalendar, DoubleClickHdl, Calendar*, EMPTYARG ) +IMPL_LINK_NOARG(MyCalendar, DoubleClickHdl) { Date aDate = aCalendar.GetCurDate(); String aStr( RTL_CONSTASCII_USTRINGPARAM( "Info: " ) ); diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 11e94947f1bb..a71227e753bd 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -129,9 +129,9 @@ class SdrItemBrowser: public _SdrItemBrowserWindow { bool bDirty; private: static Window* ImpGetViewWin(SdrView& rView); - DECL_LINK(IdleHdl,Timer*); + DECL_LINK(IdleHdl, void *); DECL_LINK(ChangedHdl,_SdrItemBrowserControl*); - DECL_LINK(SetDirtyHdl,_SdrItemBrowserControl*); + DECL_LINK(SetDirtyHdl, void *); public: SdrItemBrowser(SdrView& rView); void ForceParent(); diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx index 3168a2f22337..7e863915e52b 100644 --- a/svx/inc/svx/charmap.hxx +++ b/svx/inc/svx/charmap.hxx @@ -130,7 +130,7 @@ private: void InitSettings( sal_Bool bForeground, sal_Bool bBackground); // abstraction layers are: Unicode<->MapIndex<->Pixel Point MapIndexToPixel( int) const; - DECL_LINK( VscrollHdl, ScrollBar* ); + DECL_LINK(VscrollHdl, void *); }; #endif diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index 895036f7f3eb..b3b84dace24e 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -92,7 +92,7 @@ private: Size aLogicalAttrSize; Timer aDelayTimer; - DECL_LINK( DelayHdl, Timer * ); + DECL_LINK( DelayHdl, void * ); DECL_LINK( SelectFillTypeHdl, ListBox * ); DECL_LINK( SelectFillAttrHdl, ListBox * ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index a196ee7870b5..1dfb8ab8c7fc 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -95,13 +95,13 @@ protected: void InitHandler(); DECL_LINK( TurnOnHdl, CheckBox*); - DECL_LINK( DistModify, MetricField*); - DECL_LINK( HeightModify, MetricField*); - DECL_LINK( BorderModify, MetricField*); - DECL_LINK( BackgroundHdl, Button*); + DECL_LINK(DistModify, void *); + DECL_LINK(HeightModify, void *); + DECL_LINK(BorderModify, void *); + DECL_LINK(BackgroundHdl, void *); void UpdateExample(); - DECL_LINK( RangeHdl, Edit*); + DECL_LINK(RangeHdl, void *); private: #ifdef _SVX_HDFT_CXX diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx index 3a6703aa6cdd..a1cf6126215b 100644 --- a/svx/inc/svx/imapdlg.hxx +++ b/svx/inc/svx/imapdlg.hxx @@ -145,7 +145,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow DECL_LINK( GraphSizeHdl, IMapWindow* ); DECL_LINK( URLModifyHdl, void* ); DECL_LINK( URLLoseFocusHdl, void* ); - DECL_LINK( UpdateHdl, Timer* ); + DECL_LINK(UpdateHdl, void *); DECL_LINK( TbxUpdateHdl, Timer* ); DECL_LINK( StateHdl, IMapWindow* ); DECL_LINK( MiscHdl, void* ); diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx index acf00d18606f..10babf837f1f 100644 --- a/svx/inc/svx/itemwin.hxx +++ b/svx/inc/svx/itemwin.hxx @@ -51,7 +51,7 @@ class SvxLineBox : public LineLB ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; #ifdef _SVX_ITEMWIN_CXX - DECL_LINK( DelayHdl_Impl, Timer * ); + DECL_LINK(DelayHdl_Impl, void *); void ReleaseFocus_Impl(); #endif diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx index 0bf764bf5847..cdc27326d4fd 100644 --- a/svx/inc/svx/numvset.hxx +++ b/svx/inc/svx/numvset.hxx @@ -106,7 +106,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet sal_Bool bGrfNotFound; protected: - DECL_LINK(FormatHdl_Impl, Timer*); + DECL_LINK(FormatHdl_Impl, void *); void SetGrfNotFound(sal_Bool bSet) {bGrfNotFound = bSet;} sal_Bool IsGrfNotFound()const {return bGrfNotFound;} diff --git a/svx/inc/svx/passwd.hxx b/svx/inc/svx/passwd.hxx index a412807c80cd..ab43e5009fa5 100644 --- a/svx/inc/svx/passwd.hxx +++ b/svx/inc/svx/passwd.hxx @@ -63,8 +63,8 @@ private: sal_Bool bEmpty; - DECL_LINK( ButtonHdl, OKButton * ); - DECL_LINK( EditModifyHdl, Edit * ); + DECL_LINK(ButtonHdl, void *); + DECL_LINK(EditModifyHdl, void *); public: SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False ); diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx index 1c74ad3224a3..3b267b629887 100644 --- a/svx/inc/svx/rubydialog.hxx +++ b/svx/inc/svx/rubydialog.hxx @@ -131,14 +131,14 @@ class SvxRubyDialog : public SfxModelessDialog SfxBindings* pBindings; SvxRubyData_Impl* pImpl; - DECL_LINK(ApplyHdl_Impl, PushButton*); - DECL_LINK(CloseHdl_Impl, PushButton*); - DECL_LINK(StylistHdl_Impl, PushButton*); + DECL_LINK(ApplyHdl_Impl, void *); + DECL_LINK(CloseHdl_Impl, void *); + DECL_LINK(StylistHdl_Impl, void *); DECL_LINK(AutomaticHdl_Impl, CheckBox*); DECL_LINK(ScrollHdl_Impl, ScrollBar*); DECL_LINK(PositionHdl_Impl, ListBox*); DECL_LINK(AdjustHdl_Impl, ListBox*); - DECL_LINK(CharStyleHdl_Impl, ListBox*); + DECL_LINK(CharStyleHdl_Impl, void *); DECL_LINK(EditModifyHdl_Impl, Edit*); DECL_LINK(EditScrollHdl_Impl, sal_Int32*); DECL_LINK(EditJumpHdl_Impl, sal_Int32*); diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index 852c681fa27f..263494332dc9 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -235,12 +235,12 @@ private: DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit ); DECL_LINK( FlagHdl_Impl, Control* pCtrl ); DECL_LINK( CommandHdl_Impl, Button* pBtn ); - DECL_LINK( TemplateHdl_Impl, Button* ); + DECL_LINK(TemplateHdl_Impl, void *); DECL_LINK( FocusHdl_Impl, Control* ); - DECL_LINK( LoseFocusHdl_Impl, Control* ); - DECL_LINK( FormatHdl_Impl, Button* ); - DECL_LINK( NoFormatHdl_Impl, Button* ); - DECL_LINK( AttributeHdl_Impl, Button* ); + DECL_LINK(LoseFocusHdl_Impl, void *); + DECL_LINK(FormatHdl_Impl, void *); + DECL_LINK(NoFormatHdl_Impl, void *); + DECL_LINK(AttributeHdl_Impl, void *); DECL_LINK( TimeoutHdl_Impl, Timer* ); void Construct_Impl(); diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index c5773d101d77..19594c3a7a4a 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -249,7 +249,7 @@ public: private: SVX_DLLPRIVATE void ImpClearVars(); - DECL_LINK(ImpComeBackHdl,Timer*); + DECL_LINK(ImpComeBackHdl,void*); protected: sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const; diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index f55a18174873..eb7fb6470dcd 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -191,7 +191,7 @@ public: DECL_LINK( CbxHdl, CheckBox* pCbx ); DECL_LINK( CbxTransHdl, CheckBox* pCbx ); DECL_LINK( FocusLbHdl, ColorLB* pLb ); - DECL_LINK( ExecHdl, PushButton* pBtn ); + DECL_LINK(ExecHdl, void *); }; //------------------------------------------------------------------------- @@ -331,7 +331,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb ) //------------------------------------------------------------------------- -IMPL_LINK( MaskData, ExecHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MaskData, ExecHdl) { SfxBoolItem aBItem( SID_BMPMASK_EXEC, sal_True ); rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L ); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index c96bbf781eab..ddc11ed87e39 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -606,7 +606,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd ) return 0L; } -IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl) { aUpdateTimer.Stop(); @@ -632,7 +632,7 @@ IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG ) return 0L; } -IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl) { aCreateTimer.Stop(); @@ -800,7 +800,7 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt ) ApplyImageList(); } -IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxSuperContourDlg, MiscHdl) { SvtMiscOptions aMiscOptions; aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 5b164c02ce8a..e3a40b2c1b9e 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -623,7 +623,7 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxShowCharSet, VscrollHdl, ScrollBar *, EMPTYARG ) +IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl) { if( nSelectedIndex < FirstInView() ) { diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 9a7c8de4b02b..acb7867c2c95 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -68,8 +68,8 @@ class SvxSuperContourDlg : public SvxContourDlg DECL_LINK( Tbx1ClickHdl, ToolBox* ); DECL_LINK( MousePosHdl, ContourWindow* ); DECL_LINK( GraphSizeHdl, ContourWindow* ); - DECL_LINK( UpdateHdl, Timer* ); - DECL_LINK( CreateHdl, Timer* ); + DECL_LINK(UpdateHdl, void *); + DECL_LINK(CreateHdl, void *); DECL_LINK( StateHdl, ContourWindow* ); DECL_LINK( PipetteHdl, ContourWindow* ); DECL_LINK( PipetteClickHdl, ContourWindow* ); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index c5462aa7a2a3..6baa08bcb8f5 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1224,7 +1224,7 @@ void SvxLightCtl3D::LoseFocus() maLightControl.HideFocus(); } -IMPL_LINK( SvxLightCtl3D, ScrollBarMove, void*, EMPTYARG) +IMPL_LINK_NOARG(SvxLightCtl3D, ScrollBarMove) { const sal_Int32 nHor(maHorScroller.GetThumbPos()); const sal_Int32 nVer(maVerScroller.GetThumbPos()); @@ -1241,7 +1241,7 @@ IMPL_LINK( SvxLightCtl3D, ScrollBarMove, void*, EMPTYARG) return 0; } -IMPL_LINK( SvxLightCtl3D, ButtonPress, void*, EMPTYARG) +IMPL_LINK_NOARG(SvxLightCtl3D, ButtonPress) { if(PREVIEW_OBJECTTYPE_SPHERE == GetSvx3DLightControl().GetObjectType()) { @@ -1255,7 +1255,7 @@ IMPL_LINK( SvxLightCtl3D, ButtonPress, void*, EMPTYARG) return 0; } -IMPL_LINK( SvxLightCtl3D, InternalInteractiveChange, void*, EMPTYARG) +IMPL_LINK_NOARG(SvxLightCtl3D, InternalInteractiveChange) { double fHor, fVer; @@ -1271,7 +1271,7 @@ IMPL_LINK( SvxLightCtl3D, InternalInteractiveChange, void*, EMPTYARG) return 0; } -IMPL_LINK( SvxLightCtl3D, InternalSelectionChange, void*, EMPTYARG) +IMPL_LINK_NOARG(SvxLightCtl3D, InternalSelectionChange) { CheckSelection(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index e311731a6d23..bb28df5d5f82 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -786,7 +786,7 @@ SaveDialog::~SaveDialog() } //=============================================== -IMPL_LINK( SaveDialog, OKButtonHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SaveDialog, OKButtonHdl) { m_nResult = DLG_RET_OK; return 0; @@ -1386,7 +1386,7 @@ void RecoveryDialog::end() } //=============================================== -IMPL_LINK( RecoveryDialog, NextButtonHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl) { m_bUserDecideNext = sal_True; m_bWaitForUser = sal_False; @@ -1394,7 +1394,7 @@ IMPL_LINK( RecoveryDialog, NextButtonHdl, void*, EMPTYARG ) } //=============================================== -IMPL_LINK( RecoveryDialog, CancelButtonHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl) { if (m_eRecoveryState == RecoveryDialog::E_RECOVERY_PREPARED) { @@ -1520,7 +1520,7 @@ sal_Bool BrokenRecoveryDialog::isExecutionNeeded() } //=============================================== -IMPL_LINK( BrokenRecoveryDialog, OkButtonHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl) { String sPhysicalPath = m_aSaveDirED.GetText().EraseLeadingChars().EraseTrailingChars(); rtl::OUString sURL; @@ -1534,14 +1534,14 @@ IMPL_LINK( BrokenRecoveryDialog, OkButtonHdl, void*, EMPTYARG ) } //=============================================== -IMPL_LINK( BrokenRecoveryDialog, CancelButtonHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(BrokenRecoveryDialog, CancelButtonHdl) { EndDialog(DLG_RET_CANCEL); return 0; } //=============================================== -IMPL_LINK( BrokenRecoveryDialog, SaveButtonHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(BrokenRecoveryDialog, SaveButtonHdl) { impl_askForSavePath(); return 0; @@ -1605,19 +1605,19 @@ void BrokenRecoveryDialog::impl_askForSavePath() { } - IMPL_LINK( ErrorRepWelcomeDialog, PrevBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepWelcomeDialog, PrevBtnHdl) { m_nResult = DLG_RET_BACK; return 0; } - IMPL_LINK( ErrorRepWelcomeDialog, NextBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepWelcomeDialog, NextBtnHdl) { m_nResult = DLG_RET_OK; return 0; } - IMPL_LINK( ErrorRepWelcomeDialog, CancelBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepWelcomeDialog, CancelBtnHdl) { m_nResult = DLG_RET_CANCEL; return 0; @@ -1656,7 +1656,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() { } - IMPL_LINK( ErrorDescriptionEdit, ModifyHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorDescriptionEdit, ModifyHdl) { if ( !GetVScrollBar() ) return 0; @@ -1743,19 +1743,19 @@ void BrokenRecoveryDialog::impl_askForSavePath() maDocTypeED.GrabFocus(); } - IMPL_LINK( ErrorRepSendDialog, PrevBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepSendDialog, PrevBtnHdl) { m_nResult = DLG_RET_BACK; return 0; } - IMPL_LINK( ErrorRepSendDialog, CancelBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepSendDialog, CancelBtnHdl) { m_nResult = DLG_RET_CANCEL; return 0; } - IMPL_LINK( ErrorRepSendDialog, SendBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepSendDialog, SendBtnHdl) { SaveParams(); @@ -1765,21 +1765,21 @@ void BrokenRecoveryDialog::impl_askForSavePath() return 0; } - IMPL_LINK( ErrorRepSendDialog, ShowRepBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepSendDialog, ShowRepBtnHdl) { ErrorRepPreviewDialog aDlg( this ); aDlg.Execute(); return 0; } - IMPL_LINK( ErrorRepSendDialog, OptBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepSendDialog, OptBtnHdl) { ErrorRepOptionsDialog aDlg( this, maParams ); aDlg.Execute(); return 0; } - IMPL_LINK( ErrorRepSendDialog, ContactCBHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepSendDialog, ContactCBHdl) { bool bCheck = maContactCB.IsChecked(); maEMailAddrFT.Enable( bCheck ); @@ -1929,7 +1929,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() { } - IMPL_LINK( ErrorRepOptionsDialog, ManualBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepOptionsDialog, ManualBtnHdl) { bool bCheck = maManualBtn.IsChecked(); maProxyServerFT.Enable( bCheck ); @@ -1939,7 +1939,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() return 0; } - IMPL_LINK( ErrorRepOptionsDialog, OKBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepOptionsDialog, OKBtnHdl) { if ( maManualBtn.IsChecked() ) mrParams.miHTTPConnectionType = 2; @@ -1955,7 +1955,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() return 0; } - IMPL_LINK( ErrorRepOptionsDialog, CancelBtnHdl, void*, EMPTYARG ) + IMPL_LINK_NOARG(ErrorRepOptionsDialog, CancelBtnHdl) { EndDialog(DLG_RET_CANCEL); return 0; diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 9813ee0a8ee0..8767608b3206 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -663,7 +663,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) } } -IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxFontWorkDialog, SelectStyleHdl_Impl) { sal_uInt16 nId = aTbxStyle.GetCurItemId(); @@ -691,7 +691,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) return 0; } -IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl) { sal_uInt16 nId = aTbxAdjust.GetCurItemId(); @@ -718,7 +718,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) return 0; } -IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl) { sal_uInt16 nId = aTbxShadow.GetCurItemId(); @@ -758,14 +758,14 @@ IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_START( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxFontWorkDialog, ModifyInputHdl_Impl) { aInputTimer.Start(); return 0; } -IMPL_LINK_INLINE_END( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxFontWorkDialog, ModifyInputHdl_Impl) -IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl) { // Possibly set the Metric system again. This should be done with a // listen, this is however not possible at the moment due to compabillity @@ -819,7 +819,7 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG ) return 0; } -IMPL_LINK( SvxFontWorkDialog, FormSelectHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxFontWorkDialog, FormSelectHdl_Impl) { XFormTextStdFormItem aItem; @@ -832,7 +832,7 @@ IMPL_LINK( SvxFontWorkDialog, FormSelectHdl_Impl, void *, EMPTYARG ) return 0; } -IMPL_LINK( SvxFontWorkDialog, ColorSelectHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl) { XFormTextShadowColorItem aItem( (const String &) String(), (const Color &) aShadowColorLB.GetSelectEntryColor() ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 531f1d6f78e0..287a34ae06e0 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -510,29 +510,29 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) return 0; } -IMPL_LINK_INLINE_START( SvxHFPage, DistModify, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxHFPage, DistModify) { UpdateExample(); return 0; } -IMPL_LINK_INLINE_END( SvxHFPage, DistModify, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxHFPage, DistModify) -IMPL_LINK_INLINE_START( SvxHFPage, HeightModify, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxHFPage, HeightModify) { UpdateExample(); return 0; } -IMPL_LINK_INLINE_END( SvxHFPage, HeightModify, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxHFPage, HeightModify) -IMPL_LINK_INLINE_START( SvxHFPage, BorderModify, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SvxHFPage, BorderModify) { UpdateExample(); return 0; } -IMPL_LINK_INLINE_END( SvxHFPage, BorderModify, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SvxHFPage, BorderModify) -IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) { if ( !pBBSet ) { @@ -859,7 +859,7 @@ int SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -IMPL_LINK( SvxHFPage, RangeHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SvxHFPage, RangeHdl) { long nHHeight = aBspWin.GetHdHeight(); long nHDist = aBspWin.GetHdDist(); diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index ac21958fe048..40b3c17a1b4a 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -704,7 +704,7 @@ IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd ) return 0L; } -IMPL_LINK( SvxIMapDlg, URLModifyHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIMapDlg, URLModifyHdl) { NotifyInfo aNewInfo; @@ -717,7 +717,7 @@ IMPL_LINK( SvxIMapDlg, URLModifyHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( SvxIMapDlg, URLLoseFocusHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl) { NotifyInfo aNewInfo; const String aURLText( maURLBox.GetText() ); @@ -745,7 +745,7 @@ IMPL_LINK( SvxIMapDlg, URLLoseFocusHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( SvxIMapDlg, UpdateHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl) { pOwnData->aTimer.Stop(); @@ -830,7 +830,7 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) return 0L; } -IMPL_LINK( SvxIMapDlg, MiscHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl) { SvtMiscOptions aMiscOptions; aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 9c0c451340c8..6a272705567e 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -358,7 +358,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField ) } //------------------------------------------------------------------------ -IMPL_LINK( SvxGridTabPage, ClickRotateHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl) { if( aCbxRotate.IsChecked() ) aMtrFldAngle.Enable(); @@ -384,7 +384,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) } //------------------------------------------------------------------------ -IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl) { bAttrModified = sal_True; return 0; diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 622f2efe9055..2b2f8925e8eb 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -106,7 +106,7 @@ void OrientationHelper_Impl::ShowDependentWindows() aIt->first->Show( mbVisible ); } -IMPL_LINK( OrientationHelper_Impl, ClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(OrientationHelper_Impl, ClickHdl) { EnableDependentWindows(); return 0L; diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 787f18fe6d6d..f6dc875be342 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -40,7 +40,7 @@ // class SvxPasswordDialog ----------------------------------------------- -IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl) { sal_Bool bOK = sal_True; short nRet = RET_OK; @@ -71,7 +71,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl) { if ( !bEmpty ) { diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 2959670cc771..abdce55c131e 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -544,7 +544,7 @@ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll) return 0; } -IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl) { const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); if(!aRubyValues.getLength()) @@ -573,13 +573,13 @@ IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG) return 0; } -IMPL_LINK(SvxRubyDialog, CloseHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SvxRubyDialog, CloseHdl_Impl) { Close(); return 0; } -IMPL_LINK(SvxRubyDialog, StylistHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl) { SfxPoolItem* pState = 0; SfxItemState eState = pBindings->QueryState( SID_STYLE_DESIGNER, pState ); @@ -640,7 +640,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox) return 0; } -IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SvxRubyDialog, CharStyleHdl_Impl) { AssertOneEntry(); OUString sStyleName; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index d090ff67f001..3b1c131b4757 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1611,7 +1611,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl) { if ( pImpl->bSaveToModule ) SaveToModule_Impl(); @@ -2054,7 +2054,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxSearchDialog, LoseFocusHdl_Impl, Control *, EMPTYARG ) +IMPL_LINK_NOARG(SvxSearchDialog, LoseFocusHdl_Impl) { SaveToModule_Impl(); return 0; @@ -2062,7 +2062,7 @@ IMPL_LINK( SvxSearchDialog, LoseFocusHdl_Impl, Control *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl) { SfxObjectShell* pSh = SfxObjectShell::Current(); @@ -2158,7 +2158,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) { aLayoutBtn.SetText( aStylesStr ); bFormat = sal_False; @@ -2189,7 +2189,7 @@ IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl) { if ( !pSearchList || !pImpl->pRanges ) return 0; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index a450f134ac14..f1b810c69692 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -526,7 +526,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } } -IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) +IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl) { // only when a graphics was not there, it needs to be formatted if(bGrfNotFound) diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index ac730a35ec7b..0162c2e3c75f 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2325,7 +2325,7 @@ void Svx3DWin::Resize() } // ----------------------------------------------------------------------- -IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl) { bUpdate = !aBtnUpdate.IsChecked(); aBtnUpdate.Check( bUpdate ); @@ -2349,7 +2349,7 @@ IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG ) } // ----------------------------------------------------------------------- -IMPL_LINK( Svx3DWin, ClickAssignHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl) { SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) @@ -2983,7 +2983,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn ) // ----------------------------------------------------------------------- -IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Svx3DWin, DoubleClickHdl) { // and assign ClickAssignHdl( NULL ); @@ -2993,7 +2993,7 @@ IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( Svx3DWin, ChangeLightCallbackHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl) { return( 0L ); } @@ -3001,7 +3001,7 @@ IMPL_LINK( Svx3DWin, ChangeLightCallbackHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl) { const sal_uInt32 nLight(aCtlLightPreview.GetSvx3DLightControl().GetSelectedLight()); PushButton* pBtn = 0; diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index fde623b8da47..66c51c313dd9 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3194,7 +3194,7 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co } //------------------------------------------------------------------ -IMPL_LINK( DbFilterField, OnClick, void*, EMPTYARG ) +IMPL_LINK_NOARG(DbFilterField, OnClick) { TriState eState = ((CheckBoxControl*)m_pWindow)->GetBox().GetState(); String aText; @@ -4429,7 +4429,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _ //------------------------------------------------------------------ -IMPL_LINK( FmXListBoxCell, OnDoubleClick, void*, EMPTYARG ) +IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick) { if (m_pBox) { @@ -4815,7 +4815,7 @@ void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeE } //------------------------------------------------------------------------------ -IMPL_LINK( FmXFilterCell, OnCommit, void*, EMPTYARG ) +IMPL_LINK_NOARG(FmXFilterCell, OnCommit) { ::cppu::OInterfaceIteratorHelper aIt( m_aTextListeners ); ::com::sun::star::awt::TextEvent aEvt; diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index ebdaff328ef9..aab704a6cf09 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -360,13 +360,13 @@ namespace svxform { } //------------------------------------------------------------------------ - IMPL_LINK( XFormsPage, TbxSelectHdl, ToolBox *, EMPTYARG ) + IMPL_LINK_NOARG(XFormsPage, TbxSelectHdl) { DoToolBoxAction( m_aToolBox.GetCurItemId() ); return 0; } //------------------------------------------------------------------------ - IMPL_LINK( XFormsPage, ItemSelectHdl, DataTreeListBox *, EMPTYARG ) + IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl) { EnableMenuItems( NULL ); return 0; @@ -1985,7 +1985,7 @@ namespace svxform return 0; } // ----------------------------------------------------------------------- - IMPL_LINK( DataNavigatorWindow, ActivatePageHdl, TabControl *, EMPTYARG ) + IMPL_LINK_NOARG(DataNavigatorWindow, ActivatePageHdl) { sal_uInt16 nId = 0; XFormsPage* pPage = GetCurrentPage( nId ); @@ -1999,7 +1999,7 @@ namespace svxform return 0; } // ----------------------------------------------------------------------- - IMPL_LINK( DataNavigatorWindow, UpdateHdl, Timer *, EMPTYARG ) + IMPL_LINK_NOARG(DataNavigatorWindow, UpdateHdl) { ModelSelectHdl( NULL ); return 0; @@ -2681,7 +2681,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( AddDataItemDialog, OKHdl, OKButton *, EMPTYARG ) + IMPL_LINK_NOARG(AddDataItemDialog, OKHdl) { bool bIsHandleBinding = ( DITBinding == m_eItemType ); bool bIsHandleText = ( DITText == m_eItemType ); @@ -3077,7 +3077,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( AddConditionDialog, EditHdl, PushButton *, EMPTYARG ) + IMPL_LINK_NOARG(AddConditionDialog, EditHdl) { Reference< XNameContainer > xNameContnr; try @@ -3102,7 +3102,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( AddConditionDialog, OKHdl, OKButton *, EMPTYARG ) + IMPL_LINK_NOARG(AddConditionDialog, OKHdl) { /*!!! try @@ -3120,14 +3120,14 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( AddConditionDialog, ModifyHdl, MultiLineEdit *, EMPTYARG ) + IMPL_LINK_NOARG(AddConditionDialog, ModifyHdl) { m_aResultTimer.Start(); return 0; } //------------------------------------------------------------------------ - IMPL_LINK( AddConditionDialog, ResultHdl, Timer *, EMPTYARG ) + IMPL_LINK_NOARG(AddConditionDialog, ResultHdl) { String sCondition = m_aConditionED.GetText().EraseLeadingChars().EraseTrailingChars(); String sResult; @@ -3257,7 +3257,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( NamespaceItemDialog, OKHdl, OKButton *, EMPTYARG ) + IMPL_LINK_NOARG(NamespaceItemDialog, OKHdl) { try { @@ -3355,7 +3355,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( ManageNamespaceDialog, OKHdl, OKButton *, EMPTYARG ) + IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl) { String sPrefix = m_aPrefixED.GetText(); @@ -3432,7 +3432,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( AddSubmissionDialog, RefHdl, PushButton *, EMPTYARG ) + IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl) { AddConditionDialog aDlg( this, PN_BINDING_EXPR, m_xTempBinding ); aDlg.SetCondition( m_aRefED.GetText() ); @@ -3443,7 +3443,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( AddSubmissionDialog, OKHdl, OKButton *, EMPTYARG ) + IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl) { rtl::OUString sName(m_aNameED.GetText()); if(sName.isEmpty()) { @@ -3683,7 +3683,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( AddInstanceDialog, FilePickerHdl, PushButton *, EMPTYARG ) + IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index bc19a1c39cec..9734fac2e90c 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1281,7 +1281,7 @@ IMPL_LINK( FmFilterNavigator, OnRemove, SvLBoxEntry*, pEntry ) } //------------------------------------------------------------------------ -IMPL_LINK( FmFilterNavigator, OnDropActionTimer, void*, EMPTYARG ) +IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer) { if (--m_aTimerCounter > 0) return 0L; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 95d177a92fa2..2edf59dafb60 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1058,7 +1058,7 @@ void FmXFormShell::LockSlotInvalidation(sal_Bool bLock) } //------------------------------------------------------------------------------ -IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG) +IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots) { if ( impl_checkDisposed() ) return 0L; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index c6471c95b722..956663c906fc 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1495,7 +1495,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields) } //------------------------------------------------------------------------------ -IMPL_LINK(FormController, OnToggleAutoFields, void*, EMPTYARG) +IMPL_LINK_NOARG(FormController, OnToggleAutoFields) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2678,7 +2678,7 @@ void FormController::updateAllDispatchers() const } //------------------------------------------------------------------------------ -IMPL_LINK(FormController, OnLoad, void*, EMPTYARG) +IMPL_LINK_NOARG(FormController, OnLoad) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); m_bLocked = determineLockState(); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index df1c845e9c84..53947c390000 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1528,7 +1528,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( NavigatorTree, OnEdit, void*, EMPTYARG ) + IMPL_LINK_NOARG(NavigatorTree, OnEdit) { nEditEvent = 0; EditEntry( m_pEditEntry ); @@ -1538,7 +1538,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( NavigatorTree, OnDropActionTimer, void*, EMPTYARG ) + IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) { if (--m_aTimerCounter > 0) return 0L; @@ -1592,7 +1592,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK(NavigatorTree, OnSynchronizeTimer, void*, EMPTYARG) + IMPL_LINK_NOARG(NavigatorTree, OnSynchronizeTimer) { SynchronizeMarkList(); return 0L; @@ -1600,7 +1600,7 @@ namespace svxform //------------------------------------------------------------------------ - IMPL_LINK( NavigatorTree, OnClipboardAction, void*, EMPTYARG ) + IMPL_LINK_NOARG(NavigatorTree, OnClipboardAction) { if ( !m_aControlExchange.isClipboardOwner() ) { diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index e7e5770b066e..4c80b8af3d28 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -268,7 +268,7 @@ sal_Bool GalleryBrowser::IsLinkage() const // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser, SplitHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser, SplitHdl) { mpSplitter->SetPosPixel( Point( mpSplitter->GetSplitPosPixel(), mpSplitter->GetPosPixel().Y() ) ); Resize(); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index fc20022bcf93..d581973fe00f 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -645,7 +645,7 @@ sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser1, ShowContextMenuHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl) { ::std::vector< sal_uInt16 > aExecVector; ImplGetExecuteVector(aExecVector); @@ -684,7 +684,7 @@ IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser1, SelectThemeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl) { ( (GalleryBrowser*) GetParent() )->ThemeSelectionHasChanged(); return 0L; @@ -692,7 +692,7 @@ IMPL_LINK( GalleryBrowser1, SelectThemeHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser1, ClickNewThemeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl) { String aNewTheme( GAL_RESID( RID_SVXSTR_GALLERY_NEWTHEME ) ); String aName( aNewTheme ); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 46311b3ea560..b9953f9c814a 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -1212,7 +1212,7 @@ IMPL_LINK( GalleryBrowser2, MenuSelectHdl, Menu*, pMenu ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser2, SelectObjectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectHdl) { ImplUpdateInfoBar(); return 0L; @@ -1232,7 +1232,7 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser2, MiscHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl) { maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 0d5acf0de782..e814bfc0d6eb 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -160,8 +160,8 @@ namespace svxform String m_sInstanceURL; bool m_bLinkOnce; - DECL_LINK( TbxSelectHdl, ToolBox * ); - DECL_LINK( ItemSelectHdl, DataTreeListBox * ); + DECL_LINK(TbxSelectHdl, void *); + DECL_LINK(ItemSelectHdl, void *); void AddChildren( SvLBoxEntry* _pParent, const ImageList& _rImgLst, @@ -246,8 +246,8 @@ namespace svxform DECL_LINK( ModelSelectHdl, ListBox * ); DECL_LINK( MenuSelectHdl, MenuButton * ); DECL_LINK( MenuActivateHdl, MenuButton * ); - DECL_LINK( ActivatePageHdl, TabControl* ); - DECL_LINK( UpdateHdl, Timer* ); + DECL_LINK(ActivatePageHdl, void *); + DECL_LINK(UpdateHdl, void *); XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); void LoadModels(); @@ -355,7 +355,7 @@ namespace svxform DECL_LINK( CheckHdl, CheckBox * ); DECL_LINK( ConditionHdl, PushButton * ); - DECL_LINK( OKHdl, OKButton * ); + DECL_LINK(OKHdl, void *); void InitDialog(); void InitFromNode(); @@ -389,10 +389,10 @@ namespace svxform XFormsUIHelper1_ref m_xUIHelper; XPropertySet_ref m_xBinding; - DECL_LINK( ModifyHdl, MultiLineEdit * ); - DECL_LINK( ResultHdl, Timer * ); - DECL_LINK( EditHdl, PushButton * ); - DECL_LINK( OKHdl, OKButton * ); + DECL_LINK(ModifyHdl, void *); + DECL_LINK(ResultHdl, void *); + DECL_LINK(EditHdl, void *); + DECL_LINK(OKHdl, void *); public: AddConditionDialog( Window* pParent, @@ -434,7 +434,7 @@ namespace svxform DECL_LINK( SelectHdl, SvxSimpleTable * ); DECL_LINK( ClickHdl, PushButton * ); - DECL_LINK( OKHdl, OKButton * ); + DECL_LINK(OKHdl, void *); void LoadNamespaces(); @@ -458,7 +458,7 @@ namespace svxform AddConditionDialog* m_pConditionDlg; - DECL_LINK( OKHdl, OKButton * ); + DECL_LINK(OKHdl, void *); public: ManageNamespaceDialog( Window* pParent, AddConditionDialog* _pCondDlg, bool _bIsEdit ); @@ -507,8 +507,8 @@ namespace svxform XPropertySet_ref m_xTempBinding; XPropertySet_ref m_xCreatedBinding; - DECL_LINK( RefHdl, PushButton * ); - DECL_LINK( OKHdl, OKButton * ); + DECL_LINK(RefHdl, void *); + DECL_LINK(OKHdl, void *); void FillAllBoxes(); @@ -562,7 +562,7 @@ namespace svxform String m_sAllFilterName; - DECL_LINK( FilePickerHdl, PushButton * ); + DECL_LINK(FilePickerHdl, void *); public: AddInstanceDialog( Window* pParent, bool _bEdit ); diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 25934ef621b5..56e93dabed68 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1156,7 +1156,7 @@ void SdrItemBrowser::Undirty() } } -IMPL_LINK(SdrItemBrowser,IdleHdl,Timer*,EMPTYARG) +IMPL_LINK_NOARG(SdrItemBrowser, IdleHdl) { Undirty(); return 0; @@ -1278,7 +1278,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) return 0; } -IMPL_LINK(SdrItemBrowser,SetDirtyHdl,_SdrItemBrowserControl*,EMPTYARG) +IMPL_LINK_NOARG(SdrItemBrowser, SetDirtyHdl) { SetDirty(); return 0; diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index fe6c7f345559..95dbdcbc00a3 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -300,7 +300,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_ //////////////////////////////////////////////////////////////////////////////////////////////////// -IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG) +IMPL_LINK_NOARG_INLINE_START(SdrPaintView, ImpComeBackHdl) { if (bSomeObjChgdFlag) { bSomeObjChgdFlag=sal_False; @@ -308,7 +308,7 @@ IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG) } return 0; } -IMPL_LINK_INLINE_END(SdrPaintView,ImpComeBackHdl,Timer*,pTimer) +IMPL_LINK_NOARG_INLINE_END(SdrPaintView,ImpComeBackHdl) void SdrPaintView::FlushComeBackTimer() const { diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index faf93a0155d8..736e40041148 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2562,7 +2562,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo // -------------------------------------------------------------------- -IMPL_LINK( SvxTableController, UpdateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxTableController, UpdateHdl) { mnUpdateEvent = 0; diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index ddf01f7bbe29..192db50d3441 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -456,7 +456,7 @@ sal_Bool SvxColorDockingWindow::Close() |* \************************************************************************/ -IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) { SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); sal_uInt16 nPos = aColorSet.GetSelectItemId(); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 0cb08b1507db..e3597b17fd7b 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -464,7 +464,7 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) { int nSelected = getSelectedEntryId(); if( nSelected != -1 ) @@ -900,7 +900,7 @@ void SAL_CALL ExtrusionSurfaceWindow::statusChanged( // ----------------------------------------------------------------------- -IMPL_LINK( ExtrusionSurfaceWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 725b7f2a4be4..62aa9a140bf0 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -554,7 +554,7 @@ FillControl::~FillControl() //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( FillControl, DelayHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) { SelectFillTypeHdl( NULL ); ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" ))); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index c5c25e253ce7..5c0e657aaec6 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -253,7 +253,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork() // ----------------------------------------------------------------------- -IMPL_LINK( FontWorkGalleryDialog, ClickOKHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl) { insertSelectedFontwork(); EndDialog( true ); @@ -262,7 +262,7 @@ IMPL_LINK( FontWorkGalleryDialog, ClickOKHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( FontWorkGalleryDialog, DoubleClickFavoriteHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl) { insertSelectedFontwork(); EndDialog( true ); @@ -411,7 +411,7 @@ void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -IMPL_LINK( FontWorkAlignmentWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(FontWorkAlignmentWindow, SelectHdl) { if ( IsInPopupMode() ) EndPopupMode(); @@ -621,7 +621,7 @@ void SAL_CALL FontWorkCharacterSpacingWindow::statusChanged( const ::com::sun::s // ----------------------------------------------------------------------- -IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(FontWorkCharacterSpacingWindow, SelectHdl) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 3a6b02001e1c..2ec0687cfd69 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -93,7 +93,7 @@ void FormatPaintBrushToolBoxControl::Click() } // ----------------------------------------------------------------------- -IMPL_LINK(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) { //there was no second click during waiting this->impl_executePaintBrush(); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fb534742be53..9dd53da31af4 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -119,7 +119,7 @@ private: OUString maCommand; Reference< XFrame > mxFrame; - DECL_LINK( ImplModifyHdl, Timer* ); + DECL_LINK(ImplModifyHdl, void *); protected: @@ -190,7 +190,7 @@ void ImplGrafMetricField::Modify() // ----------------------------------------------------------------------------- -IMPL_LINK( ImplGrafMetricField, ImplModifyHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl) { const sal_Int64 nVal = GetValue(); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index fdb7b14fca61..a24ae633d851 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -92,7 +92,7 @@ SvxLineBox::~SvxLineBox() // ----------------------------------------------------------------------- -IMPL_LINK( SvxLineBox, DelayHdl_Impl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl) { if ( GetEntryCount() == 0 ) { diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 603cc4fcbc24..13c689421c68 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -107,7 +107,7 @@ private: // ----------------------------------------------------------------------- -IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TableWindow, SelectHdl) { CloseAndShowTableDialog(); return 0; diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 2d95a08ae2ca..b1d3b07ea216 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -192,7 +192,7 @@ void SvxListBoxControl::StateChanged( } -IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxListBoxControl, PopupModeEndHdl) { if( pPopupWin && 0 == pPopupWin->GetPopupModeFlags() && pPopupWin->IsUserSelected() ) @@ -230,7 +230,7 @@ void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount ) } -IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxListBoxControl, SelectHdl) { if (pPopupWin) { diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 01334d416ac2..c81177ea4620 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -458,7 +458,7 @@ SvxLineEndWindow::~SvxLineEndWindow() // ----------------------------------------------------------------------- -IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) { XLineEndItem* pLineEndItem = NULL; XLineStartItem* pLineStartItem = NULL; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index d24421d25e2c..e3669520f2a8 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -928,7 +928,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const // ----------------------------------------------------------------------- -IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl) { sal_uInt16 nItemId = aColorSet.GetSelectItemId(); SvxColorItem aColorItem( aColorSet.GetItemColor( nItemId ), theSlotId ); @@ -1140,7 +1140,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) // Per default bleiben ungesetzte Linien unveraendert // Mit Shift werden ungesetzte Linien zurueckgsetzt // -IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) { ::Color aColBlack( COL_BLACK ); SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER ); @@ -1386,7 +1386,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const // ----------------------------------------------------------------------- -IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl) { SvxLineItem aLineItem( SID_FRAME_LINESTYLE ); SvxBorderStyle nStyle = SvxBorderStyle( m_aLineStyleLb.GetSelectEntryStyle() ); @@ -1935,7 +1935,7 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, // ----------------------------------------------------------------------- -IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification) { sal_uInt16 i; diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index c974a2236f22..f26ce03f9fb2 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -432,7 +432,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur } } -IMPL_LINK( FindTextToolbarController, EditModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) { // enable or disable item DownSearch/UpSearch of findbar Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 6100860d3926..3d347f319d78 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -631,7 +631,7 @@ void ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirect updateAfterDirectionChange(); } -IMPL_LINK( ChineseDictionaryDialog, DirectionHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl) { updateAfterDirectionChange(); return 0; @@ -657,12 +657,12 @@ void ChineseDictionaryDialog::updateAfterDirectionChange() updateButtons(); } -IMPL_LINK( ChineseDictionaryDialog, EditFieldsHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsHdl) { updateButtons(); return 0; } -IMPL_LINK( ChineseDictionaryDialog, MappingSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl) { DictionaryEntry* pE = getActiveDictionary().getFirstSelectedEntry(); if(pE) @@ -749,7 +749,7 @@ void ChineseDictionaryDialog::updateButtons() m_aPB_Modify.Enable( bModify ); } -IMPL_LINK( ChineseDictionaryDialog, AddHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseDictionaryDialog, AddHdl) { if( !isEditFieldsHaveContent() ) return 0; @@ -767,7 +767,7 @@ IMPL_LINK( ChineseDictionaryDialog, AddHdl, void*, EMPTYARG ) updateButtons(); return 0; } -IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl) { rtl::OUString aTerm( m_aED_Term.GetText() ); rtl::OUString aMapping( m_aED_Mapping.GetText() ); @@ -800,7 +800,7 @@ IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( ChineseDictionaryDialog, DeleteHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseDictionaryDialog, DeleteHdl) { DictionaryList& rActive = getActiveDictionary(); DictionaryList& rReverse = getReverseDictionary(); @@ -860,7 +860,7 @@ short ChineseDictionaryDialog::Execute() return nRet; } -IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseDictionaryDialog, HeaderBarClick) { if(m_pHeaderBar) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 892d5b793620..19709d89afeb 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -138,7 +138,7 @@ public: private: DECL_LINK( DirectionHdl, void* ); - DECL_LINK( EditFieldsHdl, Control* ); + DECL_LINK(EditFieldsHdl, void *); DECL_LINK( MappingSelectHdl, void* ); DECL_LINK( AddHdl, void* ); DECL_LINK( ModifyHdl, void* ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index d79a3a34c588..c6949185410a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -132,13 +132,13 @@ void ChineseTranslationDialog::impl_UpdateVariantsCheckBox() // m_aCB_Use_Variants.Enable( m_aRB_To_Traditional.IsChecked() ); } -IMPL_LINK( ChineseTranslationDialog, DirectionHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseTranslationDialog, DirectionHdl) { impl_UpdateVariantsCheckBox(); return 0; } -IMPL_LINK( ChineseTranslationDialog, CommonTermsHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseTranslationDialog, CommonTermsHdl) { // #117820# (search for other occurrences!) // if( m_aCB_Translate_Commonterms.IsChecked() && m_aRB_To_Traditional.IsChecked() ) @@ -146,7 +146,7 @@ IMPL_LINK( ChineseTranslationDialog, CommonTermsHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( ChineseTranslationDialog, OkHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl) { //save settings to configuration SvtLinguConfig aLngCfg; @@ -162,7 +162,7 @@ IMPL_LINK( ChineseTranslationDialog, OkHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( ChineseTranslationDialog, DictionaryHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChineseTranslationDialog, DictionaryHdl) { if( !m_pDictionaryDialog ) { diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index f42fe3c2b695..cd445238c1cf 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -52,7 +52,7 @@ class SwTableWidthDlg : public SvxStandardDialog protected: virtual void Apply(); - DECL_LINK( LoseFocusHdl, Edit* pEdt=0 ); + DECL_LINK(LoseFocusHdl, void * = 0); public: SwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc ); diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index dca5bdb25eb9..c768ad1a4187 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -211,7 +211,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData ) return bThreadStarted; } -IMPL_LINK( ThreadManager, TryToStartNewThread, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(ThreadManager, TryToStartNewThread) { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index ea3965e962ac..7fd2c91f720c 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -72,7 +72,7 @@ public: SwBlink(); ~SwBlink(); - DECL_LINK( Blinker, Timer * ); + DECL_LINK( Blinker, void * ); void Insert( const Point& rPoint, const SwLinePortion* pPor, const SwTxtFrm *pTxtFrm, sal_uInt16 nDir ); diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index b72b0782fd0e..6f341d1ebdff 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -85,7 +85,7 @@ class ThreadManager : public IThreadListenerOwner void RemoveThread( const oslInterlockedCount nThreadID, const bool bThreadFinished = false ); - DECL_LINK( TryToStartNewThread, Timer* ); + DECL_LINK( TryToStartNewThread, void* ); /** suspend the starting of threads diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index f95d16cdb3fd..638ebe0834fe 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -71,7 +71,7 @@ SwBlink::~SwBlink( ) * invalidieren. *************************************************************************/ -IMPL_LINK( SwBlink, Blinker, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SwBlink, Blinker) { bVisible = !bVisible; if( bVisible ) diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 34fce61edd66..98eeccf89b2c 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -265,10 +265,10 @@ class SwMailMergeWizardExecutor : public salhelper::SimpleReferenceObject AbstractMailMergeWizard* m_pWizard; // always owner DECL_LINK( EndDialogHdl, AbstractMailMergeWizard* ); - DECL_LINK( DestroyDialogHdl, AbstractMailMergeWizard* ); + DECL_LINK( DestroyDialogHdl, void* ); DECL_LINK( DestroyWizardHdl, AbstractMailMergeWizard* ); - DECL_LINK( CancelHdl, AbstractMailMergeWizard* ); - DECL_LINK( CloseFrameHdl, AbstractMailMergeWizard* ); + DECL_LINK( CancelHdl, void* ); + DECL_LINK( CloseFrameHdl, void* ); void ExecutionFinished( bool bDeleteConfigItem ); void ExecuteWizard(); @@ -550,7 +550,7 @@ IMPL_LINK( SwMailMergeWizardExecutor, EndDialogHdl, AbstractMailMergeWizard*, pD return 0L; } -IMPL_LINK( SwMailMergeWizardExecutor, DestroyDialogHdl, AbstractMailMergeWizard*, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeWizardExecutor, DestroyDialogHdl) { delete m_pWizard; m_pWizard = 0; @@ -565,7 +565,7 @@ IMPL_LINK( SwMailMergeWizardExecutor, DestroyWizardHdl, AbstractMailMergeWizard* return 0L; } -IMPL_LINK( SwMailMergeWizardExecutor, CancelHdl, AbstractMailMergeWizard*, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CancelHdl) { if(m_pMMConfig->GetTargetView()) { @@ -585,7 +585,7 @@ IMPL_LINK( SwMailMergeWizardExecutor, CancelHdl, AbstractMailMergeWizard*, EMPTY return 0L; } -IMPL_LINK( SwMailMergeWizardExecutor, CloseFrameHdl, AbstractMailMergeWizard*, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CloseFrameHdl) { if ( m_pView2Close ) { diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index e4d1f6b41228..d96fd1fb6963 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -70,12 +70,12 @@ void SwBreakDlg::Apply() } } -IMPL_LINK_INLINE_START( SwBreakDlg, ClickHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, ClickHdl) { CheckEnable(); return 0; } -IMPL_LINK_INLINE_END( SwBreakDlg, ClickHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, ClickHdl) /*------------------------------------------------------------------------ Description: Handler for Change Page Number @@ -93,12 +93,12 @@ IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) Description: By changing the Page number the checkbox is checked. ------------------------------------------------------------------------*/ -IMPL_LINK_INLINE_START( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, PageNumModifyHdl) { aPageNumBox.Check(); return 0; } -IMPL_LINK_INLINE_END( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, PageNumModifyHdl) /*------------------------------------------------------------------------ Description: Ok-Handler; @@ -107,7 +107,7 @@ IMPL_LINK_INLINE_END( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG ) with alternating pages) ------------------------------------------------------------------------*/ -IMPL_LINK( SwBreakDlg, OkHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwBreakDlg, OkHdl) { if(aPageNumBox.IsChecked()) { // In case of differing page descriptions, test validity diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 14a9bc439ae2..c57df00efd65 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -323,7 +323,7 @@ SfxTabPage* SwCharURLPage::Create( Window* pParent, return ( new SwCharURLPage( pParent, rAttrSet ) ); } -IMPL_LINK( SwCharURLPage, InsertFileHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl) { FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 ); if( aDlgHelper.Execute() == ERRCODE_NONE ) @@ -334,7 +334,7 @@ IMPL_LINK( SwCharURLPage, InsertFileHdl, PushButton *, EMPTYARG ) return 0; } -IMPL_LINK( SwCharURLPage, EventHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwCharURLPage, EventHdl) { bModified |= SwMacroAssignDlg::INetFmtDlg( this, ::GetActiveView()->GetWrtShell(), pINetItem ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 9d46799d58a4..7a1ae4917328 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -675,7 +675,7 @@ Page: CheckBox's Click-Handler ****************************************************************************/ -IMPL_LINK( SwDropCapsPage, ClickHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) { sal_Bool bChecked = aDropCapsBox.IsChecked(); @@ -710,7 +710,7 @@ Page: CheckBox's Click-Handler ****************************************************************************/ -IMPL_LINK( SwDropCapsPage, WholeWordHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) { aDropCapsField.Enable( !aWholeWordCB.IsChecked() ); @@ -786,13 +786,13 @@ Page: Template-Box' Select-Handler. *****************************************************************************/ -IMPL_LINK_INLINE_START( SwDropCapsPage, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwDropCapsPage, SelectHdl) { pPict->UpdatePaintSettings(); bModified = sal_True; return 0; } -IMPL_LINK_INLINE_END( SwDropCapsPage, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwDropCapsPage, SelectHdl) sal_uInt16* SwDropCapsPage::GetRanges() { diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index a24c8f957fc6..b644b856d2e6 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -292,7 +292,7 @@ void SwParagraphNumTabPage::EnableNewStart() aNewStartNF.Show(); } -IMPL_LINK( SwParagraphNumTabPage, NewStartHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SwParagraphNumTabPage, NewStartHdl_Impl) { sal_Bool bEnable = aNewStartCB.IsChecked(); aNewStartNumberCB.Enable(bEnable); @@ -300,7 +300,7 @@ IMPL_LINK( SwParagraphNumTabPage, NewStartHdl_Impl, CheckBox*, EMPTYARG ) return 0; } -IMPL_LINK( SwParagraphNumTabPage, LineCountHdl_Impl, CheckBox* , EMPTYARG) +IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl) { aRestartParaCountCB.Enable(aCountParaCB.IsChecked()); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index d4ab549a8e52..648bf85b7d58 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -88,7 +88,7 @@ class SwTestAccountSettingsDialog : public SfxModalDialog bool m_bStop; void Test(); - DECL_LINK(StopHdl, PushButton*); + DECL_LINK(StopHdl, void *); DECL_STATIC_LINK(SwTestAccountSettingsDialog, TestHdl, void*); public: SwTestAccountSettingsDialog(SwMailConfigPage* pParent); @@ -129,9 +129,9 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog SwMailMergeConfigItem& rConfigItem; - DECL_LINK( OKHdl_Impl, OKButton*); + DECL_LINK(OKHdl_Impl, void *); DECL_LINK( CheckBoxHdl_Impl, CheckBox*); - DECL_LINK( RadioButtonHdl_Impl, RadioButton*); + DECL_LINK(RadioButtonHdl_Impl, void *); public: @@ -236,14 +236,14 @@ IMPL_LINK(SwMailConfigPage, ReplyToHdl, CheckBox*, pBox) return 0; } -IMPL_LINK(SwMailConfigPage, AuthenticationHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwMailConfigPage, AuthenticationHdl) { SwAuthenticationSettingsDialog aDlg(this, *m_pConfigItem); aDlg.Execute(); return 0; } -IMPL_LINK(SwMailConfigPage, TestHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwMailConfigPage, TestHdl) { SwTestAccountSettingsDialog(this).Execute(); return 0; @@ -317,7 +317,7 @@ SwTestAccountSettingsDialog::~SwTestAccountSettingsDialog() { } -IMPL_LINK(SwTestAccountSettingsDialog, StopHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwTestAccountSettingsDialog, StopHdl) { m_bStop = true; return 0; @@ -522,7 +522,7 @@ SwAuthenticationSettingsDialog::~SwAuthenticationSettingsDialog() { } -IMPL_LINK( SwAuthenticationSettingsDialog, OKHdl_Impl, OKButton*, EMPTYARG) +IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl) { rConfigItem.SetAuthentication( m_aAuthenticationCB.IsChecked() ); rConfigItem.SetSMTPAfterPOP(m_aSMTPAfterPOPRB.IsChecked()); @@ -548,7 +548,7 @@ IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, CheckBox*, pBox) return 0; } -IMPL_LINK( SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, RadioButton*, EMPTYARG) +IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl) { sal_Bool bSeparate = m_aSeparateAuthenticationRB.IsChecked(); sal_Bool bIsEnabled = m_aSeparateAuthenticationRB.IsEnabled(); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 9fc64969b7a2..59559c6025b8 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -388,7 +388,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) } } -IMPL_LINK( SwCompatibilityOptPage, SelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl) { sal_uInt16 nPos = m_aFormattingLB.GetSelectEntryPos(); sal_uLong nOptions = (sal_uLong)(void*)m_aFormattingLB.GetEntryData( nPos ); @@ -397,7 +397,7 @@ IMPL_LINK( SwCompatibilityOptPage, SelectHdl, ListBox*, EMPTYARG ) return 0; } -IMPL_LINK( SwCompatibilityOptPage, UseAsDefaultHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl) { QueryBox aBox( this, WinBits( WB_YES_NO | WB_DEF_YES ), m_sUseAsDefaultQuery ); if ( aBox.Execute() == RET_YES ) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 7f1f2fa86017..bd08de0df9a3 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -310,7 +310,7 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet) aUseCharUnit.SaveValue(); } -IMPL_LINK(SwLoadOptPage, MetricHdl, ListBox*, EMPTYARG) +IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl) { const sal_uInt16 nMPos = aMetricLB.GetSelectEntryPos(); if(nMPos != USHRT_MAX) @@ -605,7 +605,7 @@ void SwCaptionOptPage::DelUserData() } } -IMPL_LINK( SwCaptionOptPage, ShowEntryHdl, SvxCheckListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) { SvLBoxEntry* pSelEntry = aCheckLB.FirstSelected(); @@ -730,7 +730,7 @@ IMPL_LINK( SwCaptionOptPage, ShowEntryHdl, SvxCheckListBox *, EMPTYARG ) return 0; } -IMPL_LINK( SwCaptionOptPage, SaveEntryHdl, SvxCheckListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl) { SvLBoxEntry* pEntry = aCheckLB.GetHdlEntry(); @@ -772,7 +772,7 @@ void SwCaptionOptPage::SaveEntry(SvLBoxEntry* pEntry) } } -IMPL_LINK( SwCaptionOptPage, ModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl) { String sFldTypeName = aCategoryBox.GetText(); @@ -791,12 +791,12 @@ IMPL_LINK( SwCaptionOptPage, ModifyHdl, Edit *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_START( SwCaptionOptPage, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwCaptionOptPage, SelectHdl) { DrawSample(); return 0; } -IMPL_LINK_INLINE_END( SwCaptionOptPage, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwCaptionOptPage, SelectHdl) IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox ) { diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 09a10370fa78..014f04db13db 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -489,7 +489,7 @@ void SwAddPrinterTabPage::Init() } -IMPL_LINK_INLINE_START( SwAddPrinterTabPage, AutoClickHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, AutoClickHdl) { bAttrModified = sal_True; bool bIsProspect = aProspectCB.IsChecked(); @@ -502,7 +502,7 @@ IMPL_LINK_INLINE_START( SwAddPrinterTabPage, AutoClickHdl, CheckBox *, EMPTYARG aEndPageRB.Enable( !bIsProspect ); return 0; } -IMPL_LINK_INLINE_END( SwAddPrinterTabPage, AutoClickHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwAddPrinterTabPage, AutoClickHdl) void SwAddPrinterTabPage::SetFax( const std::vector<String>& rFaxLst ) { @@ -514,12 +514,12 @@ void SwAddPrinterTabPage::SetFax( const std::vector<String>& rFaxLst ) aFaxLB.SelectEntryPos(0); } -IMPL_LINK_INLINE_START( SwAddPrinterTabPage, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, SelectHdl) { bAttrModified=sal_True; return 0; } -IMPL_LINK_INLINE_END( SwAddPrinterTabPage, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwAddPrinterTabPage, SelectHdl) void SwAddPrinterTabPage::PageCreated (SfxAllItemSet aSet) { @@ -985,7 +985,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) aIndexHeightLB. SaveValue(); } -IMPL_LINK( SwStdFontTabPage, StandardHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwStdFontTabPage, StandardHdl) { sal_uInt8 nFontOffset = nFontGroup * FONT_PER_GROUP; aStandardBox.SetText(SwStdFontConfig::GetDefaultFor(FONT_STANDARD + nFontOffset, eLanguage)); @@ -1314,7 +1314,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet) CheckBoxHdl(0); } -IMPL_LINK(SwTableOptionsTabPage, CheckBoxHdl, CheckBox*, EMPTYARG) +IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl) { aNumFmtFormattingCB.Enable(aNumFormattingCB.IsChecked()); aNumAlignmentCB.Enable(aNumFormattingCB.IsChecked()); @@ -2238,7 +2238,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ColorListBox *, pColorLB ) return 0; } -IMPL_LINK( SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineOptionsTabPage, ChangedMaskPrevHdl) { aMarkPreviewWN.SetMarkPos(aMarkPosLB.GetSelectEntryPos()); aMarkPreviewWN.SetColor(aMarkColorLB.GetSelectEntryColor().GetColor()); @@ -2410,7 +2410,7 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet& ) aLenNF.SaveValue(); } -IMPL_LINK( SwCompareOptionsTabPage, ComparisonHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(SwCompareOptionsTabPage, ComparisonHdl) { bool bChecked = !aAutoRB.IsChecked(); aSettingsFL.Enable( bChecked ); @@ -2421,7 +2421,7 @@ IMPL_LINK( SwCompareOptionsTabPage, ComparisonHdl, RadioButton*, EMPTYARG ) return 0; } -IMPL_LINK( SwCompareOptionsTabPage, IgnoreHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl) { aLenNF.Enable( aIgnoreCB.IsChecked() ); return 0; @@ -2555,12 +2555,12 @@ void SwTestTabPage::Init() aTest10CBox.SetClickHdl( aLk ); } -IMPL_LINK_INLINE_START( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwTestTabPage, AutoClickHdl) { bAttrModified = sal_True; return 0; } -IMPL_LINK_INLINE_END( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwTestTabPage, AutoClickHdl) #endif diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index e0d3ddbf617e..0a27f292726a 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -286,7 +286,7 @@ SwAddressListDialog::~SwAddressListDialog() } } -IMPL_LINK(SwAddressListDialog, FilterHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl) { SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); @@ -352,7 +352,7 @@ IMPL_LINK(SwAddressListDialog, FilterHdl_Impl, PushButton*, EMPTYARG) return 0; } -IMPL_LINK(SwAddressListDialog, LoadHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl) { String sNewSource = SwNewDBMgr::LoadAndRegisterDataSource(); if(sNewSource.Len()) @@ -486,7 +486,7 @@ IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton) return 0; }; -IMPL_LINK(SwAddressListDialog, ListBoxSelectHdl_Impl, SvTabListBox*, EMPTYARG) +IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl) { SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); Application::PostUserEvent( STATIC_LINK( this, SwAddressListDialog, @@ -670,7 +670,7 @@ IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton) return 0; } -IMPL_LINK(SwAddressListDialog, OKHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwAddressListDialog, OKHdl_Impl) { EndDialog(sal_True); return 0; diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index bf84b16a8157..beab3d04663e 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -88,13 +88,13 @@ class SwAddressListDialog : public SfxModalDialog void DetectTablesAndQueries(SvLBoxEntry* pSelect, bool bWidthDialog); - DECL_LINK(FilterHdl_Impl, PushButton*); - DECL_LINK(LoadHdl_Impl, PushButton*); + DECL_LINK(FilterHdl_Impl, void *); + DECL_LINK(LoadHdl_Impl, void *); DECL_LINK(CreateHdl_Impl, PushButton*); - DECL_LINK(ListBoxSelectHdl_Impl, SvTabListBox*); + DECL_LINK(ListBoxSelectHdl_Impl, void *); DECL_LINK(EditHdl_Impl, PushButton*); DECL_LINK(TableSelectHdl_Impl, PushButton*); - DECL_LINK(OKHdl_Impl, PushButton*); + DECL_LINK(OKHdl_Impl, void *); DECL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvLBoxEntry*); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 0502b8e94371..b3cd41d955b3 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -478,7 +478,7 @@ SwCreateAddressListDialog::~SwCreateAddressListDialog() delete m_pFindDlg; } -IMPL_LINK(SwCreateAddressListDialog, NewHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwCreateAddressListDialog, NewHdl_Impl) { sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet(); ::std::vector<OUString> aNewData; @@ -494,7 +494,7 @@ IMPL_LINK(SwCreateAddressListDialog, NewHdl_Impl, PushButton*, EMPTYARG) return 0; } -IMPL_LINK(SwCreateAddressListDialog, DeleteHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwCreateAddressListDialog, DeleteHdl_Impl) { sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet(); if(m_pCSVData->aDBData.size() > 1) @@ -516,7 +516,7 @@ IMPL_LINK(SwCreateAddressListDialog, DeleteHdl_Impl, PushButton*, EMPTYARG) return 0; } -IMPL_LINK(SwCreateAddressListDialog, FindHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwCreateAddressListDialog, FindHdl_Impl) { if(!m_pFindDlg) { @@ -560,7 +560,7 @@ IMPL_LINK(SwCreateAddressListDialog, CustomizeHdl_Impl, PushButton*, pButton) return 0; } -IMPL_LINK(SwCreateAddressListDialog, OkHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl) { if(!m_sURL.Len()) { @@ -658,7 +658,7 @@ IMPL_LINK(SwCreateAddressListDialog, DBCursorHdl_Impl, PushButton*, pButton) return 0; } -IMPL_LINK(SwCreateAddressListDialog, DBNumCursorHdl_Impl, NumericField*, EMPTYARG) +IMPL_LINK_NOARG(SwCreateAddressListDialog, DBNumCursorHdl_Impl) { m_pAddressControl->SetCurrentDataSet( static_cast< sal_uInt32 >(m_aSetNoNF.GetValue() - 1) ); UpdateButtons(); @@ -748,7 +748,7 @@ SwFindEntryDialog::~SwFindEntryDialog() { } -IMPL_LINK(SwFindEntryDialog, FindHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwFindEntryDialog, FindHdl_Impl) { sal_Int32 nColumn = -1; if(m_aFindOnlyCB.IsChecked()) @@ -758,13 +758,13 @@ IMPL_LINK(SwFindEntryDialog, FindHdl_Impl, PushButton*, EMPTYARG) return 0; } -IMPL_LINK(SwFindEntryDialog, FindEnableHdl_Impl, Edit*, EMPTYARG) +IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl) { m_aFindPB.Enable(m_aFindED.GetText().Len() > 0); return 0; } -IMPL_LINK(SwFindEntryDialog, CloseHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwFindEntryDialog, CloseHdl_Impl) { Show(sal_False); return 0; diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index 6c9b64546a05..77681cff7820 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -76,13 +76,13 @@ class SwCreateAddressListDialog : public SfxModalDialog SwCSVData* m_pCSVData; SwFindEntryDialog* m_pFindDlg; - DECL_LINK(NewHdl_Impl, PushButton*); - DECL_LINK(DeleteHdl_Impl, PushButton*); - DECL_LINK(FindHdl_Impl, PushButton*); + DECL_LINK(NewHdl_Impl, void *); + DECL_LINK(DeleteHdl_Impl, void *); + DECL_LINK(FindHdl_Impl, void *); DECL_LINK(CustomizeHdl_Impl, PushButton*); - DECL_LINK(OkHdl_Impl, PushButton*); + DECL_LINK(OkHdl_Impl, void *); DECL_LINK(DBCursorHdl_Impl, PushButton*); - DECL_LINK(DBNumCursorHdl_Impl, NumericField*); + DECL_LINK(DBNumCursorHdl_Impl, void *); void UpdateButtons(); @@ -108,9 +108,9 @@ class SwFindEntryDialog : public ModelessDialog SwCreateAddressListDialog* m_pParent; - DECL_LINK(FindHdl_Impl, PushButton*); - DECL_LINK(FindEnableHdl_Impl, Edit*); - DECL_LINK(CloseHdl_Impl, PushButton*); + DECL_LINK(FindHdl_Impl, void *); + DECL_LINK(FindEnableHdl_Impl, void *); + DECL_LINK(CloseHdl_Impl, void *); public: SwFindEntryDialog(SwCreateAddressListDialog* pParent); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 8f6e0e28404e..9d53bf7e8a5a 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -85,7 +85,7 @@ SwCustomizeAddressListDialog::~SwCustomizeAddressListDialog() { } -IMPL_LINK(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, ListBox*, EMPTYARG) +IMPL_LINK_NOARG(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl) { UpdateButtons(); return 0; @@ -135,7 +135,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton) return 0; } -IMPL_LINK(SwCustomizeAddressListDialog, DeleteHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl) { sal_uInt16 nPos = m_aFieldsLB.GetSelectEntryPos(); m_aFieldsLB.RemoveEntry(m_aFieldsLB.GetSelectEntryPos()); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index 1989499cb7f7..49fad05b774e 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -57,9 +57,9 @@ class SwCustomizeAddressListDialog : public SfxModalDialog SwCSVData* m_pNewData; DECL_LINK(AddRenameHdl_Impl, PushButton*); - DECL_LINK(DeleteHdl_Impl, PushButton*); + DECL_LINK(DeleteHdl_Impl, void *); DECL_LINK(UpDownHdl_Impl, PushButton*); - DECL_LINK(ListBoxSelectHdl_Impl, ListBox*); + DECL_LINK(ListBoxSelectHdl_Impl, void *); void UpdateButtons(); public: diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 326679f5a045..41ca4b86a64e 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -108,7 +108,7 @@ SwMailMergeChildWin::~SwMailMergeChildWin() { } -IMPL_LINK( SwMailMergeChildWin, BackHdl, ToolBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl) { GetBindings().GetDispatcher()->Execute(FN_MAILMERGE_WIZARD, SFX_CALLMODE_ASYNCHRON); return 0; @@ -426,7 +426,7 @@ void lcl_Move(Control& rCtrl, long nYOffset) rCtrl.SetPosPixel(aPos); } -IMPL_LINK( SwSendMailDialog, DetailsHdl_Impl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SwSendMailDialog, DetailsHdl_Impl) { long nMove = 0; if(m_aStatusLB.IsVisible()) @@ -472,7 +472,7 @@ IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton ) return 0; } -IMPL_LINK( SwSendMailDialog, CloseHdl_Impl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl) { ModelessDialog::Show( sal_False ); return 0; diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 95633289aaf3..9920f699cab9 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -230,7 +230,7 @@ SwAddressPreview::~SwAddressPreview() { } -IMPL_LINK(SwAddressPreview, ScrollHdl, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(SwAddressPreview, ScrollHdl) { Invalidate(); return 0; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index b5aa5de8b0a6..28bf2e75be43 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -172,7 +172,7 @@ sal_Bool SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitP return sal_True; } -IMPL_LINK(SwMailMergeAddressBlockPage, AddressListHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl) { try { @@ -272,7 +272,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, CheckBox*, pBox) return 0; } -IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, SwAddressPreview*, EMPTYARG) +IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl) { sal_uInt16 nSel = m_aSettingsWIN.GetSelectedAddress(); const uno::Sequence< ::rtl::OUString> aBlocks = @@ -651,7 +651,7 @@ SwCustomizeAddressBlockDialog::~SwCustomizeAddressBlockDialog() { } -IMPL_LINK(SwCustomizeAddressBlockDialog, OKHdl_Impl, OKButton*, EMPTYARG) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, OKHdl_Impl) { EndDialog(RET_OK); return 0; @@ -665,7 +665,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, DDListBox*, pBox return 0; } -IMPL_LINK(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, AddressMultiLineEdit*, EMPTYARG) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl) { String sAddress = SwAddressPreview::FillData( GetAddress(), @@ -800,7 +800,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiL return 0; } -IMPL_LINK(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, ComboBox*, EMPTYARG) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl) { //changing the field content changes the related members, too sal_Int32 nSelected = GetSelectedItem_Impl(); @@ -1321,7 +1321,7 @@ uno::Sequence< ::rtl::OUString > SwAssignFieldsDialog::CreateAssignments() return aAssignments; } -IMPL_LINK(SwAssignFieldsDialog, OkHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwAssignFieldsDialog, OkHdl_Impl) { m_rConfigItem.SetColumnAssignment( m_rConfigItem.GetCurrentDBData(), @@ -1330,7 +1330,7 @@ IMPL_LINK(SwAssignFieldsDialog, OkHdl_Impl, PushButton*, EMPTYARG) return 0; } -IMPL_LINK(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl) { uno::Sequence< ::rtl::OUString > aAssignments = CreateAssignments(); String sPreview = SwAddressPreview::FillData( diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index d6b92245e2ac..beacab6f959e 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -84,12 +84,12 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage SwMailMergeWizard* m_pWizard; - DECL_LINK(AddressListHdl_Impl, PushButton*); + DECL_LINK(AddressListHdl_Impl, void *); DECL_LINK(SettingsHdl_Impl, PushButton*); DECL_LINK(AssignHdl_Impl, PushButton*); DECL_LINK(AddressBlockHdl_Impl, CheckBox*); DECL_LINK(InsertDataHdl_Impl, ImageButton*); - DECL_LINK(AddressBlockSelectHdl_Impl, SwAddressPreview*); + DECL_LINK(AddressBlockSelectHdl_Impl, void *); DECL_LINK(HideParagraphsHdl_Impl, CheckBox*); void EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective); @@ -261,12 +261,12 @@ private: SwMailMergeConfigItem& m_rConfigItem; DialogType m_eType; - DECL_LINK(OKHdl_Impl, OKButton*); + DECL_LINK(OKHdl_Impl, void *); DECL_LINK(ListBoxSelectHdl_Impl, DDListBox*); - DECL_LINK(EditModifyHdl_Impl, AddressMultiLineEdit*); + DECL_LINK(EditModifyHdl_Impl, void *); DECL_LINK(ImageButtonHdl_Impl, ImageButton*); DECL_LINK(SelectionChangedHdl_Impl, AddressMultiLineEdit*); - DECL_LINK(FieldChangeHdl_Impl, ComboBox*); + DECL_LINK(FieldChangeHdl_Impl, void *); bool HasItem_Impl(sal_Int32 nUserData); sal_Int32 GetSelectedItem_Impl(); @@ -302,7 +302,7 @@ class SwAssignFieldsDialog : public SfxModalDialog SwMailMergeConfigItem& m_rConfigItem; ::com::sun::star::uno::Sequence< ::rtl::OUString > CreateAssignments(); - DECL_LINK(OkHdl_Impl, PushButton*); + DECL_LINK(OkHdl_Impl, void *); DECL_LINK(AssignmentModifyHdl_Impl, void*); public: diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 9e5e038db678..6a63cd7ab5e2 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -91,7 +91,7 @@ void lcl_StoreGreetingsBox(ComboBox& rBox, rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos()); } -IMPL_LINK(SwGreetingsHandler, IndividualHdl_Impl, CheckBox*, EMPTYARG) +IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl) { sal_Bool bIndividual = m_pPersonalizedCB->IsEnabled() && m_pPersonalizedCB->IsChecked(); m_pFemaleFT->Enable(bIndividual); @@ -160,7 +160,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, PushButton*, pButton) return 0; } -IMPL_LINK(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl, ListBox*, EMPTYARG) +IMPL_LINK_NOARG(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl) { UpdatePreview(); return 0; @@ -553,7 +553,7 @@ IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, CheckBox*, pBox) return 0; } -IMPL_LINK(SwMailBodyDialog, OKHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); rConfigItem.SetGreetingLine( diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index d0376ca72649..37cbc6d2db0e 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -68,7 +68,7 @@ class SwGreetingsHandler SwMailMergeWizard* m_pWizard; - DECL_LINK(IndividualHdl_Impl, CheckBox*); + DECL_LINK(IndividualHdl_Impl, void *); DECL_LINK(GreetingHdl_Impl, PushButton*); void Contains(sal_Bool bContainsGreeting); @@ -112,7 +112,7 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, DECL_LINK(ContainsHdl_Impl, CheckBox*); DECL_LINK(InsertDataHdl_Impl, ImageButton*); - DECL_LINK(GreetingSelectHdl_Impl, ListBox*); + DECL_LINK(GreetingSelectHdl_Impl, void *); DECL_LINK(AssignHdl_Impl, PushButton*); virtual void UpdatePreview(); @@ -156,7 +156,7 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler HelpButton m_aHelp; DECL_LINK(ContainsHdl_Impl, CheckBox*); - DECL_LINK(OKHdl, PushButton*); + DECL_LINK(OKHdl, void *); public: SwMailBodyDialog(Window* pParent, SwMailMergeWizard* pWizard); ~SwMailBodyDialog(); diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 5baa5106d765..55c019cfe654 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -672,7 +672,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig OSL_ENSURE(0 == rShell.GetTableFmt(), "What to do with a table here?"); } -IMPL_LINK(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl) { m_aExampleWIN.Show( sal_True ); m_aExampleContainerWIN.Show(sal_False); @@ -737,7 +737,7 @@ IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox*, pBox) return 0; } -IMPL_LINK(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, MetricField*, EMPTYARG) +IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl) { if(m_pExampleWrtShell && m_pAddressBlockFormat) { diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index b3191f04da64..55af3284830b 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -82,7 +82,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage DECL_LINK(PreviewLoadedHdl_Impl, void*); DECL_LINK(ZoomHdl_Impl, ListBox*); - DECL_LINK(ChangeAddressHdl_Impl, MetricField*); + DECL_LINK(ChangeAddressHdl_Impl, void *); DECL_LINK(GreetingsHdl_Impl, PushButton*); DECL_LINK(AlignToTextHdl_Impl, CheckBox*); diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index 1f78b79865fe..b8c072145482 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -76,14 +76,14 @@ SwMailMergeMergePage::~SwMailMergeMergePage() { } -IMPL_LINK( SwMailMergeMergePage, EditDocumentHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwMailMergeMergePage, EditDocumentHdl_Impl) { m_pWizard->SetRestartPage(MM_MERGEPAGE); m_pWizard->EndDialog(RET_EDIT_RESULT_DOC); return 0; } -IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwMailMergeMergePage, FindHdl_Impl) { SvxSearchItem aSearchItem( SID_SEARCH_ITEM ); @@ -105,7 +105,7 @@ IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, EMPTYARG) return 0; } -IMPL_LINK( SwMailMergeMergePage, EnteredFindStringHdl_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeMergePage, EnteredFindStringHdl_Impl) { m_aFindPB.GetClickHdl().Call( &m_aFindPB ); return 0; diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx index 03a644c6fcdd..b6241188f6e7 100644 --- a/sw/source/ui/dbui/mmmergepage.hxx +++ b/sw/source/ui/dbui/mmmergepage.hxx @@ -54,8 +54,8 @@ class SwMailMergeMergePage : public svt::OWizardPage SwMailMergeWizard* m_pWizard; - DECL_LINK(EditDocumentHdl_Impl, PushButton*); - DECL_LINK(FindHdl_Impl, PushButton*); + DECL_LINK(EditDocumentHdl_Impl, void *); + DECL_LINK(FindHdl_Impl, void *); DECL_LINK(EnteredFindStringHdl_Impl, void*); public: diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index ef2540887b99..9cccd38ec403 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -661,7 +661,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton) return 0; } -IMPL_LINK(SwMailMergeOutputPage, SaveCancelHdl_Impl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeOutputPage, SaveCancelHdl_Impl) { m_bCancelSaving = true; return 0; @@ -891,7 +891,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox) return 0; } -IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) { SwView* pTargetView = m_pWizard->GetConfigItem().GetTargetView(); OSL_ENSURE(pTargetView, "no target view exists"); diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 36c30428b024..0aace255a628 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -128,13 +128,13 @@ class SwMailMergeOutputPage : public svt::OWizardPage DECL_LINK(SaveStartHdl_Impl, PushButton* ); DECL_LINK(SaveOutputHdl_Impl, PushButton* ); DECL_LINK(PrinterChangeHdl_Impl, ListBox* ); - DECL_LINK(PrintHdl_Impl, PushButton* ); + DECL_LINK(PrintHdl_Impl, void *); DECL_LINK(PrinterSetupHdl_Impl, PushButton* ); DECL_LINK(SendTypeHdl_Impl, ListBox*); DECL_LINK(SendAsHdl_Impl, PushButton*); DECL_LINK(SendDocumentsHdl_Impl, PushButton*); DECL_LINK(DocumentSelectionHdl_Impl, RadioButton*); - DECL_LINK(SaveCancelHdl_Impl, Button*); + DECL_LINK(SaveCancelHdl_Impl, void *); protected: virtual bool canAdvance() const; virtual void ActivatePage(); @@ -203,9 +203,9 @@ class SW_DLLPUBLIC SwSendMailDialog : public ModelessDialog //SfxModalDialog sal_Int32 m_nSendCount; sal_Int32 m_nErrorCount; - SW_DLLPRIVATE DECL_LINK( DetailsHdl_Impl, PushButton* ); + SW_DLLPRIVATE DECL_LINK( DetailsHdl_Impl, void* ); SW_DLLPRIVATE DECL_LINK( StopHdl_Impl, PushButton* ); - SW_DLLPRIVATE DECL_LINK( CloseHdl_Impl, PushButton* ); + SW_DLLPRIVATE DECL_LINK( CloseHdl_Impl, void* ); SW_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* ); SW_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* ); SW_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer* ); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index ea8d12696996..959eba937397 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -88,7 +88,7 @@ SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage() { } -IMPL_LINK( SwMailMergeOutputTypePage, TypeHdl_Impl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl) { bool bLetter = m_aLetterRB.IsChecked(); m_aHintHeaderFI.SetText(bLetter ? m_sLetterHintHeader : m_sMailHintHeader); diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 236b0fd6f40a..e7888d0d4fd8 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -52,7 +52,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage SwMailMergeWizard* m_pWizard; - DECL_LINK(TypeHdl_Impl, RadioButton*); + DECL_LINK(TypeHdl_Impl, void *); public: SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent); diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index c8dc41a80370..98cc930f6e3b 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -90,7 +90,7 @@ SwMailMergePrepareMergePage::~SwMailMergePrepareMergePage() { } -IMPL_LINK( SwMailMergePrepareMergePage, EditDocumentHdl_Impl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwMailMergePrepareMergePage, EditDocumentHdl_Impl) { m_pWizard->SetRestartPage(MM_PREPAREMERGEPAGE); m_pWizard->EndDialog(RET_EDIT_DOC); diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 73b138938305..595f181c665b 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -56,7 +56,7 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage SwMailMergeWizard* m_pWizard; - DECL_LINK(EditDocumentHdl_Impl, PushButton*); + DECL_LINK(EditDocumentHdl_Impl, void *); DECL_LINK(ExcludeHdl_Impl, CheckBox*); DECL_LINK(MoveHdl_Impl, void*); diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 48aa0ffb0d2e..0e80715f5a28 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -153,7 +153,7 @@ void SwDocStatPage::Update() SetData(aDocStat); } -IMPL_LINK( SwDocStatPage, UpdateHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl) { Update(); SwDocShell* pDocShell = (SwDocShell*) SfxObjectShell::Current(); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 93b71661271b..bc18bc8e32f7 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -812,7 +812,7 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) Description: in OkHdl the modified settings are being applied and reversed regions are deleted ---------------------------------------------------------------------*/ -IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) { // temp. Array because during changing of a region the position // inside of the "Core-Arrays" can be shifted: @@ -969,7 +969,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) /*--------------------------------------------------------------------- Description: clear selected region ---------------------------------------------------------------------*/ -IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) { if(!CheckPasswd()) return 0; @@ -1105,7 +1105,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) /*--------------------------------------------------------------------- Description: call dialog paste file ---------------------------------------------------------------------*/ -IMPL_LINK( SwEditRegionDlg, FileSearchHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl) { if(!CheckPasswd(0)) return 0; @@ -1119,7 +1119,7 @@ IMPL_LINK( SwEditRegionDlg, FileSearchHdl, PushButton *, EMPTYARG ) return 0; } -IMPL_LINK( SwEditRegionDlg, OptionsHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) { if(!CheckPasswd()) return 0; @@ -1382,7 +1382,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) TreeListBox immediately during editing, with empty string no Ok() ---------------------------------------------------------------------*/ -IMPL_LINK( SwEditRegionDlg, NameEditHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl) { if(!CheckPasswd(0)) return 0; @@ -1777,7 +1777,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox ) return 0; } -IMPL_LINK( SwInsertSectionTabPage, ChangeEditInReadonlyHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwInsertSectionTabPage, ChangeEditInReadonlyHdl) { return 0; } @@ -1821,13 +1821,13 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) return 0; } -IMPL_LINK_INLINE_START( SwInsertSectionTabPage, NameEditHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwInsertSectionTabPage, NameEditHdl) { String aName=aCurName.GetText(); GetTabDialog()->GetOKButton().Enable(aName.Len() && aCurName.GetEntryPos( aName ) == USHRT_MAX); return 0; } -IMPL_LINK_INLINE_END( SwInsertSectionTabPage, NameEditHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwInsertSectionTabPage, NameEditHdl) IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) { @@ -1859,7 +1859,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) return 0; } -IMPL_LINK( SwInsertSectionTabPage, FileSearchHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl) { m_pOldDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); @@ -2310,7 +2310,7 @@ void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh) aPreviewWin.SetSize(aPageSize); } -IMPL_LINK(SwSectionIndentTabPage, IndentModifyHdl, MetricField*, EMPTYARG) +IMPL_LINK_NOARG(SwSectionIndentTabPage, IndentModifyHdl) { aPreviewWin.SetLeftMargin( static_cast< long >(aBeforeMF.Denormalize(aBeforeMF.GetValue(FUNIT_TWIP))) ); aPreviewWin.SetRightMargin( static_cast< long >(aAfterMF.Denormalize(aAfterMF.GetValue(FUNIT_TWIP))) ); diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index c5f3d5d10648..3fdc8958ddc0 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -71,7 +71,7 @@ SwWordCountDialog::SwWordCountDialog(Window* pParent) : aOK.SetClickHdl(LINK(this,SwWordCountDialog, OkHdl)); } -IMPL_LINK( SwWordCountDialog, OkHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwWordCountDialog, OkHdl) { SfxViewFrame* pVFrame = ::GetActiveView()->GetViewFrame(); if (pVFrame != NULL) diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 32e876726ba9..5e21d8318b62 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -513,7 +513,7 @@ void SwHeaderFooterWin::Select( ) ExecuteCommand( GetCurItemId() ); } -IMPL_LINK( SwHeaderFooterWin, FadeHandler, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler) { const int TICKS_BEFORE_WE_APPEAR = 10; if ( m_bIsAppearing && m_nDelayAppearing < TICKS_BEFORE_WE_APPEAR ) diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index f92101cc4c72..c96f2809d493 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -434,14 +434,14 @@ void SwPageBreakWin::Fade( bool bFadeIn ) m_aFadeTimer.Start( ); } -IMPL_LINK( SwPageBreakWin, HideHandler, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwPageBreakWin, HideHandler) { Fade( false ); return 0; } -IMPL_LINK( SwPageBreakWin, FadeHandler, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SwPageBreakWin, FadeHandler) { const int TICKS_BEFORE_WE_APPEAR = 10; if ( m_bIsAppearing && m_nDelayAppearing < TICKS_BEFORE_WE_APPEAR ) diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index da0f8884c9cd..a03c5ac8f4c1 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -1048,13 +1048,13 @@ IMPL_LINK(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll) return 0; } -IMPL_LINK(SwSidebarWin, ModifyHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl) { mrView.GetDocShell()->SetModified(sal_True); return 0; } -IMPL_LINK(SwSidebarWin, DeleteHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwSidebarWin, DeleteHdl) { mnEventId = 0; Delete(); diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx index 26617b6fba35..5daebe38eccf 100644 --- a/sw/source/ui/docvw/edtdd.cxx +++ b/sw/source/ui/docvw/edtdd.cxx @@ -492,7 +492,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) } -IMPL_LINK( SwEditWin, DDHandler, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SwEditWin, DDHandler) { bDDTimerStarted = sal_False; aTimer.Stop(); diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 19bdf865aed3..26137796d908 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -581,7 +581,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) Description: increase timer for selection --------------------------------------------------------------------*/ -IMPL_LINK( SwEditWin, TimerHandler, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SwEditWin, TimerHandler) { DBG_PROFSTART(edithdl); @@ -5382,13 +5382,13 @@ void SwEditWin::ClearTip() { } -IMPL_LINK( SwEditWin, KeyInputFlushHandler, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SwEditWin, KeyInputFlushHandler) { FlushInBuffer(); return 0; } -IMPL_LINK( SwEditWin, KeyInputTimerHandler, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SwEditWin, KeyInputTimerHandler) { bTblInsDelMode = sal_False; return 0; @@ -5411,7 +5411,7 @@ void SwEditWin::StopQuickHelp() pQuickHlpData->Stop( rView.GetWrtShell() ); } -IMPL_LINK(SwEditWin, TemplateTimerHdl, Timer*, EMPTYARG) +IMPL_LINK_NOARG(SwEditWin, TemplateTimerHdl) { SetApplyTemplate(SwApplyTemplate()); return 0; diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 26f8b87a9011..d8c915cb6675 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -438,7 +438,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender) return pAddrSet; } -IMPL_LINK( SwEnvFmtPage, FormatHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwEnvFmtPage, FormatHdl) { long lWidth; long lHeight; diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 4e2ec7cbaf3a..de614b884aed 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -74,7 +74,7 @@ class SwEnvFmtPage : public SfxTabPage DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( EditHdl, MenuButton * ); - DECL_LINK( FormatHdl, ListBox * ); + DECL_LINK(FormatHdl, void *); void SetMinMax(); diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 34c5c0f735ad..76b49be137cb 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -261,7 +261,7 @@ IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox *, pListBox ) return 0; } -IMPL_LINK( SwEnvPage, FieldHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwEnvPage, FieldHdl) { String aStr ( '<' ); aStr += aDatabaseLB.GetSelectEntry(); @@ -279,7 +279,7 @@ IMPL_LINK( SwEnvPage, FieldHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK( SwEnvPage, SenderHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwEnvPage, SenderHdl) { const sal_Bool bEnable = aSenderBox.IsChecked(); GetParent()->aEnvItem.bSend = bEnable; diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 3f79b3217f3a..a7b321e485c6 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -87,7 +87,7 @@ SwEnvPrtPage::~SwEnvPrtPage() { } -IMPL_LINK( SwEnvPrtPage, ClickHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl) { if (aBottomButton.IsChecked()) { @@ -130,7 +130,7 @@ IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn ) return 0; } -IMPL_LINK( SwEnvPrtPage, AlignHdl, ToolBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl) { if (aAlignBox.GetCurItemId()) { diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index c5a8903dc66e..4dd2912d6819 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -65,8 +65,8 @@ class SwEnvPrtPage : public SfxTabPage SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet); ~SwEnvPrtPage(); - DECL_LINK( ClickHdl, Button * ); - DECL_LINK( AlignHdl, ToolBox * ); + DECL_LINK(ClickHdl, void *); + DECL_LINK(AlignHdl, void *); DECL_LINK( ButtonHdl, Button * ); using Window::GetParent; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 6c19c61e51d5..72c2af31ab0d 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -355,7 +355,7 @@ void SwLabPage::SetToBusinessCard() aTypeBox.SetPosPixel(aLBPos); }; -IMPL_LINK( SwLabPage, AddrHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwLabPage, AddrHdl) { String aWriting; @@ -380,7 +380,7 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox ) return 0; } -IMPL_LINK( SwLabPage, FieldHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwLabPage, FieldHdl) { String aStr ( '<' ); aStr += aDatabaseLB.GetSelectEntry(); @@ -398,14 +398,14 @@ IMPL_LINK( SwLabPage, FieldHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_START( SwLabPage, PageHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwLabPage, PageHdl) { aMakeBox.GetSelectHdl().Call( &aMakeBox ); return 0; } -IMPL_LINK_INLINE_END( SwLabPage, PageHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwLabPage, PageHdl) -IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwLabPage, MakeHdl) { WaitObject aWait( GetParent() ); @@ -459,13 +459,13 @@ IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_START( SwLabPage, TypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwLabPage, TypeHdl) { DisplayFormat(); aItem.aType = aTypeBox.GetSelectEntry(); return 0; } -IMPL_LINK_INLINE_END( SwLabPage, TypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwLabPage, TypeHdl) void SwLabPage::DisplayFormat() { diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 6d530f87f38b..700f04acbaec 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -123,7 +123,7 @@ void SwVisitingCardPage::InitFrameControl() } } -IMPL_LINK( SwVisitingCardPage, FrameControlInitializedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl) { SvLBoxEntry* pSel = aAutoTextLB.FirstSelected(); String sEntry; diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index d5208ddae9c8..db94f67c806a 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -382,16 +382,16 @@ SwLabFmtPage::~SwLabFmtPage() } // Modify-handler of MetricFields. start preview timer -IMPL_LINK_INLINE_START( SwLabFmtPage, ModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, ModifyHdl) { bModified = sal_True; aPreviewTimer.Start(); return 0; } -IMPL_LINK_INLINE_END( SwLabFmtPage, ModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwLabFmtPage, ModifyHdl) // Invalidate preview -IMPL_LINK_INLINE_START( SwLabFmtPage, PreviewHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, PreviewHdl) { aPreviewTimer.Stop(); ChangeMinMax(); @@ -400,7 +400,7 @@ IMPL_LINK_INLINE_START( SwLabFmtPage, PreviewHdl, Timer *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_END( SwLabFmtPage, PreviewHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwLabFmtPage, PreviewHdl) // LoseFocus-Handler: Update on change -------------------------- IMPL_LINK_INLINE_START( SwLabFmtPage, LoseFocusHdl, Control *, pControl ) @@ -570,7 +570,7 @@ void SwLabFmtPage::Reset(const SfxItemSet& ) PreviewHdl(0); } -IMPL_LINK( SwLabFmtPage, SaveHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl) { SwLabRec aRec; aRec.lHDist = static_cast< long >(GETFLDVAL(aHDistField )); @@ -638,7 +638,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) : aMakeCB.InsertEntry(pMan[i]); } -IMPL_LINK(SwSaveLabelDlg, OkHdl, OKButton*, EMPTYARG) +IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) { SwLabelConfig& rCfg = pLabPage->GetParent()->GetLabelsConfig(); String sMake(aMakeCB.GetText()); @@ -663,7 +663,7 @@ IMPL_LINK(SwSaveLabelDlg, OkHdl, OKButton*, EMPTYARG) return 0; } -IMPL_LINK(SwSaveLabelDlg, ModifyHdl, Edit*, EMPTYARG) +IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyHdl) { aOKPB.Enable(aMakeCB.GetText().Len() && aTypeED.GetText().Len()); return 0; diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 547d83753a54..d440523554d0 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -124,10 +124,10 @@ class SwLabFmtPage : public SfxTabPage SwLabFmtPage(Window* pParent, const SfxItemSet& rSet); ~SwLabFmtPage(); - DECL_LINK( ModifyHdl, Edit * ); - DECL_LINK( PreviewHdl, Timer * ); + DECL_LINK(ModifyHdl, void *); + DECL_LINK(PreviewHdl, void *); DECL_LINK( LoseFocusHdl, Control * ); - DECL_LINK( SaveHdl, PushButton* ); + DECL_LINK(SaveHdl, void *); void ChangeMinMax(); @@ -166,8 +166,8 @@ class SwSaveLabelDlg : public ModalDialog SwLabFmtPage* pLabPage; SwLabRec& rLabRec; - DECL_LINK(OkHdl, OKButton*); - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK(OkHdl, void *); + DECL_LINK(ModifyHdl, void *); public: SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec); diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index b78e2e8f6da7..69bd9221fc48 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -660,7 +660,7 @@ IMPL_LINK( SwMailMergeDlg, FilenameHdl, CheckBox*, pBox ) return 0; } -IMPL_LINK( SwMailMergeDlg, ModifyHdl, NumericField *, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeDlg, ModifyHdl) { aFromRB.Check(); return (0); @@ -780,7 +780,7 @@ bool SwMailMergeDlg::ExecQryShell() return true; } -IMPL_LINK( SwMailMergeDlg, InsertPathHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeDlg, InsertPathHdl) { String sPath( aPathED.GetText() ); if( !sPath.Len() ) @@ -810,7 +810,7 @@ IMPL_LINK( SwMailMergeDlg, InsertPathHdl, PushButton *, EMPTYARG ) return 0; } -IMPL_LINK( SwMailMergeDlg, AttachFileHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwMailMergeDlg, AttachFileHdl) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 2f3558341797..006555b5dadd 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -63,13 +63,13 @@ class SwLabPage : public SfxTabPage SwLabPage(Window* pParent, const SfxItemSet& rSet); ~SwLabPage(); - DECL_LINK( AddrHdl, Button * ); + DECL_LINK(AddrHdl, void *); DECL_LINK( DatabaseHdl, ListBox *pListBox ); // DECL_LINK( DatabaseButtonHdl, Button * ); - DECL_LINK( FieldHdl, Button * ); - DECL_LINK( PageHdl, Button * ); - DECL_LINK( MakeHdl, ListBox * ); - DECL_LINK( TypeHdl, ListBox * ); + DECL_LINK(FieldHdl, void *); + DECL_LINK(PageHdl, void *); + DECL_LINK(MakeHdl, void *); + DECL_LINK(TypeHdl, void *); void DisplayFormat (); SwLabRec* GetSelectedEntryPos(); diff --git a/sw/source/ui/envelp/syncbtn.cxx b/sw/source/ui/envelp/syncbtn.cxx index b83d0c48563d..d9dc29eec8d6 100644 --- a/sw/source/ui/envelp/syncbtn.cxx +++ b/sw/source/ui/envelp/syncbtn.cxx @@ -86,7 +86,7 @@ SwSyncBtnDlg::~SwSyncBtnDlg() { } -IMPL_LINK( SwSyncBtnDlg, BtnHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwSyncBtnDlg, BtnHdl) { SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SFX_CALLMODE_ASYNCHRON); return 0; diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 1f657a712cfd..a59932199334 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -250,7 +250,7 @@ void SwChangeDBDlg::UpdateFlds() pSh->EndAllAction(); } -IMPL_LINK( SwChangeDBDlg, ButtonHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl) { String sTableName, sColumnName; SwDBData aData; @@ -265,7 +265,7 @@ IMPL_LINK( SwChangeDBDlg, ButtonHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK( SwChangeDBDlg, TreeSelectHdl, SvTreeListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl) { sal_Bool bEnable = sal_False; @@ -300,7 +300,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) aDocDBNameFT.SetText(sName); } -IMPL_LINK( SwChangeDBDlg, AddDBHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwChangeDBDlg, AddDBHdl) { String sNewDB = SwNewDBMgr::LoadAndRegisterDataSource(); if(sNewDB.Len()) diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 4a4c8a86ffb6..88fdbf91f0ea 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -473,7 +473,7 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) return 0; } -IMPL_LINK( SwFldDBPage, AddDBHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldDBPage, AddDBHdl) { String sNewDB = SwNewDBMgr::LoadAndRegisterDataSource(); if(sNewDB.Len()) @@ -486,7 +486,7 @@ IMPL_LINK( SwFldDBPage, AddDBHdl, PushButton *, EMPTYARG ) /*-------------------------------------------------------------------- Description: Modify --------------------------------------------------------------------*/ -IMPL_LINK( SwFldDBPage, ModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl) { CheckInsert(); return 0; diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 07e76a171708..41df21066b73 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -70,8 +70,8 @@ class SwFldDBPage : public SwFldPage DECL_LINK( TypeHdl, ListBox* ); DECL_LINK( NumSelectHdl, NumFormatListBox* pLB = 0); DECL_LINK( TreeSelectHdl, SvTreeListBox* pBox ); - DECL_LINK( ModifyHdl, Edit *pED = 0 ); - DECL_LINK( AddDBHdl, PushButton* ); + DECL_LINK(ModifyHdl, void *); + DECL_LINK(AddDBHdl, void *); void CheckInsert(); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 7160fc2f0b69..d119fffb3591 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -215,7 +215,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) } } -IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldDokInfPage, TypeHdl) { // save old ListBoxPos SvLBoxEntry* pOldEntry = pSelEntry; @@ -238,7 +238,7 @@ IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG ) return 0; } -IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl) { sal_uInt16 nSubType = (sal_uInt16)(sal_uLong)pSelEntry->GetUserData(); sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos(); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index ac19388d5c9f..57182d6ed1b2 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -61,8 +61,8 @@ class SwFldDokInfPage : public SwFldPage sal_uLong nOldFormat; ::rtl::OUString m_sOldCustomFieldName; - DECL_LINK( TypeHdl, ListBox* pLB = 0 ); - DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); + DECL_LINK(TypeHdl, void * = 0); + DECL_LINK(SubTypeHdl, void * = 0); sal_uInt16 FillSelectionLB(sal_uInt16 nSubTypeId); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 5b685316ad9f..2bce604a1ae0 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -190,7 +190,7 @@ void SwFldDokPage::Reset(const SfxItemSet& ) } } -IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) { // save old ListBoxPos const sal_uInt16 nOld = GetTypeSel(); @@ -450,7 +450,7 @@ void SwFldDokPage::AddSubType(sal_uInt16 nTypeId) aSelectionLB.SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } -IMPL_LINK( SwFldDokPage, SubTypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldDokPage, SubTypeHdl) { sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) @@ -519,7 +519,7 @@ sal_uInt16 SwFldDokPage::FillFormatLB(sal_uInt16 nTypeId) return nSize; } -IMPL_LINK( SwFldDokPage, FormatHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldDokPage, FormatHdl) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 9bff88a0bb9c..4dba662d93dc 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -62,9 +62,9 @@ class SwFldDokPage : public SwFldPage sal_uInt16 nOldSel; sal_uLong nOldFormat; - DECL_LINK( TypeHdl, ListBox* pLB = 0 ); - DECL_LINK( FormatHdl, ListBox* pLB = 0 ); - DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); + DECL_LINK(TypeHdl, void *); + DECL_LINK(FormatHdl, void * = 0); + DECL_LINK(SubTypeHdl, void *); void AddSubType(sal_uInt16 nTypeId); sal_uInt16 FillFormatLB(sal_uInt16 nTypeId); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 5938f599c499..89d0ef3ef78a 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -241,7 +241,7 @@ void SwFldEditDlg::InsertHdl() /*-------------------------------------------------------------------- Description: kick off changing of the field --------------------------------------------------------------------*/ -IMPL_LINK( SwFldEditDlg, OKHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldEditDlg, OKHdl) { if (GetOKButton()->IsEnabled()) { @@ -307,7 +307,7 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) return 0; } -IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldEditDlg, AddressHdl) { SwFldPage* pTabPage = (SwFldPage*)GetTabPage(); SwFldMgr& rMgr = pTabPage->GetFldMgr(); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index a8fab0674490..03572c2cad30 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -189,7 +189,7 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) } } -IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) { // save old ListBoxPos const sal_uInt16 nOld = GetTypeSel(); @@ -410,7 +410,7 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) return 0; } -IMPL_LINK( SwFldFuncPage, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldFuncPage, SelectHdl) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); @@ -420,7 +420,7 @@ IMPL_LINK( SwFldFuncPage, SelectHdl, ListBox *, EMPTYARG ) return 0; } -IMPL_LINK( SwFldFuncPage, InsertMacroHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldFuncPage, InsertMacroHdl) { SelectHdl(); InsertHdl(); @@ -475,7 +475,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl) return 0; } -IMPL_LINK( SwFldFuncPage, ListEnableHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwFldFuncPage, ListEnableHdl) { //enable "Add" button when text is in the Edit that's not already member of the box aListAddPB.Enable(aListItemED.GetText().Len() && @@ -673,7 +673,7 @@ void SwFldFuncPage::FillUserData() SetUserData(sData); } -IMPL_LINK( SwFldFuncPage, ModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldFuncPage, ModifyHdl) { String aName(aNameED.GetText()); const sal_uInt16 nLen = aName.Len(); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 9db7ed3d2fbe..b3b75c037c13 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -75,10 +75,10 @@ class SwFldFuncPage : public SwFldPage sal_uLong nOldFormat; bool bDropDownLBChanged; - DECL_LINK( TypeHdl, ListBox* pLB = 0 ); - DECL_LINK( SelectHdl, ListBox* pLB = 0 ); - DECL_LINK( InsertMacroHdl, ListBox* pLB = 0 ); - DECL_LINK( ModifyHdl, Edit *pEd = 0 ); + DECL_LINK(TypeHdl, void *); + DECL_LINK(SelectHdl, void * = 0); + DECL_LINK(InsertMacroHdl, void *); + DECL_LINK(ModifyHdl, void * = 0); DECL_LINK( ListModifyHdl, Control*); DECL_LINK( ListEnableHdl, void*); diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index 4c63d8db7f8d..262ab14efff6 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -381,7 +381,7 @@ void SwFldPage::EnableInsert(sal_Bool bEnable) m_bInsert = bEnable; } -IMPL_LINK( SwFldPage, NumFormatHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldPage, NumFormatHdl) { InsertHdl(); diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 40c4ef60ae75..ae7772756cf5 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -62,7 +62,7 @@ protected: SwWrtShell* GetWrtShell() { return m_pWrtShell;} DECL_LINK( InsertHdl, Button *pBtn = 0 ); - DECL_LINK( NumFormatHdl, ListBox *pBtn = 0 ); + DECL_LINK(NumFormatHdl, void *); void Init(); void SavePos( const ListBox* pLst1, diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 948380f87732..e3332d088ae3 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -277,7 +277,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) } } -IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldRefPage, TypeHdl) { // save old ListBoxPos const sal_uInt16 nOld = GetTypeSel(); @@ -415,7 +415,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) return 0; } -IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldRefPage, SubTypeHdl) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); @@ -769,7 +769,7 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) Description: Modify --------------------------------------------------------------------*/ -IMPL_LINK( SwFldRefPage, ModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl) { String aName(aNameED.GetText()); const sal_uInt16 nLen = aName.Len(); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 9268e0a96561..30a56ff67f27 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -72,9 +72,9 @@ class SwFldRefPage : public SwFldPage // fallback, if previously selected text node doesn't exist anymore sal_uInt16 mnSavedSelectedPos; - DECL_LINK( TypeHdl, ListBox* pLB = 0 ); - DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); - DECL_LINK( ModifyHdl, Edit *pEd = 0 ); + DECL_LINK(TypeHdl, void *); + DECL_LINK(SubTypeHdl, void * = 0); + DECL_LINK(ModifyHdl, void * = 0); void UpdateSubType(); sal_uInt16 FillFormatLB(sal_uInt16 nTypeId); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 81b754c10a26..d40a04a88b7a 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -211,7 +211,7 @@ SfxItemSet* SwFldDlg::CreateInputItemSet( sal_uInt16 nID ) Description: kick off inserting of new fields --------------------------------------------------------------------*/ -IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldDlg, OKHdl) { if (GetOKButton().IsEnabled()) { @@ -224,7 +224,7 @@ IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK( SwFldDlg, CancelHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldDlg, CancelHdl) { Close(); return 0; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 64fb7e1cb495..c0170edddb1e 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -192,7 +192,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) } } -IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldVarPage, TypeHdl) { // save old ListBoxPos const sal_uInt16 nOld = GetTypeSel(); @@ -824,7 +824,7 @@ sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) /*-------------------------------------------------------------------- Description: Modify --------------------------------------------------------------------*/ -IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl) { String sValue(aValueED.GetText()); sal_Bool bHasValue = sValue.Len() != 0; @@ -1098,7 +1098,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) return sal_True; } -IMPL_LINK( SwFldVarPage, ChapterHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldVarPage, ChapterHdl) { sal_Bool bEnable = aChapterLevelLB.GetSelectEntryPos() != 0; @@ -1109,7 +1109,7 @@ IMPL_LINK( SwFldVarPage, ChapterHdl, ListBox *, EMPTYARG ) return 0; } -IMPL_LINK( SwFldVarPage, SeparatorHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl) { sal_Bool bEnable = aSeparatorED.GetText().Len() != 0 || aChapterLevelLB.GetSelectEntryPos() == 0; diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index f4d55ceb5755..f925dca4fb24 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -86,12 +86,12 @@ class SwFldVarPage : public SwFldPage sal_uLong nOldFormat; sal_Bool bInit; - DECL_LINK( TypeHdl, ListBox* pLB = 0 ); + DECL_LINK(TypeHdl, void *); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); - DECL_LINK( ModifyHdl, Edit *pED = 0 ); + DECL_LINK(ModifyHdl, void * = 0); DECL_LINK( TBClickHdl, ToolBox *pTB = 0); - DECL_LINK( ChapterHdl, ListBox *pLB = 0); - DECL_LINK( SeparatorHdl, Edit *pED = 0 ); + DECL_LINK(ChapterHdl, void * = 0); + DECL_LINK(SeparatorHdl, void * = 0); void UpdateSubType(); sal_uInt16 FillFormatLB(sal_uInt16 nTypeId); diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx index 0a9cf44f2924..7963e4d82234 100644 --- a/sw/source/ui/fldui/fldwrap.cxx +++ b/sw/source/ui/fldui/fldwrap.cxx @@ -59,7 +59,7 @@ SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId) : m_aUpdateTimer.SetTimeoutHdl(LINK(this, SwChildWinWrapper, UpdateHdl)); } -IMPL_LINK( SwChildWinWrapper, UpdateHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl) { GetWindow()->Activate(); // update dialog diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index af01ff5cdf30..94de28a1a639 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -191,7 +191,7 @@ void SwFldInputDlg::Apply() } -IMPL_LINK(SwFldInputDlg, NextHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwFldInputDlg, NextHdl) { EndDialog(RET_OK); return 0; diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index bbdd2b98fd5b..b7af46e91c1d 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -130,7 +130,7 @@ SwJavaEditDialog::~SwJavaEditDialog() Application::SetDefDialogParent( pOldDefDlgParent ); } -IMPL_LINK_INLINE_START( SwJavaEditDialog, PrevHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl) { SetFld(); pMgr->GoPrev(); @@ -140,9 +140,9 @@ IMPL_LINK_INLINE_START( SwJavaEditDialog, PrevHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_END( SwJavaEditDialog, PrevHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, PrevHdl) -IMPL_LINK_INLINE_START( SwJavaEditDialog, NextHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, NextHdl) { SetFld(); pMgr->GoNext(); @@ -152,9 +152,9 @@ IMPL_LINK_INLINE_START( SwJavaEditDialog, NextHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_END( SwJavaEditDialog, NextHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, NextHdl) -IMPL_LINK( SwJavaEditDialog, OKHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl) { SetFld(); EndDialog( RET_OK ); @@ -255,7 +255,7 @@ sal_Bool SwJavaEditDialog::IsUpdate() return pFld && ( bIsUrl != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText ); } -IMPL_LINK( SwJavaEditDialog, RadioButtonHdl, RadioButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl) { sal_Bool bEnable = aUrlRB.IsChecked(); aUrlPB.Enable(bEnable); @@ -291,7 +291,7 @@ IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn ) return 0; } -IMPL_LINK( SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, EMPTYARG ) +IMPL_LINK_NOARG(SwJavaEditDialog, DlgClosedHdl) { if ( pFileDlg->GetError() == ERRCODE_NONE ) { diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index e93c5525e967..0c6a0357ec4a 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -294,7 +294,7 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox) return 0; } -IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG) +IMPL_LINK_NOARG(SwColumnDlg, OkHdl) { // evaluate current selection SfxItemSet* pSet = 0; @@ -1085,7 +1085,7 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox ) /*------------------------------------------------------------------------ Description: scroll up the contents of the edits ------------------------------------------------------------------------*/ -IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwColumnPage, Up) { if( nFirstVis ) { @@ -1099,7 +1099,7 @@ IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG ) /*------------------------------------------------------------------------ Description: scroll down the contents of the edits. ------------------------------------------------------------------------*/ -IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwColumnPage, Down) { if( nFirstVis + nVisCols < nCols ) { @@ -1115,7 +1115,7 @@ IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG ) handler; triggered by an alteration of the column width or the column gap. ------------------------------------------------------------------------*/ -IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SwColumnPage, Timeout) { DBG_PROFSTART(columnhdl) ; if(pModifiedField) diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 787c7ae94f65..0d7d23b2219a 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -334,16 +334,16 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton ) DrawSample(); return 0; } -IMPL_LINK_INLINE_END( SwCaptionDialog, OptionHdl, Button*, EMPTYARG ) +IMPL_LINK_INLINE_END( SwCaptionDialog, OptionHdl, Button*, pButton ) -IMPL_LINK_INLINE_START( SwCaptionDialog, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwCaptionDialog, SelectHdl) { DrawSample(); return 0; } -IMPL_LINK_INLINE_END( SwCaptionDialog, SelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwCaptionDialog, SelectHdl) -IMPL_LINK( SwCaptionDialog, ModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl) { SwWrtShell &rSh = rView.GetWrtShell(); String sFldTypeName = aCategoryBox.GetText(); @@ -365,7 +365,7 @@ IMPL_LINK( SwCaptionDialog, ModifyHdl, Edit *, EMPTYARG ) return 0; } -IMPL_LINK(SwCaptionDialog, CaptionHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwCaptionDialog, CaptionHdl) { SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() ); SwCaptionOptDlg aDlg( this, aSet ); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index de3c4df0b862..c2d920daa7f2 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1643,7 +1643,7 @@ int SwFrmPage::DeactivatePage(SfxItemSet * _pSet) /*-------------------------------------------------------------------- Description: swap left/right with inside/outside --------------------------------------------------------------------*/ -IMPL_LINK( SwFrmPage, MirrorHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwFrmPage, MirrorHdl) { RndStdIds eId = GetAnchor(); InitPos( eId, USHRT_MAX, 0, USHRT_MAX, 0, LONG_MAX, LONG_MAX); @@ -1680,7 +1680,7 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn ) /*-------------------------------------------------------------------- Description: range check --------------------------------------------------------------------*/ -IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl) { if (bNoModifyHdl) return 0; @@ -1807,7 +1807,7 @@ IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG ) return 0; } -IMPL_LINK( SwFrmPage, AnchorTypeHdl, RadioButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwFrmPage, AnchorTypeHdl) { aMirrorPagesCB.Enable(!aAnchorAsCharRB.IsChecked()); @@ -1975,7 +1975,7 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB ) return 0; } -IMPL_LINK_INLINE_START( SwFrmPage, RealSizeHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwFrmPage, RealSizeHdl) { aWidthED.SetUserValue( aWidthED. NormalizePercent(aGrfSize.Width() ), FUNIT_TWIP); aHeightED.SetUserValue(aHeightED.NormalizePercent(aGrfSize.Height()), FUNIT_TWIP); @@ -1983,16 +1983,16 @@ IMPL_LINK_INLINE_START( SwFrmPage, RealSizeHdl, Button *, EMPTYARG ) UpdateExample(); return 0; } -IMPL_LINK_INLINE_END( SwFrmPage, RealSizeHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwFrmPage, RealSizeHdl) -IMPL_LINK( SwFrmPage, AutoWidthClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwFrmPage, AutoWidthClickHdl) { if( !IsInGraficMode() ) HandleAutoCB( aAutoWidthCB.IsChecked(), aWidthFT, aWidthAutoFT ); return 0; } -IMPL_LINK( SwFrmPage, AutoHeightClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwFrmPage, AutoHeightClickHdl) { if( !IsInGraficMode() ) HandleAutoCB( aAutoHeightCB.IsChecked(), aHeightFT, aHeightAutoFT ); @@ -2463,7 +2463,7 @@ int SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -IMPL_LINK( SwGrfExtPage, BrowseHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl) { if(!pGrfDlg) { @@ -2513,7 +2513,7 @@ IMPL_LINK( SwGrfExtPage, BrowseHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK( SwGrfExtPage, MirrorHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl) { sal_Bool bEnable = aMirrorHorzBox.IsChecked(); @@ -2725,7 +2725,7 @@ SfxTabPage* SwFrmURLPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwFrmURLPage( pParent, rSet ); } -IMPL_LINK( SwFrmURLPage, InsertFileHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) { FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); uno::Reference < ui::dialogs::XFilePicker > xFP = aDlgHelper.GetFilePicker(); @@ -3063,7 +3063,7 @@ sal_uInt16* SwFrmAddPage::GetRanges() return aAddPgRg; } -IMPL_LINK(SwFrmAddPage, EditModifyHdl, Edit*, EMPTYARG) +IMPL_LINK_NOARG(SwFrmAddPage, EditModifyHdl) { sal_Bool bEnable = 0 != aNameED.GetText().Len(); aAltNameED.Enable(bEnable); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 31a757b93b30..07f04283dc34 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -652,7 +652,7 @@ IMPL_LINK( SwWrapTabPage, WrapTypeHdl, ImageRadioButton *, pBtn ) return 0; } -IMPL_LINK( SwWrapTabPage, ContourHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl) { sal_Bool bEnable = !(aWrapOutlineCB.IsChecked() && aWrapOutlineCB.IsEnabled()); diff --git a/sw/source/ui/inc/HeaderFooterWin.hxx b/sw/source/ui/inc/HeaderFooterWin.hxx index d94931fce754..d6c250df6f47 100644 --- a/sw/source/ui/inc/HeaderFooterWin.hxx +++ b/sw/source/ui/inc/HeaderFooterWin.hxx @@ -70,7 +70,7 @@ public: void SetReadonly( bool bReadonly ); private: - DECL_LINK( FadeHandler, Timer * ); + DECL_LINK( FadeHandler, void * ); }; #endif diff --git a/sw/source/ui/inc/PageBreakWin.hxx b/sw/source/ui/inc/PageBreakWin.hxx index 86c46231ed0b..63eef5a1376c 100644 --- a/sw/source/ui/inc/PageBreakWin.hxx +++ b/sw/source/ui/inc/PageBreakWin.hxx @@ -74,7 +74,7 @@ public: private: /// Hide the button (used when the popup menu is closed by clicking outside) DECL_LINK( HideHandler, void * ); - DECL_LINK( FadeHandler, Timer * ); + DECL_LINK( FadeHandler, void * ); }; #endif diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index 26e48b21de10..d5449227cacc 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.hxx @@ -62,7 +62,7 @@ class SwBaseShell: public SfxShell // Update-Timer for graphic std::set<sal_uInt16> aGrfUpdateSlots; - DECL_LINK( GraphicArrivedHdl, SwCrsrShell* ); + DECL_LINK( GraphicArrivedHdl, void* ); protected: SwWrtShell& GetShell(); diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index effdba914367..42732df02dfc 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.hxx @@ -67,7 +67,7 @@ class SwInsertBookmarkDlg: public SvxStandardDialog SfxRequest& rReq; DECL_LINK( ModifyHdl, BookmarkCombo * ); - DECL_LINK( DeleteHdl, Button * ); + DECL_LINK(DeleteHdl, void *); virtual void Apply(); diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx index 9ff55fde5d2b..caa75d1a4c36 100644 --- a/sw/source/ui/inc/break.hxx +++ b/sw/source/ui/inc/break.hxx @@ -64,8 +64,8 @@ class SwBreakDlg: public SvxStandardDialog DECL_LINK( ClickHdl, void * ); DECL_LINK( PageNumHdl, CheckBox * ); - DECL_LINK( PageNumModifyHdl, Edit * ); - DECL_LINK( OkHdl, Button * ); + DECL_LINK(PageNumModifyHdl, void *); + DECL_LINK(OkHdl, void *); void CheckEnable(); diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index d5201d780bdd..92a4cc00fd25 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -65,9 +65,9 @@ class SwChangeDBDlg: public SvxStandardDialog SwWrtShell *pSh; SwFldMgr *pMgr; - DECL_LINK(TreeSelectHdl, SvTreeListBox* pBox = 0); - DECL_LINK(ButtonHdl, Button* pBtn); - DECL_LINK(AddDBHdl, PushButton*); + DECL_LINK(TreeSelectHdl, void * = 0); + DECL_LINK(ButtonHdl, void *); + DECL_LINK(AddDBHdl, void *); virtual void Apply(); void UpdateFlds(); diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx index b16579833101..26062f0a707d 100644 --- a/sw/source/ui/inc/chrdlg.hxx +++ b/sw/source/ui/inc/chrdlg.hxx @@ -81,8 +81,8 @@ class SwCharURLPage : public SfxTabPage SvxMacroItem* pINetItem; sal_Bool bModified; - DECL_LINK( InsertFileHdl, PushButton * ); - DECL_LINK( EventHdl, PushButton * ); + DECL_LINK(InsertFileHdl, void *); + DECL_LINK(EventHdl, void *); public: SwCharURLPage( Window* pParent, diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index b36e0623e719..5cc078c37fb5 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -78,7 +78,7 @@ class SwColumnDlg : public SfxModalDialog DECL_LINK(ObjectHdl, ListBox*); - DECL_LINK(OkHdl, OKButton*); + DECL_LINK(OkHdl, void *); public: SwColumnDlg(Window* pParent, SwWrtShell& rSh); @@ -164,11 +164,11 @@ class SwColumnPage : public SfxTabPage DECL_LINK( GapModify, PercentField * ); DECL_LINK( EdModify, PercentField * ); DECL_LINK( AutoWidthHdl, CheckBox * ); - DECL_LINK( Timeout, Timer * ); + DECL_LINK(Timeout, void *); DECL_LINK( SetDefaultsHdl, ValueSet * ); - DECL_LINK( Up, Button * ); - DECL_LINK( Down, Button * ); + DECL_LINK(Up, void *); + DECL_LINK(Down, void *); void Apply(Button *); DECL_LINK( UpdateColMgr, void* ); diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 075ebd37768b..01e90a6c9056 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -194,8 +194,8 @@ public: const SwWrtShell* GetActiveWrtShell() {return pActiveShell;} SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;} - DECL_LINK( ContentDoubleClickHdl, SwContentTree * ); - DECL_LINK( TimerUpdate, Timer * ); + DECL_LINK( ContentDoubleClickHdl, void * ); + DECL_LINK( TimerUpdate, void * ); virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); virtual void RequestingChildren( SvLBoxEntry* pParent ); @@ -296,8 +296,8 @@ protected: void Clear(); DECL_LINK( PopupHdl, Menu* ); - DECL_LINK( Timeout, Timer* ); - DECL_LINK( DoubleClickHdl, SwGlobalTree * ); + DECL_LINK( Timeout, void* ); + DECL_LINK( DoubleClickHdl, void* ); sal_Bool IsInternalDrag() const {return bIsInternalDrag != 0;} SwNavigationPI* GetParentWindow() diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index 3fc218459f68..8452660c41e3 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -74,7 +74,7 @@ class SwConvertTableDlg: public SfxModalDialog DECL_LINK( AutoFmtHdl, PushButton* ); DECL_LINK( BtnHdl, Button* ); - DECL_LINK( CheckBoxHdl, CheckBox *pCB = 0 ); + DECL_LINK(CheckBoxHdl, void * = 0); DECL_LINK( ReapeatHeaderCheckBoxHdl, void* p = 0 ); public: diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index dcbda5163ead..0386cd1ae5d6 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -107,10 +107,10 @@ class SwCaptionDialog : public SvxStandardDialog ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xNameAccess; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > xNamed; - DECL_LINK( SelectHdl, ListBox * ); - DECL_LINK( ModifyHdl, Edit * ); + DECL_LINK(SelectHdl, void *); + DECL_LINK(ModifyHdl, void *); DECL_LINK( OptionHdl, Button * ); - DECL_LINK( CaptionHdl, PushButton*); + DECL_LINK(CaptionHdl, void *); virtual void Apply(); diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx index a2a3433fe66e..02766fcbc90d 100644 --- a/sw/source/ui/inc/docstdlg.hxx +++ b/sw/source/ui/inc/docstdlg.hxx @@ -50,7 +50,7 @@ protected: virtual sal_Bool FillItemSet( SfxItemSet &rSet); virtual void Reset (const SfxItemSet &rSet); - DECL_LINK( UpdateHdl, PushButton*); + DECL_LINK(UpdateHdl, void *); private: FixedText aPageLbl; diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx index f9a8f7316c93..af04bd7f32f1 100644 --- a/sw/source/ui/inc/drpcps.hxx +++ b/sw/source/ui/inc/drpcps.hxx @@ -93,10 +93,10 @@ friend class SwDropCapsPict; virtual int DeactivatePage(SfxItemSet *pSet); void FillSet( SfxItemSet &rSet ); - DECL_LINK( ClickHdl, Button * ); + DECL_LINK(ClickHdl, void *); DECL_LINK( ModifyHdl, Edit * ); - DECL_LINK( SelectHdl, ListBox * ); - DECL_LINK( WholeWordHdl, CheckBox * ); + DECL_LINK(SelectHdl, void *); + DECL_LINK(WholeWordHdl, void *); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index 354b6a0e4ab0..45bc2776036a 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -182,19 +182,19 @@ friend void PageNumNotify( ViewShell* pVwSh, * The selection is regularly increased towards the mouse * position. */ - DECL_LINK( TimerHandler, Timer * ); + DECL_LINK( TimerHandler, void * ); void StartDDTimer(); void StopDDTimer(SwWrtShell *, const Point &); - DECL_LINK( DDHandler, Timer * ); + DECL_LINK( DDHandler, void * ); // timer for ANY-KeyInut question without a following KeyInputEvent - DECL_LINK( KeyInputFlushHandler, Timer * ); + DECL_LINK( KeyInputFlushHandler, void * ); // timer for overlapping KeyInputs (e.g. for tables) - DECL_LINK( KeyInputTimerHandler, Timer * ); + DECL_LINK( KeyInputTimerHandler, void * ); // timer for ApplyTemplates via mouse (in disguise Drag&Drop) - DECL_LINK( TemplateTimerHdl, Timer* ); + DECL_LINK( TemplateTimerHdl, void * ); using OutputDevice::GetTextColor; diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index 1deb5c788b2c..50dd3dd5f595 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -110,8 +110,8 @@ class SwEnvPage : public SfxTabPage ~SwEnvPage(); DECL_LINK( DatabaseHdl, ListBox * ); - DECL_LINK( FieldHdl, Button * ); - DECL_LINK( SenderHdl, Button * ); + DECL_LINK(FieldHdl, void *); + DECL_LINK(SenderHdl, void *); void InitDatabaseBox(); diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/ui/inc/fldedt.hxx index d41557e1636f..18c1cfc4daeb 100644 --- a/sw/source/ui/inc/fldedt.hxx +++ b/sw/source/ui/inc/fldedt.hxx @@ -40,7 +40,7 @@ class SwFldEditDlg : public SfxSingleTabDialog ImageButton aNextBT; PushButton aAddressBT; - DECL_LINK( AddressHdl, PushButton *pBt = 0 ); + DECL_LINK(AddressHdl, void *); DECL_LINK( NextPrevHdl, Button *pBt = 0 ); void Init(); @@ -51,7 +51,7 @@ public: SwFldEditDlg(SwView& rVw); ~SwFldEditDlg(); - DECL_LINK( OKHdl, Button * ); + DECL_LINK(OKHdl, void *); virtual short Execute(); diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/ui/inc/fldtdlg.hxx index 26dc75b63705..1b29cc6ae864 100644 --- a/sw/source/ui/inc/fldtdlg.hxx +++ b/sw/source/ui/inc/fldtdlg.hxx @@ -53,8 +53,8 @@ public: SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent); virtual ~SwFldDlg(); - DECL_LINK( OKHdl, Button * ); - DECL_LINK( CancelHdl, Button * ); + DECL_LINK(OKHdl, void *); + DECL_LINK(CancelHdl, void *); void Initialize(SfxChildWinInfo *pInfo); void ReInitDlg(); diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 57221dba9699..4a73d99a4522 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -141,17 +141,17 @@ class SwFrmPage: public SfxTabPage virtual int DeactivatePage(SfxItemSet *pSet); - DECL_LINK( RangeModifyHdl, Edit * ); - DECL_LINK( AnchorTypeHdl, RadioButton * ); + DECL_LINK(RangeModifyHdl, void *); + DECL_LINK(AnchorTypeHdl, void *); DECL_LINK( PosHdl, ListBox * ); DECL_LINK( RelHdl, ListBox * ); void InitPos(RndStdIds eId, sal_uInt16 nH, sal_uInt16 nHRel, sal_uInt16 nV, sal_uInt16 nVRel, long nX, long nY); - DECL_LINK( RealSizeHdl, Button * ); + DECL_LINK(RealSizeHdl, void *); DECL_LINK( RelSizeClickHdl, CheckBox * ); - DECL_LINK( MirrorHdl, CheckBox * ); + DECL_LINK(MirrorHdl, void *); DECL_LINK( AutoWidthClickHdl, void* ); DECL_LINK( AutoHeightClickHdl, void* ); @@ -227,8 +227,8 @@ class SwGrfExtPage: public SfxTabPage sal_Bool bHtmlMode; // handler for mirroring - DECL_LINK( MirrorHdl, CheckBox * ); - DECL_LINK( BrowseHdl, Button * ); + DECL_LINK(MirrorHdl, void *); + DECL_LINK(BrowseHdl, void *); virtual void ActivatePage(const SfxItemSet& rSet); SwGrfExtPage(Window *pParent, const SfxItemSet &rSet); @@ -263,7 +263,7 @@ class SwFrmURLPage : public SfxTabPage CheckBox aServerCB; CheckBox aClientCB; - DECL_LINK( InsertFileHdl, PushButton * ); + DECL_LINK(InsertFileHdl, void *); SwFrmURLPage(Window *pParent, const SfxItemSet &rSet); @@ -311,7 +311,7 @@ class SwFrmAddPage : public SfxTabPage sal_Bool bFormat; sal_Bool bNew; - DECL_LINK(EditModifyHdl, Edit*); + DECL_LINK(EditModifyHdl, void *); DECL_LINK(ChainModifyHdl, ListBox*); SwFrmAddPage(Window *pParent, const SfxItemSet &rSet); diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx index 423a0588fb0c..aaaf9a31d93f 100644 --- a/sw/source/ui/inc/glosbib.hxx +++ b/sw/source/ui/inc/glosbib.hxx @@ -97,10 +97,10 @@ class SwGlossaryGroupDlg : public SvxStandardDialog protected: virtual void Apply(); DECL_LINK( SelectHdl, SvTabListBox* ); - DECL_LINK( NewHdl, Button* ); + DECL_LINK(NewHdl, void *); DECL_LINK( DeleteHdl, Button* ); - DECL_LINK( ModifyHdl, Edit* ); - DECL_LINK( RenameHdl, Button* ); + DECL_LINK(ModifyHdl, void *); + DECL_LINK(RenameHdl, void *); public: SwGlossaryGroupDlg(Window * pParent, diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index 3f499a8c0def..2181cc576ba4 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -138,8 +138,8 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( GrpSelect, SvTreeListBox * ); DECL_LINK( MenuHdl, Menu * ); DECL_LINK( EnableHdl, Menu * ); - DECL_LINK( BibHdl, Button * ); - DECL_LINK( EditHdl, Button * ); + DECL_LINK(BibHdl, void *); + DECL_LINK(EditHdl, void *); DECL_LINK( PathHdl, Button * ); DECL_LINK( CheckBoxHdl, CheckBox * ); DECL_LINK( ShowPreviewHdl, CheckBox * ); diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index 4a99f955c583..b275ce607909 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -64,7 +64,7 @@ class SwFldInputDlg: public SvxStandardDialog PushButton aNextBT; HelpButton aHelpBT; - DECL_LINK(NextHdl, PushButton*); + DECL_LINK(NextHdl, void *); public: SwFldInputDlg( Window *pParent, SwWrtShell &rSh, SwField* pField, sal_Bool bNextButton = sal_False ); diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 0040d435c081..1351f1c9df33 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -79,7 +79,7 @@ friend class InputEdit; void CleanupUglyHackWithUndo(); void DelBoxCntnt(); - DECL_LINK( ModifyHdl, InputEdit* ); + DECL_LINK( ModifyHdl, void* ); using Window::IsActive; @@ -87,7 +87,7 @@ protected: virtual void Resize(); virtual void Click(); DECL_LINK( MenuHdl, Menu * ); - DECL_LINK( DropdownClickHdl, ToolBox* ); + DECL_LINK( DropdownClickHdl, void* ); void ApplyFormula(); void CancelFormula(); diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx index 385bdda08352..367f2537f5c9 100644 --- a/sw/source/ui/inc/insfnote.hxx +++ b/sw/source/ui/inc/insfnote.hxx @@ -64,10 +64,10 @@ class SwInsFootNoteDlg: public SvxStandardDialog ImageButton aPrevBT; ImageButton aNextBT; - DECL_LINK( NumberCharHdl, Button * ); + DECL_LINK(NumberCharHdl, void *); DECL_LINK( NumberEditHdl, void * ); - DECL_LINK( NumberAutoBtnHdl, Button *); - DECL_LINK( NumberExtCharHdl, Button *); + DECL_LINK(NumberAutoBtnHdl, void *); + DECL_LINK(NumberExtCharHdl, void *); DECL_LINK( NextPrevHdl, Button * ); virtual void Apply(); diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx index ea4d0cc08268..2824aa8299b1 100644 --- a/sw/source/ui/inc/insrule.hxx +++ b/sw/source/ui/inc/insrule.hxx @@ -51,7 +51,7 @@ class SwInsertGrfRulerDlg : public SfxModalDialog protected: DECL_LINK(SelectHdl, ValueSet*); - DECL_LINK(DoubleClickHdl, ValueSet*); + DECL_LINK(DoubleClickHdl, void *); public: SwInsertGrfRulerDlg( Window* pParent ); diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index 9f222c918176..90839bb481cd 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -77,7 +77,7 @@ class SwInsTableDlg : public SfxModalDialog DECL_LINK( ModifyName, Edit * ); DECL_LINK( ModifyRowCol, NumericField * ); DECL_LINK( AutoFmtHdl, PushButton* ); - DECL_LINK( CheckBoxHdl, CheckBox *pCB = 0 ); + DECL_LINK(CheckBoxHdl, void * = 0); DECL_LINK( ReapeatHeaderCheckBoxHdl, void* p = 0 ); DECL_LINK( ModifyRepeatHeaderNF_Hdl, void* p = 0 ); diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index 767d05a7028c..ad795216c6f9 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -78,12 +78,12 @@ private: sfx2::FileDialogHelper* pFileDlg; Window* pOldDefDlgParent; - DECL_LINK( OKHdl, Button* ); - DECL_LINK( PrevHdl, Button* ); - DECL_LINK( NextHdl, Button* ); - DECL_LINK( RadioButtonHdl, RadioButton* pBtn ); + DECL_LINK(OKHdl, void *); + DECL_LINK(PrevHdl, void *); + DECL_LINK(NextHdl, void *); + DECL_LINK(RadioButtonHdl, void *); DECL_LINK( InsertFileHdl, PushButton * ); - DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper * ); + DECL_LINK(DlgClosedHdl, void *); virtual void Apply(); diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx index 270241a2f6bd..119ea400e5bc 100644 --- a/sw/source/ui/inc/linenum.hxx +++ b/sw/source/ui/inc/linenum.hxx @@ -48,7 +48,7 @@ class SwLineNumberingDlg : public SfxSingleTabDialog { SwWrtShell* pSh; - DECL_LINK( OKHdl, Button * ); + DECL_LINK(OKHdl, void *); public: inline SwWrtShell* GetWrtShell() const { return pSh; } @@ -91,8 +91,8 @@ class SwLineNumberingPage : public SfxTabPage SwLineNumberingPage( Window* pParent, const SfxItemSet& rSet ); ~SwLineNumberingPage(); - DECL_LINK( LineOnOffHdl, CheckBox *pCB = 0 ); - DECL_LINK( ModifyHdl, Edit *pED = 0 ); + DECL_LINK(LineOnOffHdl, void * = 0); + DECL_LINK(ModifyHdl, void * = 0); public: diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index 4c01efb74a90..4607c5cd19b2 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.hxx @@ -70,8 +70,8 @@ class SwMailConfigPage : public SfxTabPage SwMailMergeConfigItem* m_pConfigItem; DECL_LINK(ReplyToHdl, CheckBox*); - DECL_LINK(AuthenticationHdl, PushButton*); - DECL_LINK(TestHdl, PushButton*); + DECL_LINK(AuthenticationHdl, void *); + DECL_LINK(TestHdl, void *); public: diff --git a/sw/source/ui/inc/mailmergechildwindow.hxx b/sw/source/ui/inc/mailmergechildwindow.hxx index a02ca949180c..b76f3ae0b06a 100644 --- a/sw/source/ui/inc/mailmergechildwindow.hxx +++ b/sw/source/ui/inc/mailmergechildwindow.hxx @@ -36,7 +36,7 @@ class SwMailMergeChildWin : public SfxFloatingWindow { ToolBox m_aBackTB; - DECL_LINK( BackHdl, ToolBox* ); + DECL_LINK( BackHdl, void* ); public: SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, Window *pParent); diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx index a38ef5eef0ca..f89f8f96ee4f 100644 --- a/sw/source/ui/inc/mailmergehelper.hxx +++ b/sw/source/ui/inc/mailmergehelper.hxx @@ -101,7 +101,7 @@ class SW_DLLPUBLIC SwAddressPreview : public Window virtual void StateChanged( StateChangedType nStateChange ); void UpdateScrollBar(); - DECL_LINK(ScrollHdl, ScrollBar*); + DECL_LINK(ScrollHdl, void*); public: SwAddressPreview(Window* pParent, const ResId rResId); diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index fd0fb2e0787b..934ad11c8b87 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -126,11 +126,11 @@ class SwMailMergeDlg : public SvxStandardDialog DECL_LINK( ButtonHdl, Button* pBtn ); - DECL_LINK( InsertPathHdl, PushButton * ); - DECL_LINK( AttachFileHdl, PushButton * ); + DECL_LINK(InsertPathHdl, void *); + DECL_LINK(AttachFileHdl, void *); DECL_LINK( OutputTypeHdl, RadioButton* pBtn ); DECL_LINK( FilenameHdl, CheckBox* pBtn ); - DECL_LINK( ModifyHdl, NumericField* pLB ); + DECL_LINK(ModifyHdl, void *); DECL_LINK( SaveTypeHdl, RadioButton* pBtn ); virtual void Apply(); diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index 97a8c4b6312f..f6d7d69c98b6 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -121,8 +121,8 @@ class SwNavigationPI : public Window, DECL_LINK( EditGetFocus, NumEditAction * ); DECL_LINK( DoneLink, SfxPoolItem * ); DECL_LINK( MenuSelectHdl, Menu * ); - DECL_LINK( ChangePageHdl, Timer* ); - DECL_LINK( PageEditModifyHdl, Edit* ); + DECL_LINK( ChangePageHdl, void* ); + DECL_LINK( PageEditModifyHdl, void* ); DECL_LINK( PopupModeEndHdl, void * ); DECL_LINK( ClosePopupWindow, SfxPopupWindow * ); void UsePage(SwWrtShell *); diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 63403fc57c51..e37d5663bd0a 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -107,15 +107,15 @@ class SwNumPositionTabPage : public SfxTabPage void InitControls(); DECL_LINK( LevelHdl, ListBox * ); - DECL_LINK( EditModifyHdl, Edit*); + DECL_LINK(EditModifyHdl, void *); DECL_LINK( DistanceHdl, MetricField * ); DECL_LINK( RelativeHdl, CheckBox * ); - DECL_LINK( StandardHdl, PushButton * ); + DECL_LINK(StandardHdl, 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* ); @@ -163,7 +163,7 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog protected: virtual short Ok(); virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage); - DECL_LINK(RemoveNumberingHdl, PushButton*); + DECL_LINK(RemoveNumberingHdl, void *); public: SwSvxNumBulletTabDialog(Window* pParent, const SfxItemSet* pSwItemSet, diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index a173de881c1d..5256256e0b56 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -67,9 +67,9 @@ class SwParagraphNumTabPage : public SfxTabPage sal_Bool bModified : 1; sal_Bool bCurNumrule : 1; - DECL_LINK( NewStartHdl_Impl, CheckBox* ); + DECL_LINK(NewStartHdl_Impl, void *); DECL_LINK( StyleHdl_Impl, ListBox* ); - DECL_LINK( LineCountHdl_Impl, CheckBox* ); + DECL_LINK(LineCountHdl_Impl, void *); protected: SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rSet ); diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx index b9e95f5722bf..926a65bcc1bb 100644 --- a/sw/source/ui/inc/optcomp.hxx +++ b/sw/source/ui/inc/optcomp.hxx @@ -63,8 +63,8 @@ private: sal_uLong m_nSavedOptions; // handler - DECL_LINK( SelectHdl, ListBox* ); - DECL_LINK( UseAsDefaultHdl, PushButton* ); + DECL_LINK(SelectHdl, void *); + DECL_LINK(UseAsDefaultHdl, void *); // private methods void InitControls( const SfxItemSet& rSet ); diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 490e0f45d52f..06e935be263e 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -70,7 +70,7 @@ private: sal_uInt16 nLastTab; sal_Int32 nOldLinkMode; - DECL_LINK(MetricHdl, ListBox*); + DECL_LINK(MetricHdl, void *); public: SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ); @@ -168,11 +168,11 @@ private: sal_uInt16 eType; sal_Bool bHTMLMode; - DECL_LINK( SelectHdl, ListBox *pLB = 0 ); - DECL_LINK( ModifyHdl, Edit *pEdt = 0 ); + DECL_LINK(SelectHdl, void *); + DECL_LINK(ModifyHdl, void * = 0); DECL_LINK( OrderHdl, ListBox* ); - DECL_LINK( ShowEntryHdl, SvxCheckListBox *pLB = 0 ); - DECL_LINK( SaveEntryHdl, SvxCheckListBox *pLB = 0 ); + DECL_LINK(ShowEntryHdl, void *); + DECL_LINK(SaveEntryHdl, void *); void DelUserData(); void SetOptions( const sal_uInt16 nPos, diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index d78ee967f40d..e89c945b94a1 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -135,8 +135,8 @@ class SwAddPrinterTabPage : public SfxTabPage sal_Bool bPreview; void Init(); - DECL_LINK( AutoClickHdl, CheckBox * ); - DECL_LINK( SelectHdl, ListBox * ); + DECL_LINK(AutoClickHdl, void *); + DECL_LINK(SelectHdl, void *); SwAddPrinterTabPage( Window* pParent, @@ -219,7 +219,7 @@ class SwStdFontTabPage : public SfxTabPage String sScriptAsian; String sScriptComplex; - DECL_LINK( StandardHdl, PushButton * ); + DECL_LINK(StandardHdl, void *); DECL_LINK( ModifyHdl, ComboBox * ); DECL_LINK( ModifyHeightHdl, FontSizeBox * ); DECL_LINK( LoseFocusHdl, ComboBox * ); @@ -278,7 +278,7 @@ class SwTableOptionsTabPage : public SfxTabPage SwWrtShell* pWrtShell; sal_Bool bHTMLMode; - DECL_LINK(CheckBoxHdl, CheckBox *pCB); + DECL_LINK(CheckBoxHdl, void *); SwTableOptionsTabPage( Window* pParent, @@ -429,7 +429,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage ~SwRedlineOptionsTabPage(); DECL_LINK( AttribHdl, ListBox *pLB ); - DECL_LINK( ChangedMaskPrevHdl, ListBox *pLB = 0 ); + DECL_LINK(ChangedMaskPrevHdl, void * = 0); DECL_LINK( ColorHdl, ColorListBox *pColorLB ); void InitFontStyle(SvxFontPrevWindow& rExampleWin); @@ -476,7 +476,7 @@ private: sal_Bool bAttrModified; void Init(); - DECL_LINK( AutoClickHdl, CheckBox * ); + DECL_LINK(AutoClickHdl, void *); }; #endif // DBG_UTIL @@ -496,8 +496,8 @@ class SwCompareOptionsTabPage : public SfxTabPage SwCompareOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwCompareOptionsTabPage(); - DECL_LINK( ComparisonHdl, RadioButton *pRB); - DECL_LINK( IgnoreHdl, CheckBox *pCB); + DECL_LINK(ComparisonHdl, void *); + DECL_LINK(IgnoreHdl, void *); public: diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 22bc4f14a26b..1b9143d4db48 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -67,7 +67,7 @@ class SwOutlineTabDialog : public SfxTabDialog sal_Bool bModified : 1; protected: - DECL_LINK( CancelHdl, Button * ); + DECL_LINK(CancelHdl, void *); DECL_LINK( FormHdl, Button * ); DECL_LINK( MenuSelectHdl, Menu * ); @@ -121,11 +121,11 @@ class SwOutlineSettingsTabPage : public SfxTabPage DECL_LINK( LevelHdl, ListBox * ); DECL_LINK( ToggleComplete, NumericField * ); DECL_LINK( CollSelect, ListBox * ); - DECL_LINK( CollSelectGetFocus, ListBox * ); + DECL_LINK(CollSelectGetFocus, void *); DECL_LINK( NumberSelect, SwNumberingTypeListBox * ); - DECL_LINK( DelimModify, Edit * ); + DECL_LINK(DelimModify, void *); DECL_LINK( StartModified, NumericField * ); - DECL_LINK( CharFmtHdl, ListBox * ); + DECL_LINK(CharFmtHdl, void *); void Update(); diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx index 319782255c70..ed47216b3561 100644 --- a/sw/source/ui/inc/pgfnote.hxx +++ b/sw/source/ui/inc/pgfnote.hxx @@ -74,9 +74,9 @@ private: FixedText aLineDistLbl; MetricField aLineDistEdit; - DECL_LINK( HeightPage, Button * ); - DECL_LINK( HeightMetric, Button * ); - DECL_LINK( HeightModify, MetricField * ); + DECL_LINK(HeightPage, void *); + DECL_LINK(HeightMetric, void *); + DECL_LINK(HeightModify, void *); DECL_LINK( LineWidthChanged_Impl, void * ); DECL_LINK( LineColorSelected_Impl, void * ); diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx index 974b48690465..f37f2c40b019 100644 --- a/sw/source/ui/inc/pggrid.hxx +++ b/sw/source/ui/inc/pggrid.hxx @@ -96,7 +96,7 @@ class SwTextGridPage: public SfxTabPage DECL_LINK(CharorLineChangedHdl, SpinField*); DECL_LINK(TextSizeChangedHdl, SpinField*); DECL_LINK(GridModifyHdl, void*); - DECL_LINK(DisplayGridHdl, CheckBox*); + DECL_LINK(DisplayGridHdl, void *); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index 15103d0b6f49..1e6ce87b1746 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -125,8 +125,8 @@ class SwEditRegionDlg : public SfxModalDialog DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); DECL_LINK( DeselectHdl, SvTreeListBox * ); - DECL_LINK( OkHdl, CheckBox * ); - DECL_LINK( NameEditHdl, Edit * ); + DECL_LINK(OkHdl, void *); + DECL_LINK(NameEditHdl, void *); DECL_LINK( ConditionEditHdl, Edit * ); DECL_LINK( ChangePasswdHdl, Button * ); @@ -134,10 +134,10 @@ class SwEditRegionDlg : public SfxModalDialog DECL_LINK( ChangeHideHdl, TriStateBox * ); // #114856# edit in readonly sections DECL_LINK( ChangeEditInReadonlyHdl, TriStateBox * ); - DECL_LINK( ChangeDismissHdl, CheckBox * ); + DECL_LINK(ChangeDismissHdl, void *); DECL_LINK( UseFileHdl, CheckBox* ); - DECL_LINK( FileSearchHdl, PushButton* ); - DECL_LINK( OptionsHdl, PushButton* ); + DECL_LINK(FileSearchHdl, void *); + DECL_LINK(OptionsHdl, void *); DECL_LINK( FileNameHdl, Edit* ); DECL_LINK( DDEHdl, CheckBox* ); DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper* ); @@ -197,12 +197,12 @@ class SwInsertSectionTabPage : public SfxTabPage DECL_LINK( ChangeHideHdl, CheckBox * ); // #114856# edit in readonly sections - DECL_LINK( ChangeEditInReadonlyHdl, CheckBox * ); + DECL_LINK(ChangeEditInReadonlyHdl, void *); DECL_LINK( ChangeProtectHdl, CheckBox * ); DECL_LINK( ChangePasswdHdl, Button * ); - DECL_LINK( NameEditHdl, Edit * ); + DECL_LINK(NameEditHdl, void *); DECL_LINK( UseFileHdl, CheckBox* ); - DECL_LINK( FileSearchHdl, PushButton* ); + DECL_LINK(FileSearchHdl, void *); DECL_LINK( DDEHdl, CheckBox* ); DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper* ); @@ -274,7 +274,7 @@ class SwSectionIndentTabPage : public SfxTabPage SvxParaPrevWindow aPreviewWin; - DECL_LINK(IndentModifyHdl, MetricField*); + DECL_LINK(IndentModifyHdl, void *); public: SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx index 3f17aff5d01a..c9993a25adae 100644 --- a/sw/source/ui/inc/srtdlg.hxx +++ b/sw/source/ui/inc/srtdlg.hxx @@ -100,7 +100,7 @@ class SwSortDlg : public SvxStandardDialog DECL_LINK( CheckHdl, CheckBox * ); DECL_LINK( DelimHdl, RadioButton* ); DECL_LINK( LanguageHdl, ListBox* ); - DECL_LINK( DelimCharHdl, PushButton* ); + DECL_LINK(DelimCharHdl, void *); public: SwSortDlg(Window * pParent, SwWrtShell &rSh); diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index f17ba03605f1..b267c179acb3 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -56,7 +56,7 @@ class SwRenameXNamedDlg : public ModalDialog ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xSecondAccess; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xThirdAccess; - DECL_LINK(OkHdl, OKButton*); + DECL_LINK(OkHdl, void *); DECL_LINK(ModifyHdl, NoSpaceEdit*); public: diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 7a4557b35a30..3f752c6ba7a8 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -227,7 +227,7 @@ class SwTOXSelectTabPage : public SfxTabPage DECL_LINK(LanguageHdl, ListBox*); DECL_LINK(CheckBoxHdl, CheckBox* ); - DECL_LINK(RadioButtonHdl, RadioButton* ); + DECL_LINK(RadioButtonHdl, void *); DECL_LINK(ModifyHdl, void*); void ApplyTOXDescription(); @@ -443,7 +443,7 @@ class SwTOXEntryTabPage : public SfxTabPage DECL_LINK(ChapterInfoOutlineHdl, NumericField*); DECL_LINK(NumberFormatHdl, ListBox*); - DECL_LINK(AllLevelsHdl, PushButton*); + DECL_LINK(AllLevelsHdl, void *); void EnableButtons(); void WriteBackLevel(); @@ -485,10 +485,10 @@ class SwTOXStylesTabPage : public SfxTabPage SwForm* m_pCurrentForm; DECL_LINK( EditStyleHdl, Button *); - DECL_LINK( StdHdl, Button * ); - DECL_LINK( EnableSelectHdl, ListBox * ); - DECL_LINK( DoubleClickHdl, Button * ); - DECL_LINK( AssignHdl, Button * ); + DECL_LINK(StdHdl, void *); + DECL_LINK(EnableSelectHdl, void *); + DECL_LINK(DoubleClickHdl, void *); + DECL_LINK(AssignHdl, void *); DECL_LINK( ModifyHdl, void*); SwForm& GetForm() diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index b728c41dac15..82125c9e2921 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -123,15 +123,15 @@ class SwIndexMarkDlg : public Window void UpdateMark(); DECL_LINK( InsertHdl, Button * ); - DECL_LINK( CloseHdl, Button * ); - DECL_LINK( DelHdl, Button * ); - DECL_LINK( NextHdl, Button * ); - DECL_LINK( NextSameHdl, Button * ); - DECL_LINK( PrevHdl, Button * ); - DECL_LINK( PrevSameHdl, Button * ); + DECL_LINK(CloseHdl, void *); + DECL_LINK(DelHdl, void *); + DECL_LINK(NextHdl, void *); + DECL_LINK(NextSameHdl, void *); + DECL_LINK(PrevHdl, void *); + DECL_LINK(PrevSameHdl, void *); DECL_LINK( ModifyHdl, ListBox* pBox = 0 ); DECL_LINK( KeyDCBModifyHdl, ComboBox * ); - DECL_LINK( NewUserIdxHdl, Button*); + DECL_LINK(NewUserIdxHdl, void *); DECL_LINK( SearchTypeHdl, CheckBox*); DECL_LINK( PhoneticEDModifyHdl, Edit * ); @@ -227,8 +227,8 @@ class SwAuthMarkDlg : public Window ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess; - DECL_LINK(InsertHdl, PushButton*); - DECL_LINK(CloseHdl, PushButton*); + DECL_LINK(InsertHdl, void *); + DECL_LINK(CloseHdl, void *); DECL_LINK(CreateEntryHdl, PushButton*); DECL_LINK(CompEntryHdl, ListBox*); DECL_LINK(ChangeSourceHdl, RadioButton*); diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index c176dc13cb6d..588a1b2cae0d 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.hxx @@ -38,7 +38,7 @@ class SwSyncBtnDlg : public SfxFloatingWindow { PushButton aSyncBtn; - DECL_LINK( BtnHdl, PushButton* pBtn = 0 ); + DECL_LINK( BtnHdl, void* ); public: SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, Window *pParent); diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index 5ba02135aa62..ef1ef18f61d0 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -89,7 +89,7 @@ class SwAutoFormatDlg : public SfxModalDialog void UpdateChecks( const SwTableAutoFmt&, sal_Bool bEnableBtn ); //------------------------ DECL_LINK( CheckHdl, Button * ); - DECL_LINK( OkHdl, Button * ); + DECL_LINK(OkHdl, void *); DECL_LINK( AddHdl, void * ); DECL_LINK( RemoveHdl, void * ); DECL_LINK( RenameHdl, void * ); diff --git a/sw/source/ui/inc/titlepage.hxx b/sw/source/ui/inc/titlepage.hxx index fbbe6742fb2b..60bcd6238afb 100644 --- a/sw/source/ui/inc/titlepage.hxx +++ b/sw/source/ui/inc/titlepage.hxx @@ -89,11 +89,11 @@ private: DECL_LINK( OKHdl, Button * ); DECL_LINK( EditHdl, Button * ); - DECL_LINK( RestartNumberingHdl, CheckBox* ); - DECL_LINK( SetPageNumberHdl, CheckBox* ); - DECL_LINK( UpHdl, NumericField * ); - DECL_LINK( DownHdl, NumericField * ); - DECL_LINK( StartPageHdl, RadioButton * ); + DECL_LINK(RestartNumberingHdl, void *); + DECL_LINK(SetPageNumberHdl, void *); + DECL_LINK(UpHdl, void *); + DECL_LINK(DownHdl, void *); + DECL_LINK(StartPageHdl, void *); public: SwTitlePageDlg( Window *pParent ); ~SwTitlePageDlg(); diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 4f374af5314c..229e8f5d810c 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -299,10 +299,10 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE void CreateBtns(); SW_DLLPRIVATE DECL_LINK( BtnPage, Button * ); - SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer * ); + SW_DLLPRIVATE DECL_LINK( TimeoutHdl, void* ); SW_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* ); - SW_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, FloatingWindow * ); + SW_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, void* ); inline long GetXScroll() const; inline long GetYScroll() const; @@ -582,10 +582,10 @@ public: void StateTabWin(SfxItemSet&); // attributes have changed - DECL_LINK( AttrChangedNotify, SwWrtShell * ); + DECL_LINK( AttrChangedNotify, void* ); // form control has been activated - DECL_LINK( FormControlActivated, FmFormShell* ); + DECL_LINK( FormControlActivated, void* ); // edit links void EditLinkDlg(); diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 34913202199b..c3bbe6a9fa0b 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -120,7 +120,7 @@ class SwWrapTabPage: public SfxTabPage DECL_LINK( RangeModifyHdl, MetricField * ); DECL_LINK( WrapTypeHdl, ImageRadioButton * ); - DECL_LINK( ContourHdl, CheckBox * ); + DECL_LINK(ContourHdl, void *); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 19a491d1e235..c647089ccd31 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -136,7 +136,7 @@ void lcl_SetBOOLProp( } } -IMPL_LINK( SwMultiTOXTabDialog, CreateExample_Hdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl) { try { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 61c308b377d9..b6133b53ec29 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -219,7 +219,7 @@ class SwAutoMarkDlg_Impl : public ModalDialog sal_Bool bCreateMode; - DECL_LINK(OkHdl, OKButton*); + DECL_LINK(OkHdl, void *); public: SwAutoMarkDlg_Impl(Window* pParent, const String& rAutoMarkURL, const String& rAutoMarkType, sal_Bool bCreate); @@ -705,9 +705,9 @@ class SwAddStylesDlg_Impl : public SfxModalDialog String sHBFirst; String* pStyleArr; - DECL_LINK(OkHdl, OKButton*); + DECL_LINK(OkHdl, void *); DECL_LINK(LeftRightHdl, PushButton*); - DECL_LINK(HeaderDragHdl, HeaderBar*); + DECL_LINK(HeaderDragHdl, void *); public: SwAddStylesDlg_Impl(Window* pParent, SwWrtShell& rWrtSh, String rStringArr[]); @@ -801,7 +801,7 @@ SwAddStylesDlg_Impl::~SwAddStylesDlg_Impl() { } -IMPL_LINK(SwAddStylesDlg_Impl, OkHdl, OKButton*, EMPTYARG) +IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl) { for(sal_uInt16 i = 0; i < MAXLEVEL; i++) pStyleArr[i].Erase(); @@ -826,7 +826,7 @@ IMPL_LINK(SwAddStylesDlg_Impl, OkHdl, OKButton*, EMPTYARG) return 0; } -IMPL_LINK(SwAddStylesDlg_Impl, HeaderDragHdl, HeaderBar*, EMPTYARG) +IMPL_LINK_NOARG(SwAddStylesDlg_Impl, HeaderDragHdl) { aHeaderTree.GetTreeListBox().Invalidate(); return 0; @@ -1460,7 +1460,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) return 0; } -IMPL_LINK(SwTOXSelectTabPage, ModifyHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyHdl) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); if(pTOXDlg) @@ -1500,7 +1500,7 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) return 0; }; -IMPL_LINK(SwTOXSelectTabPage, RadioButtonHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl) { sal_Bool bEnable = aFromCaptionsRB.IsChecked(); aCaptionSequenceFT.Enable(bEnable); @@ -2456,7 +2456,7 @@ IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, PushButton*, pBtn) return 0; } -IMPL_LINK(SwTOXEntryTabPage, AllLevelsHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwTOXEntryTabPage, AllLevelsHdl) { //get current level //write it into all levels @@ -3829,7 +3829,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) /*-------------------------------------------------------------------- Description: allocate templates --------------------------------------------------------------------*/ -IMPL_LINK( SwTOXStylesTabPage, AssignHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl) { sal_uInt16 nLevPos = aLevelLB.GetSelectEntryPos(); sal_uInt16 nTemplPos = aParaLayLB.GetSelectEntryPos(); @@ -3856,7 +3856,7 @@ IMPL_LINK( SwTOXStylesTabPage, AssignHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK( SwTOXStylesTabPage, StdHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl) { sal_uInt16 nPos = aLevelLB.GetSelectEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) @@ -3873,7 +3873,7 @@ IMPL_LINK( SwTOXStylesTabPage, StdHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_START( SwTOXStylesTabPage, DoubleClickHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwTOXStylesTabPage, DoubleClickHdl) { String aTmpName( aParaLayLB.GetSelectEntry() ); SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(); @@ -3883,12 +3883,12 @@ IMPL_LINK_INLINE_START( SwTOXStylesTabPage, DoubleClickHdl, Button *, EMPTYARG ) AssignHdl(&aAssignBT); return 0; } -IMPL_LINK_INLINE_END( SwTOXStylesTabPage, DoubleClickHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwTOXStylesTabPage, DoubleClickHdl) /*-------------------------------------------------------------------- Description: enable only when selected --------------------------------------------------------------------*/ -IMPL_LINK( SwTOXStylesTabPage, EnableSelectHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl) { aStdBT.Enable(aLevelLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND); @@ -3901,7 +3901,7 @@ IMPL_LINK( SwTOXStylesTabPage, EnableSelectHdl, ListBox *, EMPTYARG ) return 0; } -IMPL_LINK(SwTOXStylesTabPage, ModifyHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwTOXStylesTabPage, ModifyHdl) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); if(pTOXDlg) @@ -4231,7 +4231,7 @@ SwAutoMarkDlg_Impl::~SwAutoMarkDlg_Impl() { } -IMPL_LINK(SwAutoMarkDlg_Impl, OkHdl, OKButton*, EMPTYARG) +IMPL_LINK_NOARG(SwAutoMarkDlg_Impl, OkHdl) { sal_Bool bError = sal_False; if(aEntriesBB.IsModified() || bCreateMode) diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 2cc0c93afa28..9e7a604ff2fb 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -666,7 +666,7 @@ IMPL_LINK( SwNewUserIdxDlg, ModifyHdl, Edit*, pEdit) return 0; } -IMPL_LINK( SwIndexMarkDlg, NewUserIdxHdl, Button*, EMPTYARG) +IMPL_LINK_NOARG(SwIndexMarkDlg, NewUserIdxHdl) { SwNewUserIdxDlg* pDlg = new SwNewUserIdxDlg(this); if(RET_OK == pDlg->Execute()) @@ -696,7 +696,7 @@ IMPL_LINK( SwIndexMarkDlg, InsertHdl, Button *, pButton ) return 0; } -IMPL_LINK( SwIndexMarkDlg, CloseHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwIndexMarkDlg, CloseHdl) { if(bNewMark) { @@ -789,34 +789,34 @@ IMPL_LINK( SwIndexMarkDlg, ModifyHdl, ListBox *, pBox ) return 0; } -IMPL_LINK_INLINE_START( SwIndexMarkDlg, NextHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwIndexMarkDlg, NextHdl) { InsertUpdate(); pTOXMgr->NextTOXMark(); UpdateDialog(); return 0; } -IMPL_LINK_INLINE_END( SwIndexMarkDlg, NextHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwIndexMarkDlg, NextHdl) -IMPL_LINK_INLINE_START( SwIndexMarkDlg, NextSameHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwIndexMarkDlg, NextSameHdl) { InsertUpdate(); pTOXMgr->NextTOXMark(sal_True); UpdateDialog(); return 0; } -IMPL_LINK_INLINE_END( SwIndexMarkDlg, NextSameHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwIndexMarkDlg, NextSameHdl) -IMPL_LINK_INLINE_START( SwIndexMarkDlg, PrevHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwIndexMarkDlg, PrevHdl) { InsertUpdate(); pTOXMgr->PrevTOXMark(); UpdateDialog(); return 0; } -IMPL_LINK_INLINE_END( SwIndexMarkDlg, PrevHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwIndexMarkDlg, PrevHdl) -IMPL_LINK_INLINE_START( SwIndexMarkDlg, PrevSameHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwIndexMarkDlg, PrevSameHdl) { InsertUpdate(); pTOXMgr->PrevTOXMark(sal_True); @@ -824,9 +824,9 @@ IMPL_LINK_INLINE_START( SwIndexMarkDlg, PrevSameHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK_INLINE_END( SwIndexMarkDlg, PrevSameHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwIndexMarkDlg, PrevSameHdl) -IMPL_LINK( SwIndexMarkDlg, DelHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwIndexMarkDlg, DelHdl) { bDel = sal_True; InsertUpdate(); @@ -1248,7 +1248,7 @@ void SwAuthMarkDlg::ReInitDlg(SwWrtShell& rWrtShell) InitControls(); } -IMPL_LINK( SwAuthMarkDlg, CloseHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwAuthMarkDlg, CloseHdl) { if(bNewEntry) { @@ -1326,7 +1326,7 @@ IMPL_LINK( SwAuthMarkDlg, CompEntryHdl, ListBox*, pBox) return 0; } -IMPL_LINK( SwAuthMarkDlg, InsertHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwAuthMarkDlg, InsertHdl) { //insert or update the SwAuthorityField... if(pSh) diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 075f741cf230..180c3d142b6b 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -86,7 +86,7 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) /*------------------------------------------------------------------------ Description: callback to delete a text mark -----------------------------------------------------------------------*/ -IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl) { // remove text marks from the ComboBox diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index c49114f11470..d3277c2ed8d9 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -333,7 +333,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) ------------------------------------------------------------------------*/ -IMPL_LINK( SwEndNoteOptionPage, PosPageHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl) { const SwFtnNum eNum = (const SwFtnNum)GetNumbering(); bPosDoc = sal_False; @@ -349,7 +349,7 @@ IMPL_LINK( SwEndNoteOptionPage, PosPageHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK( SwEndNoteOptionPage, NumCountHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl) { sal_Bool bEnable = sal_True; if( aNumCountBox.GetEntryCount() - 1 != aNumCountBox.GetSelectEntryPos() ) @@ -369,7 +369,7 @@ IMPL_LINK( SwEndNoteOptionPage, NumCountHdl, ListBox*, EMPTYARG ) ------------------------------------------------------------------------*/ -IMPL_LINK_INLINE_START( SwEndNoteOptionPage, PosChapterHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl) { if ( !bPosDoc ) SelectNumbering(FTNNUM_DOC); @@ -381,7 +381,7 @@ IMPL_LINK_INLINE_START( SwEndNoteOptionPage, PosChapterHdl, Button *, EMPTYARG ) aPageTemplBox.Enable(); return 0; } -IMPL_LINK_INLINE_END( SwEndNoteOptionPage, PosChapterHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwEndNoteOptionPage, PosChapterHdl) SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const String& rCharFmtName ) { diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 3b4d58f4e173..284aa4ec7e4e 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -228,7 +228,7 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) return 0; } -IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl) { String sGroup(aNameED.GetText()); sGroup += GLOS_DELIM; @@ -305,7 +305,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) return 0; } -IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl) { SvLBoxEntry* pEntry = aGroupTLB.FirstSelected(); GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); @@ -357,7 +357,7 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG ) return 0; } -IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl) { String sEntry(aNameED.GetText()); sal_Bool bEnableNew = sal_True; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index e292e5ec73f1..ce888c1aab2f 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -149,7 +149,7 @@ class SwNewGlosNameDlg : public ModalDialog protected: DECL_LINK( Modify, Edit * ); - DECL_LINK( Rename, Button * ); + DECL_LINK(Rename, void *); public: SwNewGlosNameDlg( Window* pParent, @@ -445,7 +445,7 @@ IMPL_LINK_INLINE_START( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox ) EndDialog( RET_OK ); return 0; } -IMPL_LINK_INLINE_END( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, EMPTYARG ) +IMPL_LINK_INLINE_END( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox ) IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn ) { @@ -657,7 +657,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) /*-------------------------------------------------------------------- Description: dialog manage regions --------------------------------------------------------------------*/ -IMPL_LINK( SwGlossaryDlg, BibHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl) { SwGlossaries* pGloss = ::GetGlossaries(); if( pGloss->IsGlosPathErr() ) @@ -829,7 +829,7 @@ void SwGlossaryDlg::Init() aInsertTipCB.SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl)); } -IMPL_LINK_INLINE_START( SwGlossaryDlg, EditHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwGlossaryDlg, EditHdl) { // EndDialog must not be called in MenuHdl if(aEditBtn.GetCurItemId() == FN_GL_EDIT ) @@ -842,7 +842,7 @@ IMPL_LINK_INLINE_START( SwGlossaryDlg, EditHdl, Button *, EMPTYARG ) } return 0; } -IMPL_LINK_INLINE_END( SwGlossaryDlg, EditHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwGlossaryDlg, EditHdl) /*------------------------------------------------------------------------ Description: KeyInput for ShortName - Edits without Spaces @@ -862,7 +862,7 @@ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox ) return 0; } -IMPL_LINK( SwNewGlosNameDlg, Rename, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename) { SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParent(); String sNew = GetAppCharClass().uppercase(aNewShort.GetText()); @@ -1165,7 +1165,7 @@ IMPL_LINK( SwGlossaryDlg, ShowPreviewHdl, CheckBox *, pBox ) return 0; }; -IMPL_LINK( SwGlossaryDlg, PreviewLoadedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwGlossaryDlg, PreviewLoadedHdl) { sal_Bool bShow = aShowExampleCB.IsChecked(); aExampleWIN.Show( bShow ); diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index ad90331808f0..8b6699f36e66 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -82,9 +82,9 @@ class SwEndNoteOptionPage : public SfxTabPage inline void SelectNumbering(int eNum); int GetNumbering() const; - DECL_LINK( PosPageHdl, Button * ); - DECL_LINK( PosChapterHdl, Button * ); - DECL_LINK( NumCountHdl, ListBox * ); + DECL_LINK(PosPageHdl, void *); + DECL_LINK(PosChapterHdl, void *); + DECL_LINK(NumCountHdl, void *); public: diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index bcb7d87b0643..c6ddbce33ae7 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -97,31 +97,31 @@ void SwInsFootNoteDlg::Apply() bFootnote = aFtnBtn.IsChecked(); } -IMPL_LINK_INLINE_START( SwInsFootNoteDlg, NumberCharHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberCharHdl) { aNumberCharEdit.GrabFocus(); aOkBtn.Enable( aNumberCharEdit.GetText().Len() || bExtCharAvailable ); return 0; } -IMPL_LINK_INLINE_END( SwInsFootNoteDlg, NumberCharHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberCharHdl) -IMPL_LINK_INLINE_START( SwInsFootNoteDlg, NumberEditHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberEditHdl) { aNumberCharBtn.Check( sal_True ); aOkBtn.Enable( 0 != aNumberCharEdit.GetText().Len() ); return 0; } -IMPL_LINK_INLINE_END( SwInsFootNoteDlg, NumberEditHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberEditHdl) -IMPL_LINK_INLINE_START( SwInsFootNoteDlg, NumberAutoBtnHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberAutoBtnHdl) { aOkBtn.Enable( sal_True ); return 0; } -IMPL_LINK_INLINE_END( SwInsFootNoteDlg, NumberAutoBtnHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberAutoBtnHdl) -IMPL_LINK( SwInsFootNoteDlg, NumberExtCharHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) { aNumberCharBtn.Check( sal_True ); diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index bd4a1f49786c..4fc41485a887 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -188,7 +188,7 @@ void SwRulerValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } } -IMPL_LINK(SwInsertGrfRulerDlg, DoubleClickHdl, ValueSet*, EMPTYARG) +IMPL_LINK_NOARG(SwInsertGrfRulerDlg, DoubleClickHdl) { EndDialog(RET_OK); return 0; diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 35380f96fc38..81c466a6dd23 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -65,7 +65,7 @@ SwLineNumberingDlg::~SwLineNumberingDlg() { } -IMPL_LINK( SwLineNumberingDlg, OKHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl) { if (GetOKButton()->IsEnabled()) { @@ -193,7 +193,7 @@ void SwLineNumberingPage::Reset( const SfxItemSet& ) /*-------------------------------------------------------------------- Description: modify --------------------------------------------------------------------*/ -IMPL_LINK( SwLineNumberingPage, ModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwLineNumberingPage, ModifyHdl) { sal_Bool bHasValue = aDivisorED.GetText().Len() != 0; @@ -207,7 +207,7 @@ IMPL_LINK( SwLineNumberingPage, ModifyHdl, Edit *, EMPTYARG ) /*-------------------------------------------------------------------- Description: On/Off --------------------------------------------------------------------*/ -IMPL_LINK( SwLineNumberingPage, LineOnOffHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwLineNumberingPage, LineOnOffHdl) { sal_Bool bEnable = aNumberingOnCB.IsChecked(); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 6b1b558e2504..7fa8388877d2 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -569,7 +569,7 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) aIndentAtMF.SetUnit( eMetric ); } -IMPL_LINK( SwNumPositionTabPage, EditModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -740,7 +740,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox ) return 0; } -IMPL_LINK( SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl) { // determine value to be set at the chosen list levels SvxNumberFormat::SvxNumLabelFollowedBy eLabelFollowedBy = @@ -876,7 +876,7 @@ IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) return 0; } -IMPL_LINK( SwNumPositionTabPage, StandardHdl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SwNumPositionTabPage, StandardHdl) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -1018,7 +1018,7 @@ short SwSvxNumBulletTabDialog::Ok() return nRet; } -IMPL_LINK(SwSvxNumBulletTabDialog, RemoveNumberingHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(SwSvxNumBulletTabDialog, RemoveNumberingHdl) { EndDialog(RET_USER); return 0; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 144d6a13b1a9..abd58e4496a3 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -87,7 +87,7 @@ class SwNumNamesDlg: public ModalDialog DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( SelectHdl, ListBox * ); - DECL_LINK( DoubleClickHdl, ListBox * ); + DECL_LINK(DoubleClickHdl, void *); public: SwNumNamesDlg(Window *pParent); @@ -143,12 +143,12 @@ IMPL_LINK_INLINE_END( SwNumNamesDlg, ModifyHdl, Edit *, pBox ) /*------------------------------------------------------------------------ Description: DoubleClickHdl ------------------------------------------------------------------------*/ -IMPL_LINK_INLINE_START( SwNumNamesDlg, DoubleClickHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwNumNamesDlg, DoubleClickHdl) { EndDialog(RET_OK); return 0; } -IMPL_LINK_INLINE_END( SwNumNamesDlg, DoubleClickHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwNumNamesDlg, DoubleClickHdl) SwNumNamesDlg::SwNumNamesDlg(Window *pParent) : ModalDialog(pParent, SW_RES(DLG_NUM_NAMES)), @@ -253,7 +253,7 @@ void SwOutlineTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) } } -IMPL_LINK( SwOutlineTabDialog, CancelHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(SwOutlineTabDialog, CancelHdl) { if (!bModified) rWrtSh.ResetModified(); @@ -671,7 +671,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox ) return 0; } -IMPL_LINK( SwOutlineSettingsTabPage, CollSelectGetFocus, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CollSelectGetFocus) { for( sal_uInt8 i = 0; i < MAXLEVEL; ++i) aSaveCollNames[i] = pCollNames[i]; @@ -697,7 +697,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, SwNumberingTypeListBox *, pBo return 0; } -IMPL_LINK( SwOutlineSettingsTabPage, DelimModify, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, DelimModify) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -732,7 +732,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld ) return 0; } -IMPL_LINK( SwOutlineSettingsTabPage, CharFmtHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFmtHdl) { String sEntry = aCharFmtLB.GetSelectEntry(); sal_uInt16 nMask = 1; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 618a3ad7710c..df6c470efbfd 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -67,26 +67,26 @@ static sal_uInt16 aPageRg[] = { Description: handler to switch between the different possibilities how the footnote region's height can be set. ------------------------------------------------------------------------*/ -IMPL_LINK_INLINE_START( SwFootNotePage, HeightPage, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightPage) { aMaxHeightEdit.Enable(sal_False); return 0; } -IMPL_LINK_INLINE_END( SwFootNotePage, HeightPage, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightPage) -IMPL_LINK_INLINE_START( SwFootNotePage, HeightMetric, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightMetric) { aMaxHeightEdit.Enable(); aMaxHeightEdit.GrabFocus(); return 0; } -IMPL_LINK_INLINE_END( SwFootNotePage, HeightMetric, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightMetric) /*------------------------------------------------------------------------ Description: handler limit values ------------------------------------------------------------------------*/ -IMPL_LINK( SwFootNotePage, HeightModify, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG(SwFootNotePage, HeightModify) { aMaxHeightEdit.SetMax(aMaxHeightEdit.Normalize(lMaxHeight - (aDistEdit.Denormalize(aDistEdit.GetValue(FUNIT_TWIP)) + @@ -107,7 +107,7 @@ IMPL_LINK( SwFootNotePage, HeightModify, MetricField *, EMPTYARG ) return 0; } -IMPL_LINK( SwFootNotePage, LineWidthChanged_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwFootNotePage, LineWidthChanged_Impl) { sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( aLineWidthEdit.GetValue( ), @@ -118,7 +118,7 @@ IMPL_LINK( SwFootNotePage, LineWidthChanged_Impl, void *, EMPTYARG ) return 0; } -IMPL_LINK( SwFootNotePage, LineColorSelected_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl) { aLineTypeBox.SetColor( aLineColorBox.GetSelectEntryColor() ); return 0; diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 5d397e012892..f6fb3cd3f000 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -514,7 +514,7 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton) return 0; } -IMPL_LINK(SwTextGridPage, DisplayGridHdl, CheckBox*, EMPTYARG) +IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl) { sal_Bool bChecked = aDisplayCB.IsChecked(); aPrintCB.Enable(bChecked); @@ -522,7 +522,7 @@ IMPL_LINK(SwTextGridPage, DisplayGridHdl, CheckBox*, EMPTYARG) return 0; } -IMPL_LINK(SwTextGridPage, GridModifyHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwTextGridPage, GridModifyHdl) { const SfxItemSet& rOldSet = GetItemSet(); SfxItemSet aSet(rOldSet); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 4dc4cba01619..bd7c726e4fc8 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -892,31 +892,31 @@ sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvLBoxEntry& rEntry ) const rEntry.GetUserData())->pData)->pData ); } -IMPL_LINK( SwRedlineAcceptDlg, AcceptHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptHdl) { CallAcceptReject( sal_True, sal_True ); return 0; } -IMPL_LINK( SwRedlineAcceptDlg, AcceptAllHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptAllHdl) { CallAcceptReject( sal_False, sal_True ); return 0; } -IMPL_LINK( SwRedlineAcceptDlg, RejectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectHdl) { CallAcceptReject( sal_True, sal_False ); return 0; } -IMPL_LINK( SwRedlineAcceptDlg, RejectAllHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectAllHdl) { CallAcceptReject( sal_False, sal_False ); return 0; } -IMPL_LINK( SwRedlineAcceptDlg, UndoHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl) { SwView * pView = ::GetActiveView(); pView->GetViewFrame()->GetDispatcher()-> @@ -928,7 +928,7 @@ IMPL_LINK( SwRedlineAcceptDlg, UndoHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( SwRedlineAcceptDlg, FilterChangedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl) { SvxTPFilter *pFilterTP = aTabPagesCTRL.GetFilterPage(); @@ -942,7 +942,7 @@ IMPL_LINK( SwRedlineAcceptDlg, FilterChangedHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( SwRedlineAcceptDlg, DeselectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, DeselectHdl) { // avoid flickering of buttons: aDeselectTimer.Start(); @@ -950,7 +950,7 @@ IMPL_LINK( SwRedlineAcceptDlg, DeselectHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( SwRedlineAcceptDlg, SelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectHdl) { aDeselectTimer.Stop(); aSelectTimer.Start(); @@ -958,7 +958,7 @@ IMPL_LINK( SwRedlineAcceptDlg, SelectHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl) { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); aSelectTimer.Stop(); @@ -1027,7 +1027,7 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) { const CommandEvent aCEvt(pTable->GetCommandEvent()); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 4da9d1c4fae7..79d2c93bf621 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -407,7 +407,7 @@ IMPL_LINK( SwSortDlg, DelimHdl, RadioButton*, pButton ) return 0; } -IMPL_LINK( SwSortDlg, DelimCharHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 759242e43fcd..b8fc50dc0aad 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -256,33 +256,33 @@ SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) : aPagePropertiesPB.SetClickHdl(LINK(this, SwTitlePageDlg, EditHdl)); } -IMPL_LINK(SwTitlePageDlg, UpHdl, NumericField *, EMPTYARG) +IMPL_LINK_NOARG(SwTitlePageDlg, UpHdl) { if (aPageCountNF.GetValue() == 2) FillList(); return 0; } -IMPL_LINK(SwTitlePageDlg, DownHdl, NumericField *, EMPTYARG) +IMPL_LINK_NOARG(SwTitlePageDlg, DownHdl) { if (aPageCountNF.GetValue() == 1) FillList(); return 0; } -IMPL_LINK(SwTitlePageDlg, RestartNumberingHdl, CheckBox*, EMPTYARG) +IMPL_LINK_NOARG(SwTitlePageDlg, RestartNumberingHdl) { aRestartNumberingNF.Enable(aRestartNumberingCB.IsChecked()); return 0; } -IMPL_LINK(SwTitlePageDlg, SetPageNumberHdl, CheckBox*, EMPTYARG) +IMPL_LINK_NOARG(SwTitlePageDlg, SetPageNumberHdl) { aSetPageNumberNF.Enable(aSetPageNumberCB.IsChecked()); return 0; } -IMPL_LINK(SwTitlePageDlg, StartPageHdl, RadioButton*, EMPTYARG) +IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl) { aPageStartNF.Enable(aPageStartRB.IsChecked()); return 0; diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index fe643d940e90..c6b0f220fb13 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -342,7 +342,7 @@ static const char * const aStrArr[] = { return 0; } -IMPL_LINK( SwInputWindow, DropdownClickHdl, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(SwInputWindow, DropdownClickHdl) { sal_uInt16 nCurID = GetCurItemId(); EndSelection(); // setzt CurItemId zurueck ! @@ -490,7 +490,7 @@ void SwInputWindow::SetFormula( const String& rFormula, sal_Bool bDelFlag ) bDelSel = bDelFlag; } -IMPL_LINK( SwInputWindow, ModifyHdl, InputEdit*, EMPTYARG ) +IMPL_LINK_NOARG(SwInputWindow, ModifyHdl) { if (bIsTable && m_bResetUndo) { diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 8c4042a20beb..aae05243d800 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -571,7 +571,7 @@ void SwNaviImageButton::SetPopupWindow( SfxPopupWindow* pWindow ) //-------------------------------------------------------------------- -IMPL_LINK( SwNaviImageButton, PopupModeEndHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwNaviImageButton, PopupModeEndHdl) { if ( pPopupWindow->IsVisible() ) { diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index c45a40d1d619..f8369bfeec2d 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -1238,7 +1238,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) * Hier wird der State fuer SID_IMAP / SID_CONTOUR behandelt, * wenn die Grafik ausgeswappt ist * --------------------------------------------------*/ -IMPL_LINK(SwBaseShell, GraphicArrivedHdl, SwCrsrShell* , EMPTYARG ) +IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl) { sal_uInt16 nGrfType; SwWrtShell &rSh = GetShell(); diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index 5a7659d6abe3..ad9b614a4300 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -48,7 +48,7 @@ #include <table.hrc> -IMPL_LINK_INLINE_START( SwTableWidthDlg, LoseFocusHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl) { sal_uInt16 nId = (sal_uInt16)aColEdit.GetValue()-1; const SwTwips lWidth = rFnc.GetColWidth(nId); @@ -56,7 +56,7 @@ IMPL_LINK_INLINE_START( SwTableWidthDlg, LoseFocusHdl, Edit *, EMPTYARG ) aWidthEdit.SetMax(aWidthEdit.Normalize(rFnc.GetMaxColWidth(nId)), FUNIT_TWIP); return 0; } -IMPL_LINK_INLINE_END( SwTableWidthDlg, LoseFocusHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwTableWidthDlg, LoseFocusHdl) diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 1cef3b54f6a9..20d232b7593f 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -261,7 +261,7 @@ IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton ) /* */ /*********************************************************************/ -IMPL_LINK(SwConvertTableDlg, CheckBoxHdl, CheckBox*, EMPTYARG) +IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl) { aRepeatHeaderCB.Enable(aHeaderCB.IsChecked()); ReapeatHeaderCheckBoxHdl(); @@ -269,7 +269,7 @@ IMPL_LINK(SwConvertTableDlg, CheckBoxHdl, CheckBox*, EMPTYARG) return 0; } -IMPL_LINK(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl) { sal_Bool bEnable = aHeaderCB.IsChecked() && aRepeatHeaderCB.IsChecked(); aRepeatHeaderBeforeFT.Enable(bEnable); diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 7d0dbb3da188..a404ab68ddd4 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -181,7 +181,7 @@ IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit ) aOkBtn.Enable(pShell->GetTblStyle( sTblName ) == 0); return 0; } -IMPL_LINK_INLINE_END( SwInsTableDlg, ModifyName, Edit *, EMPTYARG ) +IMPL_LINK_INLINE_END( SwInsTableDlg, ModifyName, Edit *, pEdit ) IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField ) { @@ -226,7 +226,7 @@ IMPL_LINK( SwInsTableDlg, AutoFmtHdl, PushButton*, pButton ) return 0; } -IMPL_LINK(SwInsTableDlg, CheckBoxHdl, CheckBox*, EMPTYARG) +IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl) { aRepeatHeaderCB.Enable(aHeaderCB.IsChecked()); ReapeatHeaderCheckBoxHdl(); @@ -234,14 +234,14 @@ IMPL_LINK(SwInsTableDlg, CheckBoxHdl, CheckBox*, EMPTYARG) return 0; } -IMPL_LINK(SwInsTableDlg, ReapeatHeaderCheckBoxHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwInsTableDlg, ReapeatHeaderCheckBoxHdl) { aRepeatHeaderCombo.Enable(aHeaderCB.IsChecked() && aRepeatHeaderCB.IsChecked()); return 0; } -IMPL_LINK(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl, void*, EMPTYARG) +IMPL_LINK_NOARG(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl) { nEnteredValRepeatHeaderNF = aRepeatHeaderNF.GetValue(); return 0; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 8e43fcdfb2e2..23fb5bccf430 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1717,7 +1717,7 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh) } } -IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl) { if( aPgBrkCB.IsChecked() ) { @@ -1755,7 +1755,7 @@ IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG ) return 0; } -IMPL_LINK( SwTextFlowPage, ApplyCollClickHdl_Impl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl) { sal_Bool bEnable = sal_False; if ( aPageCollCB.IsChecked() && @@ -1834,7 +1834,7 @@ IMPL_LINK( SwTextFlowPage, SplitRowHdl_Impl, TriStateBox*, pBox ) return 0; } -IMPL_LINK( SwTextFlowPage, HeadLineCBClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl) { aRepeatHeaderCombo.Enable(aHeadLineCB.IsChecked()); diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 6d29d6b38b84..a7e174d50913 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -205,8 +205,8 @@ class SwTextFlowPage : public SfxTabPage sal_Bool bHtmlMode; - DECL_LINK( PageBreakHdl_Impl, CheckBox* ); - DECL_LINK( ApplyCollClickHdl_Impl, CheckBox* ); + DECL_LINK(PageBreakHdl_Impl, void *); + DECL_LINK(ApplyCollClickHdl_Impl, void *); DECL_LINK( PageBreakPosHdl_Impl, RadioButton* ); DECL_LINK( PageBreakTypeHdl_Impl, RadioButton* ); DECL_LINK( SplitHdl_Impl, CheckBox* ); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index c25bbabc2c4e..ad9acbd06509 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -345,7 +345,7 @@ IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn ) /*------------------------------------------------------------------------*/ -IMPL_LINK( SwAutoFormatDlg, AddHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl) { sal_Bool bOk = sal_False, bFmtInserted = sal_False; while( !bOk ) @@ -412,7 +412,7 @@ IMPL_LINK( SwAutoFormatDlg, AddHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SwAutoFormatDlg, RemoveHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl) { String aMessage = aStrDelMsg ; aMessage.AppendAscii("\n\n"); @@ -449,7 +449,7 @@ IMPL_LINK( SwAutoFormatDlg, RemoveHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( SwAutoFormatDlg, RenameHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl) { sal_Bool bOk = sal_False; while( !bOk ) @@ -519,7 +519,7 @@ IMPL_LINK( SwAutoFormatDlg, RenameHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( SwAutoFormatDlg, SelFmtHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl) { sal_Bool bBtnEnable = sal_False; sal_uInt8 nSelPos = (sal_uInt8) aLbFormat.GetSelectEntryPos(), nOldIdx = nIndex; @@ -554,14 +554,14 @@ IMPL_LINK( SwAutoFormatDlg, SelFmtHdl, void *, EMPTYARG ) } //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( SwAutoFormatDlg, OkHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl) { if( bSetAutoFmt ) pShell->SetTableAutoFmt( *(*pTableTbl)[ nIndex ] ); EndDialog( RET_OK ); return sal_True; } -IMPL_LINK_INLINE_END( SwAutoFormatDlg, OkHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl) //======================================================================== // AutoFmtPreview diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index fbe254b3193a..284409b1a7f8 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -218,7 +218,7 @@ void SwView::GotFocus() const a request to put the form shell on the top of the dispatcher stack --------------------------------------------------------------------*/ -IMPL_LINK( SwView, FormControlActivated, FmFormShell*, EMPTYARG ) +IMPL_LINK_NOARG(SwView, FormControlActivated) { // if a form control has been activated, and the form shell is not on the top // of the dispatcher stack, then we need to activate it @@ -489,7 +489,7 @@ extern "C" } } -IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG ) +IMPL_LINK_NOARG(SwView, AttrChangedNotify) { if ( GetEditWin().IsChainMode() ) GetEditWin().SetChainMode( sal_False ); @@ -538,7 +538,7 @@ IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG ) return 0; } -IMPL_LINK( SwView, TimeoutHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SwView, TimeoutHdl) { DBG_PROFSTART(viewhdl); diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 20f4dd70a95d..e3adc63adad7 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -911,7 +911,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox ) return res; } -IMPL_LINK( SwView, FieldPopupModeEndHdl, FloatingWindow*, EMPTYARG ) +IMPL_LINK_NOARG(SwView, FieldPopupModeEndHdl) { if ( mpFieldPopup ) { diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 00caddc10e0a..33209dc238fd 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -266,7 +266,7 @@ namespace } //-------------------------------------------------------------------- - IMPL_LINK( DelayedFileDeletion, OnTryDeleteFile, void*, EMPTYARG ) + IMPL_LINK_NOARG(DelayedFileDeletion, OnTryDeleteFile) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index c81301f52537..441ce46a5436 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -1329,7 +1329,7 @@ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) /*************************************************************************** Beschreibung: Auch auf Doppelclick wird zunaechst nur aufgeklappt ***************************************************************************/ -IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) +IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl) { SvLBoxEntry* pEntry = GetCurEntry(); // ist es ein Inhaltstyp? @@ -2227,7 +2227,7 @@ void SwContentTree::HideTree() /*************************************************************************** Beschreibung: Kein Idle mit Focus oder waehrend des Dragging ***************************************************************************/ -IMPL_LINK( SwContentTree, TimerUpdate, Timer*, EMPTYARG) +IMPL_LINK_NOARG(SwContentTree, TimerUpdate) { // kein Update waehrend D&D // Viewabfrage, da der Navigator zu spaet abgeraeumt wird diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 6fe0c60eef10..79a1c869afa2 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -1010,7 +1010,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry bDeleteContentCopy = true; } -IMPL_LINK( SwGlobalTree, Timeout, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SwGlobalTree, Timeout) { if(!HasFocus() && Update( sal_False )) Display(); @@ -1208,7 +1208,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) } } -IMPL_LINK( SwGlobalTree, DoubleClickHdl, SwGlobalTree *, EMPTYARG ) +IMPL_LINK_NOARG( SwGlobalTree, DoubleClickHdl) { SvLBoxEntry* pEntry = GetCurEntry(); SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData(); diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index cc8704570163..c19748eda344 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -70,8 +70,8 @@ class SwGlossDecideDlg : public ModalDialog ListBox aListLB; FixedLine aFL; - DECL_LINK(DoubleClickHdl, ListBox*); - DECL_LINK(SelectHdl, ListBox*); + DECL_LINK(DoubleClickHdl, void*); + DECL_LINK(SelectHdl, void*); public: SwGlossDecideDlg(Window* pParent); @@ -91,13 +91,13 @@ SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent) : aListLB.SetSelectHdl(LINK(this, SwGlossDecideDlg, SelectHdl)); } -IMPL_LINK(SwGlossDecideDlg, DoubleClickHdl, ListBox*, EMPTYARG) +IMPL_LINK_NOARG(SwGlossDecideDlg, DoubleClickHdl) { EndDialog(RET_OK); return 0; } -IMPL_LINK(SwGlossDecideDlg, SelectHdl, ListBox*, EMPTYARG) +IMPL_LINK_NOARG(SwGlossDecideDlg, SelectHdl) { aOk.Enable(LISTBOX_ENTRY_NOTFOUND != aListLB.GetSelectEntryPos()); return 0; diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 84ee92425d99..f53b4f77bdc1 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -917,7 +917,7 @@ void SwNavigationPI::SetPopupWindow( SfxPopupWindow* pWindow ) pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNavigationPI, ClosePopupWindow )); } -IMPL_LINK( SwNavigationPI, PopupModeEndHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SwNavigationPI, PopupModeEndHdl) { if ( pPopupWindow->IsVisible() ) { @@ -1322,14 +1322,14 @@ sal_Bool SwNavigationPI::IsGlobalDoc() const return bRet; } -IMPL_LINK( SwNavigationPI, ChangePageHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SwNavigationPI, ChangePageHdl) { EditAction(&GetPageEdit()); GetPageEdit().GrabFocus(); return 0; } -IMPL_LINK( SwNavigationPI, PageEditModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(SwNavigationPI, PageEditModifyHdl) { if(aPageChgTimer.IsActive()) aPageChgTimer.Stop(); diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index a4e639f5d1e8..ec447d4421c8 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -95,7 +95,7 @@ SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin, aOk.Enable(sal_False); } -IMPL_LINK(SwRenameXNamedDlg, OkHdl, OKButton*, EMPTYARG) +IMPL_LINK_NOARG(SwRenameXNamedDlg, OkHdl) { try { diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 7f2af75002f5..88f7e8ded6ae 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -288,7 +288,7 @@ void VCLXWindowImpl::callBackAsync( const VCLXWindow::Callback& i_callback ) } //---------------------------------------------------------------------------------------------------------------------- -IMPL_LINK( VCLXWindowImpl, OnProcessCallbacks, void*, EMPTYARG ) +IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks) { const Reference< uno::XInterface > xKeepAlive( mrAntiImpl ); diff --git a/tools/inc/tools/link.hxx b/tools/inc/tools/link.hxx index 974119355359..2b2af3d8048a 100644 --- a/tools/inc/tools/link.hxx +++ b/tools/inc/tools/link.hxx @@ -78,18 +78,21 @@ typedef long (*PSTUB)( void*, void* ); IMPL_STUB( Class, Method, ArgType ) \ long Class::Method( ArgType ArgName ) -#if defined GCC && defined NO_OPTIMIZE -#define IMPL_LINK_INLINE_START( Class, Method, ArgType, ArgName ) \ - IMPL_LINK( Class, Method, ArgType, ArgName ) +#define IMPL_LINK_NOARG( Class, Method ) \ + IMPL_STUB( Class, Method, void* ) \ + long Class::Method( SAL_UNUSED_PARAMETER void* ) -#define IMPL_LINK_INLINE_END( Class, Method, ArgType, ArgName ) -#else #define IMPL_LINK_INLINE_START( Class, Method, ArgType, ArgName ) \ inline long Class::Method( ArgType ArgName ) #define IMPL_LINK_INLINE_END( Class, Method, ArgType, ArgName ) \ IMPL_STUB( Class, Method, ArgType ) -#endif + +#define IMPL_LINK_NOARG_INLINE_START( Class, Method ) \ + inline long Class::Method( SAL_UNUSED_PARAMETER void* ) + +#define IMPL_LINK_NOARG_INLINE_END( Class, Method ) \ + IMPL_STUB( Class, Method, void* ) #define IMPL_LINK_INLINE( Class, Method, ArgType, ArgName, Body ) \ long Class::Method( ArgType ArgName ) \ diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx index 0fc4fb34f5fd..8915cff4cd8b 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx @@ -288,7 +288,7 @@ StringInputDialog::StringInputDialog( ResMgr& rResMgr, }; //========================================================================= -IMPL_LINK( StringInputDialog, OKHdl, Button *, EMPTYARG ) +IMPL_LINK_NOARG(StringInputDialog, OKHdl) { // trim the strings m_aNameEdit.SetText( @@ -298,7 +298,7 @@ IMPL_LINK( StringInputDialog, OKHdl, Button *, EMPTYARG ) } //========================================================================= -IMPL_LINK( StringInputDialog, NameHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(StringInputDialog, NameHdl) { /* // trim the strings diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 49566c32361f..679d83ecfdd2 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1591,7 +1591,7 @@ void UcbLockBytes::Cancel() } //---------------------------------------------------------------------------- -IMPL_LINK( UcbLockBytes, DataAvailHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(UcbLockBytes, DataAvailHdl) { if ( hasInputStream_Impl() && m_xHandler.Is() ) m_xHandler->Handle( UcbLockBytesHandler::DATA_AVAILABLE, this ); diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index a90cd35efa85..78a29c86078e 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -211,7 +211,7 @@ void LoginDialog::EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled ) // ----------------------------------------------------------------------- -IMPL_LINK( LoginDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(LoginDialog, OKHdl_Impl) { // trim the strings aNameED.SetText( aNameED.GetText().EraseLeadingChars(). @@ -224,7 +224,7 @@ IMPL_LINK( LoginDialog, OKHdl_Impl, OKButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( LoginDialog, PathHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(LoginDialog, PathHdl_Impl) { PathDialog* pDlg = new PathDialog( this, WB_3DLOOK ); pDlg->SetPath( aPathED.GetText() ); @@ -238,7 +238,7 @@ IMPL_LINK( LoginDialog, PathHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( LoginDialog, UseSysCredsHdl_Impl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl) { EnableUseSysCredsControls_Impl( aUseSysCredsCB.IsChecked() ); return 1; diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 85f8b09e504d..7ce8d5c21593 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -76,9 +76,9 @@ class LoginDialog : public ModalDialog void HideControls_Impl( sal_uInt16 nFlags ); void EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled ); - DECL_LINK( OKHdl_Impl, OKButton * ); - DECL_LINK( PathHdl_Impl, PushButton * ); - DECL_LINK( UseSysCredsHdl_Impl, CheckBox * ); + DECL_LINK(OKHdl_Impl, void *); + DECL_LINK(PathHdl_Impl, void *); + DECL_LINK(UseSysCredsHdl_Impl, void *); public: LoginDialog( Window* pParent, sal_uInt16 nFlags, diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index 8a1a040c78a6..352d0b354f6b 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -37,7 +37,7 @@ // ----------------------------------------------------------------------- -IMPL_LINK( MasterPasswordCreateDialog, EditHdl_Impl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl) { aOKBtn.Enable( aEDMasterPasswordCrt.GetText().Len() >= nMinLen ); return 0; @@ -45,7 +45,7 @@ IMPL_LINK( MasterPasswordCreateDialog, EditHdl_Impl, Edit *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( MasterPasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl) { // compare both passwords and show message box if there are not equal!! if( aEDMasterPasswordCrt.GetText() == aEDMasterPasswordRepeat.GetText() ) diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index d612ffe55e03..37698fc12fc6 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -59,8 +59,8 @@ private: HelpButton aHelpBtn; - DECL_LINK( OKHdl_Impl, OKButton * ); - DECL_LINK( EditHdl_Impl, Edit * ); + DECL_LINK(OKHdl_Impl, void *); + DECL_LINK(EditHdl_Impl, void *); public: MasterPasswordCreateDialog( Window* pParent, ResMgr * pResMgr ); diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index e36e978c2613..ddfe0762ccce 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -36,7 +36,7 @@ // ----------------------------------------------------------------------- -IMPL_LINK( MasterPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(MasterPasswordDialog, OKHdl_Impl) { EndDialog( RET_OK ); return 1; diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index b0f988d348fa..163a9c48bd3e 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -47,7 +47,7 @@ class MasterPasswordDialog : public ModalDialog HelpButton aHelpBtn; - DECL_LINK( OKHdl_Impl, OKButton * ); + DECL_LINK(OKHdl_Impl, void *); public: MasterPasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx index d60c3d4ae3e4..8ecc3190e255 100644 --- a/uui/source/newerverwarn.cxx +++ b/uui/source/newerverwarn.cxx @@ -83,7 +83,7 @@ NewerVersionWarningDialog::~NewerVersionWarningDialog() { } -IMPL_LINK( NewerVersionWarningDialog, UpdateHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl) { // detect execute path ::rtl::OUString sProgramPath; @@ -166,7 +166,7 @@ IMPL_LINK( NewerVersionWarningDialog, UpdateHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( NewerVersionWarningDialog, LaterHdl, CancelButton*, EMPTYARG ) +IMPL_LINK_NOARG(NewerVersionWarningDialog, LaterHdl) { EndDialog( RET_ASK_LATER ); return 0; diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx index 0caac8e88951..14436d952f71 100644 --- a/uui/source/newerverwarn.hxx +++ b/uui/source/newerverwarn.hxx @@ -47,8 +47,8 @@ namespace uui ::rtl::OUString m_sVersion; - DECL_LINK( UpdateHdl, PushButton* ); - DECL_LINK( LaterHdl, CancelButton* ); + DECL_LINK(UpdateHdl, void *); + DECL_LINK(LaterHdl, void *); void InitButtonWidth(); diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index ca94e181fa57..946e47e818c2 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -167,7 +167,7 @@ PasswordDialog::PasswordDialog( } -IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl) { bool bEDPasswdValid = aEDPassword.GetText().Len() >= nMinLen; bool bPasswdMismatch = aEDConfirmPassword.GetText() != aEDPassword.GetText(); diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index 0195ee5e7f5d..04572a474624 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -53,7 +53,7 @@ class PasswordDialog : public ModalDialog String aPasswdMismatch; - DECL_LINK( OKHdl_Impl, OKButton * ); + DECL_LINK(OKHdl_Impl, void *); public: PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 1d3cc72648ef..39531ae6f3c8 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -118,7 +118,7 @@ void MacroWarning::SetDocumentURL( const String& rDocURL ) maDocNameFI.SetText( rDocURL ); } -IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl) { DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" ); @@ -137,7 +137,7 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl) { if( mbSignedMode && maAlwaysTrustCB.IsChecked() ) { // insert path into trusted path list @@ -164,13 +164,13 @@ IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroWarning, DisableBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl) { EndDialog( RET_CANCEL ); return 0; } -IMPL_LINK( MacroWarning, AlwaysTrustCheckHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl) { bool bEnable = ( mnActSecLevel < 2 || maAlwaysTrustCB.IsChecked() ); maEnableBtn.Enable( bEnable ); diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index 3ef1b4283e19..7fd1a83d66c0 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -36,7 +36,7 @@ // ----------------------------------------------------------------------- -IMPL_LINK( SSLWarnDialog, OKHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SSLWarnDialog, OKHdl_Impl) { EndDialog( RET_OK ); return 1; @@ -44,7 +44,7 @@ IMPL_LINK( SSLWarnDialog, OKHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( SSLWarnDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl_Impl) { uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index a2be27e34233..0a41b8f0b208 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -62,8 +62,8 @@ private: Window* m_pParent; ResMgr* pResourceMgr; - DECL_LINK( OKHdl_Impl, PushButton * ); - DECL_LINK( ViewCertHdl_Impl, PushButton * ); + DECL_LINK(OKHdl_Impl, void *); + DECL_LINK(ViewCertHdl_Impl, void *); public: SSLWarnDialog( Window* pParent, diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 0aebd177b6c5..abd631f94b64 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -36,7 +36,7 @@ // ----------------------------------------------------------------------- -IMPL_LINK( UnknownAuthDialog, OKHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl) { if ( m_aOptionButtonAccept.IsChecked() ) { @@ -51,7 +51,7 @@ IMPL_LINK( UnknownAuthDialog, OKHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( UnknownAuthDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG ) +IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl) { uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 1f183c0fe407..469bfebf3940 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -64,8 +64,8 @@ private: Window* m_pParent; ResMgr* pResourceMgr; - DECL_LINK( OKHdl_Impl, PushButton * ); - DECL_LINK( ViewCertHdl_Impl, PushButton * ); + DECL_LINK(OKHdl_Impl, void *); + DECL_LINK(ViewCertHdl_Impl, void *); public: UnknownAuthDialog( Window* pParent, diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index e800a9016343..293d6b0eaaf6 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -122,7 +122,7 @@ public: DECL_LINK( MacroCallHdl, void* ); }; -IMPL_LINK( VbaTimer, MacroCallHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(VbaTimer, MacroCallHdl) { if ( m_aTimerInfo.second.second == 0 || GetNow() < m_aTimerInfo.second.second ) { diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx index 674bdf070c3a..66664fe5fd1f 100644 --- a/vcl/inc/idlemgr.hxx +++ b/vcl/inc/idlemgr.hxx @@ -57,7 +57,7 @@ public: { if ( maTimer.IsActive() ) maTimer.Start(); } // Timer* kann auch NULL sein - DECL_LINK( TimeoutHdl, Timer* ); + DECL_LINK(TimeoutHdl, void *); }; #endif // _SV_IDLEMGR_HXX diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx index 60d4fa5cba58..99b17c99bf8b 100644 --- a/vcl/source/app/idlemgr.cxx +++ b/vcl/source/app/idlemgr.cxx @@ -120,7 +120,7 @@ void ImplIdleMgr::RemoveIdleHdl( const Link& rLink ) // ----------------------------------------------------------------------- -IMPL_LINK( ImplIdleMgr, TimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl) { for ( size_t i = 0; i < mpIdleList->size(); ++i ) { ImplIdleData* pIdleData = (*mpIdleList)[ i ]; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 3d9823f77fbc..86a9b4816684 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -271,7 +271,7 @@ sal_Bool ComboBox::IsAutocompleteEnabled() const // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplClickBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplClickBtnHdl) { ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpSubEdit->GrabFocus(); @@ -293,7 +293,7 @@ IMPL_LINK( ComboBox, ImplClickBtnHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplPopupModeEndHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl) { if( mpFloatWin->IsPopupModeCanceled() ) { @@ -375,7 +375,7 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit ) // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) { sal_Bool bPopup = IsInDropDown(); sal_Bool bCallSelect = sal_False; @@ -469,7 +469,7 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplCancelHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplCancelHdl) { if( IsInDropDown() ) mpFloatWin->EndPopupMode(); @@ -492,7 +492,7 @@ IMPL_LINK( ComboBox, ImplSelectionChangedHdl, void*, n ) // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplDoubleClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplDoubleClickHdl) { DoubleClick(); return 0; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index ec9d7b8a401c..7d033164bd63 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2516,7 +2516,7 @@ void Edit::UpdateData() // ----------------------------------------------------------------------- -IMPL_LINK( Edit, ImplUpdateDataHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl) { UpdateData(); return 0; diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 786e28a4c6ef..f6236b5d9e5d 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2376,7 +2376,7 @@ void ImplListBox::Resize() // ----------------------------------------------------------------------- -IMPL_LINK( ImplListBox, MRUChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImplListBox, MRUChanged) { StateChanged( STATE_CHANGE_DATA ); return 1; @@ -2384,7 +2384,7 @@ IMPL_LINK( ImplListBox, MRUChanged, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ImplListBox, LBWindowScrolled, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled) { long nSet = GetTopEntry(); if( nSet > mpVScrollBar->GetRangeMax() ) diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 6441a361123d..9d2f7aaba3c8 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -225,7 +225,7 @@ void ListBox::ImplLoadRes( const ResId& rResId ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplSelectHdl) { sal_Bool bPopup = IsInDropDown(); if( IsDropDownBox() ) @@ -254,7 +254,7 @@ IMPL_LINK( ListBox, ImplSelectHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplScrollHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplScrollHdl) { ImplCallEventListeners( VCLEVENT_LISTBOX_SCROLLED ); return 1; @@ -262,7 +262,7 @@ IMPL_LINK( ListBox, ImplScrollHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplCancelHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplCancelHdl) { if( IsInDropDown() ) mpFloatWin->EndPopupMode(); @@ -305,7 +305,7 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplDoubleClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl) { DoubleClick(); return 1; @@ -313,7 +313,7 @@ IMPL_LINK( ListBox, ImplDoubleClickHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplClickBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl) { if( !mpFloatWin->IsInPopupMode() ) { @@ -335,7 +335,7 @@ IMPL_LINK( ListBox, ImplClickBtnHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplPopupModeEndHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl) { if( mpFloatWin->IsPopupModeCanceled() ) { diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 3350d1476aa6..2bb141263f17 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -139,7 +139,7 @@ MenuButton::~MenuButton() // ----------------------------------------------------------------------- -IMPL_LINK( MenuButton, ImplMenuTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl) { // Abfragen, ob Button-Benutzung noch aktiv ist, da diese ja auch // vorher abgebrochen wurden sein koennte diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index bb4cc3cfdb2c..d2611c624d69 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1204,7 +1204,7 @@ void ScrollBar::Resize() // ----------------------------------------------------------------------- -IMPL_LINK( ScrollBar, ImplAutoTimerHdl, AutoTimer*, EMPTYARG ) +IMPL_LINK_NOARG(ScrollBar, ImplAutoTimerHdl) { if( mpData && mpData->mbHide ) return 0; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index f5bf19f9ce1b..fb73946a68b7 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1014,7 +1014,7 @@ long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) // ----------------------------------------------------------------------- -IMPL_LINK( TabControl, ImplListBoxSelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl) { SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectEntryPos() ) ); return 0; diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 6f80a402921d..a6a6d00a0197 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -303,7 +303,7 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList } //---------------------------------------------------------------------------------------------------------------------- -IMPL_LINK( Throbber, TimeOutHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Throbber, TimeOutHdl) { SolarMutexGuard aGuard; if ( maImageList.empty() ) diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 90acdcf12706..630a589c38c4 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -408,7 +408,7 @@ void Animation::ImplRestartTimer( sal_uLong nTimeout ) // ----------------------------------------------------------------------- typedef ::std::vector< AInfo* > AInfoList_impl; -IMPL_LINK( Animation, ImplTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) { const size_t nAnimCount = maList.size(); AInfoList_impl aAInfoList; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 482491d2c41a..482420333060 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -276,7 +276,7 @@ struct PrintJobAsync DECL_LINK( ExecJob, void* ); }; -IMPL_LINK( PrintJobAsync, ExecJob, void*, EMPTYARG ) +IMPL_LINK_NOARG(PrintJobAsync, ExecJob) { Printer::ImplPrintJob( mpController, maInitSetup ); diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index f3ade03d1b58..a404de804d99 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -47,7 +47,7 @@ SolarThreadExecutor::~SolarThreadExecutor() osl_destroyCondition( m_aFinish ); } -IMPL_LINK( SolarThreadExecutor, worker, void*, EMPTYARG ) +IMPL_LINK_NOARG(SolarThreadExecutor, worker) { if ( !m_bTimeout ) { diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 178aef2e67c4..5be74b972306 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -270,7 +270,7 @@ void Cursor::ImplNew() // ----------------------------------------------------------------------- -IMPL_LINK( Cursor, ImplTimerHdl, AutoTimer*, EMPTYARG ) +IMPL_LINK_NOARG(Cursor, ImplTimerHdl) { if ( mpData->mbCurVisible ) ImplRestore(); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 22d510b63b59..6e10da618442 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -426,7 +426,7 @@ Dialog::~Dialog() // ----------------------------------------------------------------------- -IMPL_LINK( Dialog, ImplAsyncCloseHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl) { Close(); return 0; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index aa8b0b49d38d..2fd719393555 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -66,9 +66,9 @@ private: sal_Bool mbInMove; sal_uLong mnLastUserEvent; - DECL_LINK( DockingHdl, ImplDockFloatWin2* ); - DECL_LINK( DockTimerHdl, ImplDockFloatWin2* ); - DECL_LINK( EndDockTimerHdl, ImplDockFloatWin2* ); + DECL_LINK(DockingHdl, void *); + DECL_LINK(DockTimerHdl, void *); + DECL_LINK(EndDockTimerHdl, void *); public: ImplDockFloatWin2( Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); @@ -129,7 +129,7 @@ ImplDockFloatWin2::~ImplDockFloatWin2() // ----------------------------------------------------------------------- -IMPL_LINK( ImplDockFloatWin2, DockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); @@ -157,7 +157,7 @@ IMPL_LINK( ImplDockFloatWin2, DockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) return 0; } -IMPL_LINK( ImplDockFloatWin2, EndDockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "enddocktimer called but not floating" ); @@ -177,7 +177,7 @@ IMPL_LINK( ImplDockFloatWin2, EndDockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) } -IMPL_LINK( ImplDockFloatWin2, DockingHdl, ImplDockFloatWin2*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) { // called during move of a floating window mnLastUserEvent = 0; @@ -1264,7 +1264,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLon } } -IMPL_LINK( ImplDockingWindowWrapper, PopupModeEnd, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) { GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE ); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 9596bfb63acd..a98b994262de 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -84,8 +84,8 @@ private: sal_Bool mbInMove; sal_uLong mnLastUserEvent; - DECL_LINK( DockingHdl, ImplDockFloatWin* ); - DECL_LINK( DockTimerHdl, ImplDockFloatWin* ); + DECL_LINK(DockingHdl, void *); + DECL_LINK(DockTimerHdl, void *); public: ImplDockFloatWin( Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ); @@ -139,7 +139,7 @@ ImplDockFloatWin::~ImplDockFloatWin() // ----------------------------------------------------------------------- -IMPL_LINK( ImplDockFloatWin, DockTimerHdl, ImplDockFloatWin*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); @@ -168,7 +168,7 @@ IMPL_LINK( ImplDockFloatWin, DockTimerHdl, ImplDockFloatWin*, EMPTYARG ) return 0; } -IMPL_LINK( ImplDockFloatWin, DockingHdl, ImplDockFloatWin*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) { PointerState aState = mpDockWin->GetParent()->GetPointerState(); diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 32d70213aae2..44f172f26259 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -550,7 +550,7 @@ sal_Bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) // ----------------------------------------------------------------------- -IMPL_LINK( FloatingWindow, ImplEndPopupModeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) { mnPostId = 0; mnPopupModeFlags = 0; diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 1f104f40cd7e..73283f3ea918 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -487,10 +487,10 @@ private: sal_Bool bIgnoreFirstMove; sal_Bool bKeyInput; - DECL_LINK( PopupEnd, FloatingWindow* ); + DECL_LINK(PopupEnd, void *); DECL_LINK( HighlightChanged, Timer* ); - DECL_LINK( SubmenuClose, Timer* ); - DECL_LINK( AutoScroll, Timer* ); + DECL_LINK(SubmenuClose, void *); + DECL_LINK(AutoScroll, void *); DECL_LINK( ShowHideListener, VclWindowEvent* ); void StateChanged( StateChangedType nType ); @@ -702,9 +702,9 @@ private: void ImplInitStyleSettings(); - DECL_LINK( CloserHdl, PushButton* ); - DECL_LINK( FloatHdl, PushButton* ); - DECL_LINK( HideHdl, PushButton* ); + DECL_LINK(CloserHdl, void *); + DECL_LINK(FloatHdl, void *); + DECL_LINK(HideHdl, void *); DECL_LINK( ToolboxEventHdl, VclWindowEvent* ); DECL_LINK( ShowHideListener, VclWindowEvent* ); @@ -2990,7 +2990,7 @@ void Menu::ImplCallHighlight( sal_uInt16 nHighlightedItem ) } } -IMPL_LINK( Menu, ImplCallSelect, Menu*, EMPTYARG ) +IMPL_LINK_NOARG(Menu, ImplCallSelect) { nEventId = 0; Select(); @@ -4122,7 +4122,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM } } -IMPL_LINK( MenuFloatingWindow, PopupEnd, FloatingWindow*, EMPTYARG ) +IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd) { // "this" will be deleted before the end of this method! Menu* pM = pMenu; @@ -4171,7 +4171,7 @@ IMPL_LINK( MenuFloatingWindow, PopupEnd, FloatingWindow*, EMPTYARG ) return 0; } -IMPL_LINK( MenuFloatingWindow, AutoScroll, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MenuFloatingWindow, AutoScroll) { ImplScroll( GetPointerPosPixel() ); return 1; @@ -4240,7 +4240,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer ) return 0; } -IMPL_LINK( MenuFloatingWindow, SubmenuClose, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MenuFloatingWindow, SubmenuClose) { if( pMenu && pMenu->pStartedFrom ) { @@ -5221,7 +5221,7 @@ Size MenuBarWindow::MinCloseButtonSize() return aCloser.getMinSize(); } -IMPL_LINK( MenuBarWindow, CloserHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarWindow, CloserHdl) { if( ! pMenu ) return 0; @@ -5284,12 +5284,12 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent*, pEvent ) return 0; } -IMPL_LINK( MenuBarWindow, FloatHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarWindow, FloatHdl) { return pMenu ? ((MenuBar*)pMenu)->GetFloatButtonClickHdl().Call( pMenu ) : 0; } -IMPL_LINK( MenuBarWindow, HideHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarWindow, HideHdl) { return pMenu ? ((MenuBar*)pMenu)->GetHideButtonClickHdl().Call( pMenu ) : 0; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 11fba1441ce6..ee646e81a341 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -2178,7 +2178,7 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit ) return 0; } -IMPL_LINK( PrintDialog, UIOptionsChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(PrintDialog, UIOptionsChanged) { checkOptionalControlDependencies(); return 0; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 364766e80190..7c41eee622a3 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -380,7 +380,7 @@ void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt ) // ------------------------------------------------------------------------ -IMPL_LINK( ImplWheelWindow, ImplScrollHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) { if ( mnActDeltaX || mnActDeltaY ) { diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index ccc38c778c99..efcb7b77bc58 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -74,7 +74,7 @@ private: void ImplDrawWheel(); void ImplRecalcScrollValues(); - DECL_LINK( ImplScrollHdl, Timer* pTimer ); + DECL_LINK(ImplScrollHdl, void *); protected: diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index d065b39cc7b0..6209ee6b0877 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -82,7 +82,7 @@ SelectionEngine::~SelectionEngine() |* *************************************************************************/ -IMPL_LINK( SelectionEngine, ImpWatchDog, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog) { if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) SelMouseMove( aLastMove ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 2cf7fe092884..ff5cb5be324d 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2854,7 +2854,7 @@ void ToolBox::ImplFormat( sal_Bool bResize ) // ----------------------------------------------------------------------- -IMPL_LINK( ToolBox, ImplDropdownLongClickHdl, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) { if( mnCurPos != TOOLBOX_ITEM_NOTFOUND && (mpData->m_aItems[ mnCurPos ].mnBits & TIB_DROPDOWN) @@ -2885,7 +2885,7 @@ IMPL_LINK( ToolBox, ImplDropdownLongClickHdl, ToolBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ToolBox, ImplUpdateHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 0925ed6dd483..9528bdb2b1ff 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -2018,7 +2018,7 @@ IMPL_LINK( ToolBox, ImplCustomMenuListener, VclMenuEvent*, pEvent ) return 0; } -IMPL_LINK( ToolBox, ImplCallExecuteCustomMenu, void*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu) { mpData->mnEventId = 0; ImplExecuteCustomMenu(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 0dfe4de63a44..8c3d4554bc02 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2488,7 +2488,7 @@ void Window::ImplPostPaint() // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplHandlePaintHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplHandlePaintHdl) { // save paint events until resizing is done if( mpWindowImpl->mbFrame && mpWindowImpl->mpFrameData->maResizeTimer.IsActive() ) @@ -2500,7 +2500,7 @@ IMPL_LINK( Window, ImplHandlePaintHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplHandleResizeTimerHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) { if( mpWindowImpl->mbReallyVisible ) { @@ -3756,7 +3756,7 @@ void Window::ImplGenerateMouseMove() // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplGenerateMouseMoveHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) { mpWindowImpl->mpFrameData->mnMouseMoveId = 0; Window* pCaptureWin = ImplGetSVData()->maWinData.mpCaptureWin; diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 504b75347d2f..076657ff88c2 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1732,7 +1732,7 @@ static void ImplActivateFloatingWindows( Window* pWindow, sal_Bool bActive ) // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplAsyncFocusHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) { ImplGetWindowImpl()->mpFrameData->mnFocusId = 0; diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 3077c34b9311..6c4b6a284a13 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -267,7 +267,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent ) } } -IMPL_LINK( XIMStatusWindow, DelayedShowHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl) { m_nDelayedEvent = 0; const SystemEnvData* pData = GetSystemData(); diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 141289f3f00d..0cebdbc2efc7 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3714,7 +3714,7 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) return 1; } -IMPL_LINK( X11SalFrame, HandleAlwaysOnTopRaise, void*, EMPTYARG ) +IMPL_LINK_NOARG(X11SalFrame, HandleAlwaysOnTopRaise) { if( bMapped_ ) ToTop( 0 ); diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 65c69f691aff..70567dda80f5 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -74,7 +74,7 @@ private: sal_Bool mbInitialized; sal_uInt16 GetSelectedEntryPos( void ) const; - DECL_LINK( ViewButtonHdl, Button* ); + DECL_LINK(ViewButtonHdl, void *); DECL_LINK( CertificateHighlightHdl, void* ); DECL_LINK( CertificateSelectHdl, void* ); diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index 7bc0a1b29de6..08529dd39d05 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -104,9 +104,9 @@ private: bool m_bHasDocumentSignature; bool m_bWarningShowSignMacro; - DECL_LINK( ViewButtonHdl, Button* ); - DECL_LINK( AddButtonHdl, Button* ); - DECL_LINK( RemoveButtonHdl, Button* ); + DECL_LINK(ViewButtonHdl, void *); + DECL_LINK(AddButtonHdl, void *); + DECL_LINK(RemoveButtonHdl, void *); DECL_LINK( SignatureHighlightHdl, void* ); DECL_LINK( SignatureSelectHdl, void* ); DECL_LINK( StartVerifySignatureHdl, void* ); diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 178d44555f9b..3af050e7489e 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -124,7 +124,7 @@ private: sal_uInt16 mnCurLevel; protected: - DECL_LINK( RadioButtonHdl, RadioButton* ); + DECL_LINK(RadioButtonHdl, void *); public: MacroSecurityLevelTP( Window* pParent, MacroSecurity* _pDlg ); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index bcafd92fbbca..6651fa0f4a9e 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -122,7 +122,7 @@ short CertificateChooser::Execute() return ModalDialog::Execute(); } -// IMPL_LINK( CertificateChooser, Initialize, void*, EMPTYARG ) +// IMPL_LINK_NOARG(CertificateChooser, Initialize) void CertificateChooser::ImplInitialize() { if ( !mbInitialized ) @@ -206,7 +206,7 @@ uno::Reference< dcss::security::XCertificate > CertificateChooser::GetSelectedCe return xCert; } -IMPL_LINK( CertificateChooser, CertificateHighlightHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateChooser, CertificateHighlightHdl) { sal_Bool bEnable = GetSelectedCertificate().is(); maViewBtn.Enable( bEnable ); @@ -214,13 +214,13 @@ IMPL_LINK( CertificateChooser, CertificateHighlightHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( CertificateChooser, CertificateSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl) { EndDialog( RET_OK ); return 0; } -IMPL_LINK( CertificateChooser, ViewButtonHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateChooser, ViewButtonHdl) { ImplShowCertificateDetails(); return 0; diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 8169fcc834d6..b2c0f4240c48 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -342,7 +342,7 @@ void CertificateViewerDetailsTP::ActivatePage() { } -IMPL_LINK( CertificateViewerDetailsTP, ElementSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl) { SvLBoxEntry* pEntry = maElementsLB.FirstSelected(); String aElementText; @@ -461,7 +461,7 @@ void CertificateViewerCertPathTP::ActivatePage() } } -IMPL_LINK( CertificateViewerCertPathTP, ViewCertHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl) { SvLBoxEntry* pEntry = maCertPathLB.FirstSelected(); if( pEntry ) @@ -473,7 +473,7 @@ IMPL_LINK( CertificateViewerCertPathTP, ViewCertHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( CertificateViewerCertPathTP, CertSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl) { String sStatus; SvLBoxEntry* pEntry = maCertPathLB.FirstSelected(); diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 7a8a2d4b2766..c85a251225ce 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -370,7 +370,7 @@ short DigitalSignaturesDialog::Execute() return Dialog::Execute(); } -IMPL_LINK( DigitalSignaturesDialog, SignatureHighlightHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl) { bool bSel = maSignaturesLB.FirstSelected() ? true : false; maViewBtn.Enable( bSel ); @@ -380,7 +380,7 @@ IMPL_LINK( DigitalSignaturesDialog, SignatureHighlightHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( DigitalSignaturesDialog, OKButtonHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl) { // Export all other signatures... SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream( @@ -409,19 +409,19 @@ IMPL_LINK( DigitalSignaturesDialog, OKButtonHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( DigitalSignaturesDialog, SignatureSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl) { ImplShowSignaturesDetails(); return 0; } -IMPL_LINK( DigitalSignaturesDialog, ViewButtonHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, ViewButtonHdl) { ImplShowSignaturesDetails(); return 0; } -IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl) { if( ! canAdd()) return 0; @@ -527,7 +527,7 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG ) return 0; } -IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl) { if (!canRemove()) return 0; @@ -570,7 +570,7 @@ IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG ) return 0; } -IMPL_LINK( DigitalSignaturesDialog, StartVerifySignatureHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, StartVerifySignatureHdl) { return mbVerifySignatures ? 1 : 0; } diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 010cf7ab3191..dd9bda48f3e8 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star; -IMPL_LINK( MacroSecurity, OkBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl) { mpLevelTP->ClosePage(); mpTrustSrcTP->ClosePage(); @@ -158,7 +158,7 @@ MacroSecurityLevelTP::MacroSecurityLevelTP( Window* _pParent, MacroSecurity* _pD } -IMPL_LINK( MacroSecurityLevelTP, RadioButtonHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl) { sal_uInt16 nNewLevel = 0; if( maVeryHighRB.IsChecked() ) @@ -193,7 +193,7 @@ void MacroSecurityTrustedSourcesTP::ImplCheckButtons() } -IMPL_LINK( MacroSecurityTrustedSourcesTP, ViewCertPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl) { if( maTrustCertLB.FirstSelected() ) { @@ -219,7 +219,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, ViewCertPBHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl) { if( maTrustCertLB.FirstSelected() ) { @@ -233,7 +233,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, AddLocPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl) { try { @@ -274,7 +274,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, AddLocPBHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl) { sal_uInt16 nSel = maTrustFileLocLB.GetSelectEntryPos(); if( nSel != LISTBOX_ENTRY_NOTFOUND ) @@ -295,13 +295,13 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl) { ImplCheckButtons(); return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl) { ImplCheckButtons(); return 0; diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx index c56575b90b42..00e722ea79b2 100644 --- a/xmlsecurity/source/dialogs/warnings.cxx +++ b/xmlsecurity/source/dialogs/warnings.cxx @@ -115,7 +115,7 @@ MacroWarning::~MacroWarning() { } -IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl) { DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" ); @@ -125,7 +125,7 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl) { if( mbSignedMode && maAlwaysTrustCB.IsChecked() ) { // insert path into trusted path list diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index b312d62f31c9..3071cfbfe5dd 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -293,7 +293,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : } -IMPL_LINK( MyWin, CryptoCheckBoxHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(MyWin, CryptoCheckBoxHdl) { if ( maCryptoCheckBox.IsChecked() ) { @@ -308,7 +308,7 @@ IMPL_LINK( MyWin, CryptoCheckBoxHdl, CheckBox*, EMPTYARG ) return 1; } -IMPL_LINK( MyWin, DigitalSignaturesWithServiceHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl) { rtl::OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( @@ -323,7 +323,7 @@ IMPL_LINK( MyWin, DigitalSignaturesWithServiceHdl, Button*, EMPTYARG ) return 0; } -IMPL_LINK( MyWin, VerifyDigitalSignaturesHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl) { rtl::OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( |