summaryrefslogtreecommitdiff
path: root/basic/source/classes
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-23 12:31:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-24 08:05:55 +0200
commit06dd5b9c9e34ad932b0a111c0ecb9f1e99008a19 (patch)
treeeb0b6b1a7fca8a1747745541a048cacfd2fb092e /basic/source/classes
parentb367c81d06f64e500063ebb814eda5e8d55309ca (diff)
convert SbDEBUG constants to o3tl::typed_flags
Change-Id: Ifcada5684bacae46ec90c5ce3e58980860fee29f
Diffstat (limited to 'basic/source/classes')
-rw-r--r--basic/source/classes/sb.cxx10
-rw-r--r--basic/source/classes/sbxmod.cxx20
2 files changed, 15 insertions, 15 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index b4e21a4c6e71..d03eaa35c34b 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1430,7 +1430,7 @@ SbModule* StarBASIC::GetActiveModule()
}
}
-sal_uInt16 StarBASIC::BreakPoint( sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
+BasicDebugFlags StarBASIC::BreakPoint( sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
{
SetErrorData( 0, l, c1, c2 );
bBreak = true;
@@ -1444,7 +1444,7 @@ sal_uInt16 StarBASIC::BreakPoint( sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
}
}
-sal_uInt16 StarBASIC::StepPoint( sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
+BasicDebugFlags StarBASIC::StepPoint( sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
{
SetErrorData( 0, l, c1, c2 );
bBreak = false;
@@ -1458,9 +1458,9 @@ sal_uInt16 StarBASIC::StepPoint( sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
}
}
-sal_uInt16 StarBASIC::BreakHdl()
+BasicDebugFlags StarBASIC::BreakHdl()
{
- return aBreakHdl.IsSet() ? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE;
+ return aBreakHdl.IsSet() ? aBreakHdl.Call( this ) : BasicDebugFlags::Continue;
}
// Calls for error handler and break handler
@@ -1802,7 +1802,7 @@ void StarBASIC::SetGlobalErrorHdl( const Link<StarBASIC*,bool>& rLink )
GetSbData()->aErrHdl = rLink;
}
-void StarBASIC::SetGlobalBreakHdl( const Link<StarBASIC*,sal_uInt16>& rLink )
+void StarBASIC::SetGlobalBreakHdl( const Link<StarBASIC*,BasicDebugFlags>& rLink )
{
GetSbData()->aBreakHdl = rLink;
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index fef122064dc2..8b5b97ec3cc8 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1181,10 +1181,10 @@ void SbModule::Run( SbMethod* pMeth )
GetSbData()->pInst->nCallLvl--; // Call-Level down again
// Exist an higher-ranking runtime instance?
- // Then take over SbDEBUG_BREAK, if set
+ // Then take over BasicDebugFlags::Break, if set
SbiRuntime* pRtNext = pRt->pNext;
- if( pRtNext && (pRt->GetDebugFlags() & SbDEBUG_BREAK) )
- pRtNext->SetDebugFlags( SbDEBUG_BREAK );
+ if( pRtNext && (pRt->GetDebugFlags() & BasicDebugFlags::Break) )
+ pRtNext->SetDebugFlags( BasicDebugFlags::Break );
delete pRt;
GetSbData()->pMod = pOldMod;
@@ -1558,9 +1558,9 @@ bool SbModule::SetBP( sal_uInt16 nLine )
}
pBreaks->insert( pBreaks->begin() + i, nLine );
- // #38568: Set during runtime as well here SbDEBUG_BREAK
+ // #38568: Set during runtime as well here BasicDebugFlags::Break
if( GetSbData()->pInst && GetSbData()->pInst->pRun )
- GetSbData()->pInst->pRun->SetDebugFlags( SbDEBUG_BREAK );
+ GetSbData()->pInst->pRun->SetDebugFlags( BasicDebugFlags::Break );
return IsBreakable( nLine );
}
@@ -1975,12 +1975,12 @@ SbMethod::SbMethod( const OUString& r, SbxDataType t, SbModule* p )
: SbxMethod( r, t ), pMod( p )
{
bInvalid = true;
- nStart =
- nDebugFlags =
- nLine1 =
+ nStart = 0;
+ nDebugFlags = BasicDebugFlags::NONE;
+ nLine1 = 0;
nLine2 = 0;
- refStatics = new SbxArray;
- mCaller = nullptr;
+ refStatics = new SbxArray;
+ mCaller = nullptr;
// HACK due to 'Referenz could not be saved'
SetFlag( SbxFlagBits::NoModify );
}