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

[Norbert Thiebaud]

 chart2/source/controller/main/ChartController_TextEdit.cxx |    8 ++++++--
 chart2/source/controller/main/ChartTransferable.cxx        |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 9f476dd17cb6299f4bdef4a0d07149d541c9c9a8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 19 19:31:22 2014 -0600

    coverity#705785 Dereference before null check
    
    Change-Id: If83916c580c3c6ef64104c4052e87dc4ee168f17

diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index 6761c48..1ee17dd 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -56,7 +56,7 @@ ChartTransferable::ChartTransferable( SdrModel* pDrawModel, SdrObject* pSelected
     m_xMetaFileGraphic.set( aGraphic.GetXGraphic());
     if ( m_bDrawing )
     {
-        m_pMarkedObjModel = ( pExchgView ? pExchgView->GetMarkedObjModel() : NULL );
+        m_pMarkedObjModel = pExchgView->GetMarkedObjModel();
     }
     delete pExchgView;
 }
commit 910b7bf6c6870fed56c4450ed54303a23f5a23da
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 19 18:54:28 2014 -0600

    coverity#704562 : Dereference after null check
    
    Change-Id: Icf5e2242f73c519de91508eb912a38b21ac9a9d6

diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 32e75a8..bc578be 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -151,8 +151,12 @@ bool ChartController::EndTextEdit()
 void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
 {
     SolarMutexGuard aGuard;
-
-    if( m_pDrawViewWrapper && !m_pDrawViewWrapper->IsTextEdit() )
+    if( !m_pDrawViewWrapper)
+    {
+        OSL_ENSURE( m_pDrawViewWrapper, "No DrawViewWrapper for ChartController" );
+        return;
+    }
+    if( !m_pDrawViewWrapper->IsTextEdit() )
         this->StartTextEdit();
 
     SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create();