svx/source/dialog/srchdlg.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 866e666009ba028a646ff32158b450a5ee20d4b4
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Apr 4 19:27:41 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Apr 4 21:09:02 2020 +0200
rhbz#1820868 deref of null xLayoutManager
Change-Id: Ib396ef9f5b019b08a181eeb5a8eb983bdb401db4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91693
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 7af720d51c63..ba2a2a09ce9d 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2434,6 +2434,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
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
