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

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/gridwin4.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 186f8724fcdc82caf15f3891dff7a2a4a1cb1d92
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 13 10:04:27 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 13 16:09:17 2020 +0200

    cid#1465274 Dereference before null check
    
    Change-Id: I40337228b8591ac4f5367e581a0d2fa7575f0143
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98623
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 1f305e35f057..f31de4542bb6 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1283,9 +1283,9 @@ namespace
     class ScLOKDrawView : public FmFormView
     {
     public:
-        ScLOKDrawView(OutputDevice* pOut, ScViewData* pData) :
-            FmFormView(*pData->GetDocument()->GetDrawLayer(), pOut),
-            pScDrawView(pData ? pData->GetScDrawView() : nullptr)
+        ScLOKDrawView(OutputDevice* pOut, ScViewData& rData) :
+            FmFormView(*rData.GetDocument()->GetDrawLayer(), pOut),
+            pScDrawView(rData.GetScDrawView())
         {
         }
 
@@ -1440,7 +1440,7 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
         mpLOKDrawView.reset(bPrintTwipsMsgs ?
             new ScLOKDrawView(
                 &rDevice,
-                pViewData) :
+                *pViewData) :
             new FmFormView(
                 *pModel,
                 &rDevice));