New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem

...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
for the problem.

35 files changed, 125 insertions, 125 deletions

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* );