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 /sd | |
| parent | 32781c2d268ed94eb46318a0398385baf31368c4 (diff) | |
New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
for the problem.
Diffstat (limited to 'sd')
93 files changed, 220 insertions, 220 deletions
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"); |