20 files changed, 165 insertions, 190 deletions

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 545988b6a51e..8292dbf335e5 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1143,7 +1143,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet)
         pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() );
         pCompareClass->loadDefaultCollator( aLanguageTag.getLocale(), 0 );
         pCharClass = new CharClass( aLanguageTag );
-        ModifyHdl(m_pShortED);
+        ModifyHdl(*m_pShortED);
     }
 }
 
@@ -1256,7 +1256,7 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn)
         {
             DeleteEntry(SvTabListBox::GetEntryText(pEntry, 0), SvTabListBox::GetEntryText(pEntry, 1));
             m_pReplaceTLB->GetModel()->Remove(pEntry);
-            ModifyHdl(m_pShortED);
+            ModifyHdl(*m_pShortED);
             return false;
         }
     }
@@ -1313,15 +1313,15 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn)
         // which means EndDialog() - has to be evaluated in KeyInput
         return false;
     }
-    ModifyHdl(m_pShortED);
+    ModifyHdl(*m_pShortED);
     return true;
 }
 
-IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
+IMPL_LINK_TYPED(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void)
 {
     SvTreeListEntry* pFirstSel = m_pReplaceTLB->FirstSelected();
-    bool bShort = pEdt == m_pShortED;
-    const OUString rEntry = pEdt->GetText();
+    bool bShort = &rEdt == m_pShortED;
+    const OUString rEntry = rEdt.GetText();
     const OUString rRepString = m_pReplaceED->GetText();
     OUString aWordStr( pCharClass->lowercase( rEntry ));
 
@@ -1402,8 +1402,6 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
         }
     }
     m_pNewReplacePB->Enable( bEnableNew );
-
-    return 0;
 }
 
 static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rString)
@@ -1613,8 +1611,8 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet)
         delete pCompareClass;
         pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() );
         pCompareClass->loadDefaultCollator( LanguageTag::convertToLocale( eLastDialogLanguage ), 0 );
-        ModifyHdl(m_pAbbrevED);
-        ModifyHdl(m_pDoubleCapsED);
+        ModifyHdl(*m_pAbbrevED);
+        ModifyHdl(*m_pDoubleCapsED);
     }
 }
 
@@ -1706,23 +1704,23 @@ bool OfaAutocorrExceptPage::NewDelHdl(void* pBtn)
         && !m_pAbbrevED->GetText().isEmpty())
     {
         m_pAbbrevLB->InsertEntry(m_pAbbrevED->GetText());
-        ModifyHdl(m_pAbbrevED);
+        ModifyHdl(*m_pAbbrevED);
     }
     else if(pBtn == m_pDelAbbrevPB)
     {
         m_pAbbrevLB->RemoveEntry(m_pAbbrevED->GetText());
-        ModifyHdl(m_pAbbrevED);
+        ModifyHdl(*m_pAbbrevED);
     }
     else if((pBtn == m_pNewDoublePB || pBtn == m_pDoubleCapsED.get() )
             && !m_pDoubleCapsED->GetText().isEmpty())
     {
         m_pDoubleCapsLB->InsertEntry(m_pDoubleCapsED->GetText());
-        ModifyHdl(m_pDoubleCapsED);
+        ModifyHdl(*m_pDoubleCapsED);
     }
     else if(pBtn == m_pDelDoublePB)
     {
         m_pDoubleCapsLB->RemoveEntry(m_pDoubleCapsED->GetText());
-        ModifyHdl(m_pDoubleCapsED);
+        ModifyHdl(*m_pDoubleCapsED);
     }
     return false;
 }
@@ -1743,16 +1741,16 @@ IMPL_LINK_TYPED(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void)
     }
 }
 
-IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
+IMPL_LINK_TYPED(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void)
 {
 //  sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry();
-    const OUString& sEntry = pEdt->GetText();
+    const OUString& sEntry = rEdt.GetText();
     bool bEntryLen = !sEntry.isEmpty();
-    if(pEdt == m_pAbbrevED)
+    if(&rEdt == m_pAbbrevED)
     {
         bool bSame = lcl_FindEntry(*m_pAbbrevLB, sEntry, *pCompareClass);
         if(bSame && sEntry != m_pAbbrevLB->GetSelectEntry())
-            pEdt->SetText(m_pAbbrevLB->GetSelectEntry());
+            rEdt.SetText(m_pAbbrevLB->GetSelectEntry());
         m_pNewAbbrevPB->Enable(!bSame && bEntryLen);
         m_pDelAbbrevPB->Enable(bSame && bEntryLen);
     }
@@ -1760,11 +1758,10 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
     {
         bool bSame = lcl_FindEntry(*m_pDoubleCapsLB, sEntry, *pCompareClass);
         if(bSame && sEntry != m_pDoubleCapsLB->GetSelectEntry())
-            pEdt->SetText(m_pDoubleCapsLB->GetSelectEntry());
+            rEdt.SetText(m_pDoubleCapsLB->GetSelectEntry());
         m_pNewDoublePB->Enable(!bSame && bEntryLen);
         m_pDelDoublePB->Enable(bSame && bEntryLen);
     }
-    return 0;
 }
 
 VCL_BUILDER_FACTORY(AutoCorrEdit)
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 0dda1cd7af80..c1fb557acdc4 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -870,7 +870,7 @@ IMPL_LINK_TYPED( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void )
     }
 }
 
-IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void)
 {
     sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue(
                 m_pLineWidthMF->GetValue( ),
@@ -880,8 +880,6 @@ IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl)
 
     m_pFrameSel->SetStyleToSelection( nVal,
         SvxBorderStyle( m_pLbLineStyle->GetSelectEntryStyle() ) );
-
-    return 0;
 }
 
 
@@ -1179,21 +1177,20 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void)
 
 
 
-IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField)
+IMPL_LINK_TYPED( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void)
 {
     if ( mbSync )
     {
-        sal_Int64 nVal = pField->GetValue();
-        if(pField != m_pLeftMF)
+        sal_Int64 nVal = static_cast<MetricField&>(rField).GetValue();
+        if(&rField != m_pLeftMF)
             m_pLeftMF->SetValue(nVal);
-        if(pField != m_pRightMF)
+        if(&rField != m_pRightMF)
             m_pRightMF->SetValue(nVal);
-        if(pField != m_pTopMF)
+        if(&rField != m_pTopMF)
             m_pTopMF->SetValue(nVal);
-        if(pField != m_pBottomMF)
+        if(&rField != m_pBottomMF)
             m_pBottomMF->SetValue(nVal);
     }
-    return 0;
 }
 
 IMPL_LINK_TYPED( SvxBorderTabPage, SyncHdl_Impl, Button*, pBox, void)
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 7efc88e6a102..4fb8d0457b91 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -423,7 +423,7 @@ void SvxCharNamePage::Initialize()
     // to handle the changes of the other pages
     SetExchangeSupport();
 
-    Link<> aLink = LINK( this, SvxCharNamePage, FontModifyHdl_Impl );
+    Link<Edit&,void> aLink = LINK( this, SvxCharNamePage, FontModifyEditHdl_Impl );
     m_pWestFontNameLB->SetModifyHdl( aLink );
     m_pWestFontStyleLB->SetModifyHdl( aLink );
     m_pWestFontSizeLB->SetModifyHdl( aLink );
@@ -1191,7 +1191,11 @@ IMPL_LINK_TYPED( SvxCharNamePage, FontModifyListBoxHdl_Impl, ListBox&, rBox, voi
 {
     FontModifyHdl_Impl(&rBox);
 }
-IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox )
+IMPL_LINK_TYPED( SvxCharNamePage, FontModifyEditHdl_Impl, Edit&, rBox, void )
+{
+    FontModifyHdl_Impl(&rBox);
+}
+void SvxCharNamePage::FontModifyHdl_Impl(void* pNameBox)
 {
     m_pImpl->m_aUpdateIdle.Start();
 
@@ -1200,7 +1204,6 @@ IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox )
         FillStyleBox_Impl( static_cast<FontNameBox*>(pNameBox) );
         FillSizeBox_Impl( static_cast<FontNameBox*>(pNameBox) );
     }
-    return 0;
 }
 
 
@@ -2724,7 +2727,7 @@ void SvxCharPositionPage::Initialize()
     m_p90degRB->SetClickHdl( aLink2 );
     m_p270degRB->SetClickHdl( aLink2 );
 
-    Link<> aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl );
+    Link<Edit&,void> aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl );
     m_pHighLowMF->SetModifyHdl( aLink );
     m_pFontSizeMF->SetModifyHdl( aLink );
 
@@ -2820,13 +2823,12 @@ IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void )
 
 
 
-IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void)
 {
     sal_uInt8 nEscProp = (sal_uInt8)m_pFontSizeMF->GetValue();
     short nEsc  = (short)m_pHighLowMF->GetValue();
     nEsc *= m_pLowPosBtn->IsChecked() ? -1 : 1;
     UpdatePreview_Impl( 100, nEscProp, nEsc );
-    return 0;
 }
 
 
@@ -2889,12 +2891,12 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningSelectHdl_Impl, ListBox&, void
         m_pKerningMF->Disable();
     }
 
-    KerningModifyHdl_Impl( NULL );
+    KerningModifyHdl_Impl( *m_pKerningMF );
 }
 
 
 
-IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void)
 {
     long nVal = static_cast<long>(m_pKerningMF->GetValue());
     nVal = LogicToLogic( nVal, MAP_POINT, MAP_TWIP );
@@ -2912,7 +2914,6 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl)
     rCJKFont.SetFixKerning( (short)nKern );
     rCTLFont.SetFixKerning( (short)nKern );
     m_pPreviewWin->Invalidate();
-    return 0;
 }
 
 
@@ -2942,11 +2943,9 @@ IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, voi
 
 
 
-IMPL_LINK_NOARG(SvxCharPositionPage, ScaleWidthModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, Edit&, void)
 {
     m_pPreviewWin->SetFontWidthScale( sal_uInt16( m_pScaleWidthMF->GetValue() ) );
-
-    return 0;
 }
 
 void  SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet )
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index e7fa56d2a6ab..d1696bd52380 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -120,7 +120,7 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI
     // disable 3D border
     m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO);
 
-    Link<> aLink( LINK( this, SvxConnectionPage, ChangeAttrHdl_Impl ) );
+    Link<Edit&,void> aLink( LINK( this, SvxConnectionPage, ChangeAttrEditHdl_Impl ) );
     m_pMtrFldHorz1->SetModifyHdl( aLink );
     m_pMtrFldVert1->SetModifyHdl( aLink );
     m_pMtrFldHorz2->SetModifyHdl( aLink );
@@ -400,7 +400,11 @@ IMPL_LINK_TYPED( SvxConnectionPage, ChangeAttrListBoxHdl_Impl, ListBox&, r, void
 {
     ChangeAttrHdl_Impl(&r);
 }
-IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p )
+IMPL_LINK_TYPED( SvxConnectionPage, ChangeAttrEditHdl_Impl, Edit&, r, void )
+{
+    ChangeAttrHdl_Impl(&r);
+}
+void SvxConnectionPage::ChangeAttrHdl_Impl(void* p)
 {
     if( p == m_pMtrFldHorz1 )
     {
@@ -483,8 +487,6 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p )
             m_pMtrFldLine1->SetEmptyFieldValue();
 
     }
-
-    return 0L;
 }
 
 void SvxConnectionPage::FillTypeLB()
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index be6df3cd25a0..b833b5095500 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -87,7 +87,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )
     SetFieldUnit( *m_pTopMF , eMetric );
     SetFieldUnit( *m_pBottomMF, eMetric );
 
-    Link<> aLk = LINK(this, SvxGrfCropPage, SizeHdl);
+    Link<Edit&,void> aLk = LINK(this, SvxGrfCropPage, SizeHdl);
     m_pWidthMF->SetModifyHdl( aLk );
     m_pHeightMF->SetModifyHdl( aLk );
 
@@ -414,19 +414,19 @@ SfxTabPage::sfxpg SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet)
     description: scale changed, adjust size
  --------------------------------------------------------------------*/
 
-IMPL_LINK( SvxGrfCropPage, ZoomHdl, MetricField *, pField )
+IMPL_LINK_TYPED( SvxGrfCropPage, ZoomHdl, Edit&, rField, void )
 {
     SfxItemPool* pPool = GetItemSet().GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );
     FieldUnit eUnit = MapToFieldUnit( pPool->GetMetric( pPool->GetWhich(
                                                     SID_ATTR_GRAF_CROP ) ) );
 
