diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-01-12 18:20:51 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-14 16:40:02 +0100 |
| commit | 99ccad6fa5eab2e69fa8c43db3b27b8c02ad8217 (patch) | |
| tree | 99490fbd12ce184dded5c573481ed3bad888c013 /sc | |
| parent | 0bb77f2161e8bcaf42c536a859c2095a3f03428a (diff) | |
Fix loop conditions
2b88f6d32f572792597ccbb15276b9db52db7d10 follow-up
Change-Id: I3b525506ee222c80ff04ea38eec90a581c928985
Reviewed-on: https://gerrit.libreoffice.org/66216
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index ef9fe0137e6a..bfea212bd7cc 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1827,7 +1827,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, std::unique_ptr<ScUndoRemoveMerge> pUndoRemoveMerge; itr = aMark.begin(); - for (; itr != itrEnd && nTabCount; ++itr) + for (; itr != itrEnd && *itr < nTabCount; ++itr) { i = *itr; if( rDoc.HasAttrib( nMergeTestStartCol, nMergeTestStartRow, i, nMergeTestEndCol, nMergeTestEndRow, i, HasAttrFlags::Merged | HasAttrFlags::Overlapped ) ) @@ -4730,7 +4730,7 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e pUndoDoc.reset(new ScDocument( SCDOCMODE_UNDO )); pUndoDoc->InitUndo( &rDoc, nDestStartTab, nDestStartTab ); ScMarkData::iterator itr = aMark.begin(), itrEnd = aMark.end(); - for (; itr != itrEnd && nTabCount; ++itr) + for (; itr != itrEnd && *itr < nTabCount; ++itr) if (*itr != nDestStartTab) pUndoDoc->AddUndoTab( *itr, *itr ); |