sc/source/core/data/column3.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
New commits: commit 7a8040665f40fbcb4fa58c036aa066f061abd9ba Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Tue Aug 28 18:47:37 2012 +0200 prevent double delete of broadcaster, fdo#54074, fdo#53364 Change-Id: I7d94525daaeb7c8268fb10594c8a21ebcd52311c diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 861158c..00ac9fa 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -400,7 +400,10 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 nDe bool bKeepBC = pBC && pBC->HasListeners(); // #i99844# do not release broadcaster from old cell, it still has to notify deleted content if (bKeepBC) + { pNoteCell = new ScNoteCell( pBC ); + pOldCell->ReleaseBroadcaster(); + } // remove cell entry in cell item list SCROW nOldRow = maItems[nIdx].nRow; commit 73de74bb6ecbbbc390710ddd9d6c930378cdf142 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Tue Aug 28 16:56:31 2012 +0200 fix indentation Change-Id: I666f130fe75bd0e0fcba54fee68b97ae153db2ef diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 1d2e21c..861158c 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -399,8 +399,8 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 nDe SvtBroadcaster* pBC = pOldCell->GetBroadcaster(); bool bKeepBC = pBC && pBC->HasListeners(); // #i99844# do not release broadcaster from old cell, it still has to notify deleted content - if ( bKeepBC) - pNoteCell = new ScNoteCell( pBC ); + if (bKeepBC) + pNoteCell = new ScNoteCell( pBC ); // remove cell entry in cell item list SCROW nOldRow = maItems[nIdx].nRow; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits