sax/qa/cppunit/xmlimport.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
New commits: commit 83f50dee5b4add87cf30903aeb0e44e0d4f04682 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Fri Oct 29 09:56:46 2021 +0300 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Sat Oct 30 21:12:29 2021 +0200 Prepare for removal of non-const operator[] from Sequence in sax Change-Id: I9df7229f55347bd4477626595cab459065cc4bb8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124381 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx index cb34ff1f5eb2..fcf839609cac 100644 --- a/sax/qa/cppunit/xmlimport.cxx +++ b/sax/qa/cppunit/xmlimport.cxx @@ -358,17 +358,16 @@ void XMLImportTest::setUp() xTokenHandler.set( new DummyTokenHandler ); uno::Reference<lang::XInitialization> const xInit(m_xLegacyFastParser, uno::UNO_QUERY_THROW); - uno::Sequence<uno::Any> args(1); - args[0] <<= xTokenHandler; - xInit->initialize( args ); + xInit->initialize({ uno::Any(xTokenHandler) }); sal_Int32 nNamespaceCount = SAL_N_ELEMENTS(DummyTokenHandler::namespaceURIs); uno::Sequence<uno::Any> namespaceArgs( nNamespaceCount + 1 ); - namespaceArgs[0] <<= OUString( "registerNamespaces" ); + auto p_namespaceArgs = namespaceArgs.getArray(); + p_namespaceArgs[0] <<= OUString( "registerNamespaces" ); for (sal_Int32 i = 1; i <= nNamespaceCount; i++ ) { css::beans::Pair<OUString, sal_Int32> rPair( OUString(DummyTokenHandler::namespaceURIs[i - 1]), i << 16 ); - namespaceArgs[i] <<= rPair; + p_namespaceArgs[i] <<= rPair; } xInit->initialize( namespaceArgs ); @@ -406,9 +405,7 @@ void XMLImportTest::testMissingNamespaceDeclaration() uno::Reference<lang::XInitialization> const xInit(m_xLegacyFastParser, uno::UNO_QUERY_THROW); - uno::Sequence<uno::Any> args(1); - args[0] <<= OUString("IgnoreMissingNSDecl"); - xInit->initialize( args ); + xInit->initialize({ uno::Any(OUString("IgnoreMissingNSDecl")) }); for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS( fileNames ); i++) {