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

[Noel Grandin (via logerrit)]

 sc/source/ui/inc/navipi.hxx      |    3 ++-
 sc/source/ui/navipi/navcitem.cxx |    3 ++-
 sc/source/ui/navipi/navipi.cxx   |    5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit f07ac6d2d46cf9a86577d2622ce9b7c15887ac39
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Nov 4 11:24:00 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Nov 4 14:11:23 2019 +0100

    tdf#128562 crash when opening navigator in calc
    
    regression from
        commit 0ef5c47547bec6319b853326603f3b807407fe78
        Date:   Mon Oct 28 13:08:29 2019 +0200
        sc: rowcol: tdf#50916 convert core/tool
    
    Change-Id: If2784e3c719de39071b699a5573b65503d3cf10e
    Reviewed-on: https://gerrit.libreoffice.org/81985
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index a434df66e57f..6a2205072b97 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -231,7 +231,8 @@ private:
 
     static ScTabViewShell*  GetTabViewShell();
     static ScNavigatorSettings* GetNavigatorSettings();
-    bool                    GetViewData();
+    ScViewData*             GetViewData();
+
 
     void    UpdateColumn    ( const SCCOL* pCol = nullptr );
     void    UpdateRow       ( const SCROW* pRow = nullptr );
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index 7e0ac94b241b..a8e2672c4428 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -23,6 +23,7 @@
 
 #include <navcitem.hxx>
 #include <navipi.hxx>
+#include <viewdata.hxx>
 #include <sc.hrc>
 
 ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16          nIdP,
@@ -49,7 +50,7 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat
                 {
                     const OUString&  aAddress( pCellPosItem->GetValue() );
                     ScAddress aScAddress;
-                    aScAddress.Parse( aAddress );
+                    aScAddress.Parse( aAddress, rNavigatorDlg.GetViewData()->GetDocument() );
 
                     SCCOL nCol = aScAddress.Col()+1;
                     SCROW nRow = aScAddress.Row()+1;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 219488c1c0fc..75f508d73f5b 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -818,12 +818,11 @@ ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings()
     return pViewSh ? pViewSh->GetNavigatorSettings() : nullptr;
 }
 
-bool ScNavigatorDlg::GetViewData()
+ScViewData* ScNavigatorDlg::GetViewData()
 {
     ScTabViewShell* pViewSh = GetTabViewShell();
     pViewData = pViewSh ? &pViewSh->GetViewData() : nullptr;
-
-    return ( pViewData != nullptr );
+    return pViewData;
 }
 
 void ScNavigatorDlg::UpdateColumn( const SCCOL* pCol )