diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 16:28:40 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 18:45:13 +0100 |
commit | 5c3eca5e84f25aff0af6586cb6bf85a25bec81b3 (patch) | |
tree | fe1ac79aa95b867ab0bf04bdd173bf8a30841784 | |
parent | dfddb1d3029e1f129e94b5a2e802f32dd03fe188 (diff) |
bool improvements
Change-Id: Ia5ab74b8a8b367ea92f29eb6269ef0ede47f09bb
-rw-r--r-- | basctl/source/basicide/baside2.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/baside2.hxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/basides1.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/basobj3.cxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/basidesh.hxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 0acfe05e5380..57379a70e28c 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -653,7 +653,7 @@ void ModulWindow::ManageBreakPoints() } -long ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) +bool ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) { DBG_CHKTHIS( ModulWindow, 0 ); GoOnTop(); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index a1e23ba74a7f..e4dfc8037bfa 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -376,7 +376,7 @@ public: void BasicAddWatch(); void BasicRemoveWatch(); - long BasicErrorHdl( StarBASIC* pBasic ); + bool BasicErrorHdl( StarBASIC* pBasic ); long BasicBreakHdl( StarBASIC* pBasic ); void AssertValidEditEngine(); diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 6fcf7a99979f..38317e09a4ab 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1113,9 +1113,9 @@ BaseWindow* Shell::FindWindow( return 0; } -long Shell::CallBasicErrorHdl( StarBASIC* pBasic ) +bool Shell::CallBasicErrorHdl( StarBASIC* pBasic ) { - long nRet = 0; + bool nRet = false; ModulWindow* pModWin = ShowActiveModuleWindow( pBasic ); if ( pModWin ) nRet = pModWin->BasicErrorHdl( pBasic ); diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 9bddbad4ca44..651798d50196 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -458,7 +458,7 @@ long HandleBasicError( StarBASIC* pBasic ) } if ( pShell ) - nRet = pShell->CallBasicErrorHdl( pBasic ); + nRet = long(pShell->CallBasicErrorHdl( pBasic )); else ErrorHandler::HandleError( StarBASIC::GetErrorCode() ); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index a571d77f6278..9f1f0a3f462e 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -190,7 +190,7 @@ public: virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); - long CallBasicErrorHdl( StarBASIC* pBasic ); + bool CallBasicErrorHdl( StarBASIC* pBasic ); long CallBasicBreakHdl( StarBASIC* pBasic ); BaseWindow* FindWindow( const ScriptDocument& rDocument, const OUString& rLibName = OUString(), const OUString& rName = OUString(), ItemType nType = TYPE_UNKNOWN, bool bFindSuspended = false ); |