svx/source/dialog/_contdlg.cxx | 2 ++ svx/source/svdraw/svdundo.cxx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit fc63700181ab0f42eab5f98328074fe1682344f8 Author: Michael Stahl <mst...@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 diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index ba192eb..1b961be 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -264,6 +264,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow SvxSuperContourDlg::~SvxSuperContourDlg() { + SvtMiscOptions aMiscOptions; + aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) ); } // Resize methods commit 71f990d286c603b3bf220c8d93af69f04a45dd7a Author: Michael Stahl <mst...@redhat.com> Date: Fri May 17 13:23:34 2013 +0200 fdo#62965: fix crash in Edit Contour dialog The pObjList is 0, so use pObj's GetModel() which should be the same. (regression from 115054fef08998c56cba8f14472df1d15007f635) Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 3bcace5..5026435 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -738,7 +738,7 @@ SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect) nOrdNum=pObj->GetOrdNum(); } - m_pListener = new ObjListListener(*this, *pObj, *pObjList->GetModel()); + m_pListener = new ObjListListener(*this, *pObj, *pObj->GetModel()); } SdrUndoObjList::~SdrUndoObjList() _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits