--- a/autodoc/source/parser/cpp/all_toks.hxx +++ b/autodoc/source/parser/cpp/all_toks.hxx @@ -188,12 +187,12 @@ /* just for viewing: class Tok_TypeKey : public cpp::Token // file-> class Tok_Template : public cpp::Token // file class Tok_Namespace : public cpp::Token // file -class Tok_Bracket : public cpp::Token // ueberall -class Tok_Separator : public cpp::Token // ueberall +class Tok_Bracket : public cpp::Token // everywhere +class Tok_Separator : public cpp::Token // everywhere class Tok_Identifier : public cpp::Token // ueberall class Tok_NameSeparator : public cpp::Token // Type, Name class Tok_BuiltInType : public cpp::Token // ueberall class Tok_ConVol : public cpp::Token // class-> class Tok_StorageClass : public cpp::Token // file->, class Tok_OperatorFunctionName : public cpp::Token // class --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -247,7 +246,7 @@ Size( GetOutputSizePixel() ) ); } -// "Import" von baside4.cxx +// "Import" of baside4.cxx void CreateEngineForBasic( StarBASIC* pBasic ); void ModulWindow::CheckCompileBasic() --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -35,7 +34,7 @@ #include #include #include #include -#include // ID's fuer Imagese +#include // ID's for Images #include #include --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1475,7 +1474,7 @@ // The mapping between the old and the new error codes take place by searching // through the table SFX_VB_ErrorTab[]. This is indeed not with good performance, // but it consumes much less memory than corresponding switch blocs. // Because the conversion of error codes has not to be fast. there is no -// binaere search by VB-Error -> SFX-Error. +// binary search by VB Error -> Error SFX. // Map back new error codes to old, Sbx-compatible sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError ) --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -2470,7 +2469,7 @@ } if( !mxUnoAccess.is() ) { - // #51475 mark an invalid objekt kennzeichnen (no mxMaterialHolder) + // #51475 mark to indicate an invalid object (no mxMaterialHolder) return; } --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -2700,9 +2699,9 @@ if( xNameAccess.is() && xNameAccess->hasByName( aUName2 ) ) { Any aAny = xNameAccess->getByName( aUName2 ); - // ATTENTION: Die hier erzeugte Variable darf wegen bei XNameAccess - // nicht als feste Property in das Object aufgenommen werden und - // wird daher nirgendwo gehalten. + // ATTENTION: The variables generated here may account for XNameAccess + // may not be included as a fixed property in the Object and therefore + // won't be kept anywhere. // If this leads to problems, it has to be created synthetically or // a class SbUnoNameAccessProperty, whose existence had to be checked // constantly and which were if necessary thrown away --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -2971,7 +2970,7 @@ SbUnoObjectRef xUnoObj = Impl_CreateUnoStruct( aClassName ); if( !xUnoObj ) return; - // return the objekt + // return the object SbxVariableRef refVar = rPar.Get(0); refVar->PutObject( (SbUnoObject*)xUnoObj ); } --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1993,7 +1992,7 @@ SbModule::Notify( rBC, rHint ); } -// Implementation SbJScriptModule (Basic-Modul fuer JavaScript-Sourcen) +// Implementation SbJScriptModule (Basic module for JavaScript source code) SbJScriptModule::SbJScriptModule( const String& rName ) :SbModule( rName ) { --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -83,7 +82,7 @@ sal_Bool bExplicit; // sal_True: OPTION EXPLICIT sal_Bool bClassModule; // sal_True: OPTION ClassModule StringVector aIfaceVector; // Holds all interfaces implemented by a class module StringVector aRequiredTypes; // Types used in Dim As New outside subs - SbxDataType eDefTypes[26]; // DEFxxx-Datentypen + SbxDataType eDefTypes[26]; // DEFxxx data types SbiParser( StarBASIC*, SbModule* ); sal_Bool Parse(); --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3223,7 +3222,7 @@ // 2 == Minimized // 3 == Maximized -// 10 == Full-Screen (Textmodus-Anwendungen OS/2, WIN95, WNT) -// !!!HACK der WindowStyle wird im Creator an Application::StartApp -// uebergeben. Format: "xxxx2" +// 10 == Full-Screen (Application-TextMode OS/2, WIN95, WNT) +// !!!HACK The WindowStyle will be passed in Creator for +// Application::StartApp. Format: "xxxx2" RTLFUNC(Shell) --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -195,7 +194,7 @@ // Verwaltung &SbiRuntime::StepSTMNT, // beginning of a statement (+Line+Col) // E/A &SbiRuntime::StepOPEN, // (+SvStreamFlags+Flags) - // Objekte + // Objects &SbiRuntime::StepLOCAL, // define local variable (+StringId+Typ) &SbiRuntime::StepPUBLIC, // module global variable (+StringID+Typ) &SbiRuntime::StepGLOBAL, // define global variable (+StringID+Typ) --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -249,7 +248,7 @@ if( pArray ) pRes = pArray->Find( rName, t ); } // ExtendedsSearch in the Object-Array? - // For objects and DontCare is the Objektarray already + // For objects and DontCare is the array of objects already // searched through if( !pRes && ( t == SbxCLASS_METHOD || t == SbxCLASS_PROPERTY ) ) pRes = pObjs->Find( rName, t ); --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1654,7 +1653,7 @@ case SbxERROR: case SbxUSHORT: r << aData.nUShort; break; case SbxOBJECT: - // to save itself as Objektptr doesn't work! + // to save itself as Objectptr does not work! if( aData.pObj ) { if( PTR_CAST(SbxValue,aData.pObj) != this ) --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -44,7 +43,7 @@ TYPEINIT1(SbxVariable,SbxValue) TYPEINIT1(SbxHint,SfxSimpleHint) -extern sal_uInt32 nVarCreator; // in SBXBASE.CXX, fuer LoadData() +extern sal_uInt32 nVarCreator; // in SBXBASE.CXX, for LoadData() #ifdef DBG_UTIL static sal_uIntPtr nVar = 0; #endif --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -173,7 +172,7 @@ void SbxVariable::Broadcast( sal_uIntPtr nHintId ) { if( pCst && !IsSet( SBX_NO_BROADCAST ) ) { - // Because the method could be called from outside, check the Da die Methode von aussen aufrufbar ist, hier noch einmal + // Because the method could be called from outside, check the outside, as the method is accessible from here again // rights here again if( nHintId & SBX_HINT_DATAWANTED ) if( !CanRead() ) --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -416,14 +415,14 @@ { private: StarBASICRef xLib; String aLibName; - String aStorageName; // String reicht, da zur Laufzeit eindeutig. + String aStorageName; // String is clearly long enough String aRelStorageName; String aPassword; BOOL bDoLoad; BOOL bReference; BOOL bPasswordVerified; - BOOL bFoundInPath; // Darf dann nicht neu relativiert werden! + BOOL bFoundInPath; // May not have been made relative! // Lib represents library in new UNO library container Reference< XLibraryContainer > mxScriptCont; --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -486,7 +485,7 @@ BasicLibsBase mpList; size_t current; public: - String aBasicLibPath; // soll eigentlich Member vom Manager werden, aber jetzt nicht inkompatibel! + String aBasicLibPath; // should actually be Member of Manager, but that is not yet compatible! BasicLibInfo* GetObject( size_t i ); void Insert( BasicLibInfo* item, size_t i ); void Clear() { mpList.clear(); } --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -850,7 +849,7 @@ xStdLib->SetName( String::CreateFromAscii(szStdLibName)); pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) ); pSLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH ); - // Speichern lohnt sich nur, wenn sich das Basic aendert. + // Saving is only worthwhile if the basic changes. xStdLib->SetModified( FALSE ); bBasMgrModified = FALSE; } --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -892,12 +891,12 @@ } void BasicManager::ImpMgrNotLoaded( const String& rStorageName ) { - // pErrInf wird nur zerstoert, wenn der Fehler von einem ErrorHandler - // gehandelt wird! + // pErrInf will be destroyed only if the failure of an ErrorHandler + // is handled StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, rStorageName, ERRCODE_BUTTON_OK ); pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_OPENMGRSTREAM, rStorageName ) ); - // Eine STD-Lib erzeugen, sonst macht es Peng! + // An STD-Lib product, otherwise it just looks good BasicLibInfo* pStdLibInfo = CreateLibInfo(); pStdLibInfo->SetLib( new StarBASIC ); StarBASICRef xStdLib = pStdLibInfo->GetLib(); --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -939,9 +938,9 @@ maStorageName = INetURLObject(aStorName, INET_PROT_FILE).GetMainURL( INetURLObject::NO_DECODE ); // #i13114 removed, DBG_ASSERT(aStorageName.Len() != 0, "Bad storage name"); - String aRealStorageName = maStorageName; // fuer relative Pfade, kann durch BaseURL umgebogen werden. + String aRealStorageName = maStorageName; // for relative paths, can be altered/effected by BaseURL. - // Wenn aus Vorlagen geladen wird, gilt nur die BaseURL: + // If this is loaded from templates, then it's only good for BaseURL if ( rBaseURL.Len() ) { INetURLObject aObj( rBaseURL ); --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -990,9 +989,9 @@ } } pLibs->Insert( pInfo, LIST_APPEND ); - // Libs aus externen Dateien sollen erst bei Bedarf geladen werden. - // Aber Referenzen werden gleich geladen, sonst bekommen die Grosskunden - // vielleicht Probleme... + // Libs from external files to be loaded only when needed. + // But references are likewise loaded, otherwise the big customers + // may have problems ... if ( bLoadLibs && pInfo->DoLoad() && ( ( !pInfo->IsExtern() ) || ( pInfo->IsReference() ) ) ) { --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -1144,7 +1143,7 @@ if ( !aStorageName.Len() || ( aStorageName.EqualsAscii(szImbedded) ) ) aStorageName = GetStorageName(); SotStorageRef xStorage; - // Der aktuelle darf nicht nochmal geoffnet werden... + // Do not open the current one again... if ( pCurStorage ) { String aStorName( pCurStorage->GetName() ); --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -1173,7 +1172,7 @@ pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_OPENLIBSTORAGE, pLibInfo->GetLibName() ) ); } else { - // In dem Basic-Storage liegt jede Lib in einem Stream... + // In Basic Storage, each lib is in a stream ... SotStorageStreamRef xBasicStream = xBasicStorage->OpenSotStream( pLibInfo->GetLibName(), eStreamReadMode ); if ( !xBasicStream.Is() || xBasicStream->GetError() ) { --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -1243,7 +1242,7 @@ rStrm.Seek( nPos ); BOOL bProtected = FALSE; if ( nCreator != SBXCR_SBX ) { - // sollte nur bei verschluesselten Streams nicht stimmen. + // This should only be false for encrypted streams. bProtected = TRUE; rStrm.SetCryptMaskKey(szCryptingKey); rStrm.RefreshBuffer(); --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -1263,7 +1262,7 @@ { if( xNew->IsA( TYPE(StarBASIC) ) ) { StarBASIC* pNew = (StarBASIC*)(SbxBase*) xNew; - // Den Parent des alten BASICs uebernehmen + // take over the parent of the old BASICs if( rOldBasic.Is() ) { pNew->SetParent( rOldBasic->GetParent() ); --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -1333,14 +1332,14 @@ SetLibName( nLibId, aNewLibName ); if ( bReference ) { - pLibInfo->GetLib()->SetModified( FALSE ); // Dann nicht speichern + pLibInfo->GetLib()->SetModified( FALSE ); // Then do not save pLibInfo->SetRelStorageName( String() ); pLibInfo->IsReference() = TRUE; } else { - pLibInfo->GetLib()->SetModified( TRUE ); // Muss nach Add gespeichert werden! + pLibInfo->GetLib()->SetModified( TRUE ); // must be saved after adding - pLibInfo->SetStorageName( String::CreateFromAscii(szImbedded) ); // Im BasicManager-Storage speichern + pLibInfo->SetStorageName( String::CreateFromAscii(szImbedded) ); // save in BasicManager-Storage } bBasMgrModified = TRUE; } --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -1389,9 +1388,9 @@ pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_STDLIB, pLibInfo->GetLibName() ) ); return FALSE; } - // Wenn einer der Streams nicht geoeffnet werden kann, ist es kein - // Fehler, es gibt halt noch nichts zum loeschen, weil das Basic noch - // nie geschrieben wurde... + // If one of the streams can not be opened, there is no + // Error, there is just nothing to delete, because even the basic + // was never written ... if ( bDelBasicFromStorage && !pLibInfo->IsReference() && ( !pLibInfo->IsExtern() || SotStorage::IsStorageFile( pLibInfo->GetStorageName() ) ) ) { --- a/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -1442,7 +1441,7 @@ bBasMgrModified = TRUE; if ( pLibInfo->GetLib().Is() ) GetStdLib()->Remove( pLibInfo->GetLib() ); delete pLibs->Remove( pLibInfo ); - return TRUE; // Remove hat geklappt, Del unwichtig. + return TRUE; // Remove worked, Del unimportant. } USHORT BasicManager::GetLibCount() const --- a/clone/binfilter/binfilter/bf_basic/source/classes/image.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/image.cxx @@ -95,10 +94,10 @@ UINT16 nSign, nCount; UINT32 nLen, nOff; Clear(); - // Master-Record einlesen + // read the Master-Record r >> nSign >> nLen >> nCount; ULONG nLast = r.Tell() + nLen; - UINT32 nCharSet; // System-Zeichensatz + UINT32 nCharSet; // System character set UINT32 lDimBase; UINT16 nReserved1; UINT32 nReserved2; --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -192,11 +191,11 @@ //////////////////////////////////////////////////////////////////////////// -// Die StarBASIC-Factory hat einen Hack. Wenn ein SbModule eingerichtet wird, -// wird der Pointer gespeichert und an nachfolgende SbProperties/SbMethods -// uebergeben. Dadurch wird die Modul-Relationship wiederhergestellt. Das -// klappt aber nur, wenn ein Modul geladen wird. Fuer getrennt geladene -// Properties kann es Probleme geben! +// The StartBasic Factory has a hack. If a SbModule is established +// the pointer is stored and subsequent SbProperties / SbMethods +// handed over. Thus, the module relationship is restored. That +// only works when a module is loaded. There can be problems for +// separately loaded Properties. SbxBase* SbiFactory::Create( UINT16 nSbxId, UINT32 nCreator ) { --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -614,12 +613,12 @@ pOLEFAC = new SbOLEFactory; AddFactory( pOLEFAC ); } - // Suche ueber StarBASIC ist immer global + // Search over StarBasic are always global SetFlag( SBX_GBLSEARCH ); } // #51727 SetModified ueberladen, damit der Modified- // Zustand nicht an den Parent weitergegeben wird. void StarBASIC::SetModified( BOOL b ) { SbxBase::SetModified( b ); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -741,7 +740,7 @@ // Init-Code aller Module ausfuehren (auch in inserteten Bibliotheken) void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit ) { OSL_FAIL( "StarBASIC::InitAllModules: dead code!" ); - // Alle Objekte ueberpruefen, ob es sich um ein Basic handelt - // Wenn ja, auch dort initialisieren + // Check if all the objects can handle a Basic + // If so, initialize them there. for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ ) { --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -763,7 +762,7 @@ SbModule* pModule = (SbModule*)pModules->Get( nMod ); if( pModule->pImage ) pModule->pImage->bInit = false; } - // Alle Objekte ueberpruefen, ob es sich um ein Basic handelt - // Wenn ja, auch dort initialisieren + // Check if all the objects can handle a Basic + // If so, initialize them there. for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ ) { --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -774,12 +773,12 @@ pBasic->DeInitAllModules(); } } -// Diese Implementation sucht erst innerhalb der Runtime-Library, dann -// nach einem Element innerhalb eines Moduls. Dieses Element kann eine -// Public-Variable oder ein Entrypoint sein. Wenn nicht gefunden, wird, -// falls nach einer Methode gesucht wird und ein Modul mit dem angege- -// benen Namen gefunden wurde, der Entrypoint "Main" gesucht. Wenn das -// auch nicht klappt, laeuft die traditionelle Suche ueber Objekte an. +// This implementation searches first within the runtime library, then +// for an element within a module. This element could be +// an entry point, or a public variable. If not found, (in case we're +// looking for a method and would find a module with the given name) +// the "Main" entry point will be searched. If that doesn't work, +// then just do a traditional search over the objects. SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t ) { --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -788,7 +787,7 @@ SbxVariable* pRes = NULL; SbModule* pNamed = NULL; // "Extended" search in Runtime Lib - // aber nur, wenn SbiRuntime nicht das Flag gesetzt hat + // but only if SbiRuntime did not set the flag if( !bNoRtl ) { if( t == SbxCLASS_DONTCARE || t == SbxCLASS_OBJECT ) --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -806,8 +805,8 @@ { SbModule* p = (SbModule*) pModules->Get( i ); if( p->IsVisible() ) { - // Modul merken fuer Main()-Aufruf - // oder stimmt etwa der Name ueberein?!? + // Note this module for the call to Main() + // or the name is correct?!? if( p->GetName().EqualsIgnoreCaseAscii( rName ) ) { if( t == SbxCLASS_OBJECT || t == SbxCLASS_DONTCARE ) --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -816,7 +815,7 @@ pRes = p; break; } pNamed = p; } - // Sonst testen, ob das Element vorhanden ist + // Otherwise, test whether the element is present // GBLSEARCH-Flag rausnehmen (wg. Rekursion) USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH; p->ResetFlag( SBX_GBLSEARCH ); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -867,13 +866,13 @@ ? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE ); } // AB: 29.3.96 -// Das Mapping zwischen alten und neuen Fehlercodes erfolgt, indem die Tabelle -// SFX_VB_ErrorTab[] durchsucht wird. Dies ist zwar nicht besonders performant, -// verbraucht aber viel weniger Speicher als entsprechende switch-Bloecke. -// Die Umrechnung von Fehlercodes muss nicht schnell sein, daher auch keine -// binaere Suche bei VB-Error -> SFX-Error. +// The mapping between old and new error codes is done by searching through +// the SFX_VB_ErrorTab[] table. While this is not especially efficient, +// it consumes much less memory than equivalent switch blocks. +// The translation of error codes doesn't need to be fast, and therefore no +// binary search on VB Error -> Error SFX. -// Neue Fehler-Codes auf alte, Sbx-Kompatible zurueckmappen +// New error codes by mapping back to Sbx-Compatible. USHORT StarBASIC::GetVBErrorCode( SbError nError ) { USHORT nRet = 0; --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -911,7 +910,7 @@ nRet = pErrItem->nErrorSFX; break; } else if( pErrItem->nErrorVB > nError ) - break; // kann nicht mehr gefunden werden + break; // can not be found nIndex++; } --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -990,7 +989,7 @@ // Fehlertext basteln MakeErrorText( code, rMsg ); - // Umsetzung des Codes fuer String-Transport in SFX-Error + // code implementation for String-Transport in SFX-Error if( rMsg.Len() ) code = (ULONG)*new StringErrorInfo( code, String(rMsg) ); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sb.cxx @@ -1020,7 +1019,7 @@ if( (c & ERRCODE_CLASS_MASK) == ERRCODE_CLASS_COMPILER ) c = 0; MakeErrorText( c, rMsg ); - // Umsetzung des Codes fuer String-Transport in SFX-Error + // code implementation for String-Transport in SFX-Error if( rMsg.Len() ) code = (ULONG)*new StringErrorInfo( code, String(rMsg) ); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -95,7 +94,7 @@ TYPEINIT1(SbUnoClass,SbxObject) typedef WeakImplHelper1< XAllListener > BasicAllListenerHelper; -// Identifier fuer die dbg_-Properies als Strings anlegen +// Create the identifiers for the dbg_ properties as strings static String ID_DBG_SUPPORTEDINTERFACES( RTL_CONSTASCII_USTRINGPARAM("Dbg_SupportedInterfaces") ); static String ID_DBG_PROPERTIES( RTL_CONSTASCII_USTRINGPARAM("Dbg_Properties") ); static String ID_DBG_METHODS( RTL_CONSTASCII_USTRINGPARAM("Dbg_Methods") ); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -108,7 +107,7 @@ Reference< XComponentContext > getComponentContext_Impl( void ) { static Reference< XComponentContext > xContext; - // Haben wir schon CoreReflection, sonst besorgen + // Did we otherwise get CoreReflection if( !xContext.is() ) { Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -124,12 +123,12 @@ } return xContext; } -// CoreReflection statisch speichern +// statically save CoreReflection Reference< XIdlReflection > getCoreReflection_Impl( void ) { static Reference< XIdlReflection > xCoreReflection; // Haben wir schon CoreReflection, sonst besorgen if( !xCoreReflection.is() ) { Reference< XComponentContext > xContext = getComponentContext_Impl(); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -150,7 +149,7 @@ } return xCoreReflection; } -// CoreReflection statisch speichern +// statically save CoreReflection Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Impl( void ) { static Reference< XHierarchicalNameAccess > xCoreReflection_HierarchicalNameAccess; --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -172,7 +171,7 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl( void ) { static Reference< XHierarchicalNameAccess > xAccess; - // Haben wir schon CoreReflection, sonst besorgen + // Did we get otherwise get CoreReflection if( !xAccess.is() ) { Reference< XComponentContext > xContext = getComponentContext_Impl(); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -277,7 +276,7 @@ String aMsg = implGetExceptionMsg( e, String() ); return aMsg; } -// Error-Message fuer WrappedTargetExceptions +// Error message for WrappedTargetExceptions String implGetWrappedMsg( WrappedTargetException& e ) { String aMsg; --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -324,7 +323,7 @@ } StarBASIC::Error( nError, aMessage ); } -// Von Uno nach Sbx wandeln +// go from Uno to Sbx SbxDataType unoToSbxType( TypeClass eType ) { SbxDataType eRetType = SbxVOID; --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -468,7 +467,7 @@ String aName; SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aClassAny ); SbxObjectRef xWrapper = (SbxObject*)pSbUnoObject; - // #51475 Wenn das Objekt ungueltig ist null liefern + // #51475 If the object is invalid return NULL if( pSbUnoObject->getUnoAny().getValueType().getTypeClass() == TypeClass_VOID ) { pVar->PutObject( NULL ); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -479,7 +478,7 @@ pVar->PutObject( xWrapper ); } } break; - // Interfaces und Structs muessen in ein SbUnoObject gewrappt werden + // Structs and interfaces have to be wrapped in a SbUnoObject case TypeClass_INTERFACE: case TypeClass_STRUCT: case TypeClass_EXCEPTION: --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -512,7 +511,7 @@ String aName; SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue ); SbxObjectRef xWrapper = (SbxObject*)pSbUnoObject; - // #51475 Wenn das Objekt ungueltig ist null liefern + // #51475 If the object is invalid return NULL if( pSbUnoObject->getUnoAny().getValueType().getTypeClass() == TypeClass_VOID ) { pVar->PutObject( NULL ); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -607,7 +606,7 @@ default: pVar->PutEmpty(); break; } } -// Reflection fuer Sbx-Typen liefern +// return Reflection for Sbx types Type getUnoTypeForSbxBaseType( SbxDataType eType ) { Type aRetType = getCppuVoidType(); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -640,7 +639,7 @@ } return aRetType; } -// Konvertierung von Sbx nach Uno ohne bekannte Zielklasse fuer TypeClass_ANY +// Converting from Sbx to Uno without a known target class for TypeClass_ANY Type getUnoTypeForSbxValue( SbxValue* pVal ) { Type aRetType = getCppuVoidType(); --- a/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx +++ b/clone/binfilter/binfilter/bf_basic/source/classes/sbunoobj.cxx @@ -673,8 +672,8 @@ if( nDims == 1 && pArray->GetDim32( 1, nLower, nUpper ) ) { if( eElementTypeClass == TypeClass_VOID || eElementTypeClass == TypeClass_ANY ) { - // Wenn alle Elemente des Arrays vom gleichen Typ sind, wird - // der genommen, sonst wird das ganze als Any-Sequence betrachtet + // If all elements of the array are the same type, we'll take it, + // otherwise the whole thing is treated like an Any-Sequence sal_Bool bNeedsInit = sal_True; INT32 nSize = nUpper - nLower + 1;