sc/source/filter/excel/xelink.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 1eafd31bf7b01d79fd33178be1c16e200025d0fe Author: Caolán McNamara <caol...@redhat.com> Date: Wed Apr 15 09:41:10 2015 +0100 fix col limit crash on export of ooo103315-1.ods to xls Change-Id: Ic68ddc56d9cf9dd410c1f073ba83bfeea8220bf0 (cherry picked from commit cee6eb254fae1012bc6ffe1b2e440fe58fedac1b) Reviewed-on: https://gerrit.libreoffice.org/15318 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Eike Rathke <er...@redhat.com> diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 3c8dffc..3186412 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -1345,7 +1345,8 @@ bool XclExpXct::BuildCrnList( XclExpCrnList& rCrnRecs ) for( SCROW nScRow = nScRow1; bValid && (nScRow <= nScRow2); ++nScRow ) { ::std::pair< SCCOL, SCCOL > aColRange = mxCacheTable->getColRange( nScRow ); - for( SCCOL nScCol = aColRange.first; bValid && (nScCol < aColRange.second); ++nScCol ) + const SCCOL nScEnd = ::std::min( aColRange.second, MAXCOLCOUNT ); + for( SCCOL nScCol = aColRange.first; bValid && (nScCol < nScEnd); ++nScCol ) { if( maUsedCells.IsCellMarked( nScCol, nScRow, true ) ) {
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits