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

Noel Grandin noelgrandin at gmail.com
Tue Sep 22 11:57:03 PDT 2015


 include/svtools/svparser.hxx      |    4 ++--
 svtools/source/svrtf/svparser.cxx |    4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit f378e1748f0645481a8b2deebd7bb2b34797aff7
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Tue Sep 22 15:27:33 2015 +0200

    convert Link<> to typed
    
    Change-Id: Iccdfc807447c18c2929cc93bcb11d32b3659d666
    Reviewed-on: https://gerrit.libreoffice.org/18774
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index f4c04f5..7c595fb 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -44,7 +44,7 @@ enum SvParserState
 
 class SVT_DLLPUBLIC SvParser : public SvRefBase
 {
-    DECL_LINK( NewDataRead, void* );
+    DECL_LINK_TYPED( NewDataRead, LinkParamNone*, void );
 
 protected:
     SvStream&           rInput;
@@ -134,7 +134,7 @@ public:
 
     inline bool IsParserWorking() const { return SVPAR_WORKING == eState; }
 
-    Link<> GetAsynchCallLink() const
+    Link<LinkParamNone*,void> GetAsynchCallLink() const
         { return LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); }
 
     // for asynchronous reading from the SvStream
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 2a76863..241688d 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -606,7 +606,7 @@ void SvParser::BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
 }
 
 
-IMPL_LINK_NOARG( SvParser, NewDataRead )
+IMPL_LINK_NOARG_TYPED( SvParser, NewDataRead, LinkParamNone*, void )
 {
     switch( eState )
     {
@@ -640,8 +640,6 @@ IMPL_LINK_NOARG( SvParser, NewDataRead )
         ReleaseRef();                    // ready otherwise!
         break;
     }
-
-    return 0;
 }
 
 /*========================================================================


More information about the Libreoffice-commits mailing list