summaryrefslogtreecommitdiff
path: root/rsc/source/res
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/res
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/res')
-rw-r--r--rsc/source/res/rscclass.cxx56
-rw-r--r--rsc/source/res/rsccont.cxx16
-rw-r--r--rsc/source/res/rscmgr.cxx27
-rw-r--r--rsc/source/res/rscrange.cxx2
-rw-r--r--rsc/source/res/rscstr.cxx8
5 files changed, 52 insertions, 57 deletions
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<RSCINST *>
@@ -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<RscBaseContInst *>(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<RscBaseContInst *>(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<RscMgrInst *>(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<RscId *>(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;