diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-01 15:20:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-01 15:20:53 +0200 |
| commit | 88dde756eb18d4b65283008b940aa432f6146e50 (patch) | |
| tree | 20dee3f3861a22e802410675d35855734a7f9db2 /ucbhelper/source/provider | |
| parent | 52885c7b82e6cfdd9072af2dc597edcb31192e89 (diff) | |
Revert "cancelCommandExecution - no need to pass exception by Any"
This reverts commit 4739b31dafc5154a2c7d6b3f0ee90686863656f0.
Apparently, passing a param of type css::uno::Exception to Any
will record precisely a css::uno::Exception in that Any, losing
any subtype information, which this commit changed.
Diffstat (limited to 'ucbhelper/source/provider')
| -rw-r--r-- | ucbhelper/source/provider/cancelcommandexecution.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index 755218e51dfb..4fe2b8d4a490 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -40,7 +40,7 @@ namespace ucbhelper { -void cancelCommandExecution( const uno::Exception & rException, +void cancelCommandExecution( const uno::Any & rException, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) { @@ -51,7 +51,7 @@ void cancelCommandExecution( const uno::Exception & rException, if ( xIH.is() ) { rtl::Reference< ucbhelper::InteractionRequest > xRequest - = new ucbhelper::InteractionRequest( uno::makeAny(rException) ); + = new ucbhelper::InteractionRequest( rException ); uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations( 1 ); @@ -69,11 +69,11 @@ void cancelCommandExecution( const uno::Exception & rException, throw ucb::CommandFailedException( OUString(), uno::Reference< uno::XInterface >(), - uno::makeAny(rException) ); + rException ); } } - cppu::throwException( uno::makeAny(rException) ); + cppu::throwException( rException ); OSL_FAIL( "Return from cppu::throwException call!!!" ); throw uno::RuntimeException(); } |