[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svx/source

[Markus Mohrhard]

 svx/source/dialog/srchdlg.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3dad1d0628af49e61b34a050a83346805d8f8766
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Aug 2 14:04:15 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit dadd4abdadb970dd4912caaa56b7250c3a30cc9e)
    Reviewed-on: https://gerrit.libreoffice.org/27799
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index de310ce..d63c90f 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 =