Prepare for removal of non-const operator[] from Sequence in sdext

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

5 files changed, 28 insertions, 29 deletions

diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index dcda24fe2184..18751a00490a 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -320,16 +320,18 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
             {
                 nFilterNamePos = nAttribs;
                 rFilterData.realloc( ++nAttribs );
-                rFilterData[ nFilterNamePos ].Name = "FilterName";
+                rFilterData.getArray()[ nFilterNamePos ].Name = "FilterName";
             }
+            auto pFilterData = rFilterData.getArray();
             aOutTypeName = "pdf_Portable_Document_Format";
 
-            rFilterData[nFilterNamePos].Value <<= aOutFilterName;
+            pFilterData[nFilterNamePos].Value <<= aOutFilterName;
             if( xEmbedStream.is() )
             {
                 rFilterData.realloc( ++nAttribs );
-                rFilterData[nAttribs-1].Name = "EmbeddedSubstream";
-                rFilterData[nAttribs-1].Value <<= xEmbedStream;
+                pFilterData = rFilterData.getArray();
+                pFilterData[nAttribs-1].Name = "EmbeddedSubstream";
+                pFilterData[nAttribs-1].Value <<= xEmbedStream;
             }
             if( !aPwd.isEmpty() )
             {
@@ -337,19 +339,24 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
                 {
                     nPwdPos = nAttribs;
                     rFilterData.realloc( ++nAttribs );
-                    rFilterData[ nPwdPos ].Name = "Password";
+                    pFilterData = rFilterData.getArray();
+                    pFilterData[ nPwdPos ].Name = "Password";
                 }
-                rFilterData[ nPwdPos ].Value <<= aPwd;
+                pFilterData[ nPwdPos ].Value <<= aPwd;
             }
         }
         else
         {
+            css::beans::PropertyValue* pFilterData;
             if( nFilterNamePos == -1 )
             {
                 nFilterNamePos = nAttribs;
                 rFilterData.realloc( ++nAttribs );
-                rFilterData[ nFilterNamePos ].Name = "FilterName";
+                pFilterData = rFilterData.getArray();
+                pFilterData[ nFilterNamePos ].Name = "FilterName";
             }
+            else
+                pFilterData = rFilterData.getArray();
 
             const sal_Int32 nDocumentType = 0; //const sal_Int32 nDocumentType = queryDocumentTypeDialog(m_xContext,aURL);
             if( nDocumentType < 0 )
@@ -359,15 +366,15 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
             else switch( nDocumentType )
             {
                 case 0:
-                    rFilterData[nFilterNamePos].Value <<= OUString( "draw_pdf_import" );
+                    pFilterData[nFilterNamePos].Value <<= OUString( "draw_pdf_import" );
                     break;
 
                 case 1:
-                    rFilterData[nFilterNamePos].Value <<= OUString( "impress_pdf_import" );
+                    pFilterData[nFilterNamePos].Value <<= OUString( "impress_pdf_import" );
                     break;
 
                 case 2:
-                    rFilterData[nFilterNamePos].Value <<= OUString( "writer_pdf_import" );
+                    pFilterData[nFilterNamePos].Value <<= OUString( "writer_pdf_import" );
                     break;
 
                 default:
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 9885a6606a54..8bf54bddb99f 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -92,9 +92,7 @@ uno::Any PDFPasswordRequest::getRequest()
 
 uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordRequest::getContinuations()
 {
-    uno::Sequence< uno::Reference< task::XInteractionContinuation > > aRet( 1 );
-    aRet[0] = this;
-    return aRet;
+    return { this };
 }
 
 void PDFPasswordRequest::setPassword( const OUString& rPwd )
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index aa993ae1fa6a..e38e81fce917 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -52,10 +52,9 @@ public:
 
 OdfEmitter::OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ) :
     m_xOutput( xOutput ),
-    m_aLineFeed(1)
+    m_aLineFeed{ '\n' }
 {
     OSL_PRECOND(m_xOutput.is(), "OdfEmitter(): invalid output stream");
-    m_aLineFeed[0] = '\n';
 
     write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 }
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 14060715c83c..dc2def1c58e3 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -129,9 +129,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
         }
         if( xSubStream.is() )
         {
-            uno::Sequence< uno::Any > aArgs( 2 );
-            aArgs[0] <<= m_xModel;
-            aArgs[1] <<= xSubStream;
+            uno::Sequence< uno::Any > aArgs{ uno::Any(m_xModel), uno::Any(xSubStream) };
 
             SAL_INFO("sdext.pdfimport", "try to instantiate subfilter" );
             uno::Reference< document::XFilter > xSubFilter;
@@ -158,9 +156,9 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
                     {
                         nPwPos = aFilterData.getLength();
                         aFilterData.realloc( nPwPos+1 );
-                        aFilterData[nPwPos].Name = "Password";
+                        aFilterData.getArray()[nPwPos].Name = "Password";
                     }
-                    aFilterData[nPwPos].Value <<= aPwd;
+                    aFilterData.getArray()[nPwPos].Value <<= aPwd;
                     bRet = xSubFilter->filter( aFilterData );
                 }
                 else
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 3553a588802c..0560826d5727 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -697,8 +697,7 @@ uno::Sequence<beans::PropertyValue> LineParser::readImageImpl()
     uno::Sequence<sal_Int8> aDataSequence(nImageSize);
     readBinaryData( aDataSequence );
 
-    uno::Sequence< uno::Any > aStreamCreationArgs(1);
-    aStreamCreationArgs[0] <<= aDataSequence;
+    uno::Sequence< uno::Any > aStreamCreationArgs{ uno::Any(aDataSequence) };
 
     uno::Reference< uno::XComponentContext > xContext( m_parser.m_xContext, uno::UNO_SET_THROW );
     uno::Reference< lang::XMultiComponentFactory > xFactory( xContext->getServiceManager(), uno::UNO_SET_THROW );
@@ -729,19 +728,17 @@ void LineParser::readImage()
         uno::Sequence<sal_Int8> aDataSequence(nMaskColors);
         readBinaryData( aDataSequence );
 
-        uno::Sequence<uno::Any> aMaskRanges(2);
-
         uno::Sequence<double> aMinRange(nMaskColors/2);
+        auto pMinRange = aMinRange.getArray();
         uno::Sequence<double> aMaxRange(nMaskColors/2);
+        auto pMaxRange = aMaxRange.getArray();
         for( sal_Int32 i=0; i<nMaskColors/2; ++i )
         {
-            aMinRange[i] = aDataSequence[i] / 255.0;
-            aMaxRange[i] = aDataSequence[i+nMaskColors/2] / 255.0;
+            pMinRange[i] = aDataSequence[i] / 255.0;
+            pMaxRange[i] = aDataSequence[i+nMaskColors/2] / 255.0;
         }
 
-        aMaskRanges[0] <<= aMinRange;
-        aMaskRanges[1] <<= aMaxRange;
-
+        uno::Sequence<uno::Any> aMaskRanges{ uno::Any(aMinRange), uno::Any(aMaxRange) };
         m_parser.m_pSink->drawColorMaskedImage( aImg, aMaskRanges );
     }
     else