diff options
Diffstat (limited to 'xmloff/source/xforms/xformsimport.cxx')
| -rw-r--r-- | xmloff/source/xforms/xformsimport.cxx | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx index 12741083741f..160ad26099c1 100644 --- a/xmloff/source/xforms/xformsimport.cxx +++ b/xmloff/source/xforms/xformsimport.cxx @@ -153,38 +153,32 @@ void applyXFormsSettings( const Reference< XNameAccess >& _rXForms, const Sequen try { Sequence< OUString > aSettingsForModels( xModelSettings->getElementNames() ); - for ( const OUString* pModelName = aSettingsForModels.getConstArray(); - pModelName != aSettingsForModels.getConstArray() + aSettingsForModels.getLength(); - ++pModelName - ) + for ( auto const & modelName : aSettingsForModels ) { // the settings for this particular model Sequence< PropertyValue > aModelSettings; - OSL_VERIFY( xModelSettings->getByName( *pModelName ) >>= aModelSettings ); + OSL_VERIFY( xModelSettings->getByName( modelName ) >>= aModelSettings ); // the model itself - if ( !_rXForms->hasByName( *pModelName ) ) + if ( !_rXForms->hasByName( modelName ) ) { OSL_FAIL( "applyXFormsSettings: have settings for a non-existent XForms model!" ); continue; } // propagate the settings, being tolerant by omitting properties which are not supported - Reference< XPropertySet > xModelProps( _rXForms->getByName( *pModelName ), UNO_QUERY_THROW ); + Reference< XPropertySet > xModelProps( _rXForms->getByName( modelName ), UNO_QUERY_THROW ); Reference< XPropertySetInfo > xModelPSI( xModelProps->getPropertySetInfo(), UNO_SET_THROW ); - for ( const PropertyValue* pSetting = aModelSettings.getConstArray(); - pSetting != aModelSettings.getConstArray() + aModelSettings.getLength(); - ++pSetting - ) + for ( auto const & setting : aModelSettings ) { - if ( !xModelPSI->hasPropertyByName( pSetting->Name ) ) + if ( !xModelPSI->hasPropertyByName( setting.Name ) ) { OSL_FAIL( "applyXFormsSettings: non-existent model property!" ); continue; } - xModelProps->setPropertyValue( pSetting->Name, pSetting->Value ); + xModelProps->setPropertyValue( setting.Name, setting.Value ); } } } |