diff options
Diffstat (limited to 'rsc/inc')
-rw-r--r-- | rsc/inc/rscall.h | 28 | ||||
-rw-r--r-- | rsc/inc/rscclobj.hxx | 9 | ||||
-rw-r--r-- | rsc/inc/rscdb.hxx | 2 | ||||
-rw-r--r-- | rsc/inc/rscerror.h | 4 | ||||
-rw-r--r-- | rsc/inc/rscmgr.hxx | 2 | ||||
-rw-r--r-- | rsc/inc/rscpar.hxx | 32 | ||||
-rw-r--r-- | rsc/inc/rsctree.hxx | 2 |
7 files changed, 39 insertions, 40 deletions
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 |