[Libreoffice-commits] core.git: rsc/inc rsc/source
Jens Carl
j.carl43 at gmx.de
Fri Mar 31 09:04:25 UTC 2017
rsc/inc/rscall.h | 28 ++++++++++++++--------------
rsc/inc/rscclobj.hxx | 9 ++++-----
rsc/inc/rscdb.hxx | 2 +-
rsc/inc/rscerror.h | 4 ++--
rsc/inc/rscmgr.hxx | 2 +-
rsc/inc/rscpar.hxx | 32 ++++++++++++++++----------------
rsc/inc/rsctree.hxx | 2 +-
rsc/source/parser/rsckey.cxx | 5 ++---
rsc/source/parser/rscyacc.y | 28 ++++++++++++++--------------
rsc/source/res/rscarray.cxx | 6 +++---
rsc/source/rscpp/cpp.h | 2 +-
rsc/source/rscpp/cpp1.c | 6 +++---
rsc/source/rscpp/cpp3.c | 35 +++++++++++++++++------------------
13 files changed, 79 insertions(+), 82 deletions(-)
New commits:
commit e5bbb21b859e4191e323f25eee361a2d8cea6a08
Author: Jens Carl <j.carl43 at gmx.de>
Date: Fri Mar 31 06:37:28 2017 +0000
tdf#39468 Translate German comments
Translate German comments in rsc/
Change-Id: I8133f11566c0717fdfc796b79dca76f2365535ad
Reviewed-on: https://gerrit.libreoffice.org/35957
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index 3a043081658f..1591d1f114e3 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -27,7 +27,7 @@
#include <o3tl/typed_flags_set.hxx>
/******************* T y p e s *******************************************/
-typedef char * CLASS_DATA; // Zeiger auf die Daten einer Klasse
+typedef char * CLASS_DATA; // Pointer to the data of a class
/******************* C l a s s e s F o r w a r d s *********************/
class RscCompiler;
@@ -47,16 +47,16 @@ extern AtomContainer* pHS;
enum class CommandFlags {
NONE = 0x0000,
- Help = 0x0001, // Hilfe anzeigen
- NoPrePro = 0x0002, // kein Preprozesor
- NoSyntax = 0x0004, // keine Syntaxanalyse
- NoLink = 0x0008, // nicht linken
- NoResFile = 0x0010, // keine .res-Datei erzeugen
- Define = 0x0020, // es wurde Definitionen angegeben
- Include = 0x0040, // der Include-Pfad wurde erweitert
- Preload = 0x0200, // Alle Resourcen Preloaden
- SrsDefault = 0x1000, // immer der Default geschrieben
- NoSysResTest = 0x2000 // ueberprueft nicht die Richtigkeit von (bmp, ico, cur)
+ Help = 0x0001, // show help
+ NoPrePro = 0x0002, // no preprocessor
+ NoSyntax = 0x0004, // no parsing
+ NoLink = 0x0008, // no linking
+ NoResFile = 0x0010, // do not create .res file
+ Define = 0x0020, // definitions stated
+ Include = 0x0040, // include path extended
+ Preload = 0x0200, // preload all resources
+ SrsDefault = 0x1000, // always wrote the default
+ NoSysResTest = 0x2000 // do not check the correctness of (bmp, ico, cur)
};
namespace o3tl {
template<> struct typed_flags<CommandFlags> : is_typed_flags<CommandFlags, 0x327f> {};
@@ -88,9 +88,9 @@ struct RSCINST
struct SUBINFO_STRUCT
{
SUBINFO_STRUCT(){ nPos = 0; pClass = nullptr; };
- RscId aId; // Identifier der Resource
- sal_uInt32 nPos; // Position der Resource
- RscTop * pClass; // Klasse des Eintrages
+ RscId aId; // resource identifier
+ sal_uInt32 nPos; // position of resource
+ RscTop * pClass; // class of entry
};
/******************* F u n c t i o n *************************************/
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index c8adca501b6d..61e350773d7d 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.hxx
@@ -26,9 +26,9 @@
/******************* O b j N o d e ***************************************/
class ObjNode : public IdNode
{
- RscId aRscId; // Id der Resource
- CLASS_DATA pRscObj;// pointer to a resourceobject
- RscFileTab::Index lFileKey;// Dateischluessel
+ RscId aRscId; // resource ID
+ CLASS_DATA pRscObj; // pointer to a resourceobject
+ RscFileTab::Index lFileKey;
protected:
using NameNode::Search;
@@ -67,7 +67,7 @@ protected:
public:
using NameNode::Insert;
- ObjNode* pObjBiTree; // Zeiger auf Objektbaum
+ ObjNode* pObjBiTree; // pointer to object tree
RefNode( Atom nTyp );
sal_uInt32 GetId() const override;
void Insert( RefNode* pTN ) //< insert a new node in the b-tree
@@ -81,7 +81,6 @@ public:
ObjNode * GetObjNode() const
{
- // hole pObjBiTree
return pObjBiTree;
}
};
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index b8d3be9d2958..0da0a6dbaac2 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -60,7 +60,7 @@ struct RscSysEntry
class RscTypCont
{
rtl_TextEncoding nSourceCharSet;
- RSCBYTEORDER_TYPE nByteOrder; // Intel oder
+ RSCBYTEORDER_TYPE nByteOrder; // Intel or
OString aLanguage; // output language
std::vector< sal_uInt32 > aLangFallbacks; // language fallback list (entry 0 is language itself)
OString aSearchPath; // search path for bitmap, icon and pointer
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index 6f036eec345e..11a498e96756 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.h
@@ -138,8 +138,8 @@ public:
void LstOut( const char * );
void Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId,
const char * pMessage = nullptr );
- // Dieser Fehler sollte nur im Compilermodus auftreten,
- // das Programm wird mit exit() verlassen
+ // The error should only happen in compile mode,
+ // the program will terminated with exit()
void FatalError( const ERRTYPE& rError, const RscId &aId,
const char * pMessage = nullptr );
};
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index ad1ca97d7d5e..3bd159a901ec 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -31,7 +31,7 @@ class RscMgr : public RscClass
struct RscMgrInst
{
RscId aRefId; // nRefId = Referenz Identifier
- bool bDflt; // Ist Default
+ bool bDflt; // default
void Create(){ aRefId.Create(); bDflt = true; }
void Destroy(){ aRefId.Destroy(); }
};
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index a299af4a20ed..e0c3e861e525 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -30,26 +30,26 @@ class RscTypCont;
class RscFileInst
{
- ERRTYPE aFirstError;// Erster Fehler
- sal_uInt32 nErrorLine; // Zeile des ersten Fehlers
- sal_uInt32 nErrorPos; // Position des ersten Fehlers
- sal_uInt32 nLineNo; // Zeile in der Eingabedatei
- RscFileTab::Index lFileIndex; // Index auf Eingabedatei
- RscFileTab::Index lSrcIndex; // Index auf Basisdatei
- FILE * fInputFile; // Eingabedatei
- char * pInput; // Lesepuffer
- static const sal_uInt32 nInputBufLen = READBUFFER_MAX; // Laenge des Lesepuffers
- sal_uInt32 nInputPos; // Position im Lesepuffer
- sal_uInt32 nInputEndPos;// Ende im Lesepuffer
- char * pLine; // Zeile
- sal_uInt32 nLineBufLen;//Lange des Zeilenpuffres
- sal_uInt32 nScanPos; // Position in der Zeile
+ ERRTYPE aFirstError;
+ sal_uInt32 nErrorLine;
+ sal_uInt32 nErrorPos;
+ sal_uInt32 nLineNo; // line in input file
+ RscFileTab::Index lFileIndex; // index input file
+ RscFileTab::Index lSrcIndex; // index base file
+ FILE * fInputFile;
+ char * pInput; // read buffer
+ static const sal_uInt32 nInputBufLen = READBUFFER_MAX;
+ sal_uInt32 nInputPos;
+ sal_uInt32 nInputEndPos;
+ char * pLine;
+ sal_uInt32 nLineBufLen;
+ sal_uInt32 nScanPos; // line position
int cLastChar;
bool bEof;
public:
RscTypCont * pTypCont;
- void Init(); // ctor initialisieren
+ void Init(); // init ctor
RscFileInst( RscTypCont * pTC, RscFileTab::Index lIndexSrc,
RscFileTab::Index lFileIndex, FILE * fFile );
~RscFileInst();
@@ -67,7 +67,7 @@ public:
pLine[ nScanPos++ ] : GetChar();
}
void GetNewLine();
- // Fehlerbehandlung
+ // error handling
void SetError( ERRTYPE aError );
};
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index c6de94993a81..47dffeb66a5a 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -30,7 +30,7 @@ protected:
NameNode* pLeft; // left subtree
NameNode* pRight; // right subtree
- // pCmp ist Zeiger auf Namen
+ // pCmp is pointer to names
NameNode* Search( const void * pCmp ) const;
// convert a double linked list into a binary tree
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, ";" );
More information about the Libreoffice-commits
mailing list