[Libreoffice-commits] core.git: sc/source

[Miklos Vajna (via logerrit)]

 sc/source/ui/navipi/navipi.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b3999abc97db7b54c0d35f87c74826a0b7763658
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Nov 12 10:45:34 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Nov 12 11:41:58 2019 +0100

    sc: pViewSh can be nullptr in the ScNavigatorDlg ctor
    
    In case the nagivator dialog was enabled the last time the user exited
    from Calc, resulting in a crash-on-startup in subsequent runs.
    
    This avoids the need for a workaround to reset the user profile.
    
    Change-Id: I5041a9a258efb82051036d8404fde77c8985089a
    Reviewed-on: https://gerrit.libreoffice.org/82491
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 75f508d73f5b..148064db54a1 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -461,7 +461,10 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, vcl::Window* pParent)
     get(aLbDocuments, "documents");
     get(aEdCol, "column");
     ScTabViewShell* pViewSh = GetTabViewShell();
-    aEdCol->SetNavigatorDlg(this, pViewSh->GetViewData().GetDocument());
+    if (pViewSh)
+    {
+        aEdCol->SetNavigatorDlg(this, pViewSh->GetViewData().GetDocument());
+    }
     get(aEdRow, "row");
     aEdRow->SetNavigatorDlg(this);
     get(aTbxCmd, "toolbox");