diff options
author | Ulrich Gemkow <lobugs@ikr.uni-stuttgart.de> | 2017-12-05 22:57:13 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2017-12-07 17:58:57 +0100 |
commit | febc90fec11279d5ea14635418af207047977651 (patch) | |
tree | 6062e60d7ff20a11fa972469dc88bbea766f3d13 | |
parent | 00b644e88c9bd202e3794ad1387eb58674ea882f (diff) |
Translate german variable name
Change-Id: Ic43d47cfeac01c263422fcf8d596d62826f6981b
Reviewed-on: https://gerrit.libreoffice.org/45915
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r-- | sc/source/filter/excel/excform.cxx | 24 | ||||
-rw-r--r-- | sc/source/filter/excel/impop.cxx | 30 |
2 files changed, 27 insertions, 27 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 2a74af0c7463..1fec63a82401 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -193,17 +193,17 @@ ExcelToSc::~ExcelToSc() { } -void ExcelToSc::GetDummy( const ScTokenArray*& pErgebnis ) +void ExcelToSc::GetDummy( const ScTokenArray*& pResult ) { aPool.Store( OUString("Dummy()") ); aPool >> aStack; - pErgebnis = aPool[ aStack.Get() ]; + pResult = aPool[ aStack.Get() ]; } // if bAllowArrays is false stream seeks to first byte after <nFormulaLen> // otherwise it will seek to the first byte after the additional content (eg // inline arrays) following <nFormulaLen> -ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, std::size_t nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT ) +ConvErr ExcelToSc::Convert( const ScTokenArray*& pResult, XclImpStream& aIn, std::size_t nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT ) { RootData& rR = GetOldRoot(); sal_uInt8 nOp, nLen; @@ -229,7 +229,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s { aPool.Store( OUString("-/-") ); aPool >> aStack; - pErgebnis = aPool[ aStack.Get() ]; + pResult = aPool[ aStack.Get() ]; return ConvErr::OK; } @@ -867,24 +867,24 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s { aPool << ocBad; aPool >> aStack; - pErgebnis = aPool[ aStack.Get() ]; + pResult = aPool[ aStack.Get() ]; eRet = ConvErr::Ni; } else if( aIn.GetRecPos() != nEndPos ) { aPool << ocBad; aPool >> aStack; - pErgebnis = aPool[ aStack.Get() ]; + pResult = aPool[ aStack.Get() ]; eRet = ConvErr::Count; } else if( bArrayFormula ) { - pErgebnis = nullptr; + pResult = nullptr; eRet = ConvErr::OK; } else { - pErgebnis = aPool[ aStack.Get() ]; + pResult = aPool[ aStack.Get() ]; eRet = ConvErr::OK; } @@ -1706,13 +1706,13 @@ const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType ) aPool >> aStack; - const ScTokenArray* pErgebnis = aPool[ aStack.Get() ]; + const ScTokenArray* pResult = aPool[ aStack.Get() ]; if( nError != FormulaError::NONE ) - const_cast<ScTokenArray*>(pErgebnis)->SetCodeError( nError ); + const_cast<ScTokenArray*>(pResult)->SetCodeError( nError ); - const_cast<ScTokenArray*>(pErgebnis)->SetExclusiveRecalcModeNormal(); + const_cast<ScTokenArray*>(pResult)->SetExclusiveRecalcModeNormal(); - return pErgebnis; + return pResult; } bool ExcelToSc::ReadSharedFormulaPosition( XclImpStream& rStrm, SCCOL& rCol, SCROW& rRow ) diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index f830148594ea..e61eb7a4ba79 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -533,7 +533,7 @@ void ImportExcel::Array25() nFormLen = aIn.ReaduInt16(); } - const ScTokenArray* pErgebnis = nullptr; + const ScTokenArray* pResult = nullptr; if (ValidColRow(nLastCol, nLastRow)) { @@ -541,16 +541,16 @@ void ImportExcel::Array25() pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol), static_cast<SCROW>(nFirstRow), GetCurrScTab() ) ); - pFormConv->Convert(pErgebnis, maStrm, nFormLen, true); + pFormConv->Convert(pResult, maStrm, nFormLen, true); - SAL_WARN_IF(!pErgebnis, "sc", "*ImportExcel::Array25(): ScTokenArray is NULL!"); + SAL_WARN_IF(!pResult, "sc", "*ImportExcel::Array25(): ScTokenArray is NULL!"); } - if (pErgebnis) + if (pResult) { ScDocumentImport& rDoc = GetDocImport(); ScRange aArrayRange(nFirstCol, nFirstRow, GetCurrScTab(), nLastCol, nLastRow, GetCurrScTab()); - rDoc.setMatrixCells(aArrayRange, *pErgebnis, formula::FormulaGrammar::GRAM_ENGLISH_XL_A1); + rDoc.setMatrixCells(aArrayRange, *pResult, formula::FormulaGrammar::GRAM_ENGLISH_XL_A1); } } @@ -840,7 +840,7 @@ void ImportExcel::Shrfmla() // read mark is now on the formula - const ScTokenArray* pErgebnis; + const ScTokenArray* pResult; // The shared range in this record is erroneous more than half the time. // Don't ever rely on it. Use the one from the formula cell above. @@ -849,21 +849,21 @@ void ImportExcel::Shrfmla() ScAddress aPos(nCol1, nRow1, GetCurrScTab()); pFormConv->Reset(aPos); - pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula ); + pFormConv->Convert( pResult, maStrm, nLenExpr, true, FT_SharedFormula ); - if (!pErgebnis) + if (!pResult) { SAL_WARN("sc", "+ImportExcel::Shrfmla(): ScTokenArray is NULL!"); return; } - pExcRoot->pShrfmlaBuff->Store(aPos, *pErgebnis); + pExcRoot->pShrfmlaBuff->Store(aPos, *pResult); // Create formula cell for the last formula record. ScDocumentImport& rDoc = GetDocImport(); - ScFormulaCell* pCell = new ScFormulaCell(pD, aPos, *pErgebnis); + ScFormulaCell* pCell = new ScFormulaCell(pD, aPos, *pResult); pCell->GetCode()->WrapReference(aPos, EXC_MAXCOL8, EXC_MAXROW8); rDoc.getDoc().EnsureTable(aPos.Tab()); rDoc.setFormulaCell(aPos, pCell); @@ -1030,7 +1030,7 @@ void ImportExcel::Array34() aIn.Ignore( (GetBiff() >= EXC_BIFF5) ? 6 : 2 ); nFormLen = aIn.ReaduInt16(); - const ScTokenArray* pErgebnis = nullptr; + const ScTokenArray* pResult = nullptr; if( ValidColRow( nLastCol, nLastRow ) ) { @@ -1038,16 +1038,16 @@ void ImportExcel::Array34() pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol), static_cast<SCROW>(nFirstRow), GetCurrScTab() ) ); - pFormConv->Convert( pErgebnis, maStrm, nFormLen, true ); + pFormConv->Convert( pResult, maStrm, nFormLen, true ); - SAL_WARN_IF(!pErgebnis, "sc", "+ImportExcel::Array34(): ScTokenArray is NULL!"); + SAL_WARN_IF(!pResult, "sc", "+ImportExcel::Array34(): ScTokenArray is NULL!"); } - if (pErgebnis) + if (pResult) { ScDocumentImport& rDoc = GetDocImport(); ScRange aArrayRange(nFirstCol, nFirstRow, GetCurrScTab(), nLastCol, nLastRow, GetCurrScTab()); - rDoc.setMatrixCells(aArrayRange, *pErgebnis, formula::FormulaGrammar::GRAM_ENGLISH_XL_A1); + rDoc.setMatrixCells(aArrayRange, *pResult, formula::FormulaGrammar::GRAM_ENGLISH_XL_A1); } } |