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

Fix some "Variables reassigned a value before the old one has been used"

Browse Source 
Change-Id: I64eadd8f34e9d60e9d696fa572dc0001532eab02
This commit is contained in:
Julien Nabet
2012-09-15 13:34:50 +02:00
parent a579ad2c08
commit f2504a0a9f
3 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
accessibility/source/extended/accessibleiconchoicectrl.cxx
View File

@@ -250,10 +250,9 @@ namespace accessibility
ensureAlive(); ensureAlive();
sal_Int32 i, nCount = 0;
SvtIconChoiceCtrl* pCtrl = getCtrl(); SvtIconChoiceCtrl* pCtrl = getCtrl();
nCount = pCtrl->GetEntryCount(); sal_Int32 nCount = pCtrl->GetEntryCount();
for ( i = 0; i < nCount; ++i ) for ( sal_Int32 i = 0; i < nCount; ++i )
{ {
SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i ); SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i );
if ( pCtrl->GetCursor() != pEntry ) if ( pCtrl->GetCursor() != pEntry )
@@ -267,10 +266,10 @@ namespace accessibility
ensureAlive(); ensureAlive();
sal_Int32 i, nSelCount = 0, nCount = 0; sal_Int32 nSelCount = 0;
SvtIconChoiceCtrl* pCtrl = getCtrl(); SvtIconChoiceCtrl* pCtrl = getCtrl();
nCount = pCtrl->GetEntryCount(); sal_Int32 nCount = pCtrl->GetEntryCount();
for ( i = 0; i < nCount; ++i ) for ( sal_Int32 i = 0; i < nCount; ++i )
{ {
SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i ); SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i );
if ( pCtrl->GetCursor() == pEntry ) if ( pCtrl->GetCursor() == pEntry )
@@ -290,10 +289,10 @@ namespace accessibility
throw IndexOutOfBoundsException(); throw IndexOutOfBoundsException();
Reference< XAccessible > xChild; Reference< XAccessible > xChild;
sal_Int32 i, nSelCount = 0, nCount = 0; sal_Int32 nSelCount = 0;
SvtIconChoiceCtrl* pCtrl = getCtrl(); SvtIconChoiceCtrl* pCtrl = getCtrl();
nCount = pCtrl->GetEntryCount(); sal_Int32 nCount = pCtrl->GetEntryCount();
for ( i = 0; i < nCount; ++i ) for ( sal_Int32 i = 0; i < nCount; ++i )
{ {
SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i ); SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i );
if ( pCtrl->GetCursor() == pEntry ) if ( pCtrl->GetCursor() == pEntry )
@@ -319,11 +318,11 @@ namespace accessibility
throw IndexOutOfBoundsException(); throw IndexOutOfBoundsException();
Reference< XAccessible > xChild; Reference< XAccessible > xChild;
sal_Int32 i, nSelCount = 0, nCount = 0; sal_Int32 nSelCount = 0;
SvtIconChoiceCtrl* pCtrl = getCtrl(); SvtIconChoiceCtrl* pCtrl = getCtrl();
nCount = pCtrl->GetEntryCount(); sal_Int32 nCount = pCtrl->GetEntryCount();
bool bFound = false; bool bFound = false;
for ( i = 0; i < nCount; ++i ) for ( sal_Int32 i = 0; i < nCount; ++i )
{ {
SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i ); SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i );
if ( pEntry->IsSelected() ) if ( pEntry->IsSelected() )

22
accessibility/source/extended/accessiblelistbox.cxx
View File

@@ -307,9 +307,8 @@ namespace accessibility
ensureAlive(); ensureAlive();
sal_Int32 i, nCount = 0; sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
nCount = getListBox()->GetLevelChildCount( NULL ); for ( sal_Int32 i = 0; i < nCount; ++i )
for ( i = 0; i < nCount; ++i )
{ {
SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
if ( getListBox()->IsSelected( pEntry ) ) if ( getListBox()->IsSelected( pEntry ) )
@@ -323,9 +322,8 @@ namespace accessibility
ensureAlive(); ensureAlive();
sal_Int32 i, nCount = 0; sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
nCount = getListBox()->GetLevelChildCount( NULL ); for ( sal_Int32 i = 0; i < nCount; ++i )
for ( i = 0; i < nCount; ++i )
{ {
SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
if ( !getListBox()->IsSelected( pEntry ) ) if ( !getListBox()->IsSelected( pEntry ) )
@@ -339,9 +337,9 @@ namespace accessibility
ensureAlive(); ensureAlive();
sal_Int32 i, nSelCount = 0, nCount = 0; sal_Int32 nSelCount = 0;
nCount = getListBox()->GetLevelChildCount( NULL ); sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
for ( i = 0; i < nCount; ++i ) for ( sal_Int32 i = 0; i < nCount; ++i )
{ {
SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
if ( getListBox()->IsSelected( pEntry ) ) if ( getListBox()->IsSelected( pEntry ) )
@@ -361,9 +359,9 @@ namespace accessibility
throw IndexOutOfBoundsException(); throw IndexOutOfBoundsException();
Reference< XAccessible > xChild; Reference< XAccessible > xChild;
sal_Int32 i, nSelCount = 0, nCount = 0; sal_Int32 nSelCount= 0;
nCount = getListBox()->GetLevelChildCount( NULL ); sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
for ( i = 0; i < nCount; ++i ) for ( sal_Int32 i = 0; i < nCount; ++i )
{ {
SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
if ( getListBox()->IsSelected( pEntry ) ) if ( getListBox()->IsSelected( pEntry ) )

10
accessibility/source/extended/accessiblelistboxentry.cxx
View File

@@ -730,9 +730,8 @@ namespace accessibility
SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( !pParent ) if ( !pParent )
throw RuntimeException(); throw RuntimeException();
sal_Int32 i, nCount = 0; sal_Int32 nCount = getListBox()->GetLevelChildCount( pParent );
nCount = getListBox()->GetLevelChildCount( pParent ); for ( sal_Int32 i = 0; i < nCount; ++i )
for ( i = 0; i < nCount; ++i )
{ {
SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i ); SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
if ( getListBox()->IsSelected( pEntry ) ) if ( getListBox()->IsSelected( pEntry ) )
@@ -750,9 +749,8 @@ namespace accessibility
SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( !pParent ) if ( !pParent )
throw RuntimeException(); throw RuntimeException();
sal_Int32 i, nCount = 0; sal_Int32 nCount = getListBox()->GetLevelChildCount( pParent );
nCount = getListBox()->GetLevelChildCount( pParent ); for ( sal_Int32 i = 0; i < nCount; ++i )
for ( i = 0; i < nCount; ++i )
{ {
SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i ); SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
if ( !getListBox()->IsSelected( pEntry ) ) if ( !getListBox()->IsSelected( pEntry ) )