[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svx/source

[Michael Stahl]

 svx/source/dialog/_contdlg.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c04dc880044ca84b80bb13ac900de84ceae2a561
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 17 14:02:25 2013 +0200

    fdo#57079: SvxSuperContourDlg: unregister configuration listener
    
    ... in destructor.  Otherwise it will access freed memory when
    eventually called.  This crashes since OOo 3.2 but no idea why it would
    appear to not crash in earlier versions.
    
    Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad
    (cherry picked from commit fc63700181ab0f42eab5f98328074fe1682344f8)
    Reviewed-on: https://gerrit.libreoffice.org/3941
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index ddc11ed..39f6325 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -283,6 +283,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
 
 SvxSuperContourDlg::~SvxSuperContourDlg()
 {
+    SvtMiscOptions aMiscOptions;
+    aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
 }
 
 // Resize methods