Remove non-const Sequence::begin()/end() in internal code

... to avoid hidden cost of multiple COW checks, because they
call getArray() internally.
This obsoletes [loplugin:sequenceloop].

Also rename toNonConstRange to asNonConstRange, to reflect that
the result is a view of the sequence, not an independent object.

TODO: also drop non-const operator[], but introduce operator[]
in SequenceRange.

Change-Id: Idd5fd7a3400fe65274d2a6343025e2ef8911635d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123518
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index f821fd2494c8..c91996d0756c 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -423,7 +423,7 @@ void OWriteStream_Impl::SetDecrypted()
     m_bHasCachedEncryptionData = false;
     m_aEncryptionData.clear();
 
-    for ( auto& rProp : m_aProps )
+    for ( auto& rProp : asNonConstRange(m_aProps) )
     {
         if ( rProp.Name == "Encrypted" )
             rProp.Value <<= false;
@@ -446,7 +446,7 @@ void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEn
     m_bHasDataToFlush = true;
 
     // introduce encryption info
-    for ( auto& rProp : m_aProps )
+    for ( auto& rProp : asNonConstRange(m_aProps) )
     {
         if ( rProp.Name == "Encrypted" )
             rProp.Value <<= true;
@@ -735,7 +735,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
 
         // if there are cached properties update them
         if ( rProp.Name == aMedTypePropName || rProp.Name == aComprPropName )
-            for ( auto& rMemProp : m_aProps )
+            for ( auto& rMemProp : asNonConstRange(m_aProps) )
             {
                 if ( rProp.Name == rMemProp.Name )
                     rMemProp.Value = rProp.Value;
@@ -825,7 +825,7 @@ void OWriteStream_Impl::Commit()
     // copy properties to the package stream
     uno::Reference< beans::XPropertySet > xPropertySet( xNewPackageStream, uno::UNO_QUERY_THROW );
 
-    for ( auto& rProp : m_aProps )
+    for ( auto& rProp : asNonConstRange(m_aProps) )
     {
         if ( rProp.Name == "Size" )
         {
@@ -1053,7 +1053,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProper
     // TODO: may be also raw stream should be marked
 
     uno::Reference< beans::XPropertySet > xPropSet( m_xPackageStream, uno::UNO_QUERY_THROW );
-    for ( auto& rProp : aResult )
+    for ( auto& rProp : asNonConstRange(aResult) )
     {
         try {
             rProp.Value = xPropSet->getPropertyValue( rProp.Name );
@@ -2177,7 +2177,7 @@ void OWriteStream::CloseOutput_Impl()
     if ( !m_xSeekable.is() )
         throw uno::RuntimeException();
 
-    for ( auto& rProp : m_pImpl->m_aProps )
+    for ( auto& rProp : asNonConstRange(m_pImpl->m_aProps) )
     {
         if ( rProp.Name == "Size" )
             rProp.Value <<= m_xSeekable->getLength();
@@ -2785,7 +2785,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
                 bCompressedValueFromType = false;
         }
 
-        for ( auto& rProp : m_pImpl->m_aProps )
+        for ( auto& rProp : asNonConstRange(m_pImpl->m_aProps) )
         {
             if ( aPropertyName == rProp.Name )
                 rProp.Value = aValue;
@@ -2797,7 +2797,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
     {
         // if the "Compressed" property is not set explicitly, the MediaType can change the default value
         m_pImpl->m_bCompressedSetExplicit = true;
-        for ( auto& rProp : m_pImpl->m_aProps )
+        for ( auto& rProp : asNonConstRange(m_pImpl->m_aProps) )
         {
             if ( aPropertyName == rProp.Name )
                 rProp.Value = aValue;
@@ -2828,7 +2828,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
     }
     else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName == aMediaTypeString )
     {
-        for ( auto& rProp : m_pImpl->m_aProps )
+        for ( auto& rProp : asNonConstRange(m_pImpl->m_aProps) )
         {
             if ( aPropertyName == rProp.Name )
                 rProp.Value = aValue;
diff --git a/package/source/zipapi/ThreadedDeflater.cxx b/package/source/zipapi/ThreadedDeflater.cxx
index 73725c580c02..f574105ad4ef 100644
--- a/package/source/zipapi/ThreadedDeflater.cxx
+++ b/package/source/zipapi/ThreadedDeflater.cxx
@@ -114,8 +114,8 @@ void ThreadedDeflater::deflateWrite(
         if (!lastBatch)
         {
             assert(inputBytes == batchSize);
-            std::copy_n(inBuffer.begin() + (batchSize - MaxBlockSize), MaxBlockSize,
-                        prevDataBlock.begin());
+            std::copy_n(std::cbegin(inBuffer) + (batchSize - MaxBlockSize), MaxBlockSize,
+                        prevDataBlock.getArray());
         }
 
         processDeflatedBuffers();
@@ -130,7 +130,7 @@ void ThreadedDeflater::processDeflatedBuffers()
 
     css::uno::Sequence<sal_Int8> outBuffer(batchOutputSize);
 
-    auto pos = outBuffer.begin();
+    auto pos = outBuffer.getArray();
     for (auto& buffer : outBuffers)
     {
         pos = std::copy(buffer.begin(), buffer.end(), pos);