-    if( pField == m_pWidthZoomMF )
+    if( &rField == m_pWidthZoomMF )
     {
         long nLRBorders = lcl_GetValue(*m_pLeftMF, eUnit)
                          +lcl_GetValue(*m_pRightMF, eUnit);
         m_pWidthMF->SetValue( m_pWidthMF->Normalize(
-            ((aOrigSize.Width() - nLRBorders) * pField->GetValue())/100L),
+            ((aOrigSize.Width() - nLRBorders) * static_cast<MetricField&>(rField).GetValue())/100L),
             eUnit);
     }
     else
@@ -434,18 +434,16 @@ IMPL_LINK( SvxGrfCropPage, ZoomHdl, MetricField *, pField )
         long nULBorders = lcl_GetValue(*m_pTopMF, eUnit)
                          +lcl_GetValue(*m_pBottomMF, eUnit);
         m_pHeightMF->SetValue( m_pHeightMF->Normalize(
-            ((aOrigSize.Height() - nULBorders ) * pField->GetValue())/100L) ,
+            ((aOrigSize.Height() - nULBorders ) * static_cast<MetricField&>(rField).GetValue())/100L) ,
             eUnit );
     }
-
-    return 0;
 }
 
 /*--------------------------------------------------------------------
     description: change size, adjust scale
  --------------------------------------------------------------------*/
 
-IMPL_LINK( SvxGrfCropPage, SizeHdl, MetricField *, pField )
+IMPL_LINK_TYPED( SvxGrfCropPage, SizeHdl, Edit&, rField, void )
 {
     SfxItemPool* pPool = GetItemSet().GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );
@@ -455,7 +453,7 @@ IMPL_LINK( SvxGrfCropPage, SizeHdl, MetricField *, pField )
     Size aSize( lcl_GetValue(*m_pWidthMF, eUnit),
                 lcl_GetValue(*m_pHeightMF, eUnit) );
 
-    if(pField == m_pWidthMF)
+    if(&rField == m_pWidthMF)
     {
         long nWidth = aOrigSize.Width() -
                 ( lcl_GetValue(*m_pLeftMF, eUnit) +
@@ -475,8 +473,6 @@ IMPL_LINK( SvxGrfCropPage, SizeHdl, MetricField *, pField )
         sal_uInt16 nZoom = (sal_uInt16)( aSize.Height() * 100L/ nHeight);
         m_pHeightZoomMF->SetValue(nZoom);
     }
-
-    return 0;
 }
 
 /*--------------------------------------------------------------------
@@ -525,7 +521,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropHdl, SpinField&, rField, void )
         if(bZoom)
         {
             // scale stays, recompute width
-            ZoomHdl(m_pWidthZoomMF);
+            ZoomHdl(*m_pWidthZoomMF);
         }
     }
     else
@@ -554,7 +550,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropHdl, SpinField&, rField, void )
         if(bZoom)
         {
             // scale stays, recompute height
-            ZoomHdl(m_pHeightZoomMF);
+            ZoomHdl(*m_pHeightZoomMF);
         }
     }
     m_pExampleWN->Invalidate();
@@ -747,11 +743,10 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void )
 }
 
 
-IMPL_LINK( SvxGrfCropPage, CropModifyHdl, MetricField *, pField )
+IMPL_LINK_TYPED( SvxGrfCropPage, CropModifyHdl, Edit&, rField, void )
 {
     aTimer.Start();
-    pLastCropField = pField;
-    return 0;
+    pLastCropField = static_cast<MetricField*>(&rField);
 }
 
 Size SvxGrfCropPage::GetGrfOrigSize( const Graphic& rGrf ) const
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 88a859564d61..2ffa6abf46cd 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -135,7 +135,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs
     m_pCtlPreview->SetBackground ( rStyles.GetWindowColor() );
     m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO);
 
-    Link<> aLink( LINK( this, SvxMeasurePage, ChangeAttrHdl_Impl ) );
+    Link<Edit&,void> aLink( LINK( this, SvxMeasurePage, ChangeAttrEditHdl_Impl ) );
     m_pMtrFldLineDist->SetModifyHdl( aLink );
     m_pMtrFldHelplineOverhang->SetModifyHdl( aLink );
     m_pMtrFldHelplineDist->SetModifyHdl( aLink );
@@ -668,7 +668,11 @@ IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrListBoxHdl_Impl, ListBox&, rBox, void
 {
     ChangeAttrHdl_Impl(&rBox);
 }
-IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p )
+IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrEditHdl_Impl, Edit&, rBox, void )
+{
+    ChangeAttrHdl_Impl(&rBox);
+}
+void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
 {
     if( p == m_pMtrFldLineDist )
     {
@@ -794,8 +798,6 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p )
 
     m_pCtlPreview->SetAttributes( aAttrSet );
     m_pCtlPreview->Invalidate();
-
-    return 0L;
 }
 
 void SvxMeasurePage::FillUnitLB()
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 4e666c9bec2e..aacd985faf56 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -343,14 +343,14 @@ void SvxNumberFormatTabPage::Init_Impl()
     m_pLbCurrency->SetSelectHdl( aLink2 );
     m_pCbSourceFormat->SetClickHdl( LINK( this, SvxNumberFormatTabPage, SelFormatClickHdl_Impl ) );
 
-    Link<> aLink = LINK( this, SvxNumberFormatTabPage, OptHdl_Impl );
+    Link<Edit&,void> aLink = LINK( this, SvxNumberFormatTabPage, OptEditHdl_Impl );
 
     m_pEdDecimals->SetModifyHdl( aLink );
     m_pEdLeadZeroes->SetModifyHdl( aLink );
     m_pBtnNegRed->SetClickHdl( LINK( this, SvxNumberFormatTabPage, OptClickHdl_Impl ) );
     m_pBtnThousand->SetClickHdl( LINK( this, SvxNumberFormatTabPage, OptClickHdl_Impl ) );
     m_pLbFormat->SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) );
-    m_pEdFormat->SetModifyHdl( HDL( EditHdl_Impl ) );
+    m_pEdFormat->SetModifyHdl( HDL( EditModifyHdl_Impl ) );
     m_pIbAdd->SetClickHdl( HDL( ClickHdl_Impl ) );
     m_pIbRemove->SetClickHdl( HDL( ClickHdl_Impl ) );
     m_pIbInfo->SetClickHdl( HDL( ClickHdl_Impl ) );
@@ -1498,7 +1498,11 @@ bool SvxNumberFormatTabPage::Click_Impl(PushButton* pIB)
 #*
 #************************************************************************/
 
-IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat )
+IMPL_LINK_TYPED( SvxNumberFormatTabPage, EditModifyHdl_Impl, Edit&, rEdit, void )
+{
+    EditHdl_Impl(&rEdit);
+}
+void SvxNumberFormatTabPage::EditHdl_Impl( Edit* pEdFormat )
 {
     sal_uInt32 nCurKey = NUMKEY_UNDEFINED;
 
@@ -1551,8 +1555,6 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat )
         pNumFmtShell->SetCurNumFmtKey( nCurKey );
         UpdateOptions_Impl( true );
     }
-
-    return 0;
 }
 
 
@@ -1571,7 +1573,11 @@ IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptClickHdl_Impl, Button*, pOptCtrl, vo
 {
     OptHdl_Impl(pOptCtrl);
 }
-IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl )
+IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptEditHdl_Impl, Edit&, rEdit, void )
+{
+    OptHdl_Impl(&rEdit);
+}
+void SvxNumberFormatTabPage::OptHdl_Impl( void* pOptCtrl )
 {
     if (   (pOptCtrl == m_pEdLeadZeroes)
         || (pOptCtrl == m_pEdDecimals)
@@ -1617,7 +1623,6 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl )
             m_pLbFormat->SetNoSelection();
         }
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void)
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 36e3f71135cc..741b96a47050 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1847,7 +1847,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer *,
     m_pPreviewWIN->Invalidate();
 }
 
-IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox )
+IMPL_LINK_TYPED( SvxNumOptionsTabPage, AllLevelHdl_Impl, Edit&, rBox, void )
 {
     for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
     {
@@ -1857,14 +1857,13 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox )
             if(nActNumLvl & nMask)
             {
                 SvxNumberFormat aNumFmt(pActNum->GetLevel(e));
-                aNumFmt.SetIncludeUpperLevels((sal_uInt8) std::min(pBox->GetValue(), sal_Int64(e + 1)) );
+                aNumFmt.SetIncludeUpperLevels((sal_uInt8) std::min(static_cast<NumericField&>(rBox).GetValue(), sal_Int64(e + 1)) );
                 pActNum->SetLevel(e, aNumFmt);
             }
             nMask <<= 1;
         }
     }
     SetModified();
-    return 0;
 }
 
 IMPL_LINK_TYPED( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, void )
@@ -1956,7 +1955,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
                         SVX_NUM_CHARS_LOWER_LETTER_N == nNumberingType;
     m_pStartED->SetMin(bNoZeroAllowed ? 1 : 0);
     if(bIsNull && bNoZeroAllowed)
-        m_pStartED->GetModifyHdl().Call(m_pStartED);
+        m_pStartED->GetModifyHdl().Call(*m_pStartED);
 }
 
 IMPL_LINK_TYPED( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void )
@@ -2021,9 +2020,9 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulColorHdl_Impl, ListBox&, rListBox, voi
     SetModified();
 }
 
-IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField)
+IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, Edit&, rField, void)
 {
-    sal_uInt16 nRelSize = (sal_uInt16)pField->GetValue();
+    sal_uInt16 nRelSize = (sal_uInt16)static_cast<MetricField&>(rField).GetValue();
 
     sal_uInt16 nMask = 1;
     for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -2037,7 +2036,6 @@ IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField)
         nMask <<= 1;
     }
     SetModified();
-    return 0;
 }
 
 IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void )
@@ -2232,9 +2230,9 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void)
     }
 }
 
-IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
+IMPL_LINK_TYPED( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void)
 {
-    bool bWidth = pField == m_pWidthMF;
+    bool bWidth = &rField == m_pWidthMF;
     bLastWidthModified = bWidth;
     bool bRatio = m_pRatioCB->IsChecked();
     long nWidthVal = static_cast<long>(m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_100TH_MM)));
@@ -2297,7 +2295,6 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
         nMask <<= 1;
     }
     SetModified(bRepaint);
-    return 0;
 }
 
 IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void )
@@ -2305,9 +2302,9 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void )
     if (static_cast<CheckBox*>(pBox)->IsChecked())
     {
         if (bLastWidthModified)
-            SizeHdl_Impl(m_pWidthMF);
+            SizeHdl_Impl(*m_pWidthMF);
         else
-            SizeHdl_Impl(m_pHeightMF);
+            SizeHdl_Impl(*m_pHeightMF);
     }
 }
 
@@ -2340,7 +2337,11 @@ IMPL_LINK_NOARG_TYPED( SvxNumOptionsTabPage, EditListBoxHdl_Impl, ListBox&, void
 {
     EditModifyHdl_Impl(nullptr);
 }
-IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit )
+IMPL_LINK_TYPED( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit&, rEdit, void )
+{
+    EditModifyHdl_Impl(&rEdit);
+}
+void SvxNumOptionsTabPage::EditModifyHdl_Impl( Edit* pEdit )
 {
     bool bPrefix = pEdit == m_pPrefixED;
     bool bSuffix = pEdit == m_pSuffixED;
@@ -2372,8 +2373,6 @@ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit )
         nMask <<= 1;
     }
     SetModified();
-
-    return 0;
 }
 
 static sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sal_uInt16 nXStart,
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 9310f1642371..5f379daf7280 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -422,7 +422,7 @@ void SvxPageDescPage::Init_Impl()
     m_pLandscapeBtn->SetClickHdl(     LINK( this, SvxPageDescPage, SwapOrientation_Impl ) );
     m_pPortraitBtn->SetClickHdl(      LINK( this, SvxPageDescPage, SwapOrientation_Impl ) );
 
-    Link<> aLink = LINK( this, SvxPageDescPage, BorderModify_Impl );
+    Link<Edit&,void> aLink = LINK( this, SvxPageDescPage, BorderModify_Impl );
     m_pLeftMarginEdit->SetModifyHdl( aLink );
     m_pRightMarginEdit->SetModifyHdl( aLink );
     m_pTopMarginEdit->SetModifyHdl( aLink );
@@ -1057,7 +1057,7 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void )
 
 
 
-IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl)
+IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void)
 {
     sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE );
     SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich );
@@ -1077,7 +1077,6 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl)
         }
     }
     UpdateExample_Impl( true );
-    return 0;
 }
 
 
@@ -1178,12 +1177,11 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
 
 
 
-IMPL_LINK_NOARG(SvxPageDescPage, BorderModify_Impl)
+IMPL_LINK_NOARG_TYPED(SvxPageDescPage, BorderModify_Impl, Edit&, void)
 {
     if ( !bBorderModified )
         bBorderModified = true;
     UpdateExample_Impl();
-    return 0;
 }
 
 void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground )
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 7d9965c57fac..4b0830400560 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -834,10 +834,9 @@ IMPL_LINK_TYPED( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void
     UpdateExample_Impl();
 }
 
-IMPL_LINK_NOARG(SvxStdParagraphTabPage, ModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxStdParagraphTabPage, ModifyHdl_Impl, Edit&, void)
 {
     UpdateExample_Impl();
-    return 0;
 }
 
 void SvxStdParagraphTabPage::Init_Impl()
@@ -850,7 +849,7 @@ void SvxStdParagraphTabPage::Init_Impl()
     m_pLeftIndent->SetLoseFocusHdl( aLink2 );
     m_pRightIndent->SetLoseFocusHdl( aLink2 );
 
-    Link<> aLink = LINK( this, SvxStdParagraphTabPage, ModifyHdl_Impl );
+    Link<Edit&,void> aLink = LINK( this, SvxStdParagraphTabPage, ModifyHdl_Impl );
     m_pFLineIndent->SetModifyHdl( aLink );
     m_pLeftIndent->SetModifyHdl( aLink );
     m_pRightIndent->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 4718180cd14f..5056604dc285 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -564,7 +564,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet&
     m_pVertByMF->SetLoseFocusHdl( aLk3 );
     m_pFollowCB->SetClickHdl( LINK(this, SvxSwPosSizeTabPage, RangeModifyClickHdl) );
 
-    Link<> aLk = LINK(this, SvxSwPosSizeTabPage, ModifyHdl);
+    Link<Edit&,void> aLk = LINK(this, SvxSwPosSizeTabPage, ModifyHdl);
     m_pWidthMF->SetModifyHdl( aLk );
     m_pHeightMF->SetModifyHdl( aLk );
     m_pHoriByMF->SetModifyHdl( aLk );
@@ -1378,18 +1378,18 @@ IMPL_LINK_TYPED( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
     }
 }
 
-IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit )
+IMPL_LINK_TYPED( SvxSwPosSizeTabPage, ModifyHdl, Edit&, rEdit, void )
 {
     sal_Int64 nWidth = m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_TWIP));
     sal_Int64 nHeight = m_pHeightMF->Denormalize(m_pHeightMF->GetValue(FUNIT_TWIP));
     if ( m_pKeepRatioCB->IsChecked() )
     {
-        if ( pEdit == m_pWidthMF )
+        if ( &rEdit == m_pWidthMF )
         {
             nHeight = sal_Int64((double)nWidth / m_fWidthHeightRatio);
             m_pHeightMF->SetValue(m_pHeightMF->Normalize(nHeight), FUNIT_TWIP);
         }
-        else if(pEdit == m_pHeightMF)
+        else if(&rEdit == m_pHeightMF)
         {
             nWidth = sal_Int64((double)nHeight * m_fWidthHeightRatio);
             m_pWidthMF->SetValue(m_pWidthMF->Normalize(nWidth), FUNIT_TWIP);
@@ -1397,7 +1397,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit )
     }
     m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0;
     UpdateExample();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, ProtectHdl, Button*, void)
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 066843953d96..20659bdc7f18 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -668,7 +668,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void)
     }
 }
 
-IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, ModifyHdl_Impl, Edit&, void)
 {
     sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
@@ -681,11 +681,10 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl)
 
         m_pNewBtn->Disable();
         m_pDelBtn->Enable();
-        return 0;
+        return;
     }
     m_pNewBtn->Enable();
     m_pDelBtn->Disable();
-    return 0;
 }
 
 void SvxTabulatorTabPage::PageCreated(const SfxAllItemSet& aSet)
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 31d8f9cdda63..35ff35f36152 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -97,7 +97,7 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*,
 
     // preview
     rXFSet.ClearItem (XATTR_FILLFLOATTRANSPARENCE);
-    ModifyTransparentHdl_Impl (NULL);
+    ModifyTransparentHdl_Impl (*m_pMtrTransparent);
 }
 
 IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button*, void)
@@ -143,7 +143,7 @@ void SvxTransparenceTabPage::ActivateLinear(bool bActivate)
     m_pMtrTransparent->Enable(bActivate);
 }
 
-IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifyTransparentHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, Edit&, void)
 {
     sal_uInt16 nPos = (sal_uInt16)m_pMtrTransparent->GetValue();
     XFillTransparenceItem aItem(nPos);
@@ -151,15 +151,17 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifyTransparentHdl_Impl)
 
     // preview
     InvalidatePreview();
-
-    return 0L;
 }
 
 IMPL_LINK_TYPED(SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl, ListBox&, rListBox, void)
 {
     ModifiedTrgrHdl_Impl(&rListBox);
 }
-IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl, void *, pControl)
+IMPL_LINK_TYPED(SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl, Edit&, rBox, void)
+{
+    ModifiedTrgrHdl_Impl(&rBox);
+}
+void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(void* pControl)
 {
     if(pControl == m_pLbTrgrGradientType || pControl == this)
     {
@@ -184,8 +186,6 @@ IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl, void *, pControl)
     rXFSet.Put ( aItem );
 
     InvalidatePreview();
-
-    return 0L;
 }
 
 void SvxTransparenceTabPage::ActivateGradient(bool bActivate)
@@ -291,7 +291,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt
     // gradient transparency
     m_pMtrTrgrEndValue->SetValue( 100 );
     m_pMtrTrgrStartValue->SetValue( 0 );
-    Link<> aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrHdl_Impl);
+    Link<Edit&,void> aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl);
     m_pLbTrgrGradientType->SetSelectHdl( LINK( this, SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl) );
     m_pMtrTrgrCenterX->SetModifyHdl( aLink );
     m_pMtrTrgrCenterY->SetModifyHdl( aLink );
@@ -439,7 +439,7 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs)
     // linear transparence
     sal_uInt16 nTransp = static_cast<const XFillTransparenceItem*>(pLinearItem)->GetValue();
     m_pMtrTransparent->SetValue(bLinearActive ? nTransp : 50);
-    ModifyTransparentHdl_Impl(NULL);
+    ModifyTransparentHdl_Impl(*m_pMtrTransparent);
 
     // select the correct radio button
     if(bGradActive)
@@ -745,9 +745,9 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
     m_pLbBitmap->SetSelectHdl(   LINK( this, SvxAreaTabPage, ModifyBitmapHdl_Impl ) );
 
     m_pTsbStepCount->SetClickHdl( LINK( this, SvxAreaTabPage, ModifyStepCountClickHdl_Impl ) );
-    m_pNumFldStepCount->SetModifyHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) );
+    m_pNumFldStepCount->SetModifyHdl( LINK( this, SvxAreaTabPage, ModifyStepCountEditHdl_Impl ) );
 
-    Link<> aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) );
+    Link<Edit&,void> aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) );
     Link<Button*,void> aClickLink( LINK( this, SvxAreaTabPage, ModifyTileClickHdl_Impl ) );
     m_pTsbTile->SetClickHdl( aClickLink );
     m_pTsbStretch->SetClickHdl( aClickLink );
@@ -1740,7 +1740,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
     m_pTsbOriginal->SetState( eOriginal );
 
     // #93372# Setting proper state after changing button
-    ModifyTileHdl_Impl( NULL );
+    ModifyTileHdl_Impl( *m_pMtrFldXSize );
 
     //aRbtRow
     //aRbtColumn
@@ -2135,7 +2135,7 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl()
     m_pBxBitmap->Show();
 
     ModifyBitmapHdl_Impl( *m_pLbBitmap );
-    ModifyTileHdl_Impl( m_pTsbOriginal );
+    ModifyTileHdl_Impl( *m_pMtrFldXSize );
 }
 
 
@@ -2175,7 +2175,11 @@ IMPL_LINK_TYPED( SvxAreaTabPage, ModifyStepCountClickHdl_Impl, Button*, p, void
 {
     ModifyStepCountHdl_Impl(p);
 }
-IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
+IMPL_LINK_TYPED( SvxAreaTabPage, ModifyStepCountEditHdl_Impl, Edit&, r, void )
+{
+    ModifyStepCountHdl_Impl(&r);
+}
+void SvxAreaTabPage::ModifyStepCountHdl_Impl( void* p )
 {
     if( p == m_pTsbStepCount )
     {
@@ -2200,8 +2204,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
     m_rXFSet.Put( XGradientStepCountItem( nValue ) );
     m_pCtlXRectPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
     m_pCtlXRectPreview->Invalidate();
-
-    return 0L;
 }
 
 IMPL_LINK_NOARG_TYPED( SvxAreaTabPage, ClickImportHdl_Impl, Button*, void )
@@ -2246,9 +2248,9 @@ IMPL_LINK_NOARG_TYPED( SvxAreaTabPage, ClickImportHdl_Impl, Button*, void )
 
 IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileClickHdl_Impl, Button*, void)
 {
-    ModifyTileHdl_Impl(NULL);
+    ModifyTileHdl_Impl(*m_pMtrFldXSize);
 }
-IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileHdl_Impl, Edit&, void)
 {
     TriState eState = m_pTsbTile->GetState();
     if( eState == TRISTATE_TRUE )
@@ -2395,8 +2397,6 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
 
     m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
     m_pCtlBitmapPreview->Invalidate();
-
-    return 0L;
 }
 
 
@@ -2432,17 +2432,17 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ClickScaleHdl_Impl, Button*, void)
         m_pMtrFldYSize->SetLast( 100000 );
     }
 
-    ModifyTileHdl_Impl( NULL );
+    ModifyTileHdl_Impl( *m_pMtrFldXSize );
 }
 
 
 
-void SvxAreaTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt )
+void SvxAreaTabPage::PointChanged( vcl::Window* , RECT_POINT eRcPt )
 {
     m_eRP = eRcPt;
 
     // alignment of the bitmap fill
-    ModifyTileHdl_Impl( pWindow );
+    ModifyTileHdl_Impl( *m_pMtrFldXSize );
 }
 
 void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet)
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 48455fdd16f6..4096920da5f2 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -382,7 +382,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
     m_pLbColorModel->SetSelectHdl(
         LINK( this, SvxColorTabPage, SelectColorModelHdl_Impl ) );
 
-    Link<> aLink = LINK( this, SvxColorTabPage, ModifiedHdl_Impl );
+    Link<Edit&,void> aLink = LINK( this, SvxColorTabPage, ModifiedHdl_Impl );
     m_pR->SetModifyHdl( aLink );
     m_pG->SetModifyHdl( aLink );
     m_pB->SetModifyHdl( aLink );
@@ -656,7 +656,7 @@ VclPtr<SfxTabPage> SvxColorTabPage::Create( vcl::Window* pWindow,
 }
 
 // is called when the content of the MtrFields is changed for color values
-IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ModifiedHdl_Impl, Edit&, void)
 {
     if (eCM == CM_RGB)
     {
@@ -679,8 +679,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl)
     m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
 
     m_pCtlPreviewNew->Invalidate();
-
-    return 0;
 }
 
 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 62f69953475b..ba6e72c8a9c6 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -115,7 +115,7 @@ SvxGradientTabPage::SvxGradientTabPage
     m_pBtnDelete->SetClickHdl(
         LINK( this, SvxGradientTabPage, ClickDeleteHdl_Impl ) );
 
-    Link<> aLink = LINK( this, SvxGradientTabPage, ModifiedHdl_Impl );
+    Link<Edit&,void> aLink = LINK( this, SvxGradientTabPage, ModifiedEditHdl_Impl );
     Link<ListBox&,void> aLink2 = LINK( this, SvxGradientTabPage, ModifiedListBoxHdl_Impl );
     m_pLbGradientType->SetSelectHdl( aLink2 );
     m_pMtrCenterX->SetModifyHdl( aLink );
