diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-30 01:16:53 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-01-07 19:35:08 +0000 |
| commit | 352477c8f2f6bacaac434ef545b8a3ac5939b253 (patch) | |
| tree | 39188cfa948ae200b093da9158147804cdaaac8b /sc/source | |
| parent | 432b91f107b136f870363437cfba99e0bbf86114 (diff) | |
relative refs wrap around in xls, fdo#84556
Change-Id: If84d468d4bd55ed55ccd517d0b078d283a1a9c38
Reviewed-on: https://gerrit.libreoffice.org/13694
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sc/source')
| -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 a4f3bf634e94..5fcd60e03fbf 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -1408,7 +1408,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 ca1ca7506c9f..1be4a777db3b 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -827,17 +827,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. |