[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/cuigaldlg.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 7bfbac57ee1c0ad1e22f6fd351882e027975b635
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri May 3 10:28:44 2019 +0100
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri May 3 21:42:44 2019 +0200

    Resolves: tdf#125080 crashing adding a ref to a non-VclPtr
    
    Change-Id: I72a0deaab3d86ac0772092ab5f60bcace7632847
    Reviewed-on: https://gerrit.libreoffice.org/71732
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a272d3d54590..06f3e824fa1c 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -216,8 +216,6 @@ IMPL_LINK_NOARG(SearchProgress, CleanUpHdl, void*, void)
         m_aSearchThread->join();
 
     m_xDialog->response(RET_OK);
-
-    m_xDialog.reset();
 }
 
 void SearchProgress::LaunchThread()
@@ -244,7 +242,6 @@ TakeThread::~TakeThread()
 {
 }
 
-
 void TakeThread::execute()
 {
     sal_Int32           nEntries;
@@ -289,10 +286,9 @@ void TakeThread::execute()
         pStatusProgress.reset();
     }
 
-    Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ), 
nullptr, true );
+    Application::PostUserEvent(LINK(mpProgress, TakeProgress, CleanUpHdl));
 }
 
-
 TakeProgress::TakeProgress(weld::Window* pParent, TPGalleryThemeProperties* 
pTabPage)
     : GenericDialogController(pParent, "cui/ui/galleryapplyprogress.ui",
                               "GalleryApplyProgress")
@@ -364,7 +360,6 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void)
     xWait.reset();
 
     m_xDialog->response(RET_OK);
-    m_xDialog.reset();
 }
 
 void TakeProgress::LaunchThread()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits