ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

crashreporting: apparent null derefs of SfxViewFrame::Current()

Browse Source 
Change-Id: I0e2c07a7eaa0a13be0a44c7cd187feec8ed4c2c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136277
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2022-06-22 13:38:49 +02:00
parent d2de55c93f
commit 257d80b4ab
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svx/source/dialog/srchdlg.cxx
+14 -10
View File
@@ -2344,16 +2344,12 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
return aInfo;
}
static void lcl_SetSearchLabelWindow(const OUString& rStr)
static void lcl_SetSearchLabelWindow(const OUString& rStr, SfxViewFrame& rViewFrame)
{
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if (!pViewFrame)
return;
bool bNotFound = rStr == SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND);
css::uno::Reference< css::beans::XPropertySet > xPropSet(
pViewFrame->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY_THROW);
rViewFrame.GetFrame().GetFrameInterface(), css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager;
css::uno::Reference< css::ui::XUIElement > xUIElement =
@@ -2424,6 +2420,10 @@ OUString SvxSearchDialogWrapper::GetSearchLabel()
void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL)
{
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if (!pViewFrame)
return;
OUString sStr;
if (rSL == SearchLabel::End)
sStr = SvxResId(RID_SVXSTR_SEARCH_END);
@@ -2444,17 +2444,21 @@ void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL)
else if (rSL == SearchLabel::ReminderStartWrapped)
sStr = SvxResId(RID_SVXSTR_SEARCH_REMINDER_START_WRAPPED);
lcl_SetSearchLabelWindow(sStr);
if (SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>( SfxViewFrame::Current()->
lcl_SetSearchLabelWindow(sStr, *pViewFrame);
if (SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>( pViewFrame->
GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
pWrp->getDialog()->SetSearchLabel(sStr);
}
void SvxSearchDialogWrapper::SetSearchLabel(const OUString& sStr)
{
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if (!pViewFrame)
return;
lcl_SetSearchLabelWindow(sStr);
if (SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>( SfxViewFrame::Current()->
lcl_SetSearchLabelWindow(sStr, *pViewFrame);
if (SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>( pViewFrame->
GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
pWrp->getDialog()->SetSearchLabel(sStr);
}