[Libreoffice-commits] core.git: cui/source

[Oliver Specht]

 cui/source/customize/macropg.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 17df8859ea1e71cb9215ed6b10714c04c1829d14
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Mon Dec 14 10:43:37 2015 +0100

    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/20695
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 4861380..e2aa34d 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -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();
         if( ret )
@@ -668,7 +668,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
     else if( bAssEnabled )
     {
         // assign pressed
-        VclPtrInstance< SvxScriptSelectorDialog > pDlg( pThis, false, pThis->GetFrame() );
+        ScopedVclPtrInstance< SvxScriptSelectorDialog > pDlg( pThis, false, pThis->GetFrame() );
         if( pDlg )
         {
             short ret = pDlg->Execute();