From 605a34ccca64c86c89e4e8b6e4b049175a994d54 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 3 May 2022 12:19:50 +0200 Subject: Just use Any ctor instead of makeAny in ucb Change-Id: I5e6964b5fa02d27d37ee772c761c72ed5b50492c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133755 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- ucb/source/ucp/hierarchy/hierarchycontent.cxx | 38 +++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'ucb/source/ucp/hierarchy/hierarchycontent.cxx') diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 2151cbaf3c71..1a773cd24564 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -309,7 +309,7 @@ uno::Any SAL_CALL HierarchyContent::execute( if ( !( aCommand.Argument >>= Properties ) ) { ucbhelper::cancelCommandExecution( - uno::makeAny( lang::IllegalArgumentException( + uno::Any( lang::IllegalArgumentException( "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -329,7 +329,7 @@ uno::Any SAL_CALL HierarchyContent::execute( if ( !( aCommand.Argument >>= aProperties ) ) { ucbhelper::cancelCommandExecution( - uno::makeAny( lang::IllegalArgumentException( + uno::Any( lang::IllegalArgumentException( "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -340,7 +340,7 @@ uno::Any SAL_CALL HierarchyContent::execute( if ( !aProperties.hasElements() ) { ucbhelper::cancelCommandExecution( - uno::makeAny( lang::IllegalArgumentException( + uno::Any( lang::IllegalArgumentException( "No properties!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -376,7 +376,7 @@ uno::Any SAL_CALL HierarchyContent::execute( if ( !( aCommand.Argument >>= aOpenCommand ) ) { ucbhelper::cancelCommandExecution( - uno::makeAny( lang::IllegalArgumentException( + uno::Any( lang::IllegalArgumentException( "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -399,7 +399,7 @@ uno::Any SAL_CALL HierarchyContent::execute( if ( !( aCommand.Argument >>= aArg ) ) { ucbhelper::cancelCommandExecution( - uno::makeAny( lang::IllegalArgumentException( + uno::Any( lang::IllegalArgumentException( "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -454,7 +454,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( - uno::makeAny( lang::IllegalArgumentException( + uno::Any( lang::IllegalArgumentException( "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -476,7 +476,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( - uno::makeAny( lang::IllegalArgumentException( + uno::Any( lang::IllegalArgumentException( "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -493,7 +493,7 @@ uno::Any SAL_CALL HierarchyContent::execute( ucbhelper::cancelCommandExecution( - uno::makeAny( ucb::UnsupportedCommandException( + uno::Any( ucb::UnsupportedCommandException( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); @@ -867,7 +867,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( else if ( rProp.Name == "CreatableContentsInfo" ) { xRow->appendObject( - rProp, uno::makeAny( rData.getCreatableContentsInfo() ) ); + rProp, uno::Any( rData.getCreatableContentsInfo() ) ); } else if ( rProp.Name == "TargetURL" ) { @@ -955,7 +955,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( cppu::UnoType>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - uno::makeAny( rData.getCreatableContentsInfo() ) ); + uno::Any( rData.getCreatableContentsInfo() ) ); // Append all Additional Core Properties. @@ -1290,7 +1290,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, if ( m_eKind == ROOT ) { ucbhelper::cancelCommandExecution( - uno::makeAny( ucb::UnsupportedCommandException( + uno::Any( ucb::UnsupportedCommandException( "Not supported by root folder!", static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); @@ -1302,7 +1302,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { uno::Sequence aProps { "Title" }; ucbhelper::cancelCommandExecution( - uno::makeAny( ucb::MissingPropertiesException( + uno::Any( ucb::MissingPropertiesException( OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), @@ -1324,7 +1324,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, if ( hasData( xId ) ) { ucbhelper::cancelCommandExecution( - uno::makeAny( + uno::Any( ucb::NameClashException( OUString(), static_cast< cppu::OWeakObject * >( this ), @@ -1356,7 +1356,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, if ( nTry == 1000 ) { ucbhelper::cancelCommandExecution( - uno::makeAny( + uno::Any( ucb::UnsupportedNameClashException( "Unable to resolve name clash!", static_cast< cppu::OWeakObject * >( this ), @@ -1378,7 +1378,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, if ( hasData( xId ) ) { ucbhelper::cancelCommandExecution( - uno::makeAny( + uno::Any( ucb::UnsupportedNameClashException( OUString(), static_cast< cppu::OWeakObject * >( this ), @@ -1433,7 +1433,7 @@ void HierarchyContent::destroy( bool bDeletePhysical, if ( m_eState != PERSISTENT ) { ucbhelper::cancelCommandExecution( - uno::makeAny( ucb::UnsupportedCommandException( + uno::Any( ucb::UnsupportedCommandException( "Not persistent!", static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); @@ -1444,7 +1444,7 @@ void HierarchyContent::destroy( bool bDeletePhysical, if ( m_eKind == ROOT ) { ucbhelper::cancelCommandExecution( - uno::makeAny( ucb::UnsupportedCommandException( + uno::Any( ucb::UnsupportedCommandException( "Not supported by root folder!", static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); @@ -1481,7 +1481,7 @@ void HierarchyContent::transfer( if ( m_eState != PERSISTENT ) { ucbhelper::cancelCommandExecution( - uno::makeAny( ucb::UnsupportedCommandException( + uno::Any( ucb::UnsupportedCommandException( "Not persistent!", static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); @@ -1492,7 +1492,7 @@ void HierarchyContent::transfer( if ( !rInfo.SourceURL.startsWith( HIERARCHY_URL_SCHEME ":/" ) ) { ucbhelper::cancelCommandExecution( - uno::makeAny( ucb::InteractiveBadTransferURLException( + uno::Any( ucb::InteractiveBadTransferURLException( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); -- cgit