Kaydet (Commit) 17df8859 authored tarafından Oliver Specht's avatar Oliver Specht

Use scoped pointers to hold dialogs

assigning a component or a script to a dialog control should not results in a crash in
dbgutil-enabled build

Change-Id: I06d11d8d51d0fe8d1b2a7217c51c1dfc8d3f8c97
Reviewed-on: https://gerrit.libreoffice.org/20695Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarOliver Specht <oliver.specht@cib.de>
üst 480fb6ca
...@@ -654,7 +654,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* ...@@ -654,7 +654,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
) )
) )
{ {
VclPtrInstance< AssignComponentDialog > pAssignDlg( pThis, sEventURL ); ScopedVclPtrInstance< AssignComponentDialog > pAssignDlg( pThis, sEventURL );
short ret = pAssignDlg->Execute(); short ret = pAssignDlg->Execute();
if( ret ) if( ret )
...@@ -668,7 +668,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* ...@@ -668,7 +668,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
else if( bAssEnabled ) else if( bAssEnabled )
{ {
// assign pressed // assign pressed
VclPtrInstance< SvxScriptSelectorDialog > pDlg( pThis, false, pThis->GetFrame() ); ScopedVclPtrInstance< SvxScriptSelectorDialog > pDlg( pThis, false, pThis->GetFrame() );
if( pDlg ) if( pDlg )
{ {
short ret = pDlg->Execute(); short ret = pDlg->Execute();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment