sd/source/ui/view/drviewsf.cxx | 5 +---- svtools/source/misc/transfer2.cxx | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-)
New commits: commit 97da89451c1de4a85a8f02b496441cb712652e5a Author: Julien Nabet <[email protected]> Date: Fri Sep 27 23:14:45 2013 +0200 cppcheck: redundantAssignment Change-Id: I0e43c8920a3f439bff4835aadd5e69c322cc0730 diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 4da8400..7eac621 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -136,7 +136,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv { AcceptDropEvent aAcceptEvent; ExecuteDropEvent aExecuteEvt( rDTDE.DropAction & ~DNDConstants::ACTION_DEFAULT, Point( rDTDE.LocationX, rDTDE.LocationY ), rDTDE ); - sal_Int8 nRet = DNDConstants::ACTION_NONE; aExecuteEvt.mbDefault = ( ( rDTDE.DropAction & DNDConstants::ACTION_DEFAULT ) != 0 ); @@ -152,7 +151,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv aAcceptEvent.mbLeaving = sal_False; aAcceptEvent.mbDefault = aExecuteEvt.mbDefault; - nRet = mrParent.AcceptDrop( aAcceptEvent ); + sal_Int8 nRet = mrParent.AcceptDrop( aAcceptEvent ); if( DNDConstants::ACTION_NONE != nRet ) { commit 75fe8129a6355e2f56e40ae2be01822d8ca015ab Author: Julien Nabet <[email protected]> Date: Fri Sep 27 23:13:01 2013 +0200 cppcheck: Variable nActNumLvl reassigned before old value used Change-Id: I6d745b80b0d72033be12d8f78ebdbcdabeabd579 diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 5667740..35ef900 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -564,16 +564,13 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) aNewAttr.Put( aEditAttr, sal_False ); - sal_uInt16 nActNumLvl = (sal_uInt16)0xFFFF; SvxNumRule* pNumRule = NULL; const SfxPoolItem* pTmpItem=NULL; 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_BUL_NUM_RULE_INDEX,DEFAULT_NONE)); - nActNumLvl = mpDrawView->GetSelectionLevel(); + sal_uInt16 nActNumLvl = mpDrawView->GetSelectionLevel(); pTmpItem=GetNumBulletItem(aNewAttr, nNumItemId); if (pTmpItem) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
