mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cid#736782 dereference before null check

Browse Source 
and reduce scope of some variables

Change-Id: I1aada9af15090ff2083354ea9b265b9e3d4e5c02
This commit is contained in:
Noel Grandin
2014-02-17 11:34:58 +02:00
parent 2b3b3373eb
commit 796b51a763
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lotuswordpro/source/filter/lwptablelayout.cxx
View File

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