mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.23.6); FILE MERGED

Browse Source 
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
This commit is contained in:
Jens-Heiner Rechtien
2006-06-19 16:46:38 +00:00
parent 94934a8eaa
commit 63a7dd9d13
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
basic/source/runtime/runtime.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: runtime.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -44,10 +44,8 @@
#ifndef _ZFORLIST_HXX //autogen #ifndef _ZFORLIST_HXX //autogen
#include <svtools/zforlist.hxx> #include <svtools/zforlist.hxx>
#endif #endif
#include <sbx.hxx>
#include <svtools/syslocale.hxx> #include <svtools/syslocale.hxx>
#include "runtime.hxx" #include "runtime.hxx"
#pragma hdrstop
#include "sbintern.hxx" #include "sbintern.hxx"
#include "opcodes.hxx" #include "opcodes.hxx"
#include "codegen.hxx" #include "codegen.hxx"
@@ -503,8 +501,8 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth )
// Achtung: pMeth kann auch NULL sein (beim Aufruf des Init-Codes) // Achtung: pMeth kann auch NULL sein (beim Aufruf des Init-Codes)
SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, USHORT nStart ) 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; nFlags = pe ? pe->GetDebugFlags() : 0;
pIosys = pInst->pIosys; pIosys = pInst->pIosys;
@@ -1005,7 +1003,7 @@ void SbiRuntime::PushForEach()
return; return;
} }
bool bError = false; bool bError_ = false;
BasicCollection* pCollection; BasicCollection* pCollection;
SbxDimArray* pArray; SbxDimArray* pArray;
SbUnoObject* pUnoObj; SbUnoObject* pUnoObj;
@@ -1044,15 +1042,15 @@ void SbiRuntime::PushForEach()
} }
else else
{ {
bError = true; bError_ = true;
} }
} }
else else
{ {
bError = true; bError_ = true;
} }
if( bError ) if( bError_ )
{ {
Error( SbERR_CONVERSION ); Error( SbERR_CONVERSION );
return; return;