svl/qa/unit/test_URIHelper.cxx | 2 +-
svl/source/config/asiancfg.cxx | 10 +++++-----
svl/source/fsstor/fsstorage.cxx | 4 ++--
svl/source/misc/documentlockfile.cxx | 4 ++--
svl/source/misc/sharecontrolfile.cxx | 4 ++--
svl/source/passwordcontainer/passwordcontainer.cxx | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit eaf1f095ef96ceaf94f2fb1859324c11a35422c6
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 3 20:07:43 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 3 23:20:20 2022 +0200
Just use Any ctor instead of makeAny in svl
Change-Id: Iefa570476bf0c881e36679ae9511ff63162e05d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133771
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index bb3e29ee2810..1f81867e658a 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -150,7 +150,7 @@ css::uno::Any Content::execute(
}
break;
}
- return css::uno::makeAny(uri.toAsciiLowerCase());
+ return css::uno::Any(uri.toAsciiLowerCase());
}
class Provider: public cppu::WeakImplHelper< css::ucb::XContentProvider > {
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 3ff5797fccaf..a8f4e08e519d 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.cxx
@@ -149,17 +149,17 @@ void SvxAsianConfig::SetStartEndChars(
css::uno::Reference< css::beans::XPropertySet > el(
v.get< css::uno::Reference< css::beans::XPropertySet > >(),
css::uno::UNO_SET_THROW);
- el->setPropertyValue("StartCharacters",
css::uno::makeAny(*startChars));
- el->setPropertyValue("EndCharacters",
css::uno::makeAny(*endChars));
+ el->setPropertyValue("StartCharacters",
css::uno::Any(*startChars));
+ el->setPropertyValue("EndCharacters", css::uno::Any(*endChars));
} else {
css::uno::Reference< css::beans::XPropertySet > el(
(css::uno::Reference< css::lang::XSingleServiceFactory >(
set, css::uno::UNO_QUERY_THROW)->
createInstance()),
css::uno::UNO_QUERY_THROW);
- el->setPropertyValue("StartCharacters",
css::uno::makeAny(*startChars));
- el->setPropertyValue("EndCharacters",
css::uno::makeAny(*endChars));
- css::uno::Any v2(css::uno::makeAny(el));
+ el->setPropertyValue("StartCharacters",
css::uno::Any(*startChars));
+ el->setPropertyValue("EndCharacters", css::uno::Any(*endChars));
+ css::uno::Any v2(el);
try {
set->insertByName(name, v2);
} catch (css::container::ElementExistException &) {
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 0ae71ab53389..8d2da219d7be 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -924,9 +924,9 @@ uno::Any SAL_CALL FSStorage::getPropertyValue( const
OUString& aPropertyName )
::osl::MutexGuard aGuard( m_aMutex );
if ( aPropertyName == "URL" )
- return uno::makeAny( m_aURL );
+ return uno::Any( m_aURL );
else if ( aPropertyName == "OpenMode" )
- return uno::makeAny( m_nMode );
+ return uno::Any( m_nMode );
throw beans::UnknownPropertyException(aPropertyName); // TODO
}
diff --git a/svl/source/misc/documentlockfile.cxx
b/svl/source/misc/documentlockfile.cxx
index fdbbc90ba465..09d67a9e5533 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -101,7 +101,7 @@ bool GenDocumentLockFile::CreateOwnLockFile()
// try to let the file be hidden if possible
try {
- aTargetContent.setPropertyValue("IsHidden", uno::makeAny( true ) );
+ aTargetContent.setPropertyValue("IsHidden", uno::Any( true ) );
} catch( uno::Exception& ) {}
}
catch( ucb::NameClashException& )
@@ -159,7 +159,7 @@ void GenDocumentLockFile::RemoveFileDirectly()
uno::Reference < css::ucb::XCommandEnvironment > xEnv;
::ucbhelper::Content aCnt(GetURL(), xEnv,
comphelper::getProcessComponentContext());
aCnt.executeCommand("delete",
- uno::makeAny(true));
+ uno::Any(true));
}
diff --git a/svl/source/misc/sharecontrolfile.cxx
b/svl/source/misc/sharecontrolfile.cxx
index d0cdda561876..486f280533f7 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -76,11 +76,11 @@ ShareControlFile::ShareControlFile( std::u16string_view
aOrigURL )
ucb::InsertCommandArgument aInsertArg;
aInsertArg.Data = xInput;
aInsertArg.ReplaceExisting = false;
- aContent.executeCommand( "insert", uno::makeAny( aInsertArg )
);
+ aContent.executeCommand( "insert", uno::Any( aInsertArg ) );
// try to let the file be hidden if possible
try {
- aContent.setPropertyValue("IsHidden", uno::makeAny( true )
);
+ aContent.setPropertyValue("IsHidden", uno::Any( true ) );
} catch( uno::Exception& ) {}
// Try to open one more time
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx
b/svl/source/passwordcontainer/passwordcontainer.cxx
index 6a2537a56bda..9dd1b7eb7ebb 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -1388,7 +1388,7 @@ MasterPasswordRequest_Impl::MasterPasswordRequest_Impl(
PasswordRequestMode Mode
aRequest.Classification = InteractionClassification_ERROR;
aRequest.Mode = Mode;
- setRequest( makeAny( aRequest ) );
+ setRequest( Any( aRequest ) );
// Fill continuations...
Sequence< RememberAuthentication > aRememberModes{
RememberAuthentication_NO };
