summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-05-03 10:28:44 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2019-05-03 21:42:44 +0200
commit7bfbac57ee1c0ad1e22f6fd351882e027975b635 (patch)
tree1d798cd37379a7103b9cd64021254225a63444c0 /cui
parenta20ea8f5999b334c2165e86abb05b5e4805b18c6 (diff)
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+LibreOffice@googlemail.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx7
1 files changed, 1 insertions, 6 deletions
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()