@@ -405,7 +405,11 @@ IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox
 {
     ModifiedHdl_Impl(&rListBox);
 }
-IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl )
+IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedEditHdl_Impl, Edit&, rBox, void )
+{
+    ModifiedHdl_Impl(&rBox);
+}
+void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl )
 {
     css::awt::GradientStyle eXGS = (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos();
 
@@ -428,8 +432,6 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl )
     m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
 
     m_pCtlPreview->Invalidate();
-
-    return 0L;
 }
 
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 2c6928c46ccc..490be9dbf4d4 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -116,7 +116,7 @@ SvxHatchTabPage::SvxHatchTabPage
 
     m_pLbHatchings->SetSelectHdl( LINK( this, SvxHatchTabPage, ChangeHatchHdl_Impl ) );
 
-    Link<> aLink = LINK( this, SvxHatchTabPage, ModifiedHdl_Impl );
+    Link<Edit&,void> aLink = LINK( this, SvxHatchTabPage, ModifiedEditHdl_Impl );
     Link<ListBox&,void> aLink2 = LINK( this, SvxHatchTabPage, ModifiedListBoxHdl_Impl );
     m_pMtrDistance->SetModifyHdl( aLink );
     m_pMtrAngle->SetModifyHdl( aLink );
@@ -371,7 +371,11 @@ IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, v
 {
     ModifiedHdl_Impl(&rListBox);
 }
-IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
+IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedEditHdl_Impl, Edit&, rEdit, void )
+{
+    ModifiedHdl_Impl(&rEdit);
+}
+void SvxHatchTabPage::ModifiedHdl_Impl( void* p )
 {
     if( p == m_pMtrAngle )
     {
@@ -398,8 +402,6 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
     m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
 
     m_pCtlPreview->Invalidate();
-
-    return 0L;
 }
 
 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 640b30bb84ff..c5bc272373be 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1424,7 +1424,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     {
         sal_uInt16 nTransp = static_cast<const XLineTransparenceItem&>( rAttrs->Get( XATTR_LINETRANSPARENCE ) ).GetValue();
         m_pMtrTransparent->SetValue( nTransp );
-        ChangeTransparentHdl_Impl( NULL );
+        ChangeTransparentHdl_Impl( *m_pMtrTransparent );
     }
     else
         m_pMtrTransparent->SetText( "" );
@@ -1526,10 +1526,9 @@ IMPL_LINK_TYPED( SvxLineTabPage, ChangePreviewListBoxHdl_Impl, ListBox&, rListBo
 {
     ChangePreviewHdl_Impl(&rListBox);
 }
-IMPL_LINK( SvxLineTabPage, ChangePreviewModifyHdl_Impl, void *, pCntrl )
+IMPL_LINK_TYPED( SvxLineTabPage, ChangePreviewModifyHdl_Impl, Edit&, rEdit, void )
 {
-    ChangePreviewHdl_Impl(pCntrl);
-    return 0;
+    ChangePreviewHdl_Impl(&rEdit);
 }
 void SvxLineTabPage::ChangePreviewHdl_Impl(void * pCntrl )
 {
@@ -1600,10 +1599,9 @@ IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartListBoxHdl_Impl, ListBox&, rListBox,
 {
     ChangeStartHdl_Impl(&rListBox);
 }
-IMPL_LINK( SvxLineTabPage, ChangeStartModifyHdl_Impl, void *, p )
+IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartModifyHdl_Impl, Edit&, rEdit, void )
 {
-    ChangeStartHdl_Impl(p);
-    return 0;
+    ChangeStartHdl_Impl(&rEdit);
 }
 void SvxLineTabPage::ChangeStartHdl_Impl( void * p )
 {
@@ -1678,10 +1676,9 @@ IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndListBoxHdl_Impl, ListBox&, rListBox, v
 {
     ChangeEndHdl_Impl(&rListBox);
 }
-IMPL_LINK( SvxLineTabPage, ChangeEndModifyHdl_Impl, void *, p )
+IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndModifyHdl_Impl, Edit&, rEdit, void )
 {
-    ChangeEndHdl_Impl(p);
-    return 0;
+    ChangeEndHdl_Impl(&rEdit);
 }
 void SvxLineTabPage::ChangeEndHdl_Impl( void * p )
 {
@@ -1700,7 +1697,7 @@ void SvxLineTabPage::ChangeEndHdl_Impl( void * p )
 
 
 
-IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void)
 {
     sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue();
     XLineTransparenceItem aItem( nVal );
@@ -1710,8 +1707,6 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl)
     FillXLSet_Impl();
 
     m_pCtlPreview->Invalidate();
-
-    return 0L;
 }
 
 
@@ -1747,10 +1742,10 @@ IMPL_LINK_TYPED( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton, void )
     SymbolSelected(pButton);
 }
 
-IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField)
+IMPL_LINK_TYPED( SvxLineTabPage, SizeHdl_Impl, Edit&, rField, void)
 {
     m_bNewSize = true;
-    bool bWidth = pField == m_pSymbolWidthMF;
+    bool bWidth = &rField == m_pSymbolWidthMF;
     m_bLastWidthModified = bWidth;
     bool bRatio = m_pSymbolRatioCB->IsChecked();
     long nWidthVal = static_cast<long>(m_pSymbolWidthMF->Denormalize(m_pSymbolWidthMF->GetValue(FUNIT_100TH_MM)));
@@ -1792,16 +1787,15 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField)
     }
     m_pCtlPreview->ResizeSymbol(m_aSymbolSize);
     m_aSymbolLastSize=m_aSymbolSize;
-    return 0;
 }
 IMPL_LINK_TYPED( SvxLineTabPage, RatioHdl_Impl, Button*, pBox, void )
 {
     if (static_cast<CheckBox*>(pBox)->IsChecked())
     {
         if (m_bLastWidthModified)
-            SizeHdl_Impl(m_pSymbolWidthMF);
+            SizeHdl_Impl(*m_pSymbolWidthMF);
         else
-            SizeHdl_Impl(m_pSymbolHeightMF);
+            SizeHdl_Impl(*m_pSymbolHeightMF);
     }
 }
 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 2107aef63627..4ed6ca472e1a 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -144,7 +144,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
     Link<ListBox&, void> aLink = LINK( this, SvxLineDefTabPage, SelectTypeListBoxHdl_Impl );
     m_pLbType1->SetSelectHdl( aLink );
     m_pLbType2->SetSelectHdl( aLink );
