[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

Caolán McNamara caolanm at redhat.com
Sat Mar 21 23:32:30 PDT 2015


 sw/source/core/unocore/unotbl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0514eb49c4f492ecd33f90fee26ff873798e269d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 20 15:36:07 2015 +0000

    fix double delete on loading ooo123605-1.odt
    
    if there are no listeners to send the event to then don't
    acquire and release the Source in the temporary used by forEach
    and so avoid double-releasing on loading ooo123605-1.odt
    
    Change-Id: I6843042d7cf8c0ffee01c7d519299fcb05b29a4e
    (cherry picked from commit 9527eeec237f5d797a6420371c76f95246adeb84)
    Reviewed-on: https://gerrit.libreoffice.org/14927
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 377e392..32495c9 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -107,6 +107,8 @@ extern void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm );
 static void lcl_SendChartEvent(::cppu::OWeakObject & rSource,
                                ::cppu::OInterfaceContainerHelper & rListeners)
 {
+    if (!rListeners.getLength())
+        return;
     //TODO: find appropriate settings of the Event
     chart::ChartDataChangeEvent event;
     event.Source = & rSource;


More information about the Libreoffice-commits mailing list