basic: used typed LINKs

Change-Id: I8770a782e7ff5529e30aee13558711bdd8a4070d

4 files changed, 18 insertions, 18 deletions

diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 1638e057aed6..f8ac9f8510d6 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -125,7 +125,7 @@ class MacroSnippet
         return !mbError;
     }
 
-    DECL_LINK( BasicErrorHdl, StarBASIC * );
+    DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool );
 
     static ErrorDetail GetError()
     {
@@ -140,18 +140,18 @@ class MacroSnippet
 
     void ResetError()
     {
-        StarBASIC::SetGlobalErrorHdl( Link<>() );
+        StarBASIC::SetGlobalErrorHdl( Link<StarBASIC*,bool>() );
         mbError = false;
     }
 };
 
-IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/)
+IMPL_LINK_TYPED( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
 {
     fprintf(stderr,"(%d:%d)\n",
             StarBASIC::GetLine(), StarBASIC::GetCol1());
     fprintf(stderr,"Basic error: %s\n", OUStringToOString( StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
     mbError = true;
-    return 0;
+    return false;
 }
 #endif
 
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 336505396c58..01e6d9475b7b 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1486,7 +1486,7 @@ sal_uInt16 StarBASIC::BreakPoint( sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
     bBreak = true;
     if( GetSbData()->aBreakHdl.IsSet() )
     {
-        return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
+        return GetSbData()->aBreakHdl.Call( this );
     }
     else
     {
@@ -1500,7 +1500,7 @@ sal_uInt16 StarBASIC::StepPoint( sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
     bBreak = false;
     if( GetSbData()->aBreakHdl.IsSet() )
     {
-        return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
+        return GetSbData()->aBreakHdl.Call( this );
     }
     else
     {
@@ -1510,7 +1510,7 @@ sal_uInt16 StarBASIC::StepPoint( sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
 
 sal_uInt16 StarBASIC::BreakHdl()
 {
-    return (sal_uInt16) ( aBreakHdl.IsSet() ? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE );
+    return aBreakHdl.IsSet() ? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE;
 }
 
 // Calls for error handler and break handler
@@ -1721,7 +1721,7 @@ bool StarBASIC::CError( SbError code, const OUString& rMsg,
     bool bRet;
     if( GetSbData()->aErrHdl.IsSet() )
     {
-        bRet = (bool) GetSbData()->aErrHdl.Call( this );
+        bRet = GetSbData()->aErrHdl.Call( this );
     }
     else
     {
@@ -1769,7 +1769,7 @@ bool StarBASIC::RTError( SbError code, const OUString& rMsg, sal_Int32 l, sal_In
     SetErrorData( code, l, c1, c2 );
     if( GetSbData()->aErrHdl.IsSet() )
     {
-        return (bool) GetSbData()->aErrHdl.Call( this );
+        return GetSbData()->aErrHdl.Call( this );
     }
     else
     {
@@ -1848,17 +1848,17 @@ bool StarBASIC::ErrorHdl()
     return aErrorHdl.IsSet() && aErrorHdl.Call( this );
 }
 
-Link<> StarBASIC::GetGlobalErrorHdl()
+Link<StarBASIC*,bool> StarBASIC::GetGlobalErrorHdl()
 {
     return GetSbData()->aErrHdl;
 }
 
-void StarBASIC::SetGlobalErrorHdl( const Link<>& rLink )
+void StarBASIC::SetGlobalErrorHdl( const Link<StarBASIC*,bool>& rLink )
 {
     GetSbData()->aErrHdl = rLink;
 }
 
-void StarBASIC::SetGlobalBreakHdl( const Link<>& rLink )
+void StarBASIC::SetGlobalBreakHdl( const Link<StarBASIC*,sal_uInt16>& rLink )
 {
     GetSbData()->aBreakHdl = rLink;
 }
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index a5b487c9cc70..568340e6782b 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1724,7 +1724,7 @@ bool SbModule::ExceedsLegacyModuleSize()
 
 class ErrorHdlResetter
 {
-    Link<>  mErrHandler;
+    Link<StarBASIC*,bool> mErrHandler;
     bool    mbError;
 public:
     ErrorHdlResetter() : mbError( false )
@@ -1739,14 +1739,14 @@ public:
         // restore error handler
         StarBASIC::SetGlobalErrorHdl(mErrHandler);
     }
-    DECL_LINK( BasicErrorHdl, StarBASIC * );
+    DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool );
     bool HasError() { return mbError; }
 };
 
-IMPL_LINK( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/)
+IMPL_LINK_TYPED( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
 {
     mbError = true;
-    return 0;
+    return false;
 }
 
 void SbModule::GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache)
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index a82674ed5527..931ad30f9ed7 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -91,8 +91,8 @@ struct SbiGlobals
     SbModule*       pMod;           // currently active module
     SbModule*       pCompMod;       // currently compiled module
     short           nInst;          // number of BASICs
-    Link<>          aErrHdl;        // global error handler
-    Link<>          aBreakHdl;      // global break handler
+    Link<StarBASIC*,bool>        aErrHdl;        // global error handler
+    Link<StarBASIC*,sal_uInt16>  aBreakHdl;      // global break handler
     SbError         nCode;
     sal_Int32       nLine;
     sal_Int32       nCol1,nCol2;    // from... to...