-    Link<> aLink2 = LINK( this, SvxLineDefTabPage, ChangePreviewHdl_Impl );
+    Link<Edit&,void> aLink2 = LINK( this, SvxLineDefTabPage, ChangePreviewHdl_Impl );
     m_pMtrLength1->SetModifyHdl( aLink2 );
     m_pMtrLength2->SetModifyHdl( aLink2 );
     m_pMtrDistance->SetModifyHdl( aLink2 );
@@ -393,15 +393,13 @@ void SvxLineDefTabPage::SelectLinestyleHdl_Impl(ListBox* p)
 
 
 
-IMPL_LINK_NOARG(SvxLineDefTabPage, ChangePreviewHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangePreviewHdl_Impl, Edit&, void)
 {
     FillDash_Impl();
     m_pCtlPreview->Invalidate();
-
-    return 0L;
 }
 
-IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void)
 {
     if( m_pNumFldNumber1->GetValue() == 0L )
     {
@@ -414,14 +412,12 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl)
         m_pNumFldNumber2->SetFirst( 0L );
     }
 
-    ChangePreviewHdl_Impl( this );
-
-    return 0L;
+    ChangePreviewHdl_Impl( *m_pMtrLength1 );
 }
 
 
 
-IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void)
 {
     if( m_pNumFldNumber2->GetValue() == 0L )
     {
@@ -434,9 +430,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl)
         m_pNumFldNumber1->SetFirst( 0L );
     }
 
-    ChangePreviewHdl_Impl( this );
-
-    return 0L;
+    ChangePreviewHdl_Impl( *m_pMtrLength1 );
 }
 
 
@@ -544,7 +538,7 @@ void  SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p)
             m_pMtrLength2->Reformat();
         }
     }
-    ChangePreviewHdl_Impl( p );
+    ChangePreviewHdl_Impl( *m_pMtrLength1 );
 }
 
 
@@ -728,7 +722,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void)
 
             *pnDashListState |= ChangeType::MODIFIED;
 
-            ChangePreviewHdl_Impl( this );
+            ChangePreviewHdl_Impl( *m_pMtrLength1 );
         }
     }
 
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 4722406423b8..afb9c9306b12 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -161,7 +161,7 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA
 
     m_pTsbShowShadow->SetClickHdl( LINK( this, SvxShadowTabPage, ClickShadowHdl_Impl ) );
     m_pLbShadowColor->SetSelectHdl( LINK( this, SvxShadowTabPage, SelectShadowHdl_Impl ) );
-    Link<> aLink = LINK( this, SvxShadowTabPage, ModifyShadowHdl_Impl );
+    Link<Edit&,void> aLink = LINK( this, SvxShadowTabPage, ModifyShadowHdl_Impl );
     m_pMtrTransparent->SetModifyHdl( aLink );
     m_pMtrDistance->SetModifyHdl( aLink );
 }
@@ -248,7 +248,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
                 rAttribs.Put( aItem );
 
                 m_pCtlXRectPreview->SetRectangleAttributes( rAttribs );
-                ModifyShadowHdl_Impl( this );
+                ModifyShadowHdl_Impl( *m_pMtrTransparent );
             }
             m_nPageType = PT_SHADOW;
         }
@@ -478,7 +478,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
         m_pMtrTransparent->SaveValue();
 
         ClickShadowHdl_Impl( NULL );
-        ModifyShadowHdl_Impl( NULL );
+        ModifyShadowHdl_Impl( *m_pMtrTransparent );
     }
 }
 
@@ -504,16 +504,16 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void)
     }
     m_pCtlPosition->Invalidate();
 
-    ModifyShadowHdl_Impl( NULL );
+    ModifyShadowHdl_Impl( *m_pMtrTransparent );
 }
 
 
 
-IMPL_LINK_TYPED(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, rListBox, void)
+IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, void)
 {
-    ModifyShadowHdl_Impl(&rListBox);
+    ModifyShadowHdl_Impl(*m_pMtrTransparent);
 }
-IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void)
 {
     if( m_pTsbShowShadow->GetState() == TRISTATE_TRUE )
         m_rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
@@ -550,18 +550,16 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl)
     m_pCtlXRectPreview->SetShadowAttributes(m_aXFillAttr.GetItemSet());
     //aCtlXRectPreview.SetFillAttr( aXFillAttr );
     m_pCtlXRectPreview->Invalidate();
-
-    return 0L;
 }
 
 
 
-void SvxShadowTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt )
+void SvxShadowTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt )
 {
     m_eRP = eRcPt;
 
     // repaint shadow
-    ModifyShadowHdl_Impl( pWindow );
+    ModifyShadowHdl_Impl( *m_pMtrTransparent );
 }
 
 void SvxShadowTabPage::PageCreated(const SfxAllItemSet& aSet)
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 9cb7cc69b5fc..f6b1f26af278 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -920,12 +920,12 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs )
 
     if ( m_pMtrWidth->HasFocus() )
     {
-        ChangeWidthHdl( this );
+        ChangeWidthHdl( *m_pMtrWidth );
     }
 
     if ( m_pMtrHeight->HasFocus() )
     {
-        ChangeHeightHdl( this );
+        ChangeHeightHdl( *m_pMtrHeight );
     }
 
     if( !mbPageDisabled )
@@ -1567,7 +1567,7 @@ void SvxPositionSizeTabPage::DisableProtect()
 
 
 
-IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl)
+IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void)
 {
     if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() )
     {
@@ -1586,13 +1586,11 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl)
             m_pMtrWidth->SetUserValue(nWidth, FUNIT_NONE);
         }
     }
-
-    return 0L;
 }
 
 
 
-IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl)
+IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void)
 {
     if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() )
     {
@@ -1611,8 +1609,6 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl)
             m_pMtrHeight->SetUserValue(nHeight, FUNIT_NONE);
         }
     }
-
-    return 0L;
 }