ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

likely fix for frequent SfxViewFrame::GetChildWindow() crash

Browse Source 
crash report id: 58e9a91e-9feb-4eb4-a28e-27921d3e1b99

Change-Id: I110d96f1c73f95025918ccc4043dac40c5e1dc4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144240
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2022-12-15 19:31:33 +00:00
parent 1e3b7b9ca9
commit a0c24199e4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/source/uibase/uiview/viewsrch.cxx
+7 -3
View File
@@ -830,9 +830,13 @@ SvxSearchDialog* SwView::GetSearchDialog()
{
#if HAVE_FEATURE_DESKTOP
const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>( SfxViewFrame::Current()->GetChildWindow(nId) );
auto pSrchDlg = pWrp ? pWrp->getDialog() : nullptr;
return pSrchDlg;
SfxViewFrame* pFrame = SfxViewFrame::Current();
if (!pFrame)
return nullptr;
SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>(pFrame->GetChildWindow(nId));
if (!pWrp)
return nullptr;
return pWrp->getDialog();
#else
return nullptr;
#endif