No more need for EMPTYARG in C++11

Change-Id: I8a6abc563fa80a801d1907100d0b1138d260c36e

31 files changed, 57 insertions, 59 deletions

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 4c2063bb42a2..df1b15fc55b8 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -574,7 +574,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
 }
 
 // select event handler on the listbox
-IMPL_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
+IMPL_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
 {
     _SvxMacroTabPage_Impl*    pImpl = mpImpl;
     SvHeaderTabListBox&        rListBox = pImpl->pEventLB->GetListBox();
@@ -597,7 +597,7 @@ IMPL_LINK( _SvxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
     return GenericHandler_Impl( this, pBtn );
 }
 
-IMPL_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, EMPTYARG )
+IMPL_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, )
 {
     return GenericHandler_Impl( this, NULL );
 }
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 325f6f346c88..a27774cc717b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -441,7 +441,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent
 /* Initialize, asynchronous to prevent virtial calls
    from a constructor
  */
-IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG )
+IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, )
 {
     SetUpdateMode( false );
     //show or hide AutoCorrect depending on the modules abilities
@@ -911,7 +911,7 @@ int SpellDialog::InitUserDicts()
 }
 
 
-IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, EMPTYARG )
+IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, )
 {
     return AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu());
 }
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 77d1150f62b2..76c132ab7305 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -410,7 +410,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
     return 0;
 }
 
-IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
+IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*,)
 {
     m_pcmbSearchText->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
     return 0;
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index c24e4eb75b5a..a4e08f8d52b1 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -354,7 +354,7 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl)
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, /*pButton*/ )
 {
     if( !bBusy )
     {
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index d48e043b382f..8fcabe526a8a 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -762,7 +762,7 @@ IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
 
 
 
-IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
+IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, )
 {
     vcl::Window* pOldParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( this );
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 1b47dda9aa79..88d52d832fd0 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -94,7 +94,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
         m_pOptionsExpander->Hide();
 }
 
-IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ )
+IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, /*pBtn*/ )
 {
     bool bInvalidState = !m_pOpenReadonlyCB->IsChecked() &&
             m_pPasswdToOpenED->GetText().isEmpty() &&
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index f5739672b840..a8566ea5e015 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -542,7 +542,7 @@ void SvxThesaurusDialog::dispose()
     SvxStandardDialog::dispose();
 }
 
-IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, EMPTYARG /*pBtn*/ )
+IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, /*pBtn*/ )
 {
     EndDialog(RET_OK);
     return 0;
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index f752b806db72..b88272223efe 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -261,7 +261,7 @@ bool _SfxMacroTabPage::IsReadOnly() const
     return mpImpl->bReadOnly;
 }
 
-IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
+IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
 {
     _SfxMacroTabPage_Impl*  pImpl = mpImpl;
     SvHeaderTabListBox&     rListBox = pImpl->pEventLB->GetListBox();
@@ -279,7 +279,7 @@ IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG )
+IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, )
 {
     _SfxMacroTabPage_Impl*  pImpl = mpImpl;
     pImpl->pGroupLB->GroupSelected();
@@ -293,7 +293,7 @@ IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG )
+IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, )
 {
     EnableButtons();
     return 0;
@@ -346,7 +346,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
     return 0;
 }
 
-IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*, EMPTYARG, void )
+IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*,, void )
 {
     // FillMacroList() can take a long time -> show wait cursor and disable input
     SfxTabDialog* pTabDlg = GetTabDialog();
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 590676cffb09..89c0641e92f1 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1701,7 +1701,7 @@ void SvxPageDescPage::DisableVerticalPageDir()
     }
 }
 
-IMPL_LINK( SvxPageDescPage, FrameDirectionModify_Impl, ListBox*,  EMPTYARG)
+IMPL_LINK( SvxPageDescPage, FrameDirectionModify_Impl, ListBox*,)
 {
     m_pBspWin->SetFrameDirection( (sal_uInt32) m_pTextFlowBox->GetSelectEntryValue() );
     m_pBspWin->Invalidate();
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 5c8b4b3551aa..1444b7925955 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -180,7 +180,7 @@ namespace dbaui
         TabPage::dispose();
     }
 
-    IMPL_LINK(OTextConnectionHelper, OnControlModified, Control*, /*EMPTYARG*/)
+    IMPL_LINK(OTextConnectionHelper, OnControlModified, Control*,)
     {
         callModifiedHdl();
         return 0L;
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 58cf4d44e54c..9e62d154ec1b 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -174,7 +174,7 @@ namespace bib
         mpBibView->Resize();
     }
 
