summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-08-02 14:04:15 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-08-02 15:06:35 +0000
commit3dad1d0628af49e61b34a050a83346805d8f8766 (patch)
treeb5519e3bad63cafd95a5234724562b6eb201665b /svx
parent832d359930c86c7bfe5547e580d1bfadd9177642 (diff)
add missing nullptr check
See http://crashreport.libreoffice.org/stats/crash_details/173c2c82-7241-44b4-8394-2b5635f7f938 Change-Id: I2a03c6d6a77e3c872b8507c72b47a05db20fd564 Reviewed-on: https://gerrit.libreoffice.org/27791 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit dadd4abdadb970dd4912caaa56b7250c3a30cc9e) Reviewed-on: https://gerrit.libreoffice.org/27799 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rwxr-xr-xsvx/source/dialog/srchdlg.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index de310ce10d08..d63c90f318a3 100755
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2377,8 +2377,12 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
static vcl::Window* lcl_GetSearchLabelWindow()
{
+ SfxViewFrame* pViewFrame = SfxViewFrame::Current();
+ if (!pViewFrame)
+ return nullptr;
+
css::uno::Reference< css::beans::XPropertySet > xPropSet(
- SfxViewFrame::Current()->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY_THROW);
+ pViewFrame->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 =