Drop uses of css::uno::Sequence::getConstArray in deployment

where it was obsoleted by commits 2484de6728bd11bb7949003d112f1ece2223c7a1
(Remove non-const Sequence::begin()/end() in internal code, 2021-10-15) and
fb3c04bd1930eedacd406874e1a285d62bbf27d9 (Drop non-const Sequence::operator[]
in internal code 2021-11-05).

Change-Id: I3b2cb267010e7b654291fa866b28c7cc272f0ea1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166911
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

4 files changed, 20 insertions, 45 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index c91ec4a0b132..fe7194405576 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -507,27 +507,24 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
     }
     else
     {
+        assert(approve != abort);
         // select:
-        uno::Sequence< uno::Reference< task::XInteractionContinuation > > conts(
-            xRequest->getContinuations() );
-        uno::Reference< task::XInteractionContinuation > const * pConts = conts.getConstArray();
-        sal_Int32 len = conts.getLength();
-        for ( sal_Int32 pos = 0; pos < len; ++pos )
+        for (auto& cont : xRequest->getContinuations())
         {
             if (approve) {
-                uno::Reference< task::XInteractionApprove > xInteractionApprove( pConts[ pos ], uno::UNO_QUERY );
+                uno::Reference<task::XInteractionApprove> xInteractionApprove(cont, uno::UNO_QUERY);
                 if (xInteractionApprove.is()) {
                     xInteractionApprove->select();
                     // don't query again for ongoing continuations:
-                    approve = false;
+                    break;
                 }
             }
-            else if (abort) {
-                uno::Reference< task::XInteractionAbort > xInteractionAbort( pConts[ pos ], uno::UNO_QUERY );
+            else /*if (abort)*/ {
+                uno::Reference<task::XInteractionAbort> xInteractionAbort(cont, uno::UNO_QUERY);
                 if (xInteractionAbort.is()) {
                     xInteractionAbort->select();
                     // don't query again for ongoing continuations:
-                    abort = false;
+                    break;
                 }
             }
         }
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 0248a1537fa1..e15c72c9caac 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -623,21 +623,14 @@ void UpdateCommandEnv::handle(
     else
     {
         // select:
-        css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > conts(
-            xRequest->getContinuations() );
-        css::uno::Reference< css::task::XInteractionContinuation > const * pConts =
-            conts.getConstArray();
-        sal_Int32 len = conts.getLength();
-        for ( sal_Int32 pos = 0; pos < len; ++pos )
+        for (auto& cont : xRequest->getContinuations())
         {
-            if (approve) {
-                css::uno::Reference< css::task::XInteractionApprove > xInteractionApprove(
-                    pConts[ pos ], css::uno::UNO_QUERY );
-                if (xInteractionApprove.is()) {
-                    xInteractionApprove->select();
-                    // don't query again for ongoing continuations:
-                    approve = false;
-                }
+            css::uno::Reference< css::task::XInteractionApprove > xInteractionApprove(
+                cont, css::uno::UNO_QUERY );
+            if (xInteractionApprove.is()) {
+                xInteractionApprove->select();
+                // don't query again for ongoing continuations:
+                break;
             }
         }
     }
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index a84bc2809544..b0db2acd200e 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -396,12 +396,8 @@ void BackendImpl::implProcessHelp(
                 }
 
                 // Scan languages
-                Sequence< OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true );
-                sal_Int32 nLangCount = aLanguageFolderSeq.getLength();
-                const OUString* pSeq = aLanguageFolderSeq.getConstArray();
-                for( sal_Int32 iLang = 0 ; iLang < nLangCount ; ++iLang )
+                for (auto& aLangURL : xSFA->getFolderContents(aExpandedHelpURL, true))
                 {
-                    OUString aLangURL = pSeq[iLang];
                     if( xSFA->isFolder( aLangURL ) )
                     {
                         std::vector< OUString > aXhpFileVector;
@@ -436,12 +432,8 @@ void BackendImpl::implProcessHelp(
 
                         sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
 
-                        Sequence< OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true );
-                        sal_Int32 nSubLangCount = aSubLangSeq.getLength();
-                        const OUString* pSubLangSeq = aSubLangSeq.getConstArray();
-                        for( sal_Int32 iSubLang = 0 ; iSubLang < nSubLangCount ; ++iSubLang )
+                        for (auto& aSubFolderURL : xSFA->getFolderContents(aLangURL, true))
                         {
-                            OUString aSubFolderURL = pSubLangSeq[iSubLang];
                             if( !xSFA->isFolder( aSubFolderURL ) )
                                 continue;
 
@@ -565,12 +557,8 @@ void BackendImpl::implCollectXhpFiles( const OUString& aDir,
     Reference< ucb::XSimpleFileAccess3 > xSFA = getFileAccess();
 
     // Scan xhp files recursively
-    Sequence< OUString > aSeq = xSFA->getFolderContents( aDir, true );
-    sal_Int32 nCount = aSeq.getLength();
-    const OUString* pSeq = aSeq.getConstArray();
-    for( sal_Int32 i = 0 ; i < nCount ; ++i )
+    for (auto& aURL : xSFA->getFolderContents(aDir, true))
     {
-        OUString aURL = pSeq[i];
         if( xSFA->isFolder( aURL ) )
         {
             implCollectXhpFiles( aURL, o_rXhpFileVector );
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 494ce437e1e9..c4407d9f2ee2 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -468,10 +468,8 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
 
 void BackendImpl::PackageImpl::disposing()
 {
-    sal_Int32 len = m_bundle.getLength();
-    Reference<deployment::XPackage> const * p = m_bundle.getConstArray();
-    for ( sal_Int32 pos = 0; pos < len; ++pos )
-        try_dispose( p[ pos ] );
+    for (auto& xPackage : m_bundle)
+        try_dispose(xPackage);
     m_bundle.realloc( 0 );
 
     Package::disposing();
@@ -1064,13 +1062,12 @@ void BackendImpl::PackageImpl::exportTo(
         std::vector< Sequence<beans::PropertyValue> > manifest;
         manifest.reserve( bundle.getLength() );
         sal_Int32 baseURLlen = m_url_expanded.getLength();
-        Reference<deployment::XPackage> const *pbundle = bundle.getConstArray();
         static constexpr OUStringLiteral strMediaType( u"MediaType" );
         static constexpr OUStringLiteral strFullPath( u"FullPath" );
         static constexpr OUStringLiteral strIsFolder( u"IsFolder" );
         for ( sal_Int32 pos = bundle.getLength(); pos--; )
         {
-            Reference<deployment::XPackage> const & xPackage = pbundle[ pos ];
+            Reference<deployment::XPackage> const& xPackage = bundle[pos];
             OUString url_( expandUnoRcUrl( xPackage->getURL() ) );
             OSL_ASSERT( url_.getLength() >= baseURLlen );
             OUString fullPath;