diff options
| -rw-r--r-- | sw/source/filter/rtf/swparrtf.cxx | 18 | ||||
| -rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 12 |
2 files changed, 18 insertions, 12 deletions
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 4f8ff64906f5..d0567a4f7ba1 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -80,11 +80,12 @@ sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rP SwXTextRange::CreateXTextRange(rDoc, *rPam.GetPoint(), nullptr); uno::Reference<document::XFilter> xFilter(xInterface, uno::UNO_QUERY_THROW); - uno::Sequence<beans::PropertyValue> aDescriptor( comphelper::InitPropertySequence({ - { "InputStream", uno::Any(uno::Reference<io::XStream>(new utl::OStreamWrapper(*pStrm))) }, - { "InsertMode", uno::Any(true) }, - { "TextInsertModeRange", uno::Any(xInsertTextRange) } - })); + uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence( + { + { "InputStream", uno::Any(uno::Reference<io::XStream>(new utl::OStreamWrapper(*pStrm))) }, + { "InsertMode", uno::Any(true) }, + { "TextInsertModeRange", uno::Any(xInsertTextRange) } + })); sal_uLong ret(0); try { @@ -171,9 +172,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream& rStream) xImporter->setTargetDocument(xDstDoc); uno::Reference<document::XFilter> xFilter(xInterface, uno::UNO_QUERY_THROW); - uno::Sequence<beans::PropertyValue> aDescriptor( comphelper::InitPropertySequence({ - { "InputStream", uno::Any(uno::Reference<io::XStream>(new utl::OStreamWrapper(rStream))) } - })); + uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence( + { + { "InputStream", uno::Any(uno::Reference<io::XStream>(new utl::OStreamWrapper(rStream))) } + })); bool bRet = true; try { diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index c0389fe40a3c..086852e9a56d 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -492,7 +492,8 @@ void SigningTest::test96097Calc() // Save a copy utl::TempFile aTempFileSaveCopy; aTempFileSaveCopy.EnableKillingFile(); - uno::Sequence<beans::PropertyValue> descSaveACopy( comphelper::InitPropertySequence({ + uno::Sequence<beans::PropertyValue> descSaveACopy(comphelper::InitPropertySequence( + { { "SaveACopy", uno::Any(true) }, { "FilterName", uno::Any(OUString("calc8")) } })); @@ -503,7 +504,8 @@ void SigningTest::test96097Calc() // Save As utl::TempFile aTempFileSaveAs; aTempFileSaveAs.EnableKillingFile(); - uno::Sequence<beans::PropertyValue> descSaveAs( comphelper::InitPropertySequence({ + uno::Sequence<beans::PropertyValue> descSaveAs(comphelper::InitPropertySequence( + { { "FilterName", uno::Any(OUString("calc8")) } })); xDocStorable->storeAsURL(aTempFileSaveAs.GetURL(), descSaveAs); @@ -539,7 +541,8 @@ void SigningTest::test96097Doc() // Save a copy utl::TempFile aTempFileSaveCopy; aTempFileSaveCopy.EnableKillingFile(); - uno::Sequence<beans::PropertyValue> descSaveACopy( comphelper::InitPropertySequence({ + uno::Sequence<beans::PropertyValue> descSaveACopy(comphelper::InitPropertySequence( + { { "SaveACopy", uno::Any(true) }, { "FilterName", uno::Any(OUString("writer8")) } })); @@ -550,7 +553,8 @@ void SigningTest::test96097Doc() // Save As utl::TempFile aTempFileSaveAs; aTempFileSaveAs.EnableKillingFile(); - uno::Sequence<beans::PropertyValue> descSaveAs( comphelper::InitPropertySequence({ + uno::Sequence<beans::PropertyValue> descSaveAs(comphelper::InitPropertySequence( + { { "FilterName", uno::Any(OUString("writer8")) } })); xDocStorable->storeAsURL(aTempFileSaveAs.GetURL(), descSaveAs); |