From b7f4940c150b3bdd639afa988573a29774fff1f6 Mon Sep 17 00:00:00 2001 From: Daniel Robertson Date: Tue, 25 Aug 2015 12:24:33 -0400 Subject: canvas: replace while loops with range-based for Change-Id: Ide16bee666cf4df41646f9336a585e22a7fe53bd Reviewed-on: https://gerrit.libreoffice.org/18131 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- canvas/source/directx/dx_config.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'canvas/source/directx') diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index e4abde4dda51..be4c3c70bbf2 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -102,11 +102,9 @@ namespace dxcanvas uno::Sequence< sal_Int32 > aValues( sizeof(DeviceInfo)/sizeof(sal_Int32)*maValues.size() ); sal_Int32* pValues = aValues.getArray(); - ValueSet::const_iterator aIter( maValues.begin() ); - const ValueSet::const_iterator aEnd( maValues.end() ); - while( aIter != aEnd ) + for( const auto& rValueSet : maValues ) { - const DeviceInfo& rInfo( *aIter ); + const DeviceInfo& rInfo( rValueSet ); *pValues++ = rInfo.nVendorId; *pValues++ = rInfo.nDeviceId; *pValues++ = rInfo.nDeviceSubSysId; @@ -115,7 +113,6 @@ namespace dxcanvas *pValues++ = rInfo.nDriverVersion; *pValues++ = rInfo.nDriverSubVersion; *pValues++ = rInfo.nDriverBuildId; - ++aIter; } uno::Sequence< uno::Any > aValue(1); -- cgit