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

[Caolán McNamara]

 sc/source/ui/view/gridwin3.cxx    |    2 +-
 sw/source/core/unocore/unotbl.cxx |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 4eea128a1fbac60f3ae8d28836c95152506d9ede
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 16 09:15:59 2015 +0100

    coverity#1294409 Dereference after null check
    
    pDoc isn't null here
    
    Change-Id: Icf705f2bc67cb08a1920aea5965eb6f0e4786ada

diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 925f473..2ebc698 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -243,7 +243,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce )
     // work in the logic coordinates (ideally 100ths of mm - so that it is
     // the same as editeng and drawinglayer), and get rid of all the
     // SetMapMode's and other unneccessary fun we have with pixels
-    if (pDoc && pDoc->GetDrawLayer() && pDoc->GetDrawLayer()->isTiledRendering())
+    if (pDoc->GetDrawLayer() && pDoc->GetDrawLayer()->isTiledRendering())
     {
         return pViewData->GetLogicMode();
     }
commit e727d4ae8f4b38c7ee65425e4f7fa1d134765a1b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 16 09:13:25 2015 +0100

    coverity#1294408 Logically dead code
    
    pre recent refactor pBox was assigned NULL
    on the now early return pLines->empty() path
    
    Change-Id: I6ecb31afc7a70fd5e11ff474145fd0e73dc33cef

diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 9ffb595..af466b1 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -525,9 +525,7 @@ const SwTableBox* lcl_FindCornerTableBox(const SwTableLines& rTableLines, const
         assert(rBoxes.size() != 0);
         const SwTableBox* pBox = i_bTopLeft ? rBoxes.front() : rBoxes.back();
         assert(pBox);
-        if(!pBox)
-            return nullptr;
-        if(pBox->GetSttNd())
+        if (pBox->GetSttNd())
             return pBox;
         pLines = &pBox->GetTabLines();
     }