[Libreoffice-commits] core.git: sc/source
Albert Thuswaldner
albert.thuswaldner at gmail.com
Sun Jun 19 23:30:33 UTC 2016
sc/source/filter/lotus/filter.cxx | 2
sc/source/filter/lotus/lotform.cxx | 136 ++++++++++++++++++------------------
sc/source/filter/lotus/lotimpop.cxx | 2
sc/source/filter/lotus/lotus.cxx | 6 -
sc/source/filter/lotus/memory.cxx | 2
sc/source/filter/lotus/op.cxx | 4 -
sc/source/filter/lotus/optab.cxx | 2
7 files changed, 77 insertions(+), 77 deletions(-)
New commits:
commit 290f3629554e04f72398cdab44c76f2356c93925
Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Date: Sun Jun 19 19:05:00 2016 +0200
tdf#39468 translated german comments in sc/filters/lotus
Change-Id: Icf87fadd9a9ffb344d4f1134a54b300fdb86a7b7
Reviewed-on: https://gerrit.libreoffice.org/26481
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index be0bf63f..d833dd8 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -108,7 +108,7 @@ generate_Opcodes(LotusContext &rContext, SvStream& aStream,
WKTYP ScanVersion(LotusContext &rContext, SvStream& aStream)
{
- // PREC: pWKDatei: pointer to open file
+ // PREC: pWKFile: pointer to open file
// POST: return: type of file
sal_uInt16 nOpcode(0), nVersNr(0), nRecLen(0);
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 29fe909..75ce429 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -190,7 +190,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
if( eOc == ocPMT )
{ // special case ocPMT, ignore (negate?) last parameter!
- // zusaetzlich: 1. -> 3., 3. -> 2., 2. -> 1.
+ // additionally: 1. -> 3., 3. -> 2., 2. -> 1.
OSL_ENSURE( nAnz == 3,
"+LotusToSc::DoFunc(): ocPMT needs 3 parameters!" );
aPool << eParam[ 1 ] << ocSep << eParam[ 0 ] << ocSep
@@ -233,7 +233,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefData& rSRD )
{
- // Col
+ // Column
if( nCol & 0x8000 )
{
if( nCol & 0x0080 )
@@ -650,7 +650,7 @@ void LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest )
OSL_ENSURE( nBytesLeft <= 0, "*LotusToSc::Convert(): what happens with the rest?" );
if( rRest )
- aIn.SeekRel( nBytesLeft ); // eventuellen Rest/Ueberlauf korrigieren
+ aIn.SeekRel( nBytesLeft ); // Correct any remainder/overflow
rRest = 0;
}
@@ -663,14 +663,14 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
FT_Variable, // 1 Variable
FT_Range, // 2 Range
FT_Return, // 3 return
- FT_Braces, // 4 Bracket
- FT_ConstInt, // 5 2-Byte-Integer
- FT_ConstString, // 6 ASCII-String
+ FT_Braces, // 4 Braces
+ FT_ConstInt, // 5 2-Byte integer
+ FT_ConstString, // 6 ASCII string
FT_NOP, // 7 NOP
FT_Neg, // 8 Negation
FT_Op, // 9 Addition
FT_Op, // 10 Subtraction
- FT_Op, // 11 Multiplikation
+ FT_Op, // 11 Multiplication
FT_Op, // 12 Division
FT_Op, // 13 Power of
FT_Op, // 14 equal
@@ -696,15 +696,15 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
FT_FuncFix1, // 34 Integer INT()
FT_FuncFix1, // 35 Square Root
FT_FuncFix1, // 36 Log10
- FT_FuncFix1, // 37 Natural Logarithmus
+ FT_FuncFix1, // 37 Natural Logarithm
FT_FuncFix0, // 38 PI
FT_FuncFix1, // 39 Sine
FT_FuncFix1, // 40 Cosine
FT_FuncFix1, // 41 Tangens
- FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant) <- TODO: correct?
- FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant)
- FT_FuncFix1, // 44 Arcus-Sinus
- FT_FuncFix1, // 45 Arcus-Cosinus
+ FT_FuncFix2, // 42 Arctangens 2 (4.Quadrant) <- TODO: correct?
+ FT_FuncFix1, // 43 Arctangens (2.Quadrant)
+ FT_FuncFix1, // 44 Arcsine
+ FT_FuncFix1, // 45 Arccosine
FT_FuncFix1, // 46 Exponential function
FT_FuncFix2, // 47 Modulo
FT_FuncVar, // 48 Selection
@@ -758,7 +758,7 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
FT_FuncFix3, // 96 ?
FT_FuncFix3, // 97 ?
FT_FuncFix3, // 98 Index() <- TODO: correct?
- FT_FuncFix1, // 99 Cols()
+ FT_FuncFix1, // 99 Columns()
FT_FuncFix1, // 100 Rows()
FT_FuncFix2, // 101 Repeat()
FT_FuncFix1, // 102 Upper()
@@ -771,7 +771,7 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
FT_FuncFix1, // 109 Trim()
FT_FuncFix1, // 110 Clean()
FT_FuncFix1, // 111 F()
- FT_FuncFix1, // 112 Wert() (or W()?)
+ FT_FuncFix1, // 112 W()
FT_FuncFix2, // 113 Exact()
FT_NotImpl, // 114 Call()
FT_FuncFix1, // 115 @@()
@@ -927,9 +927,9 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocPush, // 1 Variable
ocPush, // 2 Range
ocPush, // 3 return
- ocPush, // 4 Bracket
- ocPush, // 5 2-Byte-Integer
- ocPush, // 6 ASCII-String
+ ocPush, // 4 Braces
+ ocPush, // 5 2-Byte integer
+ ocPush, // 6 ASCII string
ocPush, // 7 NOP
ocNegSub, // 8 Negation
ocAdd, // 9 Addition
@@ -965,10 +965,10 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocSin, // 39 Sine
ocCos, // 40 Cosine
ocTan, // 41 Tangens
- ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant)
- ocArcTan, // 43 Arcus-Tangens (2.Quadrant)
- ocArcSin, // 44 Arcus-Sinus
- ocArcCos, // 45 Arcus-Cosinus
+ ocArcTan2, // 42 Arctangens 2 (4.Quadrant)
+ ocArcTan, // 43 Arctangens (2.Quadrant)
+ ocArcSin, // 44 Arcsine
+ ocArcCos, // 45 Arccosine
ocExp, // 46 Exponential function
ocMod, // 47 Modulo
ocChoose, // 48 Selection
@@ -1022,7 +1022,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocDBVarP, // 96 XlfDvar
ocDBStdDevP, // 97 XlfDstdev
ocIndex, // 98 Index()
- ocColumns, // 99 Cols()
+ ocColumns, // 99 Columns()
ocRows, // 100 Rows()
ocRept, // 101 Repeat()
ocUpper, // 102 Upper()
@@ -1192,9 +1192,9 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
FT_Cref, // 1 Cell Reference
FT_Rref, // 2 Area Reference
FT_Return, // 3 return
- FT_Braces, // 4 Bracket
- FT_Snum, // 5 Short-Number
- FT_ConstString, // 6 ASCII-String
+ FT_Braces, // 4 Braces
+ FT_Snum, // 5 Short number
+ FT_ConstString, // 6 ASCII string
FT_Nrref, // 7 Named range reference
FT_Absnref, // 8 Absolut named range
FT_Erref, // 9 Err range reference
@@ -1230,11 +1230,11 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
FT_FuncFix1, // 39 Sine
FT_FuncFix1, // 40 Cosine
FT_FuncFix1, // 41 Tangens
- FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant)
- FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant)
- FT_FuncFix1, // 44 Arcus-Sinus
- FT_FuncFix1, // 45 Arcus-Cosinus
- FT_FuncFix1, // 46 Exponentialfunction
+ FT_FuncFix2, // 42 Arctangens 2 (4.Quadrant)
+ FT_FuncFix1, // 43 Arctangens (2.Quadrant)
+ FT_FuncFix1, // 44 Arcsine
+ FT_FuncFix1, // 45 Arccosine
+ FT_FuncFix1, // 46 Exponential function
FT_FuncFix2, // 47 Modulo
FT_FuncVar, // 48 Selection
FT_FuncFix1, // 49 Is not applicable?
@@ -1249,7 +1249,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
FT_FuncFix3, // 58 Future Value
FT_FuncFix3, // 59 If ... then ... else ...
FT_FuncFix1, // 60 Day of Month
- FT_FuncFix1, // 61 Monat
+ FT_FuncFix1, // 61 Month
FT_FuncFix1, // 62 Year
FT_FuncFix2, // 63 Round
FT_FuncFix3, // 64 Time
@@ -1287,7 +1287,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
FT_FuncVar, // 96 Dvar <- new
FT_FuncVar, // 97 Dstd <- new
FT_FuncVar, // 98 Index() <- change!
- FT_FuncFix1, // 99 Cols() <- new
+ FT_FuncFix1, // 99 Columns() <- new
FT_FuncFix1, // 100 Rows() <- new
FT_FuncFix2, // 101 Repeat() <- new
FT_FuncFix1, // 102 Upper() <- new
@@ -1454,11 +1454,11 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
{ // Code Description
ocPush, // 0 8-Byte-IEEE-Long-Numbers
ocPush, // 1 Variable
- ocPush, // 2 Bereich
+ ocPush, // 2 Range
ocPush, // 3 return
- ocPush, // 4 Klammer
+ ocPush, // 4 Braces
ocPush, // 5 Numbers
- ocPush, // 6 ASCII-String
+ ocPush, // 6 ASCII string
ocPush, // 7 Named range reference
ocPush, // 8 Absolut named range
ocPush, // 9 Err range reference
@@ -1468,10 +1468,10 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocPush, // 13
ocNegSub, // 14 Negation
ocAdd, // 15 Addition
- ocSub, // 16 Subtraktion
- ocMul, // 17 Multiplikation
+ ocSub, // 16 Subtraction
+ ocMul, // 17 Multiplication
ocDiv, // 18 Division
- ocPow, // 19 Potenzierung
+ ocPow, // 19 Power of
ocEqual, // 20 Equality
ocNotEqual, // 21 Inequality
ocLessEqual, // 22 <=
@@ -1488,19 +1488,19 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocAbs, // 33 Absolute Value ABS()
ocInt, // 34 Integer INT()
ocSqrt, // 35 Square Root
- ocLog10, // 36 Zehnerlogarithmus
- ocLn, // 37 Natuerlicher Logarithmus
+ ocLog10, // 36 log10
+ ocLn, // 37 Natural logarithm
ocPi, // 38 Pi
- ocSin, // 39 Sinus
- ocCos, // 40 Cosinus
+ ocSin, // 39 Sine
+ ocCos, // 40 Cosine
ocTan, // 41 Tangens
- ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant)
- ocArcTan, // 43 Arcus-Tangens (2.Quadrant)
- ocArcSin, // 44 Arcus-Sinus
- ocArcCos, // 45 Arcus-Cosinus
- ocExp, // 46 Exponentialfunction
+ ocArcTan2, // 42 Arctangens 2 (4.Quadrant)
+ ocArcTan, // 43 Arctangens (2.Quadrant)
+ ocArcSin, // 44 Arcsine
+ ocArcCos, // 45 Arccosine
+ ocExp, // 46 Exponential function
ocMod, // 47 Modulo
- ocChoose, // 48 Selection
+ ocChoose, // 48 Selection
ocIsNA, // 49 Is not available?
ocIsError, // 50 Is Error?
ocFalse, // 51 FALSE
@@ -1524,7 +1524,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocIsString, // 69 Is text?
ocLen, // 70 Len()
ocValue, // 71 Val()
- ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall
+ ocFixed, // 72 String() ocFixed alternatively + special case
ocMid, // 73 Mid()
ocChar, // 74 Char()
ocCode, // 75 Ascii()
@@ -1618,7 +1618,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocNoName, // 163 Fv2
ocNoName, // 164 Term2
ocNoName, // 165-- <- new quantity ?
- ocGetDiffDate360, // 166 D360 (US-Version, ersatzweise wie ander D360-function)
+ ocGetDiffDate360, // 166 D360 (US-Version, alternatively as other D360 function)
ocNoName, // 167
ocNoName, // 168
ocNoName, // 169
@@ -1719,11 +1719,11 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
{
nullptr, // 0 8-Byte-IEEE-Float
nullptr, // 1 Variable
- nullptr, // 2 Bereich
+ nullptr, // 2 Range
nullptr, // 3 return
- nullptr, // 4 Bracket
- nullptr, // 5 2-Byte-Integer
- nullptr, // 6 ASCII-String
+ nullptr, // 4 Braces
+ nullptr, // 5 2-Byte integer
+ nullptr, // 6 ASCII string
nullptr, // 7 Named range reference
nullptr, // 8 Absolut named range
nullptr, // 9 Err range reference
@@ -1733,10 +1733,10 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
nullptr, // 13
nullptr, // 14 Negation
nullptr, // 15 Addition
- nullptr, // 16 Subtraktion
- nullptr, // 17 Multiplikation
+ nullptr, // 16 Subtraction
+ nullptr, // 17 Multiplication
nullptr, // 18 Division
- nullptr, // 19 Potenzierung
+ nullptr, // 19 Power of
nullptr, // 20 equal
nullptr, // 21 unequal
nullptr, // 22 <=
@@ -1753,19 +1753,19 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
nullptr, // 33 Absolute Value ABS()
nullptr, // 34 Integer INT()
nullptr, // 35 Square Root
- nullptr, // 36 Zehnerlogarithmus
- nullptr, // 37 Natuerlicher Logarithmus
+ nullptr, // 36 log10
+ nullptr, // 37 Natural logarithm
nullptr, // 38 PI
- nullptr, // 39 Sinus
- nullptr, // 40 Cosinus
+ nullptr, // 39 Sine
+ nullptr, // 40 Cosine
nullptr, // 41 Tangens
- nullptr, // 42 Arcus-Tangens 2 (4.Quadrant)
- nullptr, // 43 Arcus-Tangens (2.Quadrant)
- nullptr, // 44 Arcus-Sinus
- nullptr, // 45 Arcus-Cosinus
- nullptr, // 46 Exponentialfunction
+ nullptr, // 42 Arctangens 2 (4.Quadrant)
+ nullptr, // 43 Arctangens (2.Quadrant)
+ nullptr, // 44 Arcsine
+ nullptr, // 45 Arccosine
+ nullptr, // 46 Exponential function
nullptr, // 47 Modulo
- nullptr, // 48 Auswahl
+ nullptr, // 48 Selection
nullptr, // 49 Is not applicable?
nullptr, // 50 Is Error?
nullptr, // 51 FALSE
@@ -1778,7 +1778,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
nullptr, // 58 Future Value
nullptr, // 59 If ... then ... else ...
nullptr, // 60 Day of Month
- nullptr, // 61 Monat
+ nullptr, // 61 Month
nullptr, // 62 Year
nullptr, // 63 Round
nullptr, // 64 Time
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 580fcd8..a48cefe 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -126,7 +126,7 @@ bool ImportLotus::BofFm3()
void ImportLotus::Columnwidth( sal_uInt16 nRecLen )
{
- OSL_ENSURE( nRecLen >= 4, "*ImportLotus::Columnwidth(): Record zu kurz!" );
+ OSL_ENSURE( nRecLen >= 4, "*ImportLotus::Columnwidth(): Record too short!" );
sal_uInt8 nLTab, nWindow2;
sal_uInt16 nCnt = (nRecLen < 4) ? 0 : ( nRecLen - 4 ) / 2;
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 321d4bd..8fcc421 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -51,9 +51,9 @@ FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocum
if( bWithWK3 )
eRet = aLotusImport.Read();
else
- eRet = 0xFFFFFFFF; // WK1 /WKS erzwingen
+ eRet = 0xFFFFFFFF; // force WK1 /WKS
- // ACHTUNG: QUICK-HACK fuer WK1 / WKS <-> WK3 / WK4
+ // WARNING: QUICK-HACK for WK1 / WKS <-> WK3 / WK4
if( eRet == 0xFFFFFFFF )
{
pStream->Seek( 0UL );
@@ -72,7 +72,7 @@ FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocum
if (aContext.pLotusRoot->eFirstType == Lotus_WK3)
{
- // versuchen *.FM3-File zu laden
+ // try to load *.FM3 file
INetURLObject aURL( rMedium.GetURLObject() );
aURL.setExtension( "FM3" );
SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_STD_READ );
diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx
index 4d64734..a6b8ee1 100644
--- a/sc/source/filter/lotus/memory.cxx
+++ b/sc/source/filter/lotus/memory.cxx
@@ -32,7 +32,7 @@ bool MemNew(LotusContext &rContext)
{
rContext.pValueFormCache = new FormCache(rContext.pDoc);
- // fuer tool.cxx::PutFormString()
+ // for tool.cxx::PutFormString()
rContext.pAttrUnprot = new ScProtectionAttr( true );
rContext.pAttrRight = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_RIGHT, ATTR_HOR_JUSTIFY );
rContext.pAttrLeft = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT, ATTR_HOR_JUSTIFY );
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 9893dd3..dd0057e 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -451,7 +451,7 @@ void OP_Note123(LotusContext& rContext, SvStream& r, sal_uInt16 n)
void OP_HorAlign123(LotusContext& /*rContext*/, sal_uInt8 nAlignPattern, SfxItemSet& rPatternItemSet)
{
// pre: Pattern is stored in the last 3 bites of the 21st byte
-// post: Appropriate Horizontal Alignement is set in rPattern according to the bit pattern.
+// post: Appropriate Horizontal Alignment is set in rPattern according to the bit pattern.
//
// LEFT:001, RIGHT:010, CENTER:011, JUSTIFY:110,
// LEFT-Text/RIGHT-NUMBER:100, DEFAULT:000
@@ -484,7 +484,7 @@ void OP_HorAlign123(LotusContext& /*rContext*/, sal_uInt8 nAlignPattern, SfxItem
void OP_VerAlign123(LotusContext& /*rContext*/, sal_uInt8 nAlignPattern, SfxItemSet& rPatternItemSet)
{
// pre: Pattern is stored in the last 3 bites of the 22nd byte
-// post: Appropriate Verticle Alignement is set in rPattern according to the bit pattern.
+// post: Appropriate Vertical Alignment is set in rPattern according to the bit pattern.
//
// TOP:001, MIDDLE:010, DOWN:100, DEFAULT:000
diff --git a/sc/source/filter/lotus/optab.cxx b/sc/source/filter/lotus/optab.cxx
index 9c62307..1d6decc 100644
--- a/sc/source/filter/lotus/optab.cxx
+++ b/sc/source/filter/lotus/optab.cxx
@@ -21,7 +21,7 @@
#include "optab.h"
#include "lotfilter.hxx"
-// Bearbeitungsfunktion sal_Char *X( sal_Char * )
+// edit function sal_Char *X( sal_Char * )
OPCODE_FKT LotusContext::pOpFkt[ FKT_LIMIT ] =
{ // Code
OP_BOF, // 0
More information about the Libreoffice-commits
mailing list