mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#95551 - fix image map crash.

Browse Source 
Remove listener we add, and don't crash on callback for disposed dialog.

Change-Id: Ia6a1bddd212cb28a0331469e8e87324346d02841
This commit is contained in:
Michael Meeks
2015-11-12 17:29:47 +00:00
parent 43f38e717b
commit 51af0ef35b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
svx/source/dialog/imapdlg.cxx
View File

@@ -182,7 +182,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window
m_pEdtText->SetModifyHdl( LINK( this, SvxIMapDlg, URLModifyHdl ) ); m_pEdtText->SetModifyHdl( LINK( this, SvxIMapDlg, URLModifyHdl ) );
m_pCbbTarget->SetLoseFocusHdl( LINK( this, SvxIMapDlg, URLLoseFocusHdl ) ); m_pCbbTarget->SetLoseFocusHdl( LINK( this, SvxIMapDlg, URLLoseFocusHdl ) );
SvtMiscOptions aMiscOptions; SvtMiscOptions aMiscOptions;
aMiscOptions.AddListenerLink( LINK( this, SvxIMapDlg, MiscHdl ) ); aMiscOptions.AddListenerLink( LINK( this, SvxIMapDlg, MiscHdl ) );
m_pTbxIMapDlg1->SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) ); m_pTbxIMapDlg1->SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) );
@@ -220,6 +220,9 @@ void SvxIMapDlg::dispose()
{ {
pIMapWnd->SetUpdateLink( Link<GraphCtrl*,void>() ); pIMapWnd->SetUpdateLink( Link<GraphCtrl*,void>() );
SvtMiscOptions aMiscOptions;
aMiscOptions.RemoveListenerLink( LINK( this, SvxIMapDlg, MiscHdl ) );
// Delete URL-List // Delete URL-List
pIMapWnd.disposeAndClear(); pIMapWnd.disposeAndClear();
DELETEZ( pOwnData ); DELETEZ( pOwnData );
@@ -805,8 +808,11 @@ IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void )
IMPL_LINK_NOARG_TYPED(SvxIMapDlg, MiscHdl, LinkParamNone*, void) IMPL_LINK_NOARG_TYPED(SvxIMapDlg, MiscHdl, LinkParamNone*, void)
{ {
SvtMiscOptions aMiscOptions; if (m_pTbxIMapDlg1)
m_pTbxIMapDlg1->SetOutStyle( aMiscOptions.GetToolboxStyle() ); {
SvtMiscOptions aMiscOptions;
m_pTbxIMapDlg1->SetOutStyle( aMiscOptions.GetToolboxStyle() );
}
} }
SvxIMapDlg* GetIMapDlg() SvxIMapDlg* GetIMapDlg()