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

[Markus Mohrhard]

 sc/source/ui/view/gridwin.cxx  |    3 +--
 sc/source/ui/view/gridwin2.cxx |    2 +-
 sc/source/ui/view/gridwin4.cxx |    7 +++----
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit be5511822416c27647fbdc8cd36a19bd8ccce488
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Aug 18 20:02:05 2017 +0200

    get the ScDocument directly from the ScViewData
    
    Change-Id: Id4b836bb334a208f83aeffed8ae932f4ce7437ec
    Reviewed-on: https://gerrit.libreoffice.org/41338
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 23edbf1b28bb..a09477ba2b61 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4473,8 +4473,7 @@ void ScGridWindow::UpdateFormulas()
 
     SCROW nPosY = nY1;
 
-    ScDocShell* pDocSh = pViewData->GetDocShell();
-    ScDocument& rDoc = pDocSh->GetDocument();
+    ScDocument& rDoc = *pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
 
     rDoc.ExtendHidden( nX1, nY1, nX2, nY2, nTab );
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 4e175365e6a3..5c6daf65c11d 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -600,7 +600,7 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu()
 
 bool ScGridWindow::UpdateVisibleRange()
 {
-    ScDocument& rDoc = pViewData->GetDocShell()->GetDocument();
+    ScDocument& rDoc = *pViewData->GetDocument();
 
     SCCOL nPosX = 0;
     SCROW nPosY = 0;
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index b7f319135f88..eb5f702c85bf 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -379,8 +379,7 @@ void ScGridWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const tools::R
 
 void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode )
 {
-    ScDocShell* pDocSh = pViewData->GetDocShell();
-    ScDocument& rDoc = pDocSh->GetDocument();
+    ScDocument& rDoc = *pViewData->GetDocument();
 
     // let's ignore the normal Draw() attempts when doing the tiled rendering,
     // all the rendering should go through PaintTile() in that case.
@@ -523,8 +522,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
         bool bLogicText)
 {
     ScModule* pScMod = SC_MOD();
-    ScDocShell* pDocSh = pViewData->GetDocShell();
-    ScDocument& rDoc = pDocSh->GetDocument();
+    ScDocument& rDoc = *pViewData->GetDocument();
     const ScViewOptions& rOpts = pViewData->GetOptions();
     bool bIsTiledRendering = comphelper::LibreOfficeKit::isActive();
 
@@ -840,6 +838,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
     ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() );
     if (pHdl)
     {
+        ScDocShell* pDocSh = pViewData->GetDocShell();
         ScRangeFindList* pRangeFinder = pHdl->GetRangeFindList();
         if ( pRangeFinder && !pRangeFinder->IsHidden() &&
                 pRangeFinder->GetDocName() == pDocSh->GetTitle() )