[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/column3.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit cedaa445535e9337294a46cb75c4850294e4f715
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Aug 28 18:47:37 2012 +0200

    prevent double delete of broadcaster, fdo#54074, fdo#53364
    
    Change-Id: I7d94525daaeb7c8268fb10594c8a21ebcd52311c
    Signed-off-by: Noel Power <noel.power at suse.com>

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index aab315c..6495ca6 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -401,8 +401,11 @@ 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 );
+                    pOldCell->ReleaseBroadcaster();
+                }
 
                 // remove cell entry in cell item list
                 SCROW nOldRow = maItems[nIdx].nRow;