sc/source/core/data/sortparam.cxx | 3 --- sc/source/core/data/table3.cxx | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-)
New commits: commit 08ee936f3d1cd0d0424dd50bc96da19faf424a86 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Thu Apr 5 05:31:13 2012 +0200 small memory leak in table3.cxx diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 97b948b..7e766a3 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -217,7 +217,7 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo ) class ScSortInfoArray { private: - ScSortInfo*** pppInfo; + ScSortInfo*** pppInfo; SCSIZE nCount; SCCOLROW nStart; sal_uInt16 nUsedSorts; @@ -245,6 +245,7 @@ public: delete ppInfo[j]; delete [] ppInfo; } + delete[] pppInfo; } ScSortInfo* Get( sal_uInt16 nSort, SCCOLROW nInd ) { return (pppInfo[nSort])[ nInd - nStart ]; } commit 9646685f3ead54fc67bc457a4804defce8a88e05 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Thu Apr 5 05:29:01 2012 +0200 this does hopefully no longer result in a crash diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index 21bf327..1cafc92 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -182,14 +182,11 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) for (i=0; i<MAXSUBTOTAL; i++) if (rSub.bGroupActive[i]) { -#if 0 -// FIXME this crashes in sc_unoapi currently; table3.cxx has nMaxSorts = 3... ScSortKeyState key; key.bDoSort = true; key.nField = rSub.nField[i]; key.bAscending = rSub.bAscending; maKeyState.push_back(key); -#endif } // dann dahinter die alten Einstellungen _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits