Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4079
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/4079/1
fdo#39468 - translate German comments
Change-Id: I1324c2682873112fa7702b94fcaceab6de0b94d1
---
M rsc/inc/rscrsc.hxx
M rsc/source/prj/start.cxx
M rsc/source/rscpp/cpp3.c
M sc/source/ui/dbgui/asciiopt.cxx
M sc/source/ui/dbgui/imoptdlg.cxx
M sc/source/ui/docshell/docsh8.cxx
M sc/source/ui/miscdlgs/mtrindlg.cxx
7 files changed, 102 insertions(+), 90 deletions(-)
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index d5a768e..579049d 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -40,12 +40,12 @@
public:
- RscStrList aInputList; // Liste der Quelldateien
- OString aPath; // Liste der Pfade
+ RscStrList aInputList; // List of source files
+ OString aPath; // List of paths
RSCBYTEORDER_TYPE nByteOrder;
- unsigned short nCommands; // Steuerbits
- OString aOutputSrs; // Name der Srs-Ausgabedatei
- OString aILDir;
+ unsigned short nCommands; // control bits
+ OString aOutputSrs; // Name of the Srs output file
+ OString aILDir;
struct OutputFile
{
@@ -86,10 +86,10 @@
const OUString& rSrsOutPath );
public:
- RscTypCont* pTC; // String und Id-Verwalter
- RscCmdLine* pCL; // Kommandozeile
- FILE * fListing; // Ausgabedatei fuer Listings
- FILE * fExitFile; // bei Abbruch muss diese Datei geschlossen
werden
+ RscTypCont* pTC; // String and Id manager
+ RscCmdLine* pCL; // Command line
+ FILE * fListing; // Output file for listings
+ FILE * fExitFile; // in case of abortion this file must be closed
RscCompiler( RscCmdLine *, RscTypCont * );
~RscCompiler();
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index f15472c..2c8c271 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -50,8 +50,8 @@
const OString& rOutput, RscPtrPtr * pCmdLine,
sal_Bool bResponse )
{
- RscPtrPtr aNewCmdL; // Kommandozeile
- RscPtrPtr aRespCmdL; // Kommandozeile
+ RscPtrPtr aNewCmdL; // Command line
+ RscPtrPtr aRespCmdL; // Command line
RscPtrPtr * pCmdL = &aNewCmdL;
int i, nRet;
FILE* fRspFile = NULL;
@@ -216,7 +216,7 @@
RscStrList aTmpList;
char * pStr;
char ** ppStr;
- RscPtrPtr aCmdLine; // Kommandozeile
+ RscPtrPtr aCmdLine; // Command line
sal_uInt32 i;
OString* pString;
@@ -260,7 +260,7 @@
}
else
{
- // Eingabedatei
+ // Input file
aInputList.push_back( new OString(*ppStr) );
}
ppStr++;
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index df5a2c7..dad521a 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -29,7 +29,7 @@
#include <string.h>
#ifndef _NO_PROTO
-int AddInclude( char *pIncStr ); /* BP, 11.09.91, Forward-Deklaration */
+int AddInclude( char *pIncStr ); /* BP, 11.09.91, Forward declaration */
#endif
#if (OSL_DEBUG_LEVEL > 1) && (HOST == SYS_VMS || HOST == SYS_UNIX)
@@ -146,15 +146,15 @@
#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 the environment variable INCLUDE is now also analysed.
+ * To make things more complicated, all entries that are separated by ';',
+ * have to be added to the list.
+ * This is realised by function strtok().
+ * Be careful when using malloc !!!
+ * In savestring is getmem() used. Probably these two functions get in
+ * the way of each other. When I used malloc instead of savestring it crashed
+ * in strcpy() !
*/
#if !defined( WNT ) && ! defined UNX
@@ -171,18 +171,18 @@
}
-/* 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: Enhancement of the INCLUDE service
+ * Up to now the cpp could not handle include parameters on the command line,
+ * where the directories were not separated by ';'.
+ * This is understandable, because that cpp was custom-made for UNIX systems
+ * and in UNI the ';' characters count as end of a command.
*/
int AddInclude( char* pIncStr )
{
- char *pIncEnv = NULL; /* Kopie des INCLUDE */
- char *pIncPos; /* wandert zum naechsten */
+ char *pIncEnv = NULL; /* Copy of the INCLUDE */
+ char *pIncPos; /* goes to the next one */
pIncEnv = savestring( pIncStr );
pIncPos = strtok( pIncEnv, ";" );
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 2a195ad..92ed469 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -179,10 +179,9 @@
return false;
}
-//
-// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
-// darum ab Version 336 Komma stattdessen
-//
+/* The Options string must not contain a semicolon (due to the pick list).
+ * Therefor a comma instead from version 336 on.
+ */
void ScAsciiOptions::ReadFromString( const String& rString )
@@ -192,9 +191,9 @@
xub_StrLen nSub;
xub_StrLen i;
- //
- // Feld-Trenner
- //
+ /*
+ * field separator
+ */
if ( nCount >= 1 )
{
@@ -219,9 +218,9 @@
}
}
- //
- // Text-Trenner
- //
+ /*
+ * text separator
+ */
if ( nCount >= 2 )
{
@@ -230,9 +229,9 @@
cTextSep = (sal_Unicode) nVal;
}
- //
- // Zeichensatz
- //
+ /*
+ * character set
+ */
if ( nCount >= 3 )
{
@@ -240,9 +239,9 @@
eCharSet = ScGlobal::GetCharsetValue( aToken );
}
- //
- // Startzeile
- //
+ /*
+ * start line
+ */
if ( nCount >= 4 )
{
@@ -250,9 +249,9 @@
nStartRow = aToken.ToInt32();
}
- //
- // Spalten-Infos
- //
+ /*
+ * column information
+ */
if ( nCount >= 5 )
{
@@ -311,9 +310,9 @@
{
OUString aOutStr;
- //
- // Feld-Trenner
- //
+ /*
+ * field separator
+ */
if ( bFixedLen )
aOutStr += pStrFix;
@@ -336,24 +335,24 @@
}
aOutStr += "," +
- // Text-Trenner
+ // text separator
OUString::number(cTextSep) + ",";
- //
- // Zeichensatz
- //
+ /*
+ * character set
+ */
if ( bCharSetSystem ) // force "SYSTEM"
aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW );
else
aOutStr += ScGlobal::GetCharsetString( eCharSet );
aOutStr += "," +
- // Startzeile
+ // start line
OUString::number(nStartRow) + ",";
- //
- // Spalten-Infos
- //
+ /*
+ * column information
+ */
OSL_ENSURE( !nInfoCount || (pColStart && pColFormat), "0-Zeiger in
ScAsciiOptions" );
for (sal_uInt16 nInfo=0; nInfo<nInfoCount; nInfo++)
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index f1dc8de..e22f6dd 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -25,9 +25,10 @@
static const sal_Char pStrFix[] = "FIX";
-//------------------------------------------------------------------------
-// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
-// darum ab Version 336 Komma stattdessen
+/*
+ * The Options string must not contain a semicolon (due to the pick list).
+ * Therefor a comma instead from version 336 on.
+ */
ScImportOptions::ScImportOptions( const String& rStr )
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 120b386..c53f86e 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -132,7 +132,8 @@
} // if ( aIter == aMap.end() )
OUString aCharSetStr;
if ( RTL_TEXTENCODING_DONTKNOW != *aIter )
- { // it's not the virtual "system charset"
+ {
+ // it's not the virtual "system charset"
const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( *aIter
);
OSL_ENSURE( pIanaName, "invalid mime name!" );
if ( pIanaName )
@@ -519,8 +520,8 @@
sal_Int32 nDbType = sdbc::DataType::SQLNULL;
String aFieldName, aString;
- // Feldname[,Type[,Width[,Prec]]]
- // Typ etc.: L; D; C[,W]; N[,W[,P]]
+ // field name[,Type[,Width[,Prec]]]
+ // type etc.: L; D; C[,W]; N[,W[,P]]
if ( bHasFieldNames )
{
aString = pDoc->GetString(nCol, nFirstRow, nTab);
@@ -577,11 +578,13 @@
else
aFieldName = aString;
- // Feldnamen pruefen und ggbf. gueltigen Feldnamen erzeugen.
- // Erstes Zeichen muss Buchstabe sein,
- // weitere nur alphanumerisch und Unterstrich erlaubt,
- // "_DBASELOCK" ist reserviert (obsolet weil erstes Zeichen kein
Buchstabe),
- // keine doppelten Namen.
+ /*
+ * Check field name and if necessary create valid field name.
+ * First sign has to be a character,
+ * further only alpha-numeric and underscore allowed,
+ * "_DBASELOCK" is reserved (obsoled, because first sign is no
character),
+ * no double names.
+ */
if ( !IsAsciiAlpha( aFieldName.GetChar(0) ) )
aFieldName.Insert( 'N', 0 );
String aTmpStr;
@@ -598,7 +601,8 @@
aFieldName.Erase( 10 );
if (!aFieldNames.insert(aFieldName).second)
- { // doppelter Feldname, numerisch erweitern
+ {
+ // double field name, enhance numeric
sal_uInt16 nSub = 1;
String aFixPart( aFieldName );
do
@@ -619,7 +623,8 @@
}
if ( !bTypeDefined )
- { // Feldtyp
+ {
+ // field type
ScRefCellValue aCell;
aCell.assign(*pDoc, ScAddress(nCol, nFirstDataRow, nTab));
if (aCell.isEmpty() || aCell.hasString())
@@ -655,31 +660,34 @@
}
bool bSdbLenAdjusted = false;
bool bSdbLenBad = false;
- // Feldlaenge
+ // field length
if ( nDbType == sdbc::DataType::VARCHAR && !nFieldLen )
- { // maximale Feldbreite bestimmen
+ {
+ // determine maximum field width
nFieldLen = pDoc->GetMaxStringLen( nTab, nCol, nFirstDataRow,
nLastRow, eCharSet );
if ( nFieldLen == 0 )
nFieldLen = 1;
}
else if ( nDbType == sdbc::DataType::DECIMAL )
- { // maximale Feldbreite und Nachkommastellen bestimmen
+ {
+ // determine maximum field with and positions after decimal point.
xub_StrLen nLen;
sal_uInt16 nPrec;
nLen = pDoc->GetMaxNumberStringLen( nPrec, nTab, nCol,
nFirstDataRow, nLastRow );
- // dBaseIII Limit Nachkommastellen: 15
+ // dBaseIII limit points after decimal point: 15
if ( nPrecision > 15 )
nPrecision = 15;
if ( nPrec > 15 )
nPrec = 15;
if ( bPrecDefined && nPrecision != nPrec )
- { // Laenge auf vorgegebene Nachkommastellen anpassen
+ {
+ // Adjust length to given positions after decimal point.
if ( nPrecision )
nLen = sal::static_int_cast<xub_StrLen>( nLen + (
nPrecision - nPrec ) );
else
- nLen -= nPrec+1; // auch den . mit raus
+ nLen -= nPrec+1; // also remove the dot '.'
}
if ( nLen > nFieldLen && !bTypeDefined )
nFieldLen = nLen;
@@ -688,9 +696,9 @@
if ( nFieldLen == 0 )
nFieldLen = 1;
else if ( nFieldLen > 19 )
- nFieldLen = 19; // dBaseIII Limit Feldlaenge numerisch: 19
+ nFieldLen = 19; // dBaseIII limit field length numeric: 19
if ( nPrecision && nFieldLen < nPrecision + 2 )
- nFieldLen = nPrecision + 2; // 0. muss mit reinpassen
+ nFieldLen = nPrecision + 2; // 0. has to fit in
// 538 MUST: Sdb internal representation adds 2 to the field
length!
// To give the user what he wants we must substract it here.
//! CAVEAT! There is no way to define a numeric field with a
length
@@ -709,7 +717,9 @@
bHasMemo = sal_True;
}
else
- nFieldLen = 254; // dumm gelaufen..
+ {
+ nFieldLen = 254; // shit happens ...
+ }
}
pColNames[nField] = aFieldName;
@@ -725,7 +735,7 @@
nFieldLen = 2; // THIS is reality
}
if ( bUpdateTitles )
- { // Angabe anpassen und ausgeben
+ { // Adjust declaration and display
OUString aOutString = aFieldName;
switch ( nDbType )
{
@@ -810,7 +820,8 @@
sal_Bool bHasFieldNames = sal_True;
for ( SCCOL nDocCol = nFirstCol; nDocCol <= nLastCol && bHasFieldNames;
nDocCol++ )
- { // nur Strings in erster Zeile => sind Feldnamen
+ {
+ // Only strings in first line => these are fieldnames.
if ( !aDocument.HasStringData( nDocCol, nFirstRow, nTab ) )
bHasFieldNames = false;
}
@@ -969,7 +980,7 @@
if (!aCell.isEmpty())
{
if (aCell.meType == CELLTYPE_EDIT)
- { // Paragraphs erhalten
+ { // get paragraphs
lcl_getLongVarCharEditString(aString, aCell,
aEditEngine);
}
else
@@ -994,7 +1005,7 @@
case sdbc::DataType::DATE:
{
aDocument.GetValue( nDocCol, nDocRow, nTab, fVal );
- // zwischen 0 Wert und 0 kein Wert unterscheiden
+ // differ between 0 value and 0 no value
sal_Bool bIsNull = (fVal == 0.0);
if ( bIsNull )
bIsNull = !aDocument.HasValueData( nDocCol,
nDocRow, nTab );
@@ -1042,7 +1053,8 @@
//! ScDocShell::SbaSdbExport is still missing!
if ( !aProgress.SetStateOnPercent( nDocRow - nFirstRow ) )
- { // UserBreak
+ {
+ // UserBreak
nErr = SCERR_EXPORT_DATA;
break;
}
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx
b/sc/source/ui/miscdlgs/mtrindlg.cxx
index 0829670..7ff8c68 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -85,7 +85,7 @@
long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const
{
/*
- mit Nachkommastellen:
+ with positions after decimal point:
double nVal = aEdValue.GetValue( eUnit );
sal_uInt16 nDecs = aEdValue.GetDecimalDigits();
@@ -101,7 +101,7 @@
return nVal / nFactor;
*/
- // erstmal Nachkommastellen abschneiden - nich so doll...
+ // at first cutting of the positions after the decimal point - not that
good...
return sal::static_int_cast<long>( aEdValue.Denormalize(
aEdValue.GetValue( eUnit ) ) );
}
--
To view, visit https://gerrit.libreoffice.org/4079
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1324c2682873112fa7702b94fcaceab6de0b94d1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold <tho...@arnhold.org>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
