[Libreoffice-commits] core.git: include/editeng include/svx svx/source

[Noel Grandin]

 include/editeng/outliner.hxx  |    4 ++--
 include/svx/svdedxv.hxx       |    2 +-
 svx/source/svdraw/svdedxv.cxx |    5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 32cbfd1addeb37f302ed309e7a383e2cadc84520
Author: Noel Grandin <noelgran...@gmail.com>
Date:   Tue Sep 22 15:11:03 2015 +0200

    convert Link<> to typed
    
    Change-Id: Ifb8ccbbed6d7d00f15fa8cff5dfdcd5d55de0d5f
    Reviewed-on: https://gerrit.libreoffice.org/18773
    Reviewed-by: Noel Grandin <noelgran...@gmail.com>
    Tested-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index c7cc676..77ae2e0 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -215,7 +215,7 @@ private:
     EDITENG_DLLPRIVATE void         ImpPasted( sal_Int32 nStart, sal_Int32 
nPrevParaCount, sal_Int32 nSize);
     EDITENG_DLLPRIVATE sal_Int32    ImpCalcSelectedPages( bool 
bIncludeFirstSelected );
 
-    Link<> aEndCutPasteLink;
+    Link<LinkParamNone*,void> aEndCutPasteLink;
 
 public:
                 OutlinerView( Outliner* pOut, vcl::Window* pWindow );
@@ -376,7 +376,7 @@ public:
     OUString    GetSurroundingText() const;
     Selection   GetSurroundingTextSelection() const;
 
-    void        SetEndCutPasteLinkHdl(const Link<> &rLink) { aEndCutPasteLink 
= rLink; }
+    void        SetEndCutPasteLinkHdl(const Link<LinkParamNone*,void> &rLink) 
{ aEndCutPasteLink = rLink; }
 };
 
 
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index bec7338..0bb7fb6 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -116,7 +116,7 @@ protected:
 
     // Chaining
     void ImpChainingEventHdl();
-    DECL_LINK(ImpAfterCutOrPasteChainingEventHdl,void*);
+    DECL_LINK_TYPED(ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void);
 
 
     // Check if the whole text is selected.
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b922d39..9c88120 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -549,15 +549,14 @@ void SdrObjEditView::ImpChainingEventHdl()
 
 }
 
-IMPL_LINK_NOARG(SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl)
+IMPL_LINK_NOARG_TYPED(SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl, 
LinkParamNone*, void)
 {
     SdrTextObj* pTextObj = dynamic_cast< SdrTextObj * >( GetTextEditObject());
     if (!pTextObj)
-        return 0;
+        return;
     ImpChainingEventHdl();
     TextChainCursorManager *pCursorManager = new TextChainCursorManager(this, 
pTextObj);
     ImpMoveCursorAfterChainingEvent(pCursorManager);
-    return 0;
 }
 
 void SdrObjEditView::ImpMoveCursorAfterChainingEvent(TextChainCursorManager 
*pCursorManager)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits