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

cppcheck: Variable nActNumLvl reassigned before old value used

Browse Source 
Change-Id: I6d745b80b0d72033be12d8f78ebdbcdabeabd579
This commit is contained in:
Julien Nabet
2013-09-27 23:13:01 +02:00
parent fa82c9a1d1
commit 75fe8129a6
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sd/source/ui/view/drviewsf.cxx
View File

@@ -564,16 +564,13 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
aNewAttr.Put( aEditAttr, sal_False ); aNewAttr.Put( aEditAttr, sal_False );
sal_uInt16 nActNumLvl = (sal_uInt16)0xFFFF;
SvxNumRule* pNumRule = NULL; SvxNumRule* pNumRule = NULL;
const SfxPoolItem* pTmpItem=NULL; const SfxPoolItem* pTmpItem=NULL;
sal_uInt16 nNumItemId = SID_ATTR_NUMBERING_RULE; sal_uInt16 nNumItemId = SID_ATTR_NUMBERING_RULE;
//if(SFX_ITEM_SET == aNewAttr.GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pTmpItem))
// nActNumLvl = ((const SfxUInt16Item*)pTmpItem)->GetValue();
rSet.Put(SfxUInt16Item(FN_NUM_NUM_RULE_INDEX,DEFAULT_NONE)); rSet.Put(SfxUInt16Item(FN_NUM_NUM_RULE_INDEX,DEFAULT_NONE));
rSet.Put(SfxUInt16Item(FN_BUL_NUM_RULE_INDEX,DEFAULT_NONE)); rSet.Put(SfxUInt16Item(FN_BUL_NUM_RULE_INDEX,DEFAULT_NONE));
nActNumLvl = mpDrawView->GetSelectionLevel(); sal_uInt16 nActNumLvl = mpDrawView->GetSelectionLevel();
pTmpItem=GetNumBulletItem(aNewAttr, nNumItemId); pTmpItem=GetNumBulletItem(aNewAttr, nNumItemId);
if (pTmpItem) if (pTmpItem)