diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-01-19 23:21:51 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-01-19 23:21:51 -0500 |
| commit | b70937f47e062ac87bf15bb2f69498e8c140bd5c (patch) | |
| tree | 1dacd7948a2046d8f335b676186347caf37b3c11 /sc/source/core/data/dpobject.cxx | |
| parent | 1a14a77ed3d240efa8548c35c1ce84f38d4d231c (diff) | |
Removed the ugly stlport workaround code.
It's too ugly for me to live with. I'll find a better, and hopefully
cleaner workaround.
Diffstat (limited to 'sc/source/core/data/dpobject.cxx')
| -rw-r--r-- | sc/source/core/data/dpobject.cxx | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 782340bee..21c69434c 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2418,17 +2418,6 @@ ScDPCollection::~ScDPCollection() void ScDPCollection::DeleteOnTab( SCTAB nTab ) { -#ifdef STLPORT_WORKAROUND - // We do this only because STLPort crashes when erasing an element when - // the container only contains one element. - if (maTables.size() == 1) - { - if (maTables.back().GetOutRange().aStart.Tab() == nTab) - maTables.clear(); - return; - } -#endif - TablesType::iterator itr = maTables.begin(), itrEnd = maTables.end(); while (itr != itrEnd) { @@ -2635,16 +2624,6 @@ void ScDPCollection::FreeTable(ScDPObject* pDPObj) const ScAddress& s = rOutRange.aStart; const ScAddress& e = rOutRange.aEnd; pDoc->RemoveFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE); -#ifdef STLPORT_WORKAROUND - // We do this only because STLPort crashes when erasing an element when - // the container only contains one element. - if (maTables.size() == 1) - { - if (&maTables.back() == pDPObj) - maTables.clear(); - return; - } -#endif TablesType::iterator itr = maTables.begin(), itrEnd = maTables.end(); for (; itr != itrEnd; ++itr) { |