-    IMPL_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG )
+    IMPL_LINK( BibView, CallMappingHdl, BibView*, )
     {
         m_pDatMan->CreateMappingDialog( this );
         return 0;
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 7235c1b8244f..dcbc676e900f 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -175,7 +175,7 @@ Image PlacesListBox::getEntryIcon( PlacePtr pPlace )
     return theImage;
 }
 
-IMPL_LINK( PlacesListBox, Selection, void* , EMPTYARG )
+IMPL_LINK( PlacesListBox, Selection, void* , )
 {
     sal_uInt32 nSelected = mpImpl->GetCurrRow();
     PlacePtr pPlace = maPlaces[nSelected];
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index cfb4ce423de2..1e7e818fea57 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -674,7 +674,7 @@ void SvtFileDialog::Init_Impl
     Resize();
 }
 
-IMPL_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG )
+IMPL_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, )
 {
     _pFileView->EndInplaceEditing( false );
 
@@ -1222,7 +1222,7 @@ IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl )
 }
 
 IMPL_LINK_TYPED(
-    SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, EMPTYARG, void)
+    SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*,, void)
 {
     // filter the view again
     ExecuteFilter();
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index 45e72980d7fd..a48c3b86d68e 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -113,8 +113,6 @@
 #define LINK(Instance, Class, Member) ::tools::detail::makeLink( \
     static_cast<Class *>(Instance), &Class::LinkStub##Member)
 
-#define EMPTYARG
-
 template<typename Arg = void *, typename Ret = sal_IntPtr> class Link {
 public:
     typedef Ret Stub(void *, Arg);
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index d0415abab096..d35e88518f3e 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -472,7 +472,7 @@ void ScVbaEventListener::postWindowResizeEvent( vcl::Window* pWindow )
     }
 }
 
-IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, vcl::Window*, EMPTYARG pWindow )
+IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, vcl::Window*, pWindow )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index b18846486550..7b72aba9a170 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -482,7 +482,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
     return 0;
 }
 
-IMPL_LINK (ScPreviewShell, CloseHdl, SystemWindow*, EMPTYARG)
+IMPL_LINK (ScPreviewShell, CloseHdl, SystemWindow*,)
 {
     ExitPreview();
     return 0;
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index e2082c236251..a8b8a1360690 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -364,7 +364,7 @@ void ShutdownIcon::StartFileDialog()
 
 
 
-IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYARG )
+IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, )
 {
     DBG_ASSERT( m_pFileDlg, "ShutdownIcon, DialogClosedHdl_Impl(): no file dialog" );
 
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 0f715272b847..612166cfcf7b 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -155,7 +155,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta
 }
 
 IMPL_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl,
-                                    SfxTemplateControllerItem*, EMPTYARG)
+                                    SfxTemplateControllerItem*,)
 {
     nUserEventId = 0;
     SfxBoolItem* pState = 0;
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index f976942654b3..7522c571db25 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -277,7 +277,7 @@ Image TabBar::GetItemImage (const DeckDescriptor& rDeckDescriptor) const
         mxFrame);
 }
 
-IMPL_LINK(TabBar::Item, HandleClick, Button*, EMPTYARG)
+IMPL_LINK(TabBar::Item, HandleClick, Button*,)
 {
     try
     {
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 98f451341909..e62257b95564 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -149,7 +149,7 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont)
 
 /**************************************************************************/
 
-IMPL_LINK( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, EMPTYARG/*pButton*/ )
+IMPL_LINK( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *,/*pButton*/ )
 {
     m_pZoom->Enable(m_pSizeZoomed->IsChecked());
     return 0;
@@ -305,7 +305,7 @@ IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox )
 }
 
 
-IMPL_LINK( SmFontDialog, AttrChangeHdl, CheckBox *, EMPTYARG /*pCheckBox*/ )
+IMPL_LINK( SmFontDialog, AttrChangeHdl, CheckBox *, /*pCheckBox*/ )
 {
     if (m_pBoldCheckBox->IsChecked())
         Face.SetWeight(FontWeight(WEIGHT_BOLD));
@@ -445,7 +445,7 @@ public:
     }
 };
 
-IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
 {
     if (SaveDefaultsQuery(this).Execute() == RET_YES)
     {
@@ -553,7 +553,7 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
 }
 
 
-IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
 {
     if (SaveDefaultsQuery(this).Execute() == RET_YES)
     {
@@ -750,7 +750,7 @@ IMPL_LINK( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu )
 }
 
 
-IMPL_LINK( SmDistanceDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmDistanceDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
 {
     if (SaveDefaultsQuery(this).Execute() == RET_YES)
     {
@@ -1056,7 +1056,7 @@ void SmDistanceDialog::WriteTo(SmFormat &rFormat) /*const*/
     rFormat.RequestApplyChanges();
 }
 
-IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
 {
     if (SaveDefaultsQuery(this).Execute() == RET_YES)
     {
@@ -1394,7 +1394,7 @@ void SmShowSymbolSetWindow::Resize()
     calccols();
 }
 
-IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, EMPTYARG /*pScrollBar*/)
+IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/)
 {
     Invalidate();
     return 0;
@@ -1844,7 +1844,7 @@ SmSym * SmSymDefineDialog::GetSymbol(const ComboBox &rComboBox)
 }
 
 
-IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, EMPTYARG pComboBox )
+IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, pComboBox )
 {
     (void) pComboBox;
 #if OSL_DEBUG_LEVEL > 1
@@ -1855,7 +1855,7 @@ IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, EMPTYARG pComboBox
 }
 
 
-IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox *, EMPTYARG pComboBox )
+IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox *, pComboBox )
 {
     (void) pComboBox;
 #if OSL_DEBUG_LEVEL > 1
@@ -1895,7 +1895,7 @@ IMPL_LINK( SmSymDefineDialog, ModifyHdl, ComboBox *, pComboBox )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox )
+IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, pListBox )
 {
     (void) pListBox;
 #if OSL_DEBUG_LEVEL > 1
@@ -1907,7 +1907,7 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, EMPTYARG pListBox )
+IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, pListBox )
 {
     (void) pListBox;
     sal_Int32 nPos = pFontsSubsetLB->GetSelectEntryPos();
@@ -1923,7 +1923,7 @@ IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, EMPTYARG pListBox )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, EMPTYARG pComboBox )
+IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, pComboBox )
 {
     (void) pComboBox;
 #if OSL_DEBUG_LEVEL > 1
@@ -1967,7 +1967,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
 }
 
 
-IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton )
+IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, pButton )
 {
     (void) pButton;
 #if OSL_DEBUG_LEVEL > 1
@@ -1998,7 +1998,7 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
+IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton )
 {
     (void) pButton;
 #if OSL_DEBUG_LEVEL > 1
@@ -2039,7 +2039,7 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton )
+IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton )
 {
     (void) pButton;
 #if OSL_DEBUG_LEVEL > 1
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 1167cf6e5a60..ce8471f69591 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -572,7 +572,7 @@ void SmEditWindow::CreateEditView()
 }
 
 
-IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, EMPTYARG /*pStat*/ )
+IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, /*pStat*/ )
 {
     if (!pEditView)
         return 1;
@@ -583,7 +583,7 @@ IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, EMPTYARG /*pStat*/ )
     }
 }
 
-IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, EMPTYARG /*pScrollBar*/ )
+IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/ )
 {
     OSL_ENSURE(pEditView, "EditView missing");
     if (pEditView)
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 561246b21065..34e35bacbd8c 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -3307,7 +3307,7 @@ IMPL_LINK_NOARG_TYPED(IcnViewEdit_Impl, Timeout_Impl, Idle *, void)
     CallCallBackHdl_Impl();
 }
 
-IMPL_LINK( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator*, EMPTYARG  )
+IMPL_LINK( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator*,  )
 {
     bCanceled = false;
     bGrabFocus = true;
@@ -3315,7 +3315,7 @@ IMPL_LINK( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator*, EMPTYARG  )
     return 1;
 }
 
-IMPL_LINK( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator*, EMPTYARG  )
+IMPL_LINK( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator*,  )
 {
     bCanceled = true;
     bGrabFocus = true;
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 2db914235d80..90fdea7b0a92 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -146,13 +146,13 @@ void PlaceEditDialog::InitDetails( )
     SelectTypeHdl( m_pLBServerType );
 }
 
-IMPL_LINK ( PlaceEditDialog,  OKHdl, Button *, EMPTYARG )
+IMPL_LINK ( PlaceEditDialog,  OKHdl, Button *, )
 {
     EndDialog( RET_OK );
     return 1;
 }
 
