diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-19 09:22:10 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-19 09:22:10 +0200 |
| commit | 30cc03733bdac1a0057c521834de9226773e2ac9 (patch) | |
| tree | e419e4aa20a406290d15090f6829769c3cb150bf | |
| parent | 50d48709af3406eb270e5357f5d2cc6a218337a9 (diff) | |
Use comphelper::InitPropertySequence()
Change-Id: I10d7fa6180b09f2304227e9fab81bba88f46294f
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 7648a951c071..bf24caade498 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -77,6 +77,7 @@ #include <tools/datetimeutils.hxx> #include <oox/drawingml/drawingmltypes.hxx> #include <unotools/streamwrap.hxx> +#include <comphelper/propertysequence.hxx> #include <bordertest.hxx> @@ -105,15 +106,14 @@ protected: uno::Reference<document::XFilter> xFilter(m_xSFactory->createInstance("com.sun.star.comp.Writer.WriterFilter"), uno::UNO_QUERY_THROW); uno::Reference<document::XImporter> xImporter(xFilter, uno::UNO_QUERY_THROW); xImporter->setTargetDocument(mxComponent); - uno::Sequence<beans::PropertyValue> aDescriptor(3); - aDescriptor[0].Name = "InputStream"; SvStream* pStream = utl::UcbStreamHelper::CreateStream(getURLFromSrc("/sw/qa/extras/ooxmlimport/data/") + rFilename, StreamMode::READ); uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStream)); - aDescriptor[0].Value <<= xStream; - aDescriptor[1].Name = "InsertMode"; - aDescriptor[1].Value <<= sal_True; - aDescriptor[2].Name = "TextInsertModeRange"; - aDescriptor[2].Value <<= xTextRange; + uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence( + { + {"InputStream", uno::makeAny(xStream)}, + {"InputMode", uno::makeAny(sal_True)}, + {"TextInsertModeRange", uno::makeAny(xTextRange)}, + })); return xFilter->filter(aDescriptor); } }; |