summaryrefslogtreecommitdiff
path: root/basic/source/classes
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-14 09:20:01 +0200
committerNoel Grandin <noel@peralex.com>2015-05-19 11:10:54 +0200
commitae451af87d01de3806abf1db474017d002092e4c (patch)
tree6da5249f4a848d186d2c47a7f8c6ddc9ad0f713c /basic/source/classes
parentacc4c466c35e8ca9ca7ce8bd7b90c505061a0fb3 (diff)
basic: used typed LINKs
Change-Id: I8770a782e7ff5529e30aee13558711bdd8a4070d
Diffstat (limited to 'basic/source/classes')
-rw-r--r--basic/source/classes/sb.cxx16
-rw-r--r--basic/source/classes/sbxmod.cxx8
2 files changed, 12 insertions, 12 deletions
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)