editeng: make Link<> usage typed

Change-Id: Iec36c7e4f4fbc2ee2ee25d4d0c8488340ba7d8c4
Reviewed-on: https://gerrit.libreoffice.org/16968
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

2 files changed, 19 insertions, 28 deletions

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index dc7f4f688788..88d46504cca4 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -489,7 +489,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerStatusEventHdl,EditStatus*,pEditStat)
     return 0;
 }
 
-IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
+IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,void)
 {
     bool bOk=false;
     OUString& rStr=pFI->GetRepresentation();
@@ -513,15 +513,14 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
         }
     }
     Outliner& rDrawOutl=pMod->GetDrawOutliner(pTextObj);
-    Link<> aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
+    Link<EditFieldInfo*,void> aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
     if (!bOk && aDrawOutlLink.IsSet()) {
         aDrawOutlLink.Call(pFI);
         bOk = !rStr.isEmpty();
     }
     if (!bOk && aOldCalcFieldValueLink.IsSet()) {
-        return aOldCalcFieldValueLink.Call(pFI);
+        aOldCalcFieldValueLink.Call(pFI);
     }
-    return 0;
 }
 
 IMPL_LINK(SdrObjEditView, EndTextEditHdl, SdrUndoManager*, /*pUndoManager*/)
@@ -633,7 +632,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
         // FieldHdl has to be set by SdrBeginTextEdit, because this call an UpdateFields
         pTextEditOutliner->SetCalcFieldValueHdl(LINK(this,SdrObjEditView,ImpOutlinerCalcFieldValueHdl));
         pTextEditOutliner->SetBeginPasteOrDropHdl(LINK(this,SdrObjEditView,BeginPasteOrDropHdl));
-        pTextEditOutliner->SetEndPasteOrDropHdl(LINK(this,SdrObjEditView, EndPasteOrDropHdl));
+        pTextEditOutliner->SetEndPasteOrDropHdl(LINK(this,SdrObjEditView,EndPasteOrDropHdl));
 
         // It is just necessary to make the visualized page known. Set it.
         pTextEditOutliner->setVisualizedPage(pPV->GetPage());
@@ -782,8 +781,8 @@ bool SdrObjEditView::SdrBeginTextEdit(
         else
         {
             pTextEditOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink);
-            pTextEditOutliner->SetBeginPasteOrDropHdl(Link<>());
-            pTextEditOutliner->SetEndPasteOrDropHdl(Link<>());
+            pTextEditOutliner->SetBeginPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
+            pTextEditOutliner->SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
         }
     }
     if (pTextEditOutliner != NULL)
@@ -915,8 +914,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
             // Set old CalcFieldValue-Handler again, this
             // has to happen before Obj::EndTextEdit(), as this does UpdateFields().
             pTEOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink);
-            pTEOutliner->SetBeginPasteOrDropHdl(Link<>());
-            pTEOutliner->SetEndPasteOrDropHdl(Link<>());
+            pTEOutliner->SetBeginPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
+            pTEOutliner->SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
 
             const bool bUndo = IsUndoEnabled();
             if( bUndo )
@@ -1873,16 +1872,14 @@ void SdrObjEditView::MarkListHasChanged()
     }
 }
 
-IMPL_LINK( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos )
+IMPL_LINK_TYPED( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos, void )
 {
     OnEndPasteOrDrop( pInfos );
-    return 0;
 }
 
-IMPL_LINK( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos )
+IMPL_LINK_TYPED( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos, void )
 {
     OnBeginPasteOrDrop( pInfos );
-    return 0;
 }
 
 void SdrObjEditView::OnBeginPasteOrDrop( PasteOrDropInfos* )
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 0f2cca449268..74eebf06590d 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -93,9 +93,9 @@ namespace
         DECL_LINK_TYPED(decomposeBlockTextPrimitive, DrawPortionInfo*, void);
         DECL_LINK_TYPED(decomposeStretchTextPrimitive, DrawPortionInfo*, void);
 
-        DECL_LINK(decomposeContourBulletPrimitive, DrawBulletInfo* );
-        DECL_LINK(decomposeBlockBulletPrimitive, DrawBulletInfo* );
-        DECL_LINK(decomposeStretchBulletPrimitive, DrawBulletInfo* );
+        DECL_LINK_TYPED(decomposeContourBulletPrimitive, DrawBulletInfo*, void);
+        DECL_LINK_TYPED(decomposeBlockBulletPrimitive, DrawBulletInfo*, void);
+        DECL_LINK_TYPED(decomposeStretchBulletPrimitive, DrawBulletInfo*, void);
 
         static bool impIsUnderlineAbove(const vcl::Font& rFont);
         void impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo);
@@ -127,7 +127,7 @@ namespace
             mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeContourBulletPrimitive));
             mrOutliner.StripPortions();
             mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
-            mrOutliner.SetDrawBulletHdl(Link<>());
+            mrOutliner.SetDrawBulletHdl(Link<DrawBulletInfo*,void>());
         }
 
         void decomposeBlockTextPrimitive(
@@ -142,7 +142,7 @@ namespace
             mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeBlockBulletPrimitive));
             mrOutliner.StripPortions();
             mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
-            mrOutliner.SetDrawBulletHdl(Link<>());
+            mrOutliner.SetDrawBulletHdl(Link<DrawBulletInfo*,void>());
         }
 
         void decomposeStretchTextPrimitive(const basegfx::B2DHomMatrix& rNewTransformA, const basegfx::B2DHomMatrix& rNewTransformB)
@@ -153,7 +153,7 @@ namespace
             mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeStretchBulletPrimitive));
             mrOutliner.StripPortions();
             mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
-            mrOutliner.SetDrawBulletHdl(Link<>());
+            mrOutliner.SetDrawBulletHdl(Link<DrawBulletInfo*,void>());
         }
 
         drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence();
@@ -620,34 +620,28 @@ namespace
         }
     }
 
-    IMPL_LINK(impTextBreakupHandler, decomposeContourBulletPrimitive, DrawBulletInfo*, pInfo)
+    IMPL_LINK_TYPED(impTextBreakupHandler, decomposeContourBulletPrimitive, DrawBulletInfo*, pInfo, void)
     {
         if(pInfo)
         {
             impHandleDrawBulletInfo(*pInfo);
         }
-
-        return 0;
     }
 
-    IMPL_LINK(impTextBreakupHandler, decomposeBlockBulletPrimitive, DrawBulletInfo*, pInfo)
+    IMPL_LINK_TYPED(impTextBreakupHandler, decomposeBlockBulletPrimitive, DrawBulletInfo*, pInfo, void)
     {
         if(pInfo)
         {
             impHandleDrawBulletInfo(*pInfo);
         }
-
-        return 0;
     }
 
-    IMPL_LINK(impTextBreakupHandler, decomposeStretchBulletPrimitive, DrawBulletInfo*, pInfo)
+    IMPL_LINK_TYPED(impTextBreakupHandler, decomposeStretchBulletPrimitive, DrawBulletInfo*, pInfo, void)
     {
         if(pInfo)
         {
             impHandleDrawBulletInfo(*pInfo);
         }
-
-        return 0;
     }
 
     drawinglayer::primitive2d::Primitive2DSequence impTextBreakupHandler::getPrimitive2DSequence()