summaryrefslogtreecommitdiff
path: root/reportdesign/source/filter
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-10-29 09:55:58 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-10-30 20:55:43 +0200
commitc5196e281f51b2894aa903469ba8c15a6723eb4c (patch)
tree8a54d1c35de97ede316fc94036e25fc591382290 /reportdesign/source/filter
parent7ddf23d19439b9aa569ae35bbac41079203b9f84 (diff)
Prepare for removal of non-const operator[] from Sequence in reportdesign
Change-Id: I7631aeb90bf224ba7a00025df6e3fa444b216a42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124380 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'reportdesign/source/filter')
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx12
3 files changed, 8 insertions, 8 deletions
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 4cebfa18a7ea..ca5cba2ae459 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -168,7 +168,7 @@ void OXMLControlProperty::addValue(const OUString& _sValue)
{
sal_Int32 nPos = m_aSequence.getLength();
m_aSequence.realloc(nPos+1);
- m_aSequence[nPos] = aValue;
+ m_aSequence.getArray()[nPos] = aValue;
}
}
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index ec1796a56db1..123e4a1bb888 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -309,7 +309,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >
{
sal_Int32 nCount = m_aColumns.getLength();
m_aColumns.realloc(nCount+1);
- m_aColumns[nCount] = rColumnName;
+ m_aColumns.getArray()[nCount] = rColumnName;
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index e2fe119eea5a..18053c097630 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -213,14 +213,15 @@ static ErrCode ReadThroughComponent(
nArgs++;
uno::Sequence< uno::Any > aFilterCompArgs( nArgs );
+ auto aFilterCompArgsRange = asNonConstRange(aFilterCompArgs);
nArgs = 0;
if (rxGraphicStorageHandler.is())
- aFilterCompArgs[nArgs++] <<= rxGraphicStorageHandler;
+ aFilterCompArgsRange[nArgs++] <<= rxGraphicStorageHandler;
if( _xEmbeddedObjectResolver.is())
- aFilterCompArgs[ nArgs++ ] <<= _xEmbeddedObjectResolver;
+ aFilterCompArgsRange[ nArgs++ ] <<= _xEmbeddedObjectResolver;
if ( _xProp.is() )
- aFilterCompArgs[ nArgs++ ] <<= _xProp;
+ aFilterCompArgsRange[ nArgs++ ] <<= _xProp;
// the underlying SvXMLImport implements XFastParser, XImporter, XFastDocumentHandler
Reference< XFastParser > xFastParser(
@@ -407,14 +408,13 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
uno::Reference<document::XEmbeddedObjectResolver> xEmbeddedObjectResolver;
uno::Reference< uno::XComponentContext > xContext = GetComponentContext();
- uno::Sequence<uno::Any> aArgs(1);
- aArgs[0] <<= xStorage;
+ uno::Sequence<uno::Any> aArgs{ uno::Any(xStorage) };
xGraphicStorageHandler.set(
xContext->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.comp.Svx.GraphicImportHelper", aArgs, xContext),
uno::UNO_QUERY);
uno::Reference< lang::XMultiServiceFactory > xReportServiceFactory( m_xReportDefinition, uno::UNO_QUERY);
- aArgs[0] <<= beans::NamedValue("Storage",uno::makeAny(xStorage));
+ aArgs.getArray()[0] <<= beans::NamedValue("Storage", uno::makeAny(xStorage));
xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments("com.sun.star.document.ImportEmbeddedObjectResolver",aArgs) , uno::UNO_QUERY);
static constexpr OUStringLiteral s_sOld = u"OldFormat";