desktop/source/app/check_ext_deps.cxx | 6 +-
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 4 -
desktop/source/deployment/inc/dp_interact.h | 6 +-
desktop/source/deployment/registry/component/dp_component.cxx | 14 ++---
desktop/source/deployment/registry/help/dp_help.cxx | 4 -
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 2
desktop/source/lib/init.cxx | 8 +--
desktop/source/migration/migration.cxx | 26 +++++-----
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 2
9 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 3705139a8ecc98cd8f548cb7706503bd72dd4029
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed May 4 14:40:41 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed May 4 19:28:34 2022 +0200
Just use Any ctor instead of makeAny in desktop
Change-Id: Ieca85ea1b822ffa80420ed1cb6950bdedd15d000
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133828
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/desktop/source/app/check_ext_deps.cxx
b/desktop/source/app/check_ext_deps.cxx
index a5978696f6e5..80c6f044a8c5 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -316,12 +316,12 @@ static void impl_setNeedsCompatCheck()
comphelper::getProcessComponentContext() ) );
beans::NamedValue v( "nodepath",
- makeAny( OUString("org.openoffice.Setup/Office") ) );
+ Any( OUString("org.openoffice.Setup/Office") ) );
Sequence< Any > theArgs{ Any(v) };
Reference< beans::XPropertySet > pset(
theConfigProvider->createInstanceWithArguments( aAccessSrvc,
theArgs ), UNO_QUERY_THROW );
- Any value = makeAny( OUString("never") );
+ Any value( OUString("never") );
pset->setPropertyValue("LastCompatibilityCheckID", value );
Reference< util::XChangesBatch >( pset, UNO_QUERY_THROW
)->commitChanges();
@@ -346,7 +346,7 @@ static bool impl_needsCompatCheck()
comphelper::getProcessComponentContext() ) );
beans::NamedValue v( "nodepath",
- makeAny( OUString("org.openoffice.Setup/Office") ) );
+ Any( OUString("org.openoffice.Setup/Office") ) );
Sequence< Any > theArgs{ Any(v) };
Reference< beans::XPropertySet > pset(
theConfigProvider->createInstanceWithArguments( aAccessSrvc,
theArgs ), UNO_QUERY_THROW );
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 4db98a876b05..285cff67c2cf 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -441,7 +441,7 @@ void UpdateInstallDialog::Thread::installExtensions()
}
if (!updateData.aUpdateSource.is() &&
!updateData.sLocalURL.isEmpty())
{
- css::beans::NamedValue prop("EXTENSION_UPDATE",
css::uno::makeAny(OUString("1")));
+ css::beans::NamedValue prop("EXTENSION_UPDATE",
css::uno::Any(OUString("1")));
if (!updateData.bIsShared)
xExtension = m_dialog.getExtensionManager()->addExtension(
updateData.sLocalURL,
css::uno::Sequence<css::beans::NamedValue>(&prop, 1),
@@ -458,7 +458,7 @@ void UpdateInstallDialog::Thread::installExtensions()
//add extension. Currently it contains only
"SUPPRESS_LICENSE". So it could happen
//that a license is displayed when updating from the shared
repository, although the
//shared extension was installed using "SUPPRESS_LICENSE".
- css::beans::NamedValue prop("EXTENSION_UPDATE",
css::uno::makeAny(OUString("1")));
+ css::beans::NamedValue prop("EXTENSION_UPDATE",
css::uno::Any(OUString("1")));
if (!updateData.bIsShared)
xExtension = m_dialog.getExtensionManager()->addExtension(
updateData.aUpdateSource->getURL(),
css::uno::Sequence<css::beans::NamedValue>(&prop, 1),
diff --git a/desktop/source/deployment/inc/dp_interact.h
b/desktop/source/deployment/inc/dp_interact.h
index 645a3a80ba0d..20e486c37412 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -37,7 +37,7 @@ inline void progressUpdate(
css::uno::Reference<css::ucb::XProgressHandler> xProgressHandler(
xCmdEnv->getProgressHandler() );
if (xProgressHandler.is()) {
- xProgressHandler->update( css::uno::makeAny(status) );
+ xProgressHandler->update( css::uno::Any(status) );
}
}
}
@@ -65,7 +65,7 @@ inline ProgressLevel::ProgressLevel(
if (xCmdEnv.is())
m_xProgressHandler = xCmdEnv->getProgressHandler();
if (m_xProgressHandler.is())
- m_xProgressHandler->push( css::uno::makeAny(status) );
+ m_xProgressHandler->push( css::uno::Any(status) );
}
@@ -79,7 +79,7 @@ inline ProgressLevel::~ProgressLevel()
inline void ProgressLevel::update( OUString const & status ) const
{
if (m_xProgressHandler.is())
- m_xProgressHandler->update( css::uno::makeAny(status) );
+ m_xProgressHandler->update( css::uno::Any(status) );
}
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx
b/desktop/source/deployment/registry/component/dp_component.cxx
index 9cb4846c6ee8..6aad3b1d2419 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1496,7 +1496,7 @@ void BackendImpl::TypelibraryPackageImpl::processPackage_(
"/singletons"
"/com.sun.star.reflection.theTypeDescriptionManager"),
css::uno::UNO_QUERY_THROW)->insert(
- css::uno::makeAny(expandUnoRcUrl(url)));
+ css::uno::Any(expandUnoRcUrl(url)));
}
that->addToUnoRc( m_jarFile ? RCITEM_JAR_TYPELIB : RCITEM_RDB_TYPELIB,
@@ -1514,7 +1514,7 @@ void BackendImpl::TypelibraryPackageImpl::processPackage_(
"/singletons"
"/com.sun.star.reflection.theTypeDescriptionManager"),
css::uno::UNO_QUERY_THROW)->remove(
- css::uno::makeAny(expandUnoRcUrl(url)));
+ css::uno::Any(expandUnoRcUrl(url)));
}
}
}
@@ -1670,13 +1670,13 @@ void
BackendImpl::ComponentsPackageImpl::processPackage_(
// supporting the extended XSet semantics:
css::uno::Sequence< css::beans::NamedValue > args
{
- { "uri", css::uno::makeAny(expandUnoRcUrl(url)) },
- { "component-context", css::uno::makeAny(context) }
+ { "uri", css::uno::Any(expandUnoRcUrl(url)) },
+ { "component-context", css::uno::Any(context) }
};
css::uno::Reference< css::container::XSet > smgr(
that->getRootContext()->getServiceManager(),
css::uno::UNO_QUERY_THROW);
- smgr->insert(css::uno::makeAny(args));
+ smgr->insert(css::uno::Any(args));
}
that->addToUnoRc(RCITEM_COMPONENTS, url, xCmdEnv);
} else { // revoke
@@ -1684,11 +1684,11 @@ void
BackendImpl::ComponentsPackageImpl::processPackage_(
if (!startup) {
// This relies on the root component context's service manager
// supporting the extended XSet semantics:
- css::uno::Sequence< css::beans::NamedValue > args { { "uri",
css::uno::makeAny(expandUnoRcUrl(url)) } };
+ css::uno::Sequence< css::beans::NamedValue > args { { "uri",
css::uno::Any(expandUnoRcUrl(url)) } };
css::uno::Reference< css::container::XSet > smgr(
that->getRootContext()->getServiceManager(),
css::uno::UNO_QUERY_THROW);
- smgr->remove(css::uno::makeAny(args));
+ smgr->remove(css::uno::Any(args));
}
that->releaseObject(url);
that->revokeEntryFromDb(url); // in case it got added with old code
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index f039d27250d9..9e1a75fb93fb 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -392,7 +392,7 @@ void BackendImpl::implProcessHelp(
"No help folder";
OWeakObject* oWeakThis = this;
throw deployment::DeploymentException( OUString(),
oWeakThis,
- makeAny(
uno::Exception( aErrStr, oWeakThis ) ) );
+ Any(
uno::Exception( aErrStr, oWeakThis ) ) );
}
// Scan languages
@@ -538,7 +538,7 @@ void BackendImpl::implProcessHelp(
OWeakObject* oWeakThis = this;
throw deployment::DeploymentException( OUString(),
oWeakThis,
- makeAny(
uno::Exception( aErrStr, oWeakThis ) ) );
+ Any(
uno::Exception( aErrStr, oWeakThis ) ) );
}
}
}
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 34ff6d4ecd05..4d3501bf7152 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -356,7 +356,7 @@ void BackendImpl::PackageImpl::processPackage_(
if (doRegisterPackage)
{
// will throw if it fails
- m_xNameCntrPkgHandler->insertByName( m_url, makeAny( Reference<
XPackage >(this) ) );
+ m_xNameCntrPkgHandler->insertByName( m_url, Any( Reference< XPackage
>(this) ) );
}
else // revokePackage()
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 914885b30065..d5713b8edbf7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4821,8 +4821,8 @@ static bool doc_paste(LibreOfficeKitDocument* pThis,
const char* pMimeType, cons
uno::Sequence<beans::PropertyValue>
aPropertyValues(comphelper::InitPropertySequence(
{
- {"AnchorType",
uno::makeAny(static_cast<sal_uInt16>(css::text::TextContentAnchorType_AS_CHARACTER))},
- {"IgnoreComments", uno::makeAny(true)},
+ {"AnchorType",
uno::Any(static_cast<sal_uInt16>(css::text::TextContentAnchorType_AS_CHARACTER))},
+ {"IgnoreComments", uno::Any(true)},
}));
if (!comphelper::dispatchCommand(".uno:Paste", aPropertyValues))
{
@@ -6419,7 +6419,7 @@ static void activateNotebookbar(std::u16string_view rApp)
if (aAppNode.isValid())
{
- aAppNode.setNodeValue("Active",
makeAny(OUString("notebookbar_online.ui")));
+ aAppNode.setNodeValue("Active",
Any(OUString("notebookbar_online.ui")));
aAppNode.commit();
}
}
@@ -6678,7 +6678,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
// 3) InitVCL()
{
comphelper::ProfileZone aInit("preload");
-
aService->initialize({css::uno::makeAny<OUString>("preload")});
+ aService->initialize({css::uno::Any(OUString("preload"))});
}
{ // Force load some modules
comphelper::ProfileZone aInit("preload modules");
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 25579a979dbc..524ca86152d1 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -197,7 +197,7 @@ bool MigrationImpl::doMigration()
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::Sequence< uno::Any > lArgs {uno::Any(aOldCfgDataPath),
uno::Any(embed::ElementModes::READ)};
uno::Reference< uno::XComponentContext >
xContext(comphelper::getProcessComponentContext());
uno::Reference< lang::XSingleServiceFactory >
xStorageFactory(embed::FileSystemStorageFactory::create(xContext));
@@ -261,7 +261,7 @@ void MigrationImpl::setMigrationCompleted()
{
try {
uno::Reference< XPropertySet >
aPropertySet(getConfigAccess("org.openoffice.Setup/Office", true),
uno::UNO_QUERY_THROW);
- aPropertySet->setPropertyValue("MigrationCompleted",
uno::makeAny(true));
+ aPropertySet->setPropertyValue("MigrationCompleted", uno::Any(true));
uno::Reference< XChangesBatch >(aPropertySet,
uno::UNO_QUERY_THROW)->commitChanges();
} catch (...) {
// fail silently
@@ -703,7 +703,7 @@ uno::Reference< XNameAccess >
MigrationImpl::getConfigAccess(const char* pPath,
comphelper::getProcessComponentContext()));
// access the provider
- uno::Sequence< uno::Any > theArgs {uno::makeAny(sConfigURL)};
+ uno::Sequence< uno::Any > theArgs {uno::Any(sConfigURL)};
xNameAccess.set(
theConfigProvider->createInstanceWithArguments(
sAccessSrvc, theArgs ), uno::UNO_QUERY_THROW );
@@ -753,9 +753,9 @@ void MigrationImpl::runServices()
uno::Sequence< uno::Any > seqArguments(3);
auto pseqArguments = seqArguments.getArray();
pseqArguments[0] <<= NamedValue("Productname",
- uno::makeAny(m_aInfo.productname));
+ uno::Any(m_aInfo.productname));
pseqArguments[1] <<= NamedValue("UserData",
- uno::makeAny(m_aInfo.userdata));
+ uno::Any(m_aInfo.userdata));
// create an instance of every migration service
@@ -775,7 +775,7 @@ void MigrationImpl::runServices()
seqExtDenyList = comphelper::arrayToSequence< OUString >(
rMigration.excludeExtensions.data(),
nSize );
pseqArguments[2] <<= NamedValue("ExtensionDenyList",
- uno::makeAny( seqExtDenyList ));
+ uno::Any( seqExtDenyList ));
xMigrationJob.set(
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(rMigration.service,
seqArguments, xContext),
@@ -802,8 +802,8 @@ std::vector< MigrationModuleInfo >
MigrationImpl::detectUIChangesForAllModules()
static const OUStringLiteral MENUBAR(u"menubar");
static const OUStringLiteral TOOLBAR(u"toolbar");
- uno::Sequence< uno::Any > lArgs {uno::makeAny(m_aInfo.userdata +
"/user/config/soffice.cfg/modules"),
- uno::makeAny(embed::ElementModes::READ)};
+ uno::Sequence< uno::Any > lArgs {uno::Any(m_aInfo.userdata +
"/user/config/soffice.cfg/modules"),
+ uno::Any(embed::ElementModes::READ)};
uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
embed::FileSystemStorageFactory::create(comphelper::getProcessComponentContext()));
@@ -974,13 +974,13 @@ void MigrationImpl::mergeOldToNewVersion(const
uno::Reference< ui::XUIConfigurat
if (nIndex == -1) {
auto aProperties =
vcl::CommandInfoProvider::GetCommandProperties(elem.m_sCommandURL,
sModuleIdentifier);
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(vcl::CommandInfoProvider::GetLabelForCommand(aProperties)),
beans::PropertyState_DIRECT_VALUE),
- beans::PropertyValue(ITEM_DESCRIPTOR_CONTAINER, 0,
uno::makeAny(elem.m_xPopupMenu), beans::PropertyState_DIRECT_VALUE)
+ beans::PropertyValue(ITEM_DESCRIPTOR_COMMANDURL, 0,
uno::Any(elem.m_sCommandURL), beans::PropertyState_DIRECT_VALUE),
+ beans::PropertyValue(ITEM_DESCRIPTOR_LABEL, 0,
uno::Any(vcl::CommandInfoProvider::GetLabelForCommand(aProperties)),
beans::PropertyState_DIRECT_VALUE),
+ beans::PropertyValue(ITEM_DESCRIPTOR_CONTAINER, 0,
uno::Any(elem.m_xPopupMenu), beans::PropertyState_DIRECT_VALUE)
};
if (elem.m_sPrevSibling.isEmpty())
- xTemp->insertByIndex(0, uno::makeAny(aPropSeq));
+ xTemp->insertByIndex(0, uno::Any(aPropSeq));
else {
sal_Int32 nCount = xTemp->getCount();
sal_Int32 i = 0;
@@ -999,7 +999,7 @@ void MigrationImpl::mergeOldToNewVersion(const
uno::Reference< ui::XUIConfigurat
break;
}
- xTemp->insertByIndex(i+1, uno::makeAny(aPropSeq));
+ xTemp->insertByIndex(i+1, uno::Any(aPropSeq));
}
}
}
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index cdaec44ebc35..374520235a0a 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -406,7 +406,7 @@ extern "C" int unopkg_main()
{
beans::NamedValue nvSuppress(
"SUPPRESS_LICENSE", option_suppressLicense ?
- makeAny(OUString("1")):makeAny(OUString("0")));
+ Any(OUString("1")):Any(OUString("0")));
xExtensionManager->addExtension(
cmdPackage,
Sequence<beans::NamedValue>(&nvSuppress, 1),
repository, Reference<task::XAbortChannel>(),
xCmdEnv);
