From eddbdb1938b981b64c923030bc6658ab281971b7 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 23 Sep 2011 17:10:57 +0100
Subject: cppcheck: don't dereference NULL pRow

---
 lotuswordpro/source/filter/xfilter/xfcell.cxx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'lotuswordpro')

diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index be319ca7863a..8437275fd1b1 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -173,12 +173,17 @@ void    XFCell::SetValue(rtl::OUString value)
 
 rtl::OUString   XFCell::GetCellName()
 {
-    rtl::OUString   name;
-    XFRow   *pRow = m_pOwnerRow;
+    XFRow *pRow = m_pOwnerRow;
+
+    if( !pRow )
+        return A2OUSTR("");
+
     XFTable *pTable = pRow->GetOwnerTable();
 
-    if( !pRow || !pTable )
+    if( !pTable )
         return A2OUSTR("");
+
+    rtl::OUString name;
     if( pTable->IsSubTable() )
     {
         name = pTable->GetTableName() + A2OUSTR(".") + Int32ToOUString(m_nCol) + A2OUSTR(".") + Int32ToOUString(pRow->GetRow());
-- 
cgit