From 796b51a763d956e58e38af5643854ba3b49bc76a Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 17 Feb 2014 11:34:58 +0200
Subject: [PATCH] cid#736782 dereference before null check

and reduce scope of some variables

Change-Id: I1aada9af15090ff2083354ea9b265b9e3d4e5c02
---
 lotuswordpro/source/filter/lwptablelayout.cxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index b8193b4ca63d..209c2ace7c5a 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1184,7 +1184,6 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_
         pXFPara = static_cast<XFParagraph*>(pCell->FindFirstContent(enumXFContentPara));
         if (!pXFPara)
             return;
-        XFColor aColor;
         XFColor aNullColor = XFColor();
 
         if ( pXFPara)
@@ -1196,8 +1195,8 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_
             if (!sNumfmt.isEmpty())
             {
                 pNumStyle = (XFNumberStyle*)pXFStyleManager->FindStyle( sNumfmt);
-                aColor = pNumStyle->GetColor();
-                if ( pNumStyle &&  aColor != aNullColor )
+                XFColor aColor = pNumStyle->GetColor();
+                if ( aColor != aNullColor )
                     bColorMod = sal_True;//end
             }
 
@@ -1213,7 +1212,7 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_
                 if (bColorMod)
                 {
                     XFFont* pFont = pOverStyle->GetFont();
-                    aColor = pFont->GetColor();
+                    XFColor aColor = pFont->GetColor();
                     if ( aColor == aNullColor )
                     {
                         XFFont* pNewFont = new XFFont;