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 /ucb/source/ucp/ext/ucpext_content.cxx | |
| 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 'ucb/source/ucp/ext/ucpext_content.cxx')
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_content.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 562d81030dcb..950a953fed99 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -191,8 +191,8 @@ namespace ucb { namespace ucp { namespace ext Sequence< Property > Properties; if ( !( aCommand.Argument >>= Properties ) ) { - ::ucbhelper::cancelCommandExecution( IllegalArgumentException( - OUString(), *this, -1 ), + ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -204,16 +204,16 @@ namespace ucb { namespace ucp { namespace ext Sequence< PropertyValue > aProperties; if ( !( aCommand.Argument >>= aProperties ) ) { - ::ucbhelper::cancelCommandExecution( IllegalArgumentException( - OUString(), *this, -1 ), + ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } if ( !aProperties.getLength() ) { - ::ucbhelper::cancelCommandExecution( IllegalArgumentException( - OUString(), *this, -1 ), + ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -235,8 +235,8 @@ namespace ucb { namespace ucp { namespace ext OpenCommandArgument2 aOpenCommand; if ( !( aCommand.Argument >>= aOpenCommand ) ) { - ::ucbhelper::cancelCommandExecution( IllegalArgumentException( - OUString(), *this, -1 ), + ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -263,8 +263,8 @@ namespace ucb { namespace ucp { namespace ext else { - ::ucbhelper::cancelCommandExecution( UnsupportedCommandException( - OUString(), *this ), + ::ucbhelper::cancelCommandExecution( makeAny( UnsupportedCommandException( + OUString(), *this ) ), i_rEvironment ); // unreachable } |