diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-30 01:16:53 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-30 01:21:54 +0100 |
| commit | b010e6724fa5cd519daafd3abf57f0a3257025bb (patch) | |
| tree | e365faf912007e152a286282dcd8adceca53a8d7 /sc | |
| parent | 87e0ae677a7d39e4890d470a3537113c9ab2fa95 (diff) | |
relative refs wrap around in xls, fdo#84556
Change-Id: If84d468d4bd55ed55ccd517d0b078d283a1a9c38
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/excform8.cxx | 11 | ||||
| -rw-r--r-- | sc/source/filter/excel/impop.cxx | 12 |
2 files changed, 16 insertions, 7 deletions
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 042d79bddc08..ff4bd6c72576 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -1464,7 +1464,16 @@ void ExcelToSc8::ExcRelToScRel8( sal_uInt16 nRow, sal_uInt16 nC, ScSingleRefData { // C O L if( bColRel ) - rSRD.SetRelCol(static_cast<SCCOL>(static_cast<sal_Int8>(nC))); + { + SCCOL nRelCol = static_cast<sal_Int8>(nC); + sal_Int16 nDiff = aEingPos.Col() + nRelCol; + if ( nDiff < 0) + { + // relative column references wrap around + nRelCol = static_cast<sal_Int16>(256 + (int)nRelCol); + } + rSRD.SetRelCol(static_cast<SCCOL>(nRelCol)); + } else rSRD.SetAbsCol(static_cast<SCCOL>(nCol)); diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index b000fa0e38d8..0629bca8a03e 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -842,17 +842,17 @@ void ImportExcel::Shrfmla( void ) const ScTokenArray* pErgebnis; - pFormConv->Reset(); - pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula ); - - OSL_ENSURE( pErgebnis, "+ImportExcel::Shrfmla(): ScTokenArray is NULL!" ); - // The shared range in this record is erroneous more than half the time. - // Don't ever rely on it. + // Don't ever rely on it. Use the one from the formula cell above. SCCOL nCol1 = mpLastFormula->mnCol; SCROW nRow1 = mpLastFormula->mnRow; ScAddress aPos(nCol1, nRow1, GetCurrScTab()); + pFormConv->Reset(aPos); + pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula ); + + OSL_ENSURE( pErgebnis, "+ImportExcel::Shrfmla(): ScTokenArray is NULL!" ); + pExcRoot->pShrfmlaBuff->Store(aPos, *pErgebnis); // Create formula cell for the last formula record. |