diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-03 10:28:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-03 13:38:32 +0200 |
| commit | c0038f61aff45595c962911f16dfdef93f41924e (patch) | |
| tree | 63816df68632d95a5b57cfc15b86a23dec1e5480 | |
| parent | b329d6f4ce4a594c35125fbe180aed876a66c454 (diff) | |
Resolves: tdf#125080 crashing adding a ref to a non-VclPtr
Change-Id: I72a0deaab3d86ac0772092ab5f60bcace7632847
Reviewed-on: https://gerrit.libreoffice.org/71729
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index f54c1b3cf727..d9ea30e9ff20 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -217,8 +217,6 @@ IMPL_LINK_NOARG(SearchProgress, CleanUpHdl, void*, void) m_aSearchThread->join(); m_xDialog->response(RET_OK); - - m_xDialog.reset(); } void SearchProgress::LaunchThread() @@ -245,7 +243,6 @@ TakeThread::~TakeThread() { } - void TakeThread::execute() { sal_Int32 nEntries; @@ -290,10 +287,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") @@ -365,7 +361,6 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void) xWait.reset(); m_xDialog->response(RET_OK); - m_xDialog.reset(); } void TakeProgress::LaunchThread() |