diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:46:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:46:38 +0000 |
| commit | 63a7dd9d13c97bc23a0a90d2e477a18e691e0870 (patch) | |
| tree | 0462dae6a9f3d629c243a3d8496ccd1e89dc2dae /basic/source/runtime/runtime.cxx | |
| parent | 94934a8eaaaeabe3fe5c91a45d6d5a2393464efb (diff) | |
INTEGRATION: CWS warnings01 (1.23.6); FILE MERGED
2006/05/23 19:10:47 sb 1.23.6.5: RESYNC: (1.26-1.27); FILE MERGED
2006/01/25 19:13:40 sb 1.23.6.4: RESYNC: (1.24-1.26); FILE MERGED
2005/12/01 14:56:12 ab 1.23.6.3: #i53898# Removed warnings for unxlngi6
2005/11/07 17:39:57 pl 1.23.6.2: RESYNC: (1.23-1.24); FILE MERGED
2005/11/07 12:02:50 ab 1.23.6.1: #i53898# Removed warnings
Diffstat (limited to 'basic/source/runtime/runtime.cxx')
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 25ef562a08de..43591b731e2a 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -4,9 +4,9 @@ * * $RCSfile: runtime.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: rt $ $Date: 2006-05-05 10:13:10 $ + * last change: $Author: hr $ $Date: 2006-06-19 17:46:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,10 +44,8 @@ #ifndef _ZFORLIST_HXX //autogen #include <svtools/zforlist.hxx> #endif -#include <sbx.hxx> #include <svtools/syslocale.hxx> #include "runtime.hxx" -#pragma hdrstop #include "sbintern.hxx" #include "opcodes.hxx" #include "codegen.hxx" @@ -503,8 +501,8 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth ) // Achtung: pMeth kann auch NULL sein (beim Aufruf des Init-Codes) SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, USHORT nStart ) - : pMeth( pe ), pMod( pm ), pImg( pMod->pImage ), - rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ) + : rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ), + pMod( pm ), pMeth( pe ), pImg( pMod->pImage ) { nFlags = pe ? pe->GetDebugFlags() : 0; pIosys = pInst->pIosys; @@ -1005,7 +1003,7 @@ void SbiRuntime::PushForEach() return; } - bool bError = false; + bool bError_ = false; BasicCollection* pCollection; SbxDimArray* pArray; SbUnoObject* pUnoObj; @@ -1044,15 +1042,15 @@ void SbiRuntime::PushForEach() } else { - bError = true; + bError_ = true; } } else { - bError = true; + bError_ = true; } - if( bError ) + if( bError_ ) { Error( SbERR_CONVERSION ); return; |