diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-01-29 11:57:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-01 12:17:56 +0000 |
| commit | 4739b31dafc5154a2c7d6b3f0ee90686863656f0 (patch) | |
| tree | 0437d82f929131f3c900b5feb74cee4b1595499b /xmlhelp | |
| parent | 385c207e3a0b2d946ff29a9003b36f81a8946c55 (diff) | |
cancelCommandExecution - no need to pass exception by Any
all the call sites are passing an uno::Exception subtype
Change-Id: I6de1f00810e063e75ef620314561d7e2d6445ada
Reviewed-on: https://gerrit.libreoffice.org/33657
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/content.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index fbc0eb7a035c..0f188ea7bb29 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -226,8 +226,7 @@ uno::Any SAL_CALL Content::execute( uno::Sequence< beans::Property > Properties; if ( !( aCommand.Argument >>= Properties ) ) { - aRet <<= lang::IllegalArgumentException(); - ucbhelper::cancelCommandExecution(aRet,Environment); + ucbhelper::cancelCommandExecution(lang::IllegalArgumentException(), Environment); } aRet <<= getPropertyValues( Properties ); @@ -237,8 +236,7 @@ uno::Any SAL_CALL Content::execute( uno::Sequence<beans::PropertyValue> propertyValues; if( ! ( aCommand.Argument >>= propertyValues ) ) { - aRet <<= lang::IllegalArgumentException(); - ucbhelper::cancelCommandExecution(aRet,Environment); + ucbhelper::cancelCommandExecution(lang::IllegalArgumentException(), Environment); } uno::Sequence< uno::Any > ret(propertyValues.getLength()); @@ -270,8 +268,7 @@ uno::Any SAL_CALL Content::execute( ucb::OpenCommandArgument2 aOpenCommand; if ( !( aCommand.Argument >>= aOpenCommand ) ) { - aRet <<= lang::IllegalArgumentException(); - ucbhelper::cancelCommandExecution(aRet,Environment); + ucbhelper::cancelCommandExecution(lang::IllegalArgumentException(), Environment); } uno::Reference< io::XActiveDataSink > xActiveDataSink( @@ -287,8 +284,7 @@ uno::Any SAL_CALL Content::execute( aOpenCommand.Sink, uno::UNO_QUERY); if(xActiveDataStreamer.is()) { - aRet <<= ucb::UnsupportedDataSinkException(); - ucbhelper::cancelCommandExecution(aRet,Environment); + ucbhelper::cancelCommandExecution(ucb::UnsupportedDataSinkException(), Environment); } uno::Reference< io::XOutputStream > xOutputStream( @@ -332,8 +328,7 @@ uno::Any SAL_CALL Content::execute( else { // Unsupported command - aRet <<= ucb::UnsupportedCommandException(); - ucbhelper::cancelCommandExecution(aRet,Environment); + ucbhelper::cancelCommandExecution(ucb::UnsupportedCommandException(), Environment); } return aRet; |