sc/source/ui/unoobj/chart2uno.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 2f4832a31d1e81ffbe043d9bb1d0816a03b8d137 Author: Eike Rathke <er...@redhat.com> Date: Fri Dec 8 00:04:31 2017 +0100 Key must be sal_uInt32 instead of sal_Int16 SCCOL, tdf#113861 follow-up FormulaTokenMapMap key is bit masked left shifted tab value plus column value. And as FormulaTokenMap key was changed from sal_uInt32 to SCROW (which is correct), use that type when assigning. Change-Id: I4c76330378e64cb7dc06a956cbf2c23f4428b658 (cherry picked from commit 78a3f7e10e650bc464202dacd131f9c3b0ddfcdf) Reviewed-on: https://gerrit.libreoffice.org/46061 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 4728efe7ae3c..f42fd4f1fff6 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -242,7 +242,7 @@ vector<ScTokenRef> TokenTable::getAllRanges() const } typedef std::map<SCROW, FormulaToken*> FormulaTokenMap; -typedef std::map<SCCOL, FormulaTokenMap*> FormulaTokenMapMap; +typedef std::map<sal_uInt32, FormulaTokenMap*> FormulaTokenMapMap; class Chart2PositionMap { @@ -805,7 +805,7 @@ void Chart2Positioner::createPositionMap() FormulaTokenMap* pFirstCol = pCols->begin()->second; for (FormulaTokenMap::const_iterator it1 = pFirstCol->begin(); it1 != pFirstCol->end(); ++it1) { - sal_uInt32 nKey = it1->first; + SCROW nKey = it1->first; for (FormulaTokenMapMap::const_iterator it2 = pCols->begin(); it2 != pCols->end(); ++it2) { pCol = it2->second; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits