summaryrefslogtreecommitdiff
path: root/rsc/source/tools
diff options
context:
space:
mode:
authorLucas Satabin <lucas.satabin@gnieh.org>2015-08-25 22:31:58 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2015-08-28 19:00:08 +0000
commit894151e80f27c84113b571dda3479ad4b2525686 (patch)
treef2d733215856120b09160cebb916ebf4fefaac0a /rsc/source/tools
parent831c69f9397ed813364235dddf465996d361d0a8 (diff)
tdf#39468: Translate German comments in core/rsc/source
Change-Id: Ia2d94a88d217a3b0ec9c78096b8d74a38216fbc9 Reviewed-on: https://gerrit.libreoffice.org/18066 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'rsc/source/tools')
-rw-r--r--rsc/source/tools/rscdef.cxx29
-rw-r--r--rsc/source/tools/rsctree.cxx17
2 files changed, 22 insertions, 24 deletions
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 <rscdef.hxx>
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<RscDefine *>(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<const sal_uInt32 *>(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<const char *>(pSearch) );