-IMPL_LINK ( PlaceEditDialog, DelHdl, Button *, EMPTYARG )
+IMPL_LINK ( PlaceEditDialog, DelHdl, Button *, )
 {
     // ReUsing existing symbols...
     EndDialog( RET_NO );
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 25bd129118a7..2eb65f4eea2c 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2957,7 +2957,7 @@ namespace svxform
     }
 
 
-    IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *,  EMPTYARG )
+    IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *, )
     {
         bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL );
         m_pEditNamespaceBtn->Enable( bEnable );
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 7ada52b9a09e..0e94ee4b6efb 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -381,7 +381,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
     return 0;
 }
 
-IMPL_LINK(TextCharacterSpacingControl, KerningSelectHdl, ListBox*, EMPTYARG)
+IMPL_LINK(TextCharacterSpacingControl, KerningSelectHdl, ListBox*,)
 {
     if ( maLBKerning->GetSelectEntryPos() > 0 )
     {
@@ -406,7 +406,7 @@ IMPL_LINK(TextCharacterSpacingControl, KerningSelectHdl, ListBox*, EMPTYARG)
     KerningModifyHdl( NULL );
     return 0;
 }
-IMPL_LINK(TextCharacterSpacingControl, KerningModifyHdl, MetricField*, EMPTYARG)
+IMPL_LINK(TextCharacterSpacingControl, KerningModifyHdl, MetricField*,)
 {
     if ( maVSSpacing->GetSelectItemId() > 0 )
     {
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx
index 8aade3602440..446e430fa34b 100644
--- a/sw/qa/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/tiledrendering/tiledrendering.cxx
@@ -111,7 +111,7 @@ public:
     DECL_LINK ( ChooseDocumentHdl, Button * );
 };
 
-IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG )
+IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, )
 {
     int contextWidth = mpContextWidth->GetValue();
     int contextHeight = mpContextHeight->GetValue();
@@ -147,7 +147,7 @@ IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK ( TiledRenderingDialog,  ChooseDocumentHdl, Button *, EMPTYARG )
+IMPL_LINK ( TiledRenderingDialog,  ChooseDocumentHdl, Button *, )
 {
     FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 );
     uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 70ce57e19fd2..c73ebca8a0c8 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1266,7 +1266,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
     return pNewFmt;
 }
 
-IMPL_LINK( SwDoc, BackgroundDone, SvxBrushItem*, EMPTYARG )
+IMPL_LINK( SwDoc, BackgroundDone, SvxBrushItem*, )
 {
     SwViewShell* pStartSh = getIDocumentLayoutAccess().GetCurrentViewShell();
     if(pStartSh)
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 7f86ef083348..98953c089ab8 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -183,7 +183,7 @@ void SwGlossaryGroupDlg::Apply()
     }
 }
 
-IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG  )
+IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*,  )
 {
     m_pNewPB->Enable(false);
     SvTreeListEntry* pFirstEntry = m_pGroupTLB->FirstSelected();
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index c53f78670309..4293b0376ebf 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -401,7 +401,7 @@ IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl)
     return 0;
 }
 
-IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, EMPTYARG )
+IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, )
 {
     mpMarginValueSet->SetNoSelection();
     mpMarginValueSet->SelectItem(0);
@@ -415,7 +415,7 @@ IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( PageMarginControl, ModifyULMarginHdl, MetricField *, EMPTYARG )
+IMPL_LINK( PageMarginControl, ModifyULMarginHdl, MetricField *, )
 {
     mpMarginValueSet->SetNoSelection();
     mpMarginValueSet->SelectItem(0);
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 27ddf863620e..38505c695eab 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1217,7 +1217,7 @@ SwNavigationPI* SwGlobalTree::GetParentWindow()
     return static_cast<SwNavigationPI*>(Window::GetParent());
 }
 
-IMPL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG)
+IMPL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*,)
 {
     const SfxObjectShell* pShell = SwGlobalTree::GetShowShell();
     SfxViewFrame* pFirst = pShell ? SfxViewFrame::GetFirst(pShell) : NULL;
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index 58362cb24494..e801c746890c 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -47,13 +47,13 @@ void AuthFallbackDlg::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK ( AuthFallbackDlg,  OKHdl, Button *, EMPTYARG )
+IMPL_LINK ( AuthFallbackDlg,  OKHdl, Button *, )
 {
     EndDialog( RET_OK );
     return 1;
 }
 
-IMPL_LINK ( AuthFallbackDlg,  CancelHdl, Button *, EMPTYARG )
+IMPL_LINK ( AuthFallbackDlg,  CancelHdl, Button *, )
 {
     EndDialog( RET_CANCEL );
     return 0;