ucbhelper/source/client/content.cxx | 8
++++----
ucbhelper/source/provider/authenticationfallback.cxx | 2 +-
ucbhelper/source/provider/resultset.cxx | 8
++++----
ucbhelper/source/provider/simpleauthenticationrequest.cxx | 2 +-
ucbhelper/source/provider/simplecertificatevalidationrequest.cxx | 2 +-
ucbhelper/source/provider/simpleioerrorrequest.cxx | 2 +-
ucbhelper/source/provider/simplenameclashresolverequest.cxx | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 4ad4c963747729c0b980ef49228f468177dc2cca
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 3 11:22:11 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 3 16:03:54 2022 +0200
Just use Any ctor instead of makeAny in ucbhelper
Change-Id: I54169b62d93018d06655c92c0ba99fdee499a8e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133751
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/ucbhelper/source/client/content.cxx
b/ucbhelper/source/client/content.cxx
index e222213ce671..dfe2a9103add 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -508,7 +508,7 @@ Sequence< Any > Content::setPropertyValues(
if ( rPropertyNames.getLength() != rValues.getLength() )
{
ucbhelper::cancelCommandExecution(
- makeAny( IllegalArgumentException(
+ Any( IllegalArgumentException(
"Length of property names sequence and value "
"sequence are unequal!",
get(),
@@ -927,7 +927,7 @@ bool Content::insertNewContent( const OUString&
rContentType,
xNew, m_xImpl->getEnvironment(), m_xImpl->getComponentContext() );
aNewContent.setPropertyValues( rPropertyNames, rPropertyValues );
aNewContent.executeCommand( "insert",
- makeAny(
+ Any(
InsertCommandArgument(
rData.is() ? rData : new
EmptyInputStream,
false /* ReplaceExisting */ ) ) );
@@ -1009,7 +1009,7 @@ bool Content::isFolder()
return bFolder;
ucbhelper::cancelCommandExecution(
- makeAny( UnknownPropertyException(
+ Any( UnknownPropertyException(
"Unable to retrieve value of property 'IsFolder'!",
get() ) ),
m_xImpl->getEnvironment() );
@@ -1028,7 +1028,7 @@ bool Content::isDocument()
return bDoc;
ucbhelper::cancelCommandExecution(
- makeAny( UnknownPropertyException(
+ Any( UnknownPropertyException(
"Unable to retrieve value of property 'IsDocument'!",
get() ) ),
m_xImpl->getEnvironment() );
diff --git a/ucbhelper/source/provider/authenticationfallback.cxx
b/ucbhelper/source/provider/authenticationfallback.cxx
index 70fd0ecbf6b5..04491520bd85 100644
--- a/ucbhelper/source/provider/authenticationfallback.cxx
+++ b/ucbhelper/source/provider/authenticationfallback.cxx
@@ -22,7 +22,7 @@ AuthenticationFallbackRequest::AuthenticationFallbackRequest(
aRequest.instructions = rInstructions;
aRequest.url = rURL;
- setRequest( uno::makeAny( aRequest ) );
+ setRequest( uno::Any( aRequest ) );
m_xAuthFallback = new InteractionAuthFallback( this );
setContinuations({ new InteractionAbort(this), m_xAuthFallback });
diff --git a/ucbhelper/source/provider/resultset.cxx
b/ucbhelper/source/provider/resultset.cxx
index bd253295cfda..eff10d5d253c 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -1342,8 +1342,8 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld,
sal_uInt32 nNew )
"RowCount",
false,
1001,
- uno::makeAny( nOld ), // old value
- uno::makeAny( nNew ) ) ); // new value
+ uno::Any( nOld ), // old value
+ uno::Any( nNew ) ) ); // new value
}
@@ -1358,8 +1358,8 @@ void ResultSet::rowCountFinal()
"IsRowCountFinal",
false,
1000,
- uno:: makeAny( false ), // old value
- uno::makeAny( true ) ) ); // new value
+ uno:: Any( false ), // old value
+ uno::Any( true ) ) ); // new value
}
diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
index c6eee708bbd3..972864d9aab6 100644
--- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
+++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
@@ -109,7 +109,7 @@ void SimpleAuthenticationRequest::initialize(
bool bAllowUseSystemCredentials,
bool bAllowSessionStoring )
{
- setRequest( uno::makeAny( rRequest ) );
+ setRequest( uno::Any( rRequest ) );
// Fill continuations...
unsigned int nSize = 2;
diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
index af39fdf03f16..e1dba7a35dd2 100644
--- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
+++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
@@ -34,7 +34,7 @@
SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( sal_Int3
aRequest.Certificate = certificate;
aRequest.HostName = hostname;
- setRequest( uno::makeAny( aRequest ) );
+ setRequest( uno::Any( aRequest ) );
setContinuations({ new InteractionAbort(this), new
InteractionApprove(this) });
}
diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx
b/ucbhelper/source/provider/simpleioerrorrequest.cxx
index 7a18c6474295..df28f63525bc 100644
--- a/ucbhelper/source/provider/simpleioerrorrequest.cxx
+++ b/ucbhelper/source/provider/simpleioerrorrequest.cxx
@@ -39,7 +39,7 @@ SimpleIOErrorRequest::SimpleIOErrorRequest(
aRequest.Code = eError;
aRequest.Arguments = rArgs;
- setRequest( uno::makeAny( aRequest ) );
+ setRequest( uno::Any( aRequest ) );
// Fill continuations...
setContinuations({ new InteractionAbort(this) });
diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index e5118d536033..652bdcdbb187 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
@@ -138,7 +138,7 @@
SimpleNameClashResolveRequest::SimpleNameClashResolveRequest(
aRequest.ClashingName = rClashingName;
aRequest.ProposedNewName = OUString();
- setRequest( uno::makeAny( aRequest ) );
+ setRequest( uno::Any( aRequest ) );
// Fill continuations...
m_xNameSupplier = new InteractionSupplyName( this );
