sc/source/core/data/table2.cxx | 46 +++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 20 deletions(-)
New commits:
commit c41f604ecf65550bcb456f8a635aa6d534e9452b
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Thu Jun 4 02:19:09 2015 +0900
tdf#91425 CRASH - Calc Insert Columns Left
This fix is a SCCOL variant of:
commit c66d1b9fcc2244b4fd8940f17ebf4e772f09c84e
Author: Kohei Yoshida <kyosh...@novell.com>
Date: Thu May 5 00:23:25 2011 -0400
fdo#36406: Let's not use invalidated iterators.
std::set::erase(iterator) call invalidates the iterator of the erased
element. We better not use it after the erase() call. Since the number
of manual breaks should not be high enough to cause a performance
bottleneck under normal usage, a safer linear copy should just be fine.
Now, I'm not sure if this indeed is the cause of the erroneous amount
of manual breaks in the test document, but I didn't see any other likely
spot.
Change-Id: I0c2e8f738949776aa7f8ea5528e2c0eeb9351c16
Reviewed-on: https://gerrit.libreoffice.org/16063
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
(cherry picked from commit 1ba1cbe48c40d649c33661abb32369c39a23fff4)
Reviewed-on: https://gerrit.libreoffice.org/16081
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index fad5443..95eee7f 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -295,18 +295,17 @@ void ScTable::InsertCol(
if (!maColManualBreaks.empty())
{
- std::set<SCCOL>::reverse_iterator rit = maColManualBreaks.rbegin();
- while (rit != maColManualBreaks.rend())
- {
- SCCOL nCol = *rit;
- if (nCol < nStartCol)
- break; // while
- else
- {
- maColManualBreaks.erase( (++rit).base());
- maColManualBreaks.insert( static_cast<SCCOL>( nCol +
nSize));
- }
- }
+ // Copy all breaks up to nStartCol (non-inclusive).
+ ::std::set<SCCOL>::iterator itr1 =
maColManualBreaks.lower_bound(nStartCol);
+ ::std::set<SCCOL> aNewBreaks(maColManualBreaks.begin(), itr1);
+
+ // Copy all breaks from nStartCol (inclusive) to the last element,
+ // but add nSize to each value.
+ ::std::set<SCCOL>::iterator itr2 = maColManualBreaks.end();
+ for (; itr1 != itr2; ++itr1)
+ aNewBreaks.insert(static_cast<SCCOL>(*itr1 + nSize));
+
+ maColManualBreaks.swap(aNewBreaks);
}
}
@@ -376,14 +375,21 @@ void ScTable::DeleteCol(
if (!maColManualBreaks.empty())
{
- std::set<SCCOL>::iterator it = maColManualBreaks.upper_bound(
static_cast<SCCOL>( nStartCol + nSize - 1));
- maColManualBreaks.erase( maColManualBreaks.lower_bound(
nStartCol), it);
- while (it != maColManualBreaks.end())
- {
- SCCOL nCol = *it;
- maColManualBreaks.erase( it++);
- maColManualBreaks.insert( static_cast<SCCOL>( nCol - nSize));
- }
+ // Erase all manual breaks between nStartCol and nStartCol + nSize
- 1 (inclusive).
+ std::set<SCCOL>::iterator itr1 =
maColManualBreaks.lower_bound(nStartCol);
+ std::set<SCCOL>::iterator itr2 =
maColManualBreaks.upper_bound(static_cast<SCCOL>(nStartCol + nSize - 1));
+ maColManualBreaks.erase(itr1, itr2);
+
+ // Copy all breaks from the 1st element up to nStartCol to the new
container.
+ itr1 = maColManualBreaks.lower_bound(nStartCol);
+ ::std::set<SCCOL> aNewBreaks(maColManualBreaks.begin(), itr1);
+
+ // Copy all breaks from nStartCol to the last element, but
subtract each value by nSize.
+ itr2 = maColManualBreaks.end();
+ for (; itr1 != itr2; ++itr1)
+ aNewBreaks.insert(static_cast<SCCOL>(*itr1 - nSize));
+
+ maColManualBreaks.swap(aNewBreaks);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
