From b0f42b588f52268b8cfad527ba76fdbd125ea5ea Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 3 May 2022 23:22:21 +0200 Subject: [PATCH] Just use Any ctor instead of makeAny in sdext Change-Id: I78f6972f0fe94423e00f2c3766df694d8e118439 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133784 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sdext/source/pdfimport/misc/pwdinteract.cxx | 4 ++-- sdext/source/pdfimport/wrapper/wrapper.cxx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index b80f6a60237e..79ef78181600 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -73,7 +73,7 @@ private: PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const OUString& rName ) : m_aRequest( - uno::makeAny( + uno::Any( task::DocumentPasswordRequest( OUString(), uno::Reference< uno::XInterface >(), task::InteractionClassification_QUERY, @@ -127,7 +127,7 @@ private: virtual ~UnsupportedEncryptionFormatRequest() override {} virtual uno::Any SAL_CALL getRequest() override { - return uno::makeAny( + return uno::Any( task::ErrorCodeRequest( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_IO_WRONGVERSION))); diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 891839f6b977..62eeea5c5376 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -717,9 +717,9 @@ uno::Sequence LineParser::readImageImpl() uno::UNO_QUERY_THROW ); uno::Sequence aSequence( comphelper::InitPropertySequence({ - { "URL", uno::makeAny(aFileName) }, - { "InputStream", uno::makeAny( xDataStream ) }, - { "InputSequence", uno::makeAny(aDataSequence) } + { "URL", uno::Any(aFileName) }, + { "InputStream", uno::Any( xDataStream ) }, + { "InputSequence", uno::Any(aDataSequence) } })); return aSequence;