summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Fraczek <fraczek.jacek@gmail.com>2018-06-23 21:28:30 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-07-02 14:06:40 +0200
commit10b34eb9f33a19e1189bd822244c04484ae06404 (patch)
tree3b2d35828b0ade834ddfab6a8e84a64b2745dc1f
parent74b33394c45889b640a852ad156e31a5ba60e45b (diff)
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
Change-Id: Ib06c8ed707bdfd87b294b2597614249fac2c1f18 Reviewed-on: https://gerrit.libreoffice.org/56342 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
-rw-r--r--desktop/source/migration/migration.cxx30
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx7
2 files changed, 14 insertions, 23 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index a42602bc7204..c40993338e46 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -240,10 +240,9 @@ bool MigrationImpl::doMigration()
if (sModuleIdentifier.isEmpty())
continue;
- uno::Sequence< uno::Any > lArgs(2);
- OUString aOldCfgDataPath = m_aInfo.userdata + "/user/config/soffice.cfg/modules/";
- lArgs[0] <<= aOldCfgDataPath + i.sModuleShortName;
- lArgs[1] <<= embed::ElementModes::READ;
+
+ OUString aOldCfgDataPath = m_aInfo.userdata + "/user/config/soffice.cfg/modules/" + i.sModuleShortName;
+ uno::Sequence< uno::Any > lArgs {uno::makeAny(aOldCfgDataPath), uno::makeAny(embed::ElementModes::READ)};
uno::Reference< uno::XComponentContext > xContext(comphelper::getProcessComponentContext());
uno::Reference< lang::XSingleServiceFactory > xStorageFactory(embed::FileSystemStorageFactory::create(xContext));
@@ -769,8 +768,7 @@ uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPa
comphelper::getProcessComponentContext()));
// access the provider
- uno::Sequence< uno::Any > theArgs(1);
- theArgs[ 0 ] <<= sConfigURL;
+ uno::Sequence< uno::Any > theArgs {uno::makeAny(sConfigURL)};
xNameAccess.set(
theConfigProvider->createInstanceWithArguments(
sAccessSrvc, theArgs ), uno::UNO_QUERY_THROW );
@@ -870,9 +868,8 @@ std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules(
const OUString MENUBAR("menubar");
const OUString TOOLBAR("toolbar");
- uno::Sequence< uno::Any > lArgs(2);
- lArgs[0] <<= m_aInfo.userdata + "/user/config/soffice.cfg/modules";
- lArgs[1] <<= embed::ElementModes::READ;
+ uno::Sequence< uno::Any > lArgs {uno::makeAny(m_aInfo.userdata + "/user/config/soffice.cfg/modules"),
+ uno::makeAny(embed::ElementModes::READ)};
uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
embed::FileSystemStorageFactory::create(comphelper::getProcessComponentContext()));
@@ -1046,17 +1043,14 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
}
}
- } while (nIndex>=0);
+ } while (nIndex >= 0);
if (nIndex == -1) {
- uno::Sequence< beans::PropertyValue > aPropSeq(3);
-
- aPropSeq[0].Name = ITEM_DESCRIPTOR_COMMANDURL;
- aPropSeq[0].Value <<= elem.m_sCommandURL;
- aPropSeq[1].Name = ITEM_DESCRIPTOR_LABEL;
- aPropSeq[1].Value <<= retrieveLabelFromCommand(elem.m_sCommandURL, sModuleIdentifier);
- aPropSeq[2].Name = ITEM_DESCRIPTOR_CONTAINER;
- aPropSeq[2].Value <<= elem.m_xPopupMenu;
+ uno::Sequence< beans::PropertyValue > aPropSeq {
+ beans::PropertyValue(ITEM_DESCRIPTOR_COMMANDURL, 0, uno::makeAny(elem.m_sCommandURL), beans::PropertyState_DIRECT_VALUE),
+ beans::PropertyValue(ITEM_DESCRIPTOR_LABEL, 0, uno::makeAny(retrieveLabelFromCommand(elem.m_sCommandURL, sModuleIdentifier)), beans::PropertyState_DIRECT_VALUE),
+ beans::PropertyValue(ITEM_DESCRIPTOR_CONTAINER, 0, uno::makeAny(elem.m_xPopupMenu), beans::PropertyState_DIRECT_VALUE)
+ };
if (elem.m_sPrevSibling.isEmpty())
xTemp->insertByIndex(0, uno::makeAny(aPropSeq));
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 70c8ac5249ee..4a68a61aa52d 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -353,16 +353,13 @@ Reference<XComponentContext> connectToOffice(
Reference<XComponentContext> const & xLocalComponentContext,
bool verbose )
{
- Sequence<OUString> args( 3 );
- args[ 0 ] = "--nologo";
- args[ 1 ] = "--nodefault";
-
OUString pipeId( ::dp_misc::generateRandomPipeId() );
OUStringBuffer buf;
buf.append( "--accept=pipe,name=" );
buf.append( pipeId );
buf.append( ";urp;" );
- args[ 2 ] = buf.makeStringAndClear();
+
+ Sequence<OUString> args { "--nologo", "--nodefault", buf.makeStringAndClear() };
OUString appURL( getExecutableDir() + "/soffice" );
if (verbose)