Kaydet (Commit) 7b954849 authored tarafından Matteo Casalin's avatar Matteo Casalin

Base loops on getToken index, not on numer of tokens

Change-Id: I5dea52157b42749bcd1925bd7a9fcefad1dc857f
Reviewed-on: https://gerrit.libreoffice.org/66224
Tested-by: Jenkins
Reviewed-by: 's avatarMatteo Casalin <matteo.casalin@yahoo.com>
üst c7e7146e
...@@ -476,11 +476,8 @@ Sequence< Any > AnimationsImportHelperImpl::convertValueSequence( XMLTokenEnum e ...@@ -476,11 +476,8 @@ Sequence< Any > AnimationsImportHelperImpl::convertValueSequence( XMLTokenEnum e
// fill the sequence // fill the sequence
Any* pValues = aValues.getArray(); Any* pValues = aValues.getArray();
sal_Int32 nIndex; for (sal_Int32 nIndex = 0; nIndex >= 0; )
for( nIndex = 0; nElements && (nIndex >= 0); nElements-- )
{
*pValues++ = convertValue( eAttributeName, rValue.getToken( 0, ';', nIndex ) ); *pValues++ = convertValue( eAttributeName, rValue.getToken( 0, ';', nIndex ) );
}
} }
return aValues; return aValues;
...@@ -556,8 +553,7 @@ Any AnimationsImportHelperImpl::convertTiming( const OUString& rValue ) ...@@ -556,8 +553,7 @@ Any AnimationsImportHelperImpl::convertTiming( const OUString& rValue )
// fill the sequence // fill the sequence
Sequence< Any > aValues( nElements ); Sequence< Any > aValues( nElements );
Any* pValues = aValues.getArray(); Any* pValues = aValues.getArray();
sal_Int32 nIndex = 0; for (sal_Int32 nIndex = 0; nIndex >= 0; )
while( (nElements--) && (nIndex >= 0) )
*pValues++ = convertTiming( rValue.getToken( 0, ';', nIndex ) ); *pValues++ = convertTiming( rValue.getToken( 0, ';', nIndex ) );
aAny <<= aValues; aAny <<= aValues;
...@@ -578,8 +574,7 @@ Sequence< double > AnimationsImportHelperImpl::convertKeyTimes( const OUString& ...@@ -578,8 +574,7 @@ Sequence< double > AnimationsImportHelperImpl::convertKeyTimes( const OUString&
if( nElements ) if( nElements )
{ {
double* pValues = aKeyTimes.getArray(); double* pValues = aKeyTimes.getArray();
sal_Int32 nIndex = 0; for (sal_Int32 nIndex = 0; nIndex >= 0; )
while( (nElements--) && (nIndex >= 0) )
*pValues++ = rValue.getToken( 0, ';', nIndex ).toDouble(); *pValues++ = rValue.getToken( 0, ';', nIndex ).toDouble();
} }
...@@ -598,8 +593,7 @@ Sequence< TimeFilterPair > AnimationsImportHelperImpl::convertTimeFilter( const ...@@ -598,8 +593,7 @@ Sequence< TimeFilterPair > AnimationsImportHelperImpl::convertTimeFilter( const
if( nElements ) if( nElements )
{ {
TimeFilterPair* pValues = aTimeFilter.getArray(); TimeFilterPair* pValues = aTimeFilter.getArray();
sal_Int32 nIndex = 0; for (sal_Int32 nIndex = 0; nIndex >= 0; )
while( (nElements--) && (nIndex >= 0) )
{ {
const OUString aToken( rValue.getToken( 0, ';', nIndex ) ); const OUString aToken( rValue.getToken( 0, ';', nIndex ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment