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

coverity#705502 Dereference null return value

Browse Source 
Change-Id: I5f41ff8017879a75f088fc0aa1b8ce99f935a46f
This commit is contained in:
Caolán McNamara
2014-03-28 10:41:50 +00:00
parent da0581b32c
commit 0804c8239f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sw/source/core/text/atrstck.cxx
View File

@@ -610,15 +610,20 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr )
const SwTxtAttr* pTopAt = aAttrStack[ nStackPos ].Top(); const SwTxtAttr* pTopAt = aAttrStack[ nStackPos ].Top();
if ( pTopAt ) if ( pTopAt )
{ {
const SfxPoolItem* pItemNext(NULL);
// check if top attribute is collection of attributes // check if top attribute is collection of attributes
if ( RES_TXTATR_INETFMT == pTopAt->Which() || if ( RES_TXTATR_INETFMT == pTopAt->Which() ||
RES_TXTATR_CHARFMT == pTopAt->Which() || RES_TXTATR_CHARFMT == pTopAt->Which() ||
RES_TXTATR_AUTOFMT == pTopAt->Which() ) RES_TXTATR_AUTOFMT == pTopAt->Which() )
{ {
const SfxItemSet* pSet = CharFmt::GetItemSet( pTopAt->GetAttr() ); const SfxItemSet* pSet = CharFmt::GetItemSet( pTopAt->GetAttr() );
const SfxPoolItem* pItemNext; if (pSet)
pSet->GetItemState( nAttr, RES_TXTATR_AUTOFMT != pTopAt->Which(), &pItemNext ); pSet->GetItemState( nAttr, RES_TXTATR_AUTOFMT != pTopAt->Which(), &pItemNext );
}
if (pItemNext)
{
Color aColor; Color aColor;
if ( lcl_ChgHyperLinkColor( *pTopAt, *pItemNext, mpShell, &aColor ) ) if ( lcl_ChgHyperLinkColor( *pTopAt, *pItemNext, mpShell, &aColor ) )
{ {