remove usages of STATIC_ARRAY_END in sc

if used in loops, rewrite to range based loop,
else replace STATIC_ARRAY_END( ) with std::end( )

Change-Id: Ib05063eb78f82c8af967bc82e9759af2a58258c8
Reviewed-on: https://gerrit.libreoffice.org/24808
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>

1 files changed, 12 insertions, 14 deletions

diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index bf395ac20425..ee8d4aa56cd5 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -448,9 +448,8 @@ static const XclChFormatInfo spFmtInfos[] =
 
 XclChFormatInfoProvider::XclChFormatInfoProvider()
 {
-    const XclChFormatInfo* pEnd = STATIC_ARRAY_END( spFmtInfos );
-    for( const XclChFormatInfo* pIt = spFmtInfos; pIt != pEnd; ++pIt )
-        maInfoMap[ pIt->meObjType ] = pIt;
+    for(auto const &rIt : spFmtInfos)
+        maInfoMap[ rIt.meObjType ] = &rIt;
 }
 
 const XclChFormatInfo& XclChFormatInfoProvider::GetFormatInfo( XclChObjectType eObjType ) const
@@ -515,9 +514,8 @@ void XclChExtTypeInfo::Set( const XclChTypeInfo& rTypeInfo, bool b3dChart, bool
 
 XclChTypeInfoProvider::XclChTypeInfoProvider()
 {
-    const XclChTypeInfo* pEnd = STATIC_ARRAY_END( spTypeInfos );
-    for( const XclChTypeInfo* pIt = spTypeInfos; pIt != pEnd; ++pIt )
-        maInfoMap[ pIt->meTypeId ] = pIt;
+    for(const auto &rIt : spTypeInfos)
+        maInfoMap[ rIt.meTypeId ] = &rIt;
 }
 
 const XclChTypeInfo& XclChTypeInfoProvider::GetTypeInfo( XclChTypeId eTypeId ) const
@@ -529,20 +527,20 @@ const XclChTypeInfo& XclChTypeInfoProvider::GetTypeInfo( XclChTypeId eTypeId ) c
 
 const XclChTypeInfo& XclChTypeInfoProvider::GetTypeInfoFromRecId( sal_uInt16 nRecId ) const
 {
-    const XclChTypeInfo* pEnd = STATIC_ARRAY_END( spTypeInfos );
-    for( const XclChTypeInfo* pIt = spTypeInfos; pIt != pEnd; ++pIt )
-        if( pIt->mnRecId == nRecId )
-            return *pIt;
+    for(const auto &rIt : spTypeInfos)
+    {
+        if(rIt.mnRecId == nRecId)
+            return rIt;
+    }
     OSL_FAIL( "XclChTypeInfoProvider::GetTypeInfoFromRecId - unknown record id" );
     return GetTypeInfo( EXC_CHTYPEID_UNKNOWN );
 }
 
 const XclChTypeInfo& XclChTypeInfoProvider::GetTypeInfoFromService( const OUString& rServiceName ) const
 {
-    const XclChTypeInfo* pEnd = STATIC_ARRAY_END( spTypeInfos );
-    for( const XclChTypeInfo* pIt = spTypeInfos; pIt != pEnd; ++pIt )
-        if( rServiceName.equalsAscii( pIt->mpcServiceName ) )
-            return *pIt;
+    for(auto const &rIt : spTypeInfos)
+        if( rServiceName.equalsAscii( rIt.mpcServiceName ) )
+            return rIt;
     OSL_FAIL( "XclChTypeInfoProvider::GetTypeInfoFromService - unknown service name" );
     return GetTypeInfo( EXC_CHTYPEID_UNKNOWN );
 }