From 894151e80f27c84113b571dda3479ad4b2525686 Mon Sep 17 00:00:00 2001 From: Lucas Satabin Date: Tue, 25 Aug 2015 22:31:58 +0200 Subject: tdf#39468: Translate German comments in core/rsc/source Change-Id: Ia2d94a88d217a3b0ec9c78096b8d74a38216fbc9 Reviewed-on: https://gerrit.libreoffice.org/18066 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- rsc/source/parser/rscdb.cxx | 56 +++++++------- rsc/source/parser/rscicpx.cxx | 167 +++++++++++++++++++++--------------------- rsc/source/parser/rscinit.cxx | 28 +++---- rsc/source/parser/rsclex.cxx | 32 ++++---- rsc/source/parser/rscpar.cxx | 14 ++-- rsc/source/res/rscclass.cxx | 56 +++++++------- rsc/source/res/rsccont.cxx | 16 ++-- rsc/source/res/rscmgr.cxx | 27 ++++--- rsc/source/res/rscrange.cxx | 2 +- rsc/source/res/rscstr.cxx | 8 +- rsc/source/rsc/rsc.cxx | 40 +++++----- rsc/source/tools/rscdef.cxx | 29 ++++---- rsc/source/tools/rsctree.cxx | 17 ++--- 13 files changed, 242 insertions(+), 250 deletions(-) (limited to 'rsc') diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index f58ff3eda8dd..42aa6dac19aa 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -61,7 +61,7 @@ RscTypCont :: RscTypCont( RscError * pErrHdl, , nFlags( nFlagsP ) { nUniqueId = 256; - nPMId = RSC_VERSIONCONTROL +1; //mindestens einen groesser + nPMId = RSC_VERSIONCONTROL +1; // at least one more pEH = pErrHdl; Init(); } @@ -168,13 +168,13 @@ void Pre_dtorTree( RscTop * pRscTop ) RscTypCont :: ~RscTypCont() { - // Alle Unterbaeume loeschen + // delete all subtrees aVersion.pClass->Destroy( aVersion ); rtl_freeMemory( aVersion.pData ); DestroySubTrees( pRoot ); - // Alle Klassen noch gueltig, jeweilige Instanzen freigeben - // BasisTypen + // all classes are still valid, destroy each instance + // of base types for ( size_t i = 0, n = aBaseLst.size(); i < n; ++i ) aBaseLst[ i ]->Pre_dtor(); @@ -188,10 +188,10 @@ RscTypCont :: ~RscTypCont() aString.Pre_dtor(); aWinBits.Pre_dtor(); aVersion.pClass->Pre_dtor(); - // Zusammengesetzte Typen + // sub-types Pre_dtorTree( pRoot ); - // Klassen zerstoeren + // destroy classes delete aVersion.pClass; DestroyTree( pRoot ); @@ -216,9 +216,9 @@ void RscTypCont::ClearSysNames() RscTop * RscTypCont::SearchType( Atom nId ) { - /* [Beschreibung] + /* [Description] - Sucht eine Basistyp nId; + Search for base type nId; */ if( nId == InvalidAtom ) return NULL; @@ -343,10 +343,10 @@ class RscEnumerateObj { friend class RscEnumerateRef; private: - ERRTYPE aError; // Enthaelt den ersten Fehler + ERRTYPE aError; // contains the first field RscTypCont* pTypCont; - FILE * fOutput; // AusgabeDatei - sal_uLong lFileKey; // Welche src-Datei + FILE * fOutput; // output file + sal_uLong lFileKey; // what source file RscTop * pClass; DECL_LINK( CallBackWriteRc, ObjNode * ); @@ -397,45 +397,45 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode ) void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut ) { - // Definition der Struktur, aus denen die Resource aufgebaut ist + // structure definition from which the resource is built /* struct RSHEADER_TYPE{ - sal_uInt32 nId; // Identifier der Resource - sal_uInt32 nRT; // Resource Typ - sal_uInt32 nGlobOff; // Globaler Offset - sal_uInt32 nLocalOff; // Lokaler Offset + sal_uInt32 nId; // resource identifier + sal_uInt32 nRT; // resource type + sal_uInt32 nGlobOff; // global offset + sal_uInt32 nLocalOff; // local offset } aHeader; */ sal_uInt32 nId = rMem.GetLong( 0 ); sal_uInt32 nRT = rMem.GetLong( 4 ); - // Tabelle wird entsprechend gefuellt + // table is filled with with nId and nRT pTypCont->PutTranslatorKey( (sal_uInt64(nRT) << 32) + sal_uInt64(nId) ); if( nRT == RSC_VERSIONCONTROL ) - { // kommt immmer als letztes + { // always comes last sal_Int32 nCount = pTypCont->aIdTranslator.size(); - // groesse der Tabelle + // table size sal_uInt32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(sal_Int32))) + sizeof(sal_Int32); - rMem.Put( nCount ); //Anzahl speichern + rMem.Put( nCount ); // save the count for( std::map< sal_uInt64, sal_uLong >::const_iterator it = pTypCont->aIdTranslator.begin(); it != pTypCont->aIdTranslator.end(); ++it ) { - // Schluessel schreiben + // save the key rMem.Put( it->first ); - // Objekt Id oder Position schreiben + // save the object id or position rMem.Put( (sal_Int32)it->second ); } - rMem.Put( nSize ); // Groesse hinten Speichern + rMem.Put( nSize ); // save the size next } - //Dateioffset neu setzen + // reset the file offset pTypCont->IncFilePos( rMem.Size() ); - //Position wurde vorher in Tabelle geschrieben + // position was written previously in the table bool bSuccess = (1 == fwrite( rMem.GetBuffer(), rMem.Size(), 1, fOut )); SAL_WARN_IF(!bSuccess, "rsc", "short write"); }; @@ -492,7 +492,7 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) aIdTranslator.clear(); nFilePos = 0; - nPMId = RSCVERSION_ID +1; //mindestens einen groesser + nPMId = RSCVERSION_ID +1; // at least one more aError = aEnumRef.WriteRc(); @@ -582,9 +582,9 @@ IMPL_LINK( RscDel, Delete, RscTop *, pNode ) void RscTypCont :: Delete( sal_uLong lFileKey ) { - // Resourceinstanzen loeschen + // delete resource instance RscDel aDel( pRoot, lFileKey ); - // Defines loeschen + // delete defines aFileTab.DeleteFileContext( lFileKey ); } diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 03fe7be6a9f6..16eda4454fb0 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -38,7 +38,7 @@ void RscTypCont::InsWinBit( RscTop * pClass, const OString& rName, { RscClient * pClient; - // Clientvariablen einfuegen + // add client variables aBaseLst.push_back( pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nVal ) ); @@ -63,11 +63,11 @@ RscTop * RscTypCont::InitClassMgr() aNmTb.Put( nId, CLASSNAME, pClassMgr ); pClassMgr->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - // Variablen anlegen + // initialize variables { RscContWriteSrc * pCont; - // Variablen anlegen + // initialize variables aBaseLst.push_back( pCont = new RscContExtraData( pHS->getID( "ContExtradata" ), RSC_NOTYPE ) ); pCont->SetTypeClass( &aShort, &aString ); nRsc_EXTRADATA = nId = aNmTb.Put( "ExtraData", VARNAME ); @@ -91,7 +91,7 @@ RscTop * RscTypCont::InitClassString( RscTop * pSuper ) aNmTb.Put( nId, CLASSNAME, pClassString ); pClassString->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "Text", VARNAME ); pClassString->SetVariable( nId, &aLangString ); return pClassString; @@ -107,8 +107,7 @@ RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper ) pClassBitmap->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); aNmTb.Put( nId, CLASSNAME, pClassBitmap ); - // Die Klasse RscSysDepend behandelt die Variablen - // "FILE" gesondert + // the class RscSysDepend handles variables "FILE" in a specific way nId = aNmTb.Put( "File", VARNAME ); pClassBitmap->SetVariable( nId, &aLangString, NULL, VAR_NORC ); @@ -120,13 +119,13 @@ RscTop * RscTypCont::InitClassColor( RscTop * pSuper, RscEnum * pColor ) Atom nId; RscTop * pClassColor; - // Klasse anlegen + // initialize class nId = pHS->getID( "Color" ); pClassColor = new RscClass( nId, RSC_COLOR, pSuper ); pClassColor->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); aNmTb.Put( nId, CLASSNAME, pClassColor ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "Red", VARNAME ); pClassColor->SetVariable( nId, &aUShort ); nId = aNmTb.Put( "Green", VARNAME ); @@ -145,13 +144,13 @@ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap, Atom nId; RscTop * pClassImage; - // Klasse anlegen + // initialize class nId = pHS->getID( "Image" ); pClassImage = new RscClass( nId, RSC_IMAGE, pSuper ); pClassImage->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); aNmTb.Put( nId, CLASSNAME, pClassImage ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "ImageBitmap", VARNAME ); pClassImage->SetVariable( nId, pClassBitmap, NULL, 0, RSC_IMAGE_IMAGEBITMAP ); nId = aNmTb.Put( "MaskBitmap", VARNAME ); @@ -169,7 +168,7 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, Atom nId; RscTop * pClassImageList; - // Klasse anlegen + // initialize class nId = pHS->getID( "ImageList" ); pClassImageList = new RscClass( nId, RSC_IMAGELIST, pSuper ); pClassImageList->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); @@ -204,13 +203,13 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, Atom nId; RscTop * pClassWindow; - // Klasse anlegen + // initialize class nId = pHS->getID( "Window" ); pClassWindow = new RscClass( nId, RSC_WINDOW, pSuper ); pClassWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassWindow ); - // Variablen anlegen + // initialize variables { RscFlag * pFlag; RscClient * pClient; @@ -218,13 +217,13 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagWndExtra" ), RSC_NOTYPE ) ); - // Konstanten in Tabelle stellen + // set the constants in table nDisableId = pHS->getID( "RSWND_DISABLE" ); SETCONST( pFlag, nDisableId, RSWND_DISABLED ); nOutputSizeId = pHS->getID( "RSWND_OUTPUTSIZE" ); SETCONST( pFlag, nOutputSizeId, RSWND_CLIENTSIZE ); - // Variable einfuegen + // add variable nVarId = aNmTb.Put( "_RscExtraFlags", VARNAME ); pClassWindow->SetVariable( nVarId, pFlag, NULL, VAR_HIDDEN | VAR_NOENUM ); @@ -284,17 +283,17 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, nId = aNmTb.Put( "UniqueId", VARNAME ); pClassWindow->SetVariable( nId, &aString, NULL, 0, WINDOW_UNIQUEID ); - // BorderStyle + // border style RscEnum* pBorderStyleEnum = new RscEnum( pHS->getID( "WindowBorderStyle" ), RSC_NOTYPE ); aBaseLst.push_back( pBorderStyleEnum ); - // Konstanten in Tabelle stellen + // set constants in table SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NORMAL" ), WindowBorderStyle::NORMAL ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MONO" ), WindowBorderStyle::MONO ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MENU" ), WindowBorderStyle::MENU ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NOBORDER" ), WindowBorderStyle::NOBORDER ); - // Variable einfuegen + // add variable nId = aNmTb.Put( "BorderStyle", VARNAME ); pClassWindow->SetVariable( nId, pBorderStyleEnum, NULL, 0, @@ -308,7 +307,7 @@ RscTop * RscTypCont::InitClassSystemWindow( RscTop * pSuper ) Atom nId; RscTop * pClassSystemWindow; - // Klasse anlegen + // initialize class nId = pHS->getID( "SystemWindow" ); pClassSystemWindow = new RscClass( nId, RSC_SYSWINDOW, pSuper ); pClassSystemWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); @@ -330,14 +329,14 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper ) Atom nId; RscTop * pClassWorkWindow; - // Klasse anlegen + // initialize class nId = pHS->getID( "WorkWindow" ); pClassWorkWindow = new RscClass( nId, RSC_WORKWIN, pSuper ); pClassWorkWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassWorkWindow ); - // Variablen anlegen + // initialize variables { Atom nVarId; RscEnum * pShow; @@ -349,7 +348,7 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper ) SETCONST( pShow, "SHOW_MAXIMIZED", WORKWIN_SHOWMAXIMIZED ); - // Variable einfuegen + // add variable nVarId = aNmTb.Put( "Show", VARNAME ); pClassWorkWindow->SetVariable( nVarId, pShow, NULL ); } @@ -362,7 +361,7 @@ RscTop * RscTypCont::InitClassControl( RscTop * pSuper ) Atom nId; RscTop * pClassControl; - // Klasse anlegen + // initialize class nId = pHS->getID( "Control" ); pClassControl = new RscClass( nId, RSC_CONTROL, pSuper ); pClassControl->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); @@ -379,13 +378,13 @@ RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper ) Atom nId; RscTop * pClassCheckBox; - // Klasse anlegen + // initialize class nId = pHS->getID( "CheckBox" ); pClassCheckBox = new RscClass( nId, RSC_CHECKBOX, pSuper ); pClassCheckBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassCheckBox ); - // Variablen anlegen + // initialize variables INS_WINBIT( pClassCheckBox, WordBreak ) INS_WINBIT( pClassCheckBox, Top ) INS_WINBIT( pClassCheckBox, VCenter ) @@ -402,7 +401,7 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper ) Atom nId; RscTop * pClassPushButton; - // Klasse anlegen + // initialize class nId = pHS->getID( "PushButton" ); pClassPushButton = new RscClass( nId, RSC_PUSHBUTTON, pSuper ); pClassPushButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); @@ -423,19 +422,19 @@ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper, Atom nId; RscTop * pClassImageButton; - // Klasse anlegen + // initialize class nId = pHS->getID( "ImageButton" ); pClassImageButton = new RscClass( nId, RSC_IMAGEBUTTON, pSuper ); pClassImageButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassImageButton ); - // Variablen anlegen + // initialize variables { nId = aNmTb.Put( "ButtonImage", VARNAME ); pClassImageButton->SetVariable( nId, pClassImage, NULL, 0, RSC_IMAGEBUTTON_IMAGE ); } - // Variablen anlegen + // initialize variables { Atom nVarId; RscEnum * pSymbol; @@ -467,7 +466,7 @@ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper, SETCONST( pSymbol, "IMAGEBUTTON_WINDBACKWARD", SymbolType::WINDBACKWARD ); SETCONST( pSymbol, "IMAGEBUTTON_WINDFORWARD", SymbolType::WINDFORWARD ); - // Variable einfuegen + // add variable nVarId = aNmTb.Put( "Symbol", VARNAME ); pClassImageButton->SetVariable( nVarId, pSymbol, NULL, 0, RSC_IMAGEBUTTON_SYMBOL ); @@ -488,7 +487,7 @@ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper ) Atom nId; RscTop * pClassEdit; - // Klasse anlegen + // initialize class nId = pHS->getID( "Edit" ); pClassEdit = new RscClass( nId, RSC_EDIT, pSuper ); pClassEdit->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); @@ -511,13 +510,13 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) Atom nId; RscTop * pClassListBox; - // Klasse anlegen + // initialize class nId = pHS->getID( "ListBox" ); pClassListBox = new RscClass( nId, RSC_LISTBOX, pSuper ); pClassListBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassListBox ); - // Variablen anlegen + // initialize variables INS_WINBIT(pClassListBox,Sort) INS_WINBIT(pClassListBox,DropDown) INS_WINBIT(pClassListBox,HScroll); @@ -543,13 +542,13 @@ RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ) Atom nId; RscTop * pClassComboBox; - // Klasse anlegen + // initialize class nId = pHS->getID( "ComboBox" ); pClassComboBox = new RscClass( nId, RSC_COMBOBOX, pSuper ); pClassComboBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassComboBox ); - // Variablen anlegen + // initialize variables INS_WINBIT(pClassComboBox,DropDown) INS_WINBIT(pClassComboBox,Sort) INS_WINBIT(pClassComboBox,HScroll); @@ -569,13 +568,13 @@ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) Atom nId; RscTop * pClassFixedText; - // Klasse anlegen + // initialize class nId = pHS->getID( "FixedText" ); pClassFixedText = new RscClass( nId, RSC_TEXT, pSuper ); pClassFixedText->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassFixedText ); - // Variablen anlegen + // initialize variables INS_WINBIT(pClassFixedText,Left) INS_WINBIT(pClassFixedText,Center) INS_WINBIT(pClassFixedText,Right) @@ -594,13 +593,13 @@ RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage Atom nId; RscTop * pClassFixedImage; - // Klasse anlegen + // initialize class nId = pHS->getID( "FixedImage" ); pClassFixedImage = new RscClass( nId, RSC_FIXEDIMAGE, pSuper ); pClassFixedImage->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassFixedImage ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "Fixed", VARNAME ); pClassFixedImage->SetVariable( nId, pClassImage, 0, 0, RSC_FIXEDIMAGE_IMAGE ); @@ -612,13 +611,13 @@ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper ) Atom nId; RscTop * pClassRadioButton; - // Klasse anlegen + // initialize class nId = pHS->getID( "RadioButton" ); pClassRadioButton = new RscClass( nId, RSC_RADIOBUTTON, pSuper ); pClassRadioButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassRadioButton ); - // Variablen anlegen + // initialize variables INS_WINBIT( pClassRadioButton, WordBreak ) INS_WINBIT( pClassRadioButton, Top ) INS_WINBIT( pClassRadioButton, VCenter ) @@ -635,12 +634,12 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) Atom nId; RscTop * pClassKeyCode; - // Klasse anlegen + // initialize class nId = pHS->getID( "KeyCode" ); pClassKeyCode = new RscClass( nId, RSC_KEYCODE, pSuper ); aNmTb.Put( nId, CLASSNAME, pClassKeyCode ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "Code", VARNAME ); pClassKeyCode->SetVariable( nId, pKey ); @@ -651,7 +650,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagKeyModifier" ), RSC_NOTYPE ) ); - // Konstanten in Tabelle stellen + // set constants in table nShiftId = pHS->getID( "KEY_SHIFT" ); SETCONST( pFlag, nShiftId, KEY_SHIFT ); nMod1Id = pHS->getID( "KEY_MOD1" ); @@ -659,12 +658,12 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) nMod2Id = pHS->getID( "KEY_MOD2" ); SETCONST( pFlag, nMod2Id, KEY_MOD2 ); - // Variable einfuegen + // add variable nVarId = aNmTb.Put( "_ModifierFlags", VARNAME ); pClassKeyCode->SetVariable( nVarId, pFlag, NULL, VAR_HIDDEN | VAR_NOENUM ); - // Clientvariablen einfuegen + // add client variables aBaseLst.push_back( pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nShiftId ) ); @@ -712,7 +711,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) SETCONST( pKeyFunc, "KEYFUNC_PROPERTIES", KeyFuncType::PROPERTIES ); SETCONST( pKeyFunc, "KEYFUNC_FRONT", KeyFuncType::FRONT ); SETCONST( pKeyFunc, "KEYFUNC_FINDBACKWARD", KeyFuncType::FINDBACKWARD ); - // Variable einfuegen + // add variable nVarId = aNmTb.Put( "Function", VARNAME ); pClassKeyCode->SetVariable( nVarId, pKeyFunc, NULL ); } @@ -726,12 +725,12 @@ RscTop * RscTypCont::InitClassAccelItem( RscTop * pSuper, Atom nId; RscTop * pClassAccelItem; - // Klasse anlegen + // initialize class nId = pHS->getID( "AcceleratorItem" ); pClassAccelItem = new RscClass( nId, RSC_ACCELITEM, pSuper ); aNmTb.Put( nId, CLASSNAME, pClassAccelItem ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "Identifier", VARNAME ); pClassAccelItem->SetVariable( nId, &aIdNoZeroUShort ); nId = aNmTb.Put( "Disable", VARNAME ); @@ -748,13 +747,13 @@ RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem ) Atom nId; RscTop * pClassAccel; - // Klasse anlegen + // initialize class nId = pHS->getID( "Accelerator" ); pClassAccel = new RscClass( nId, RSC_ACCEL, pSuper ); pClassAccel->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); aNmTb.Put( nId, CLASSNAME, pClassAccel ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "HelpText", VARNAME ); pClassAccel->SetVariable( nId, &aLangString ); { @@ -778,12 +777,12 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, Atom nId; RscTop * pClassMenuItem; - // Klasse anlegen + // initialize class nId = pHS->getID( "MenuItem" ); pClassMenuItem = new RscClass( nId, RSC_MENUITEM, pSuper ); aNmTb.Put( nId, CLASSNAME, pClassMenuItem ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "Separator", VARNAME ); pClassMenuItem->SetVariable( nId, &aBool, NULL, 0, RSC_MENUITEM_SEPARATOR ); @@ -798,7 +797,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagMenuState" ), RSC_NOTYPE ) ); - // Konstanten in Tabelle stellen + // set constants in table nCheckableId = pHS->getID( "MIB_CHECKABLE" ); SETCONST( pFlag, nCheckableId, MenuItemBits::CHECKABLE ); nAutoCheckId = pHS->getID( "MIB_AUTOCHECK" ); @@ -810,13 +809,13 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, nHelpId = pHS->getID( "MIB_HELP" ); SETCONST( pFlag, nHelpId, MenuItemBits::HELP ); - // Variable einfuegen + // add variable nVarId = aNmTb.Put( "_MenuItemFlags", VARNAME ); pClassMenuItem->SetVariable( nVarId, pFlag, NULL, VAR_HIDDEN | VAR_NOENUM, RSC_MENUITEM_STATUS ); - // Clientvariablen einfuegen + // add client variables aBaseLst.push_back( pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nCheckableId ) ); @@ -887,13 +886,13 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper, Atom nId; RscTop * pClassMenu; - // Klasse anlegen + // initialize class nId = pHS->getID( "Menu" ); pClassMenu = new RscClass( nId, RSC_MENU, pSuper ); pClassMenu->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); aNmTb.Put( nId, CLASSNAME, pClassMenu ); - // Variablen anlegen + // initialize variables { RscCont * pCont; @@ -916,7 +915,7 @@ RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper ) Atom nId; RscTop * pClassSplitWindow; - // Klasse anlegen + // initialize class nId = pHS->getID( "SplitWindow" ); pClassSplitWindow = new RscClass( nId, RSC_SPLITWINDOW, pSuper ); pClassSplitWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); @@ -934,12 +933,12 @@ RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper ) Atom nId; RscTop * pClassNumeric; - // Klasse anlegen + // initialize class nId = pHS->getID( "NumericFormatter" ); pClassNumeric = new RscClass( nId, RSC_NOTYPE, pSuper ); pClassNumeric->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "Minimum", VARNAME ); pClassNumeric->SetVariable( nId, &aIdLong, NULL, 0, NUMERICFORMATTER_MIN ); @@ -968,12 +967,12 @@ RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper, Atom nId; RscTop * pClassMetric; - // Klasse anlegen + // initialize class nId = pHS->getID( "MetricFormatter" ); pClassMetric = new RscClass( nId, RSC_NOTYPE, pSuper ); pClassMetric->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "Unit", VARNAME ); pClassMetric->SetVariable( nId, pFieldUnits, NULL, 0, METRICFORMATTER_UNIT ); @@ -989,7 +988,7 @@ RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper ) Atom nId; RscTop * pClassSpinField; - // Klasse anlegen + // initialize class nId = pHS->getID( "SpinField" ); pClassSpinField = new RscClass( nId, RSC_SPINFIELD, pSuper ); pClassSpinField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); @@ -1007,14 +1006,14 @@ RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper ) Atom nId; RscTop * pClassNumericField; - // Klasse anlegen + // initialize class nId = pHS->getID( "NumericField" ); pClassNumericField = new RscClass( nId, RSC_NUMERICFIELD, pSuper ); pClassNumericField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassNumericField ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "First", VARNAME ); pClassNumericField->SetVariable( nId, &aIdLong, NULL, 0, NUMERICFIELD_FIRST ); @@ -1032,14 +1031,14 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper ) Atom nId; RscTop * pClassMetricField; - // Klasse anlegen + // initialize class nId = pHS->getID( "MetricField" ); pClassMetricField = new RscClass( nId, RSC_METRICFIELD, pSuper ); pClassMetricField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassMetricField ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "First", VARNAME ); pClassMetricField->SetVariable( nId, &aIdLong, NULL, 0, METRICFIELD_FIRST ); @@ -1059,13 +1058,13 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, Atom nId; RscTop * pClassDockWindow; - // Klasse anlegen + // initialize class nId = pHS->getID( "DockingWindow" ); pClassDockWindow = new RscClass( nId, RSC_DOCKINGWINDOW, pSuper ); pClassDockWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassDockWindow ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "_FloatingPosMapMode", VARNAME ); pClassDockWindow->SetVariable( nId, pMapUnit, NULL, 0, RSC_DOCKINGWINDOW_XYMAPMODE ); @@ -1098,12 +1097,12 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, Atom nId; RscTop * pClassToolBoxItem; - // Klasse anlegen + // initialize class nId = pHS->getID( "ToolBoxItem" ); pClassToolBoxItem = new RscClass( nId, RSC_TOOLBOXITEM, pSuper ); aNmTb.Put( nId, CLASSNAME, pClassToolBoxItem ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "Identifier", VARNAME ); pClassToolBoxItem->SetVariable( nId, &aIdNoZeroUShort, NULL, 0, RSC_TOOLBOXITEM_ID ); @@ -1116,7 +1115,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, SETCONST( pEnum, "TOOLBOXITEM_SEPARATOR", ToolBoxItemType::SEPARATOR ); SETCONST( pEnum, "TOOLBOXITEM_BREAK", ToolBoxItemType::BREAK ); - // Variable einfuegen + // add variable nId = aNmTb.Put( "Type", VARNAME ); pClassToolBoxItem->SetVariable( nId, pEnum, NULL, 0, RSC_TOOLBOXITEM_TYPE ); @@ -1128,7 +1127,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagToolBoxState" ), RSC_NOTYPE ) ); - // Konstanten in Tabelle stellen + // set constants in table l_nCheckableId = pHS->getID( "ToolBoxItemBits::CHECKABLE" ); SETCONST( pFlag, l_nCheckableId, ToolBoxItemBits::CHECKABLE ); l_nAutoCheckId = pHS->getID( "ToolBoxItemBits::AUTOCHECK" ); @@ -1142,13 +1141,13 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, l_nDropDownId = pHS->getID( "ToolBoxItemBits::DROPDOWN" ); SETCONST( pFlag, l_nDropDownId, ToolBoxItemBits::DROPDOWN ); - // Variable einfuegen + // add variable l_nVarId = aNmTb.Put( "_ToolBoxItemFlags", VARNAME ); pClassToolBoxItem->SetVariable( l_nVarId, pFlag, NULL, VAR_HIDDEN | VAR_NOENUM, RSC_TOOLBOXITEM_STATUS ); - // Clientvariablen einfuegen + // add client variables aBaseLst.push_back( pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nCheckableId ) ); @@ -1227,13 +1226,13 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, Atom nId; RscTop * pClassToolBox; - // Klasse anlegen + // initialize class nId = pHS->getID( "ToolBox" ); pClassToolBox = new RscClass( nId, RSC_TOOLBOX, pSuper ); pClassToolBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassToolBox ); - // Variablen anlegen + // initialize variables { RscEnum * pEnum; @@ -1242,7 +1241,7 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, SETCONST( pEnum, "BUTTON_TEXT", ButtonType::TEXT ); SETCONST( pEnum, "BUTTON_SYMBOLTEXT", ButtonType::SYMBOLTEXT ); - // Variable einfuegen + // add variable nId = aNmTb.Put( "ButtonType", VARNAME ); pClassToolBox->SetVariable( nId, pEnum, NULL, 0, RSC_TOOLBOX_BUTTONTYPE ); @@ -1256,7 +1255,7 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, SETCONST( pEnum, "BOXALIGN_RIGHT", WindowAlign::Right ); SETCONST( pEnum, "BOXALIGN_BOTTOM", WindowAlign::Bottom ); - // Variable einfuegen + // add variable nId = aNmTb.Put( "Align", VARNAME ); pClassToolBox->SetVariable( nId, pEnum, NULL, 0, RSC_TOOLBOX_ALIGN ); @@ -1309,7 +1308,7 @@ RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, Atom nId; RscTop * pClassSfxFamilyStyleItem; - // Klasse anlegen + // initialize class nId = pHS->getID( "SfxStyleFamilyItem" ); pClassSfxFamilyStyleItem = new RscClass( nId, RSC_SFX_STYLE_FAMILY_ITEM, pSuper ); aNmTb.Put( nId, CLASSNAME, pClassSfxFamilyStyleItem ); @@ -1354,12 +1353,12 @@ RscTop * RscTypCont::InitClassSfxTemplateDialog( RscTop * pSuper, Atom nId; RscTop * pClassSfxTemplateDialog; - // Klasse anlegen + // initialize class nId = pHS->getID( "SfxStyleFamilies" ); pClassSfxTemplateDialog = new RscClass( nId, RSC_SFX_STYLE_FAMILIES, pSuper ); aNmTb.Put( nId, CLASSNAME, pClassSfxTemplateDialog ); - // Variablen anlegen + // initialize variables { RscCont * pCont; @@ -1379,7 +1378,7 @@ RscTop * RscTypCont::InitClassSfxSlotInfo( RscTop * pSuper ) Atom nId; RscTop * pClassSfxSlotInfo; - // Klasse anlegen + // initialize class nId = pHS->getID( "SfxSlotInfo" ); pClassSfxSlotInfo = new RscClass( nId, RSC_SFX_SLOT_INFO, pSuper ); aNmTb.Put( nId, CLASSNAME, pClassSfxSlotInfo ); diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 24ee7529a1de..6f9cb4058204 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -111,7 +111,7 @@ void RscTypCont::Init() aNmTb.Put( "extendable", EXTENDABLE, (sal_IntPtr)0 ); aNmTb.Put( "writeifset", WRITEIFSET, (sal_IntPtr)0 ); -/* Werte fuer Aufzaehlungstypen */ +/* values for integer types */ aNmTb.Put( "TRUE", BOOLEAN, (sal_IntPtr)sal_True ); aNmTb.Put( "FALSE", BOOLEAN, (sal_IntPtr)sal_False ); @@ -142,7 +142,7 @@ void RscTypCont::Init() aIdLong.SetRange( SAL_MIN_INT32, SAL_MAX_INT32 ); } { - // Variablenname fuer WinBits + // variable name for WinBits nWinBitVarId = aNmTb.Put( "_WinBits", VARNAME ); // Windows @@ -288,17 +288,17 @@ void RscTypCont::Init() pClassString = InitClassString( pClassMgr ); pRoot->Insert( pClassString ); - // String als Referenzklasse des Basisstrings einsetzen + // set String as reference class of the base strings aString.SetRefClass( pClassString ); - // Klasse anlegen + // initialize class nId = pHS->getID( "StringArray" ); pClassStringArray = new RscClass( nId, RSC_STRINGARRAY, pClassMgr ); pClassStringArray->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); aNmTb.Put( nId, CLASSNAME, pClassStringArray ); pRoot->Insert( pClassStringArray ); - // Variablen anlegen + // initialize variables nId = aNmTb.Put( "ItemList", VARNAME ); pClassStringArray->SetVariable( nId, pLangStringLongTupelList ); @@ -334,7 +334,7 @@ void RscTypCont::Init() pClassControl = InitClassControl( pClassWindow ); pRoot->Insert( pClassControl ); - // Klasse anlegen + // initialize class nId = pHS->getID( "Button" ); pClassButton = new RscClass( nId, RSC_BUTTON, pClassControl ); pClassButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); @@ -344,7 +344,7 @@ void RscTypCont::Init() pClassCheckBox = InitClassCheckBox( pClassButton ); pRoot->Insert( pClassCheckBox ); - // Klasse anlegen + // initialize class pClassPushButton = InitClassPushButton( pClassButton ); pRoot->Insert( pClassPushButton ); } @@ -388,7 +388,7 @@ void RscTypCont::Init() pRoot->Insert( pClassAccel ); nAcceleratorType = pClassAccel->GetId(); - // pClassAccel ist erst hier definiert + // pClassAccel is only completely defined here nId = aNmTb.Put( "SubAccelerator", VARNAME ); pClassAccelItem->SetVariable( nId, pClassAccel, NULL, VAR_SVDYNAMIC, ACCELITEM_ACCEL ); @@ -400,7 +400,7 @@ void RscTypCont::Init() pClassMenu = InitClassMenu( pClassMgr, pClassMenuItem ); pRoot->Insert( pClassMenu ); - // pClassMenu ist erst hier definiert + // pClassMenu is only completely defined here nId = aNmTb.Put( "SubMenu", VARNAME ); pClassMenuItem->SetVariable( nId, pClassMenu, NULL, VAR_SVDYNAMIC, RSC_MENUITEM_MENU ); @@ -409,7 +409,7 @@ void RscTypCont::Init() pClassSplitWindow = InitClassSplitWindow( pClassWindow ); pRoot->Insert( pClassSplitWindow ); - // Klasse anlegen + // initialize class nId = pHS->getID( "SpinButton" ); pClassSpinButton = new RscClass( nId, RSC_SPINBUTTON, pClassControl ); pClassSpinButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); @@ -417,7 +417,7 @@ void RscTypCont::Init() { RscClient * pClient; - // Clientvariablen einfuegen + // add client variables // Sysmodal aBaseLst.push_back( pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nRepeatId ) @@ -433,14 +433,14 @@ void RscTypCont::Init() pRoot->Insert( pClassSpinField ); } { - { // Mehrfachvererbung von Hand + { // hand-made multiple inheritance RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField ); aBaseLst.push_back( pClassTmp ); pClassNumericField = InitClassNumericField( pClassTmp ); pRoot->Insert( pClassNumericField ); } - { // Mehrfachvererbung von Hand + { // hand-made multiple inheritance RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField ); aBaseLst.push_back( pClassTmp ); pClassTmp = InitClassMetricFormatter( pClassTmp, pFieldUnits ); @@ -462,7 +462,7 @@ void RscTypCont::Init() pClassImageList ); pRoot->Insert( pClassToolBox ); - // Klasse anlegen + // initialize class nId = pHS->getID( "FixedLine" ); pClassFixedLine = new RscClass( nId, RSC_FIXEDLINE, pClassControl ); diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index d8517e142749..d0a7a3c6f7d7 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -50,7 +50,7 @@ const char* StringContainer::putString( const char* pString ) } int c; -bool bLastInclude;// War letztes Symbol INCLUDE +bool bLastInclude;// true, if last symbol was INCLUDE RscFileInst* pFI; RscTypCont* pTC; RscExpression * pExp; @@ -100,10 +100,10 @@ sal_uInt32 GetNumber() } } - while( c=='U' || c=='u' || c=='l' || c=='L' ) //Wg. Unsigned Longs + while( c=='U' || c=='u' || c=='l' || c=='L' ) // because of unsigned longs c = pFI->GetFastChar(); - if( l > 0x7fffffff ) //Oberstes bit gegebenenfalls abschneiden; + if( l > 0x7fffffff ) // drop the most significant bit if needed; l &= 0x7fffffff; return l; @@ -113,7 +113,7 @@ int MakeToken( YYSTYPE * pTokenVal ) { int c1; - while( true ) // Kommentare und Leerzeichen ueberlesen + while( true ) // ignore comments and space characters { while( isspace( c ) ) c = pFI->GetFastChar(); @@ -157,7 +157,7 @@ int MakeToken( YYSTYPE * pTokenVal ) if( bLastInclude ) { - bLastInclude = false; //Zuruecksetzten + bLastInclude = false; // reset if( '<' == c ) { OStringBuffer aBuf( 256 ); @@ -232,11 +232,11 @@ int MakeToken( YYSTYPE * pTokenVal ) { KEY_STRUCT aKey; - // Suche nach dem Schluesselwort + // search for keyword if( pTC->aNmTb.Get( nHashId, &aKey ) ) { - // Schluesselwort gefunden + // keyword found switch( aKey.nTyp ) { case CLASSNAME: @@ -336,20 +336,20 @@ void yyerror( char* pMessage ) void InitParser( RscFileInst * pFileInst ) { - pTC = pFileInst->pTypCont; // Datenkontainer setzten + pTC = pFileInst->pTypCont; // set file container pFI = pFileInst; pStringContainer = new StringContainer(); - pExp = NULL; //fuer MacroParser + pExp = NULL; // for macro parser bTargetDefined = false; - // Anfangszeichen initialisieren + // initialize first character bLastInclude = false; c = pFI->GetFastChar(); } void EndParser() { - // Stack abraeumen + // empty stack while( ! S.IsEmpty() ) S.Pop(); @@ -366,10 +366,10 @@ void EndParser() void IncludeParser( RscFileInst * pFileInst ) { - int nToken; // Wert des Tokens - YYSTYPE aYYSType; // Daten des Tokens - RscFile * pFName; // Filestruktur - sal_uLong lKey; // Fileschluessel + int nToken; // token value + YYSTYPE aYYSType; // token data + RscFile * pFName; // file structure + sal_uLong lKey; // file key RscTypCont * pTypCon = pFileInst->pTypCont; pFName = pTypCon->aFileTab.Get( pFileInst->GetFileIndex() ); @@ -412,7 +412,7 @@ ERRTYPE parser( RscFileInst * pFileInst ) EndParser(); - // yyparser gibt 0 zurueck, wenn erfolgreich + // yyparser returns 0 on success if( 0 == aError ) aError.Clear(); if( pFileInst->pTypCont->pEH->nErrors ) diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx index 088fce877d6f..23ce975d7168 100644 --- a/rsc/source/parser/rscpar.cxx +++ b/rsc/source/parser/rscpar.cxx @@ -44,7 +44,7 @@ RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, lSrcIndex = lIndexSrc; fInputFile = fFile; - //Status: Zeiger am Ende des Lesepuffers + // state: pointer at the end of the input buffer nInputPos = nInputEndPos = nInputBufLen = READBUFFER_MAX; pInput = static_cast(rtl_allocateMemory( nInputBufLen )); } @@ -63,7 +63,7 @@ int RscFileInst::GetChar() return pLine[ nScanPos++ ]; else if( nInputPos >= nInputEndPos && nInputEndPos != nInputBufLen ) { - // Dateiende + // end of file bEof = true; return 0; } @@ -79,7 +79,7 @@ void RscFileInst::GetNewLine() nLineNo++; nScanPos = 0; - //laeuft bis Dateiende + // run until end of file sal_uInt32 nLen = 0; while( (nInputPos < nInputEndPos) || (nInputEndPos == nInputBufLen) ) { @@ -91,15 +91,15 @@ void RscFileInst::GetNewLine() while( nInputPos < nInputEndPos ) { - //immer eine Zeile lesen + // always read one line if( nLen >= nLineBufLen ) { nLineBufLen += 256; - // einen dazu fuer '\0' + // one more for '\0' pLine = static_cast(rtl_reallocateMemory( pLine, nLineBufLen +1 )); } - // cr lf, lf cr, lf oder cr wird '\0' + // cr lf, lf cr, lf or cr become '\0' if( pInput[ nInputPos ] == '\n' ) { nInputPos++; @@ -136,7 +136,7 @@ void RscFileInst::GetNewLine() } } - // Abbruch ueber EOF + // stop on reaching EOF pLine[ nLen ] = '\0'; END: diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 1d365b13b0dc..a7c63b827c0c 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -213,11 +213,11 @@ void RscClass::Destroy( const RSCINST & rInst ) aTmpI = GetInstData( rInst.pData, i, true ); if( aTmpI.IsInst() ) { - // Objekt loeschen + // destroy object aTmpI.pClass->Destroy( aTmpI ); if( pVarTypeList[ i ].nVarType & VAR_POINTER ) { - // Speicher freigeben + // free memory rtl_freeMemory( aTmpI.pData ); } } @@ -272,7 +272,7 @@ ERRTYPE RscClass::SetVariable( Atom nVarName, nEntries++; if( nEntries > (sizeof( sal_uLong ) * 8) ) { - // Bereich fuer Default zu klein + // range for default is too small RscExit( 16 ); } return ERR_OK; @@ -313,11 +313,11 @@ RSCINST RscClass::GetVariable( const RSCINST & rInst, } else { - // Default Instanz generieren + // generate default instance RSCINST aDefInst = rInitInst; if( !aDefInst.IsInst() && bInitDflt ) { - // mit dem Variablen-Default besetzen + // set to default variables aDefInst.pData = pVarTypeList[ i ].pDefault; aDefInst.pClass = pVarTypeList[ i ].pClass; } @@ -332,7 +332,7 @@ RSCINST RscClass::GetVariable( const RSCINST & rInst, } } else - { // Wird ueber Zeiger angegeben + { // is provided via pointer if( VAR_EXTENDABLE & pVarTypeList[ i ].nVarType ) { RSCINST * pInst = reinterpret_cast @@ -352,7 +352,7 @@ RSCINST RscClass::GetVariable( const RSCINST & rInst, } } } - // auf nicht Default setzen + // set as non default SetVarDflt( rInst.pData, i, false ); return aTmpI; } @@ -380,7 +380,7 @@ RSCINST RscClass::GetCopyVar( const RSCINST & rInst, Atom nVarName) { if( IsDflt( rInst.pData, i ) ) { - // mit Variablen Default initialiaieren + // initialize with default variables aVarI = GetVariable( rInst, nVarName, RSCINST(), true ); SetVarDflt( rInst.pData, i, true ); } @@ -427,8 +427,7 @@ void RscClass::SetToDefault( const RSCINST & rInst ) for( i = 0; i < nEntries; i++ ) { - // Variablen ohne eigenen Speicher werden vom "Datenserver" - // auf Default gesetzt + // variables without own memory are set from "data server" to default if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) ) { aTmpI = GetInstData( rInst.pData, i, true ); @@ -436,7 +435,7 @@ void RscClass::SetToDefault( const RSCINST & rInst ) aTmpI.pClass->SetToDefault( aTmpI ); } } - pClass->nVarDflt = ~((sal_uLong)0); // alles auf Default + pClass->nVarDflt = ~((sal_uLong)0); // set everything to default RscTop::SetToDefault( rInst ); } @@ -448,8 +447,7 @@ bool RscClass::IsDefault( const RSCINST & rInst ) for( i = 0; i < nEntries; i++ ) { - // Variablen ohne eigenen Speicher werden vom "Datenserver" - // auf Default untersucht + // variables without own memory are looked for default in "data server" if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) ) if( !IsDflt( rInst.pData, i ) ) return false; @@ -490,7 +488,7 @@ bool RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ) return false; if( aTmpI.pClass == pVarTypeList[ nEle ].pClass ) - //sie haben auch die gleiche Klasse + // they also have the same class return aTmpI.pClass->IsValueDefault( aTmpI, GetDfltData( nEle ) ); else return false; @@ -514,7 +512,7 @@ bool RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) if( aTmpI.IsInst() ) { if( aTmpI.pClass != pVarTypeList[ i ].pClass ) - //sie haben nicht die gleiche Klasse + // they don't have the same class return false; aDfltI = GetInstData( pDef, i, true ); @@ -550,7 +548,7 @@ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName ) SetVarDflt( rInst.pData, i, true ); } } - else //In Superklasse nach Variable suchen + else // look for variable in super class RscTop::SetDefault( rInst, nVarName ); } @@ -571,7 +569,7 @@ void RscClass::WriteSrc( const RSCINST & rInst, { if( !(VAR_HIDDEN & pVarTypeList[ i ].nVarType) ) { - // Hack wegen Position und Dimensiuon + // hack for position and dimension if( nRsc_XYMAPMODEId == pVarTypeList[ i ].nVarName || nRsc_WHMAPMODEId == pVarTypeList[ i ].nVarName ) { @@ -579,7 +577,7 @@ void RscClass::WriteSrc( const RSCINST & rInst, !IsDflt( rInst.pData, i+1 ) || //X, Width !IsDflt( rInst.pData, i+2 ) ) //Y, Height { - // ein Wert ist nicht Default + // one value is no default for( n = 0; n < nTab; n++ ) fputc( '\t', fOutput ); @@ -612,7 +610,7 @@ void RscClass::WriteSrc( const RSCINST & rInst, aTmpI, fOutput, pTC, nTab, RscId(), pVarName ); fprintf( fOutput, " );\n" ); } - i += 2; //_X, _Y oder _Width, Height ueberlesen + i += 2; // ignore _X, _Y or _Width, Height } else if( !IsDflt( rInst.pData, i ) && !IsValueDflt( rInst.pData, i ) ) @@ -647,11 +645,11 @@ sal_Int32 RscClass::GetCorrectValues( const RSCINST & rInst, sal_Int32 nLang = 0; sal_Int32 nBaseValue; - // Basiswert holen + // retrieve base value RSCINST aTmpI = GetInstData( rInst.pData, nVarPos, true ); aTmpI.pClass->GetNumber( aTmpI, &nBaseValue ); - // Sprach Delta holen + // retrieve language delta aTmpI = rInst.pClass->GetVariable( rInst, nRsc_DELTALANG, RSCINST() ); if( aTmpI.IsInst() ) { @@ -672,9 +670,9 @@ ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst, sal_uInt32 i = 0; ERRTYPE aError; RSCINST aTmpI; - sal_uInt32 nMaskOff = 0;// Offset um Maskenfeld zu addressieren + sal_uInt32 nMaskOff = 0;// offset to address mask field - // Wenn eine Variable Maskierung hat, dann Maskenfeld + // when a variable is masked, then mask field for( i = 0; i < nEntries; i++ ) { if( pVarTypeList[ i ].nMask ) @@ -716,8 +714,7 @@ ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst, else { aTmpI = GetInstData( rInst.pData, i, true ); - // Nur an Variable Extradata bExtra nicht auf false - // setzen + // set only for variable extradata with bExtra not false aError = aTmpI.pClass-> WriteRcHeader( aTmpI, rMem, pTC, RscId(), nDeep, @@ -738,8 +735,7 @@ ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst, else aTmpI = GetInstData( rInst.pData, i, true ); - // Nur an Variable Extradata bExtra nicht auf false - // setzen + // set only for variable extradata with bExtra not false aError = aTmpI.pClass-> WriteRcHeader( aTmpI, rMem, pTC, RscId(), nDeep, @@ -777,7 +773,7 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem ERRTYPE aError; RSCINST aFileName; - //Instanz mit dem Dateinamen "FILENAME" holen + // retriebe instance with file name "FILENAME" aFileName = RscClass::GetCopyVar( rInst, pHS->getID( "FILE", true ) ); if( aFileName.IsInst() ) { @@ -787,7 +783,7 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem // Obsolete - need changes in VCL rMem.Put( sal_uInt32(0) ); - // Identifier schreiben + // write identifier sal_uInt32 nId = 0xFFFFFFFF; if( aTmpMem.Size() && pTC && (*aTmpMem.GetUTF8( 0 ) != '\0') ) { @@ -812,7 +808,7 @@ ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, if( this == rInst.pClass ) { - // nur wenn es eigen Klasse ist + // only when it is own class aError = WriteSysDependRc( rInst, rMem, pTC, nDeep, bExtra ); } return aError; diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx index e0ddc76ff4bc..2adc1fcf5769 100644 --- a/rsc/source/res/rsccont.cxx +++ b/rsc/source/res/rsccont.cxx @@ -198,7 +198,7 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, if( !bNoId ) aTmpI = SearchEle( rInst, rEleName, pCreateClass ); - // Eintrag gefunden + // entry found if( aTmpI.IsInst() ) { aError = WRN_CONT_DOUBLEID; @@ -228,7 +228,7 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, if( rCreateInst.IsInst() ) { - // Instanz mit CreateInst-Daten initialisieren + // initialize instance with CreateInst data pClassData->pEntries[ pClassData->nEntries ].aInst = pCreateClass->Create( NULL, rCreateInst ); } @@ -279,16 +279,16 @@ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, int nInc = 1; sal_uInt32 i = 0; - // Quelle Merken + // mark source aEntry = pClassData->pEntries[ nSourcePos ]; - // Richtung der for-Schleife bestimmen + // guess direction of the for-loop if( nDestPos < nSourcePos ) nInc = -1; for( i = nSourcePos; i != nDestPos; i += nInc ) pClassData->pEntries[ i ] = pClassData->pEntries[ i + nInc ]; - // Zuweisung Quelle auf Ziel + // assign source to target pClassData->pEntries[ nDestPos ] = aEntry; } else @@ -530,8 +530,8 @@ bool RscBaseCont::IsConsistent( const RSCINST & rInst ) pClassData = reinterpret_cast(rInst.pData + nOffInstData); - // auf doppelten Id Testen und Reihenfolge beibehalten - // Komplexitaet = n^2 / 2 + // check for duplicate Id and keep order + // complexity = n^2 / 2 for( i = 0; i < pClassData->nEntries; i++ ) { if( !bNoId ) @@ -685,7 +685,7 @@ ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem, ERRTYPE aError; if( bExtra || bNoId ) - { // Nur Subresourcen schreiben, wenn bExtra == true + { // only write sub resources when bExtra == true pClassData = reinterpret_cast(rInst.pData + nOffInstData); for (sal_uInt32 i = 0; i < pClassData->nEntries && aError.IsOk(); i++ ) diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index 1f8e941d079f..cb4ca66719f2 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.cxx @@ -168,7 +168,7 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, if( pClassData->aRefId.IsId() ) { - //Erhoehen und abfragen um Endlosrekusion zu vermeiden + // increment and test to avoid endless recursion nDeep++; if( nDeep > nRefDeep ) aError = ERR_REFTODEEP; @@ -220,17 +220,17 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, if( aError.IsOk() ) { - // RscClass wird uebersprungen + // RscClass is skipped aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra ); } /* - // Definition der Struktur, aus denen die Resource aufgebaut ist + // structure definitoin from which the resource is built struct RSHEADER_TYPE{ - RESOURCE_TYPE nRT; // Resource Typ - sal_uInt32 nRT; // Resource Typ - sal_uInt32 nGlobOff; // Globaler Offset - sal_uInt32 nLocalOff; // Lokaler Offset + RESOURCE_TYPE nRT; // resource type + sal_uInt32 nRT; // resource type + sal_uInt32 nGlobOff; // global offset + sal_uInt32 nLocalOff; // local offset }; */ sal_uInt32 nID = rId; @@ -291,17 +291,17 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) while( aTmpI.IsInst() && (nDeep < nRefDeep) && aError.IsOk() ) { - // Referenz holen + // retrieve reference aTmpI.pClass->GetRef( aTmpI, &aId ); - // Referenziertes Objekt holen + // retrieve referenced object pObjNode = aTmpI.pClass->GetObjNode( aId ); - // Referenzierte Objekt gefunden ? + // was the referenced object found? if( pObjNode ) { aTmpI.pData = pObjNode->GetRscObj(); nDeep++; } - else //aTmpI.IsInst() wird false, Schleife beenden + else //aTmpI.IsInst() becomes false, end loop aTmpI.pData = NULL; } @@ -329,9 +329,8 @@ ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId ) else { pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - aOldId = pClassData->aRefId;// Alten Wert merken - pClassData->aRefId = rRefId;// vorher eintragen, - // sonst Fehler bei rekursion + aOldId = pClassData->aRefId;// mark old value + pClassData->aRefId = rRefId;// previous entry to avoid failure when recursing aError = IsToDeep( rInst ); diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx index 782076250297..f83792a4939b 100644 --- a/rsc/source/res/rscrange.cxx +++ b/rsc/source/res/rscrange.cxx @@ -301,7 +301,7 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnCla else *pClassData = RscId( nMin ); - //cUnused wird fuer Defaultkennung verwendet + //cUnusedi is used as default identifier reinterpret_cast(aInst.pData)->aExp.cUnused = true; } diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index 2e7ffee915c8..f656e72b0ed8 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.cxx @@ -146,7 +146,7 @@ bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) if( pData->aRefId.aExp.IsNumber() && pDefData->aRefId.aExp.IsNumber() ) { - // Sind die Referenzidentifier gleich + // check whether reference identifiers are equal if( pData->aRefId.GetNumber() == pDefData->aRefId.GetNumber() ) { return true; @@ -205,7 +205,7 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, nSlashPos = nPos = 0; while( pStrI->pStr[ n ] && (nPos < 72 || nPos - nSlashPos <= 3) ) - { // nach \ mindesten 3 Zeichen wegeb \xa7 + { // after \ drop at least 3 characters \xa7 fputc( pStrI->pStr[ n ], fOutput ); if( pStrI->pStr[ n ] == '\\' ) nSlashPos = nPos; @@ -214,7 +214,7 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, } fputc( '\"', fOutput ); - if( pStrI->pStr[ n ] ) //nocht nicht zu ende + if( pStrI->pStr[ n ] ) // end not reached yet { fputc( '\n', fOutput ); } @@ -242,7 +242,7 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, while( aError.IsOk() && aId.IsId() ) { - //Erhoehen und abfragen um Endlosrekusion zu vermeiden + // increment and test to avoid endless recursion nDeep++; if( nDeep > nRefDeep ) aError = ERR_REFTODEEP; diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index e9d25ab3d08a..01cd95ead9e2 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -128,12 +128,12 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) nCommands |= NOLINK_FLAG; } else if( !rsc_stricmp( (*ppStr) + 1, "l" ) ) - { // Linken, keine Syntax und kein Prepro + { // links, no syntax and no preprocessing nCommands |= NOPREPRO_FLAG; nCommands |= NOSYNTAX_FLAG; } else if( !rsc_stricmp( (*ppStr) + 1, "r" ) ) - { // erzeugt kein .res-file + { // generate no .res file nCommands |= NORESFILE_FLAG; } else if( !rsc_strnicmp( (*ppStr) + 1, "sub", 3 ) ) @@ -148,19 +148,19 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) } } else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) ) - { // Alle Resourcen mit Preload + { // all resources with Preload nCommands |= PRELOAD_FLAG; } else if( !rsc_stricmp( (*ppStr) + 1, "LITTLEENDIAN" ) ) - { // Byte Ordnung beim Schreiben + { // endianness when writing nByteOrder = RSC_LITTLEENDIAN; } else if( !rsc_stricmp( (*ppStr) + 1, "BIGENDIAN" ) ) - { // Byte Ordnung beim Schreiben + { // endianness when writing nByteOrder = RSC_BIGENDIAN; } else if( !rsc_strnicmp( (*ppStr) + 1, "d", 1 ) ) - { // Symbole definieren + { // define symbols nCommands |= DEFINE_FLAG; } else if( !rsc_strnicmp( (*ppStr) + 1, "i", 1 ) ) @@ -206,7 +206,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) aILDir = (*ppStr) + 5; } else if( !rsc_stricmp( (*ppStr) + 1, "NoSysResTest" ) ) - { // Bitmap, Pointers, Icons nicht ueberpruefen + { // don't check Bitmap, Pointers, Icons nCommands |= NOSYSRESTEST_FLAG; } else if( !rsc_stricmp( (*ppStr) + 1, "SrsDefault" ) ) @@ -228,7 +228,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) } else { - // Eingabedatei + // input file aInputList.push_back( new OString(*ppStr) ); } ppStr++; @@ -340,7 +340,7 @@ ERRTYPE RscCompiler::Start() if( !pFName->bScanned && !pFName->IsIncFile() ) { aError = IncludeParser( aIndex ); - // Currentzeiger richtig setzen + // set current pointer correctly aIndex = pTC->aFileTab.GetIndexOf( pFName ); } aIndex = pTC->aFileTab.NextIndex( aIndex ); @@ -384,8 +384,8 @@ void RscCompiler::EndCompile() pTC->pEH->StdOut( pCL->aOutputSrs.getStr(), RscVerbosityVerbose ); pTC->pEH->StdOut( ".\n", RscVerbosityVerbose ); - // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputSrs.getStr() ); // Zieldatei loeschen + // copy from TMP to real names + unlink( pCL->aOutputSrs.getStr() ); // delete target file if( !(pCL->nCommands & NOSYNTAX_FLAG) ) { FILE * foutput; @@ -394,7 +394,7 @@ void RscCompiler::EndCompile() pTC->pEH->FatalError( ERR_OPENFILE, RscId(), pCL->aOutputSrs.getStr() ); else { - // Schreibe Datei + // write file sal_uIntPtr aIndex = pTC->aFileTab.FirstIndex(); while( aIndex != UNIQUEINDEX_ENTRY_NOTFOUND ) { @@ -402,7 +402,7 @@ void RscCompiler::EndCompile() if( !pFN->IsIncFile() ) { pTC->WriteSrc( foutput, NOFILE_INDEX, false ); - break; // ?T 281091MM nur eine Src-Datei + break; // ?T 281091MM only one source file } } @@ -438,12 +438,12 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey ) ::IncludeParser( &aFileInst ); fclose( finput ); - // Include-Pfad durchsuchen + // look into include path for ( size_t i = 0, n = pFName->aDepLst.size(); i < n; ++i ) { RscDepend * pDep = pFName->aDepLst[ i ]; RscFile * pFNTmp = pTC->aFileTab.GetFile( pDep->GetFileKey() ); - // Kein Pfad und Include Datei + // no path and include file if( pFNTmp && !pFNTmp->bLoaded ) { pFNTmp->aPathName = pFNTmp->aFileName; @@ -469,8 +469,8 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, else if( !pFName->bLoaded ) { - //Include-Dateien vorher lesen - pFName->bLoaded = true; //Endlos Rekursion vermeiden + // first read include file + pFName->bLoaded = true; // avoid endless recursion for ( size_t i = 0; i < pFName->aDepLst.size() && aError.IsOk(); ++i ) { @@ -479,7 +479,7 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, } if( aError.IsError() ) - pFName->bLoaded = false; //bei Fehler nicht geladenen + pFName->bLoaded = false; // not loaded upon error else { OUString aTmpPath; @@ -512,7 +512,7 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, aError = ::parser( &aFileInst ); if( aError.IsError() ) - pTC->Delete( lFileKey );//Resourceobjekte loeschen + pTC->Delete( lFileKey );// delete resource objects pTC->pEH->StdOut( "\n", RscVerbosityVerbose ); fclose( finput ); }; @@ -630,7 +630,7 @@ ERRTYPE RscCompiler::Link() if ( NULL == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) ) pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() ); - // Schreibe Datei + // write file sal_Char cSearchDelim = SAL_PATHSEPARATOR; sal_Char cAccessDelim = SAL_PATHDELIMITER; pTC->ChangeLanguage( it->aLangName ); diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index ac1fb17b2ce8..b0284ce49162 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -18,7 +18,7 @@ */ -// Programmuebergreifende Includes. +// overall program includes #include bool RscId::bNames = true; @@ -250,7 +250,7 @@ bool RscExpType::Evaluate( sal_Int32 * plValue ) const if( IsDefinition() ) { aExp.pDef->Evaluate(); - // Eventuellen Fehler ignorieren + // ignore potential errors *plValue = aExp.pDef->GetNumber(); } else if( IsExpression() ) @@ -303,7 +303,7 @@ bool RscExpression::Evaluate( sal_Int32 * plValue ) sal_Int32 lLeft; sal_Int32 lRight; - // linken und rechten Zweig auswerten + // interpret left and right branches if( aLeftExp.Evaluate( &lLeft ) && aRightExp.Evaluate( &lRight ) ) { if( cOperation == '&' ) @@ -335,7 +335,7 @@ OString RscExpression::GetMacro() { OStringBuffer aLeft; - // Ausgabeoptimierung + // output optimization if( aLeftExp.IsNothing() ) { if ( '-' == cOperation ) @@ -354,13 +354,13 @@ OString RscExpression::GetMacro() else { aLeft.append('('); - // linken Zweig auswerten + // interpret left branch aLeftExp.AppendMacro(aLeft); aLeft.append(cOperation); aLeft.append('('); - // rechten Zweig auswerten + // interpret right branch aRightExp.AppendMacro(aLeft); aLeft.append(')'); @@ -384,8 +384,8 @@ RscFile :: ~RscFile() delete aDepLst[ i ]; aDepLst.clear(); - //von hinten nach vorne ist besser wegen der Abhaengigkeiten - //Objekte zerstoeren sich, wenn Referenzzaehler NULL + // from back to front is better because of dependencies + // objects are destroyed when reference counter is NULL while( aDefLst.Remove() ) ; } @@ -417,10 +417,10 @@ bool RscFile :: InsertDependFile( sal_uLong lIncFile, size_t lPos ) return true; } - // Current-Zeiger steht auf letztem Element + // current pointer points to last element if( lPos >= aDepLst.size() ) - { //letztes Element muss immer letztes bleiben - // Abhaengigkeit vor der letzten Position eintragen + { // the last element must always stay the last one + // put dependency before the last position aDepLst.push_back( new RscDepend( lIncFile ) ); } else @@ -467,7 +467,7 @@ void RscDefTree::Remove( RscDefine * pDef ) { if( pDefRoot ) { - //falls pDef == pDefRoot + // in case pDef == pDefRoot pDefRoot = static_cast(pDefRoot->Remove( pDef )); } pDef->DecRef(); @@ -612,7 +612,7 @@ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const OString& rDefName, if( !pDef ) { - //Macros in den Expressions sind definiert ? + // are macros in expressions defined? if( TestDef( lFileKey, lPos, pExp ) ) { RscFile * pFile = GetFile( lFileKey ); @@ -629,8 +629,7 @@ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const OString& rDefName, if( !pDef ) { - // pExp wird immer Eigentum und muss, wenn es nicht benoetigt wird - // geloescht werden + // pExp is always always owned and must be deleted after used delete pExp; } return pDef; diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx index a45880ac0245..eb69285cd22f 100644 --- a/rsc/source/tools/rsctree.cxx +++ b/rsc/source/tools/rsctree.cxx @@ -71,10 +71,10 @@ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ) { pList = nullptr; } - if( NULL != (pTmp = pMiddle->Left()) ) // rechten Zeiger auf Null + if( NULL != (pTmp = pMiddle->Left()) ) // set right pointer to NULL pTmp->pRight = nullptr; - // linken Zeiger auf Null + // set left pointer to NULL BiNode * pRightNode = pMiddle->Right(); if (pRightNode) pRightNode->pLeft = nullptr; @@ -90,7 +90,7 @@ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ) BiNode * BiNode::ChangeBTreeDLList() { BiNode * pList; - BiNode * pLL_RN; // linke Liste rechter Knoten + BiNode * pLL_RN; // right node of left list if( Right() ) { @@ -247,10 +247,9 @@ NameNode* NameNode::Search( const void * pSearch ) const return NULL; } -// Ein Knoten wird in den Baum eingefuegt -// Gibt es einen Knoten mit dem gleichen Namen, dann return false -// sonst return true. Der Knoten wird auf jeden Fall eingefuegt. - +// A node is inserted into the tree +// If a node with the same name already exists, then returns false +// otherwise, returns true, In any case, the node will be inserted bool NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ) { bool bRet = true; @@ -340,7 +339,7 @@ COMPARE IdNode::Compare( const NameNode * pSearch ) const return EQUAL; } -// pSearch ist ein Zeiger auf sal_uInt32 +// pSearch is a pointer to sal_uInt32 COMPARE IdNode::Compare( const void * pSearch ) const { if( GetId() < *static_cast(pSearch) ) @@ -373,7 +372,7 @@ COMPARE StringNode::Compare( const NameNode * pSearch ) const return EQUAL; } -// pSearch ist ein Zeiger auf const char * +// pSearch is a pointer to const char * COMPARE StringNode::Compare( const void * pSearch ) const { int nCmp = strcmp( m_aName.getStr(), static_cast(pSearch) ); -- cgit