Simplify Sequence iterations in writerfilter, writerperfect, xmlhelp

Use range-based loops or replace with comphelper or STL functions

Change-Id: I9113e04d15ad84d0abac087afc627969e8ebc354
Reviewed-on: https://gerrit.libreoffice.org/73867
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 36 insertions, 52 deletions

diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 33a6bc6bf4cf..30c36cbf5414 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -234,14 +234,13 @@ uno::Any SAL_CALL Content::execute(
         uno::Sequence< uno::Any > ret(propertyValues.getLength());
         uno::Sequence< beans::Property > props(getProperties(Environment));
         // No properties can be set
-        for(sal_Int32 i = 0; i < ret.getLength(); ++i) {
-            ret[i] <<= beans::UnknownPropertyException();
-            for(sal_Int32 j = 0; j < props.getLength(); ++j)
-                if(props[j].Name == propertyValues[i].Name) {
-                    ret[i] <<= lang::IllegalAccessException();
-                    break;
-                }
-        }
+        std::transform(propertyValues.begin(), propertyValues.end(), ret.begin(),
+            [&props](const beans::PropertyValue& rPropVal) {
+                if (std::any_of(props.begin(), props.end(),
+                                [&rPropVal](const beans::Property& rProp) { return rProp.Name == rPropVal.Name; }))
+                    return css::uno::toAny(lang::IllegalAccessException());
+                return css::uno::toAny(beans::UnknownPropertyException());
+            });
 
         aRet <<= ret;
     }
@@ -331,10 +330,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     rtl::Reference< ::ucbhelper::PropertyValueSet > xRow =
         new ::ucbhelper::PropertyValueSet( m_xContext );
 
-    for ( sal_Int32 n = 0; n < rProperties.getLength(); ++n )
+    for ( const beans::Property& rProp : rProperties )
     {
-        const beans::Property& rProp = rProperties[n];
-
         if ( rProp.Name == "ContentType" )
             xRow->appendString(
                 rProp,
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index e12ae7930853..61756c23eeda 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -1160,19 +1160,16 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
         {
             Sequence< Reference< deployment::XPackage > > aPkgSeq = xPackage->getBundle
                 ( Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>() );
-            sal_Int32 nPkgCount = aPkgSeq.getLength();
-            const Reference< deployment::XPackage >* pSeq = aPkgSeq.getConstArray();
-            for( sal_Int32 iPkg = 0 ; iPkg < nPkgCount ; ++iPkg )
+            auto pSubPkg = std::find_if(aPkgSeq.begin(), aPkgSeq.end(),
+                [&aHelpMediaType](const Reference< deployment::XPackage >& xSubPkg) {
+                    const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType();
+                    OUString aMediaType = xPackageTypeInfo->getMediaType();
+                    return aMediaType == aHelpMediaType;
+                });
+            if (pSubPkg != aPkgSeq.end())
             {
-                const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ];
-                const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType();
-                OUString aMediaType = xPackageTypeInfo->getMediaType();
-                if( aMediaType == aHelpMediaType )
-                {
-                    xHelpPackage = xSubPkg;
-                    o_xParentPackageBundle = xPackage;
-                    break;
-                }
+                xHelpPackage = *pSubPkg;
+                o_xParentPackageBundle = xPackage;
             }
         }
         else
@@ -1319,11 +1316,8 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUS
     OUString aExtensionPath = xPackage->getURL();
     Sequence< OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );
 
-    const OUString* pSeq = aEntrySeq.getConstArray();
-    sal_Int32 nCount = aEntrySeq.getLength();
-    for( sal_Int32 i = 0 ; i < nCount ; ++i )
+    for( const OUString& aEntry : aEntrySeq )
     {
-        OUString aEntry = pSeq[i];
         if( m_xSFA->isFolder( aEntry ) )
         {
             sal_Int32 nLastSlash = aEntry.lastIndexOf( '/' );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index c399d32c660c..fa9ac9ba6f84 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -370,18 +370,17 @@ public:
 
     beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override
     {
-        for( int i = 0; i < m_aSeq.getLength(); ++i )
-            if( aName == m_aSeq[i].Name )
-                return m_aSeq[i];
+        auto pProp = std::find_if(m_aSeq.begin(), m_aSeq.end(),
+            [&aName](const beans::Property& rProp) { return aName == rProp.Name; });
+        if (pProp != m_aSeq.end())
+            return *pProp;
         throw beans::UnknownPropertyException();
     }
 
     sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override
     {
-        for( int i = 0; i < m_aSeq.getLength(); ++i )
-            if( Name == m_aSeq[i].Name )
-                return true;
-        return false;
+        return std::any_of(m_aSeq.begin(), m_aSeq.end(),
+            [&Name](const beans::Property& rProp) { return Name == rProp.Name; });
     }
 
 private:
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index 60a0596f9dc4..65e624433bf6 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -87,10 +87,10 @@ TVFactory::createInstanceWithArguments(
     }
 
     OUString hierview;
-    for( int i = 0; i < Arguments.getLength(); ++i )
+    for( const auto& rArgument : Arguments )
     {
         PropertyValue pV;
-        if( ! ( Arguments[i] >>= pV ) )
+        if( ! ( rArgument >>= pV ) )
             continue;
 
         if( pV.Name != "nodepath" )
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 32be860859c0..f11ae69d948e 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -897,19 +897,16 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
     {
         Sequence< Reference< deployment::XPackage > > aPkgSeq = xPackage->getBundle
             ( Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>() );
-        sal_Int32 nPkgCount = aPkgSeq.getLength();
-        const Reference< deployment::XPackage >* pSeq = aPkgSeq.getConstArray();
-        for( sal_Int32 iPkg = 0 ; iPkg < nPkgCount ; ++iPkg )
+        auto pSubPkg = std::find_if(aPkgSeq.begin(), aPkgSeq.end(),
+            [](const Reference< deployment::XPackage >& xSubPkg) {
+                const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType();
+                OUString aMediaType = xPackageTypeInfo->getMediaType();
+                return aMediaType == aHelpMediaType;
+            });
+        if (pSubPkg != aPkgSeq.end())
         {
-            const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ];
-            const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType();
-            OUString aMediaType = xPackageTypeInfo->getMediaType();
-            if( aMediaType == aHelpMediaType )
-            {
-                xHelpPackage = xSubPkg;
-                o_xParentPackageBundle = xPackage;
-                break;
-            }
+            xHelpPackage = *pSubPkg;
+            o_xParentPackageBundle = xPackage;
         }
     }
     else
@@ -1025,11 +1022,8 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUS
     OUString aExtensionPath = xPackage->getURL();
     Sequence< OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );
 
-    const OUString* pSeq = aEntrySeq.getConstArray();
-    sal_Int32 nCount = aEntrySeq.getLength();
-    for( sal_Int32 i = 0 ; i < nCount ; ++i )
+    for( const OUString& aEntry : aEntrySeq )
     {
-        OUString aEntry = pSeq[i];
         if( m_xSFA->isFolder( aEntry ) )
         {
             sal_Int32 nLastSlash = aEntry.lastIndexOf( '/' );