diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-03-31 06:37:28 +0000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-03-31 09:04:03 +0000 |
commit | e5bbb21b859e4191e323f25eee361a2d8cea6a08 (patch) | |
tree | 1e1cc75a780aec2222232e77746af6b6d28e3c76 /rsc/source | |
parent | bb37c73bdc7544f67d1acb98af6248fb43140ca7 (diff) |
tdf#39468 Translate German comments
Translate German comments in rsc/
Change-Id: I8133f11566c0717fdfc796b79dca76f2365535ad
Reviewed-on: https://gerrit.libreoffice.org/35957
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'rsc/source')
-rw-r--r-- | rsc/source/parser/rsckey.cxx | 5 | ||||
-rw-r--r-- | rsc/source/parser/rscyacc.y | 28 | ||||
-rw-r--r-- | rsc/source/res/rscarray.cxx | 6 | ||||
-rw-r--r-- | rsc/source/rscpp/cpp.h | 2 | ||||
-rw-r--r-- | rsc/source/rscpp/cpp1.c | 6 | ||||
-rw-r--r-- | rsc/source/rscpp/cpp3.c | 35 |
6 files changed, 40 insertions, 42 deletions
diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index 8f3a11f61260..b4758fff6aaa 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -58,7 +58,7 @@ void RscNameTable::SetSort( bool bSorted ) bSort = bSorted; if( bSort && pTable) { - // Schluesselwort Feld sortieren + // sort keyword field qsort( static_cast<void *>(pTable), nEntries, sizeof( KEY_STRUCT ), KeyCompare ); } @@ -111,7 +111,7 @@ bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ) if( bSort ) { - // Suche nach dem Schluesselwort + // search for the keyword aSearchName.nName = nName; pKey = static_cast<KEY_STRUCT *>(bsearch( &aSearchName, pTable, @@ -130,7 +130,6 @@ bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ) if( pKey ) { - // Schluesselwort gefunden *pEle = *pKey; return true; } diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index 4d51eb1c7241..d4cad7f1103c 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -117,7 +117,7 @@ bool DoClassHeader( RSCHEADER * pHeader, bool bMember ) if( bMember ) { - // Angabe von Superklassen oder abgeleiteten Klassen ist jetzt erlaubt + // specification of superclasses or derived classes is now allowed if( S.Top().pClass->InHierarchy( pHeader->pClass ) || pHeader->pClass->InHierarchy( S.Top().pClass) ) { @@ -200,7 +200,7 @@ bool DoClassHeader( RSCHEADER * pHeader, bool bMember ) } RSCINST GetFirstTupelEle( const RSCINST & rTop ) -{ // Aufwaertskompatible, Tupel probieren +{ // upward compatible, test Tupel RSCINST aInst; ERRTYPE aErr; @@ -768,7 +768,7 @@ var_list_header if( aError.IsError() || aError.IsWarning() ) pTC->pEH->Error( aError, S.Top().pClass, RscId() ); if( aError.IsError() ) - { // unbedingt Instanz auf den Stack bringen + { // implicit to get instance on the stack aInst = S.Top().pClass->Create( nullptr, RSCINST() ); } S.Push( aInst ); @@ -818,11 +818,11 @@ var_bodysimple aError = S.Top().pClass->SetNumber( S.Top(), l ); } if( aError.IsError() ) - { // Aufwaertskompatible, Tupel probieren + { // upward compatible, test Tupel RSCINST aInst = GetFirstTupelEle( S.Top() ); if( aInst.pData ) { - aError.Clear(); // Fehler zuruecksetzen + aError.Clear(); // reset error aError = aInst.pClass->SetRef( aInst, RscId( $1 ) ); if( aError.IsError() ) { @@ -844,11 +844,11 @@ var_bodysimple ERRTYPE aError; aError = S.Top().pClass->SetConst( S.Top(), $1.hashid, $1.nValue ); if( aError.IsError() ) - { // Aufwaertskompatible, Tupel probieren + { // upward compatible, test Tupel RSCINST aInst = GetFirstTupelEle( S.Top() ); if( aInst.pData ) { - aError.Clear(); // Fehler zuruecksetzen + aError.Clear(); // reset error aError = aInst.pClass->SetConst( aInst, $1.hashid, $1.nValue ); } } @@ -861,11 +861,11 @@ var_bodysimple ERRTYPE aError; aError = S.Top().pClass->SetNotConst( S.Top(), $2.hashid ); if( aError.IsError() ) - { // Aufwaertskompatible, Tupel probieren + { // upward compatible, test Tupel RSCINST aInst = GetFirstTupelEle( S.Top() ); if( aInst.pData ) { - aError.Clear(); // Fehler zuruecksetzen + aError.Clear(); // reset error aError = aInst.pClass->SetNotConst( aInst, $2.hashid ); } } @@ -878,11 +878,11 @@ var_bodysimple ERRTYPE aError; aError = S.Top().pClass->SetBool( S.Top(), $1 ); if( aError.IsError() ) - { // Aufwaertskompatible, Tupel probieren + { // upward compatible, test Tupel RSCINST aInst = GetFirstTupelEle( S.Top() ); if( aInst.pData ) { - aError.Clear(); // Fehler zuruecksetzen + aError.Clear(); // reset error aError = aInst.pClass->SetBool( aInst, $1 ); } } @@ -895,11 +895,11 @@ var_bodysimple ERRTYPE aError; aError = S.Top().pClass->SetString( S.Top(), $1 ); if( aError.IsError() ) - { // Aufwaertskompatible, Tupel probieren + { // upward compatible, test Tupel RSCINST aInst = GetFirstTupelEle( S.Top() ); if( aInst.pData ) { - aError.Clear(); // Fehler zuruecksetzen + aError.Clear(); // reset error aError = aInst.pClass->SetString( aInst, $1 ); } } @@ -1090,7 +1090,7 @@ macro_expression id_expression : id_expression line_number | macro_expression - { // pExpession auswerten und loeschen + { // evaluate pExpession and delete it if( RSCEXP_EXP == $1.cType ) { sal_Int32 lValue; diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx index de0e8feec0f0..0b86f75a73b3 100644 --- a/rsc/source/res/rscarray.cxx +++ b/rsc/source/res/rscarray.cxx @@ -152,7 +152,7 @@ ERRTYPE RscArray::GetValueEle( const RSCINST & rInst, Atom nId; if( !pTypeClass->GetValueConst( sal_uInt32(lValue), &nId ) ) - { // nicht gefunden + { // not found return ERR_ARRAY_INVALIDINDEX; } @@ -187,7 +187,7 @@ ERRTYPE RscArray::GetArrayEle( const RSCINST & rInst, { sal_Int32 lValue; if( !pTypeClass->GetConstValue( nId, &lValue ) ) - { // nicht gefunden + { // not found return ERR_ARRAY_INVALIDINDEX; } @@ -309,7 +309,7 @@ void RscArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData); if( pTC->IsSrsDefault() ) - { // nur einen Wert schreiben + { // only write one value RscInstNode * pNode = nullptr; if( pClassData->pNode ) { diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index 98ba2072abe3..11524ecfb4be 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -25,7 +25,7 @@ #define FALSE 0 #endif -/* in cpp1.c: file-pointer auf stdout oder file */ +/* in cpp1.c: file-pointer on stdout file file */ extern FILE* pCppOut; /* BP */ #define PUTCHAR( d ) fprintf( pCppOut, "%c", (d) ) /* BP */ #if OSL_DEBUG_LEVEL > 1 diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index d5e8d545ec64..13518a264187 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -27,11 +27,11 @@ FILE* pCppOut = NULL; static FILE* pCppIn = NULL; #if OSL_DEBUG_LEVEL > 1 -FILE* pDefOut = NULL; /* ER evtl. #define's dump */ +FILE* pDefOut = NULL; /* ER possible #define's dump */ #endif #ifdef B200 -/* einzige Moeglichkeit unter BC Stack und Heap festzusetzen */ +/* only possibility under BC to set stack and head */ extern unsigned _stklen = 24000; extern unsigned _heaplen = 30000; #endif @@ -191,7 +191,7 @@ static int nRunde = 0; void InitCpp1() { int i; - /* in der LIB-Version muessen alle Variablen initialisiert werden */ + /* in LIB-Version all variables must be initialized */ line = wrongline = errors = recursion = 0; for( i = 0; i < IDMAX; i++ ) diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index 6e6f87aa59a8..63cdb661674a 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -96,21 +96,20 @@ void setincdirs() #if HOST == SYS_UNKNOWN /* - * Kontext: GenMake - * Unter DOS wird nun auch die Environment-Variable INCLUDE ausgewetet. - * Es kommt erschwerend hinzu, dass alle Eintraege, die mit ';' getrennt - * sind, mit in die Liste aufenommen werden muessen. - * Dies wird mit der Funktion strtok() realisiert. - * Vorsicht bei der Benutzung von malloc !!! - * In savestring wird naemlich getmem() verwendet. Vermutlich kommen sich - * die beiden Funktion in die Quere. Als ich malloc statt savestring - * verwendete knallte es in strcpy() ! + * Context: GenMake + * Under DOS also the environment variable INCLUDE is used. + * To make it difficult all entries separated by ';' have to be + * included in the list and this is done with strtok(). + * Be careful using malloc() !!! + * In savestring() as a matter of fact getmem() is used and probably these + * two functions are getting in the way of each other. + * When I used malloc() instead of savestring() an error occured in strcpy(). */ #if !defined(_WIN32) && !defined(UNX) extern char* getenv( char *pStr ); /* BP */ #endif - char* pIncGetEnv = NULL; /* Pointer auf INCLUDE */ + char* pIncGetEnv = NULL; /* Pointer to INCLUDE */ if ( ( pIncGetEnv = getenv("INCLUDE") ) != NULL ) AddInclude( pIncGetEnv ); @@ -120,18 +119,18 @@ void setincdirs() } -/* Kontext: Erweiterung des INCLUDE-Services - * Bislang konnte der cpp keine Include-Angaben in der Kommandozeile - * vertragen, bei denen die directries mit ';' getrennt wurden. - * Dies ist auch verstaendlich, da dieses cpp fuer UNIX-Systeme - * massgeschneidert wurde und in UNI die ';' als Zeichen zum Abschluss - * von Kommandos gilt. + +/* Context: Extension of the INCLUDE service + * So far the cpp couldn't use include statements in the command line + * where the directories are separated with ';'. + * This totally understandable because this cpp is fitted to UNIX + * systems and under UNIX ';' is used to terminate commandos. */ int AddInclude( char* pIncStr ) { - char* pIncEnv = NULL; /* Kopie des INCLUDE */ - char* pIncPos; /* wandert zum naechsten */ + char* pIncEnv = NULL; /* copy of INCLUDE */ + char* pIncPos; /* goes to the next */ pIncEnv = savestring( pIncStr ); pIncPos = strtok( pIncEnv, ";" ); |