diff options
| author | Johnny_M <klasse@partyheld.de> | 2019-01-13 13:46:32 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2019-01-22 19:55:18 +0100 |
| commit | b100f2b4656894f742d8e8314cb5eb3ce0d4e09e (patch) | |
| tree | d3a8603fb16b8d7d3daa81313657768f49d5a5b7 /sc | |
| parent | 628078fea5be293038ee2cca494ef77227077c35 (diff) | |
Translate German variable names
Please feel free to suggest a better name, if desired
Change-Id: If763bd70cecd77f4536d7d47a499a63234325c02
Reviewed-on: https://gerrit.libreoffice.org/66256
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/excform8.cxx | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 6c12e98cc618..5984d5292a7b 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -136,7 +136,7 @@ ConvErr ExcelToSc8::Convert( std::unique_ptr<ScTokenArray>& rpTokArray, XclImpSt { bool bError = false; bool bArrayFormula = false; - TokenId nMerk0; + TokenId nBuf0; const bool bCondFormat = eFT == FT_CondFormat; const bool bRangeName = eFT == FT_RangeName; const bool bRangeNameOrCond = bRangeName || bCondFormat; @@ -175,90 +175,90 @@ ConvErr ExcelToSc8::Convert( std::unique_ptr<ScTokenArray>& rpTokArray, XclImpSt bArrayFormula = true; break; case 0x03: // Addition [312 264] - aStack >> nMerk0; - aPool << aStack << ocAdd << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocAdd << nBuf0; aPool >> aStack; break; case 0x04: // Subtraction [313 264] // SECOND-TOP minus TOP - aStack >> nMerk0; - aPool << aStack << ocSub << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocSub << nBuf0; aPool >> aStack; break; case 0x05: // Multiplication [313 264] - aStack >> nMerk0; - aPool << aStack << ocMul << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocMul << nBuf0; aPool >> aStack; break; case 0x06: // Division [313 264] // divide TOP by SECOND-TOP - aStack >> nMerk0; - aPool << aStack << ocDiv << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocDiv << nBuf0; aPool >> aStack; break; case 0x07: // Exponentiation [313 265] // raise SECOND-TOP to power of TOP - aStack >> nMerk0; - aPool << aStack << ocPow << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocPow << nBuf0; aPool >> aStack; break; case 0x08: // Concatenation [313 265] // append TOP to SECOND-TOP - aStack >> nMerk0; - aPool << aStack << ocAmpersand << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocAmpersand << nBuf0; aPool >> aStack; break; case 0x09: // Less Than [313 265] // SECOND-TOP < TOP - aStack >> nMerk0; - aPool << aStack << ocLess << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocLess << nBuf0; aPool >> aStack; break; case 0x0A: // Less Than or Equal [313 265] // SECOND-TOP <= TOP - aStack >> nMerk0; - aPool << aStack << ocLessEqual << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocLessEqual << nBuf0; aPool >> aStack; break; case 0x0B: // Equal [313 265] // SECOND-TOP == TOP - aStack >> nMerk0; - aPool << aStack << ocEqual << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocEqual << nBuf0; aPool >> aStack; break; case 0x0C: // Greater Than or Equal [313 265] // SECOND-TOP >= TOP - aStack >> nMerk0; - aPool << aStack << ocGreaterEqual << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocGreaterEqual << nBuf0; aPool >> aStack; break; case 0x0D: // Greater Than [313 265] // SECOND-TOP > TOP - aStack >> nMerk0; - aPool << aStack << ocGreater << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocGreater << nBuf0; aPool >> aStack; break; case 0x0E: // Not Equal [313 265] // SECOND-TOP != TOP - aStack >> nMerk0; - aPool << aStack << ocNotEqual << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocNotEqual << nBuf0; aPool >> aStack; break; case 0x0F: // Intersection [314 265] - aStack >> nMerk0; - aPool << aStack << ocIntersect << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocIntersect << nBuf0; aPool >> aStack; break; case 0x10: // Union [314 265] // ocSep instead of 'ocUnion' - aStack >> nMerk0; - aPool << aStack << ocSep << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocSep << nBuf0; // doesn't fit exactly, but is more Excel-like aPool >> aStack; break; case 0x11: // Range [314 265] - aStack >> nMerk0; - aPool << aStack << ocRange << nMerk0; + aStack >> nBuf0; + aPool << aStack << ocRange << nBuf0; aPool >> aStack; break; case 0x12: // Unary Plus [312 264] @@ -716,9 +716,9 @@ ConvErr ExcelToSc8::Convert( std::unique_ptr<ScTokenArray>& rpTokArray, XclImpSt { TokenId nPar1 = aPool.Store( aApplic ); TokenId nPar2 = aPool.Store( aTopic ); - nMerk0 = aPool.Store( pExtName->GetName() ); + nBuf0 = aPool.Store( pExtName->GetName() ); aPool << ocDde << ocOpen << nPar1 << ocSep << nPar2 << ocSep - << nMerk0 << ocClose; + << nBuf0 << ocClose; aPool >> aStack; pExtName->CreateDdeData( GetDoc(), aApplic, aTopic ); GetDoc().SetLinkFormulaNeedingCheck(true); |