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

loplugin:loopvartoosmall

Browse Source 
Change-Id: Id2771f413798ed9ceb76e9c4dd3113633d4e481e
This commit is contained in:
Stephan Bergmann 2017-02-27 13:02:26 +01:00
parent e36f0860f0
commit 36a5d940e7
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdext/source/minimizer/configurationaccess.cxx
View File

@ -251,7 +251,6 @@ void ConfigurationAccess::SaveConfiguration()
do do
{ {
int i; int i;
unsigned int k;
Reference<util::XChangesBatch> xRoot( OpenConfiguration( false ), UNO_QUERY_THROW ); Reference<util::XChangesBatch> xRoot( OpenConfiguration( false ), UNO_QUERY_THROW );
// storing the last used settings // storing the last used settings
@ -267,7 +266,7 @@ void ConfigurationAccess::SaveConfiguration()
for( i = 0; i < aElements.getLength(); i++ ) for( i = 0; i < aElements.getLength(); i++ )
xNameContainer->removeByName( aElements[ i ] ); xNameContainer->removeByName( aElements[ i ] );
for( k = 1; k < maSettings.size(); k++ ) for( std::vector<OptimizerSettings>::size_type k = 1; k < maSettings.size(); k++ )
{ {
OptimizerSettings& rSettings( maSettings[ k ] ); OptimizerSettings& rSettings( maSettings[ k ] );
OUString aElementName( "Template" + OUString::number( k ) ); OUString aElementName( "Template" + OUString::number( k ) );

10
sdext/source/minimizer/optimizerdialogcontrols.cxx
View File

@ -377,14 +377,13 @@ void OptimizerDialog::InitNavigationBar()
void OptimizerDialog::UpdateControlStatesPage0() void OptimizerDialog::UpdateControlStatesPage0()
{ {
sal_uInt32 i;
short nSelectedItem = -1; short nSelectedItem = -1;
Sequence< OUString > aItemList; Sequence< OUString > aItemList;
const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() ); const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() );
if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
{ {
aItemList.realloc( rList.size() - 1 ); aItemList.realloc( rList.size() - 1 );
for ( i = 1; i < rList.size(); i++ ) for ( std::vector<OptimizerSettings>::size_type i = 1; i < rList.size(); i++ )
{ {
aItemList[ i - 1 ] = rList[ i ].maName; aItemList[ i - 1 ] = rList[ i ].maName;
if ( nSelectedItem < 0 ) if ( nSelectedItem < 0 )
@ -598,13 +597,12 @@ void OptimizerDialog::UpdateControlStatesPage4()
} }
setControlProperty( "ComboBox0Pg4", "Enabled", Any( false ) ); setControlProperty( "ComboBox0Pg4", "Enabled", Any( false ) );
sal_uInt32 w;
Sequence< OUString > aItemList; Sequence< OUString > aItemList;
const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() ); const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() );
if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
{ {
aItemList.realloc( rList.size() - 1 ); aItemList.realloc( rList.size() - 1 );
for ( w = 1; w < rList.size(); w++ ) for ( std::vector<OptimizerSettings>::size_type w = 1; w < rList.size(); w++ )
aItemList[ w - 1 ] = rList[ w ].maName; aItemList[ w - 1 ] = rList[ w ].maName;
} }
setControlProperty( "ComboBox0Pg4", "StringItemList", Any( aItemList ) ); setControlProperty( "ComboBox0Pg4", "StringItemList", Any( aItemList ) );
@ -613,7 +611,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
bool bSaveSettingsEnabled = true; bool bSaveSettingsEnabled = true;
if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
{ {
for ( w = 1; w < rList.size(); w++ ) for ( std::vector<OptimizerSettings>::size_type w = 1; w < rList.size(); w++ )
{ {
if ( rList[ w ] == rList[ 0 ] ) if ( rList[ w ] == rList[ 0 ] )
{ {
@ -877,7 +875,7 @@ void OptimizerDialog::InitPage4()
OUString aSettingsName; OUString aSettingsName;
OUString aDefault( getString( STR_MY_SETTINGS ) ); OUString aDefault( getString( STR_MY_SETTINGS ) );
sal_Int32 nSession = 1; sal_Int32 nSession = 1;
sal_uInt32 i; std::vector<OptimizerSettings>::size_type i;
const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() ); const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() );
do do
{ {