svx/source/dialog/srchdlg.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit e53bf1716a4ed3be7abbf07a22a3ca55bc88ff34
Author: Caolán McNamara <[email protected]>
AuthorDate: Sat Apr 4 19:27:41 2020 +0100
Commit: Michael Stahl <[email protected]>
CommitDate: Mon Apr 6 11:23:42 2020 +0200
rhbz#1820868 deref of null xLayoutManager
Change-Id: Ib396ef9f5b019b08a181eeb5a8eb983bdb401db4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91710
Tested-by: Jenkins
Reviewed-by: Michael Stahl <[email protected]>
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 01274ced7f7b..5f2b426e759d 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2437,6 +2437,8 @@ OUString SvxSearchDialogWrapper::GetSearchLabel()
pViewFrame->GetFrame().GetFrameInterface(),
css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager;
+ if (!xLayoutManager.is())
+ return OUString();
css::uno::Reference< css::ui::XUIElement > xUIElement =
xLayoutManager->getElement("private:resource/toolbar/findbar");
if (!xUIElement.is())
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
