summaryrefslogtreecommitdiff
path: root/ucbhelper/source
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2017-01-29 11:57:08 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-01 12:17:56 +0000
commit4739b31dafc5154a2c7d6b3f0ee90686863656f0 (patch)
tree0437d82f929131f3c900b5feb74cee4b1595499b /ucbhelper/source
parent385c207e3a0b2d946ff29a9003b36f81a8946c55 (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 'ucbhelper/source')
-rw-r--r--ucbhelper/source/client/content.cxx12
-rw-r--r--ucbhelper/source/provider/cancelcommandexecution.cxx8
2 files changed, 10 insertions, 10 deletions
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index cdf39ef5bc78..251c56a27f8e 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -505,11 +505,11 @@ Sequence< Any > Content::setPropertyValues(
if ( rPropertyNames.getLength() != rValues.getLength() )
{
ucbhelper::cancelCommandExecution(
- makeAny( IllegalArgumentException(
+ IllegalArgumentException(
"Length of property names sequence and value "
"sequence are unequal!",
get(),
- -1 ) ),
+ -1 ),
m_xImpl->getEnvironment() );
// Unreachable
}
@@ -1011,9 +1011,9 @@ bool Content::isFolder()
return bFolder;
ucbhelper::cancelCommandExecution(
- makeAny( UnknownPropertyException(
+ UnknownPropertyException(
"Unable to retrieve value of property 'IsFolder'!",
- get() ) ),
+ get() ),
m_xImpl->getEnvironment() );
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
@@ -1034,9 +1034,9 @@ bool Content::isDocument()
return bDoc;
ucbhelper::cancelCommandExecution(
- makeAny( UnknownPropertyException(
+ UnknownPropertyException(
"Unable to retrieve value of property 'IsDocument'!",
- get() ) ),
+ get() ),
m_xImpl->getEnvironment() );
// Unreachable - cancelCommandExecution always throws an exception,
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx
index 4fe2b8d4a490..755218e51dfb 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.cxx
@@ -40,7 +40,7 @@ namespace ucbhelper
{
-void cancelCommandExecution( const uno::Any & rException,
+void cancelCommandExecution( const uno::Exception & rException,
const uno::Reference<
ucb::XCommandEnvironment > & xEnv )
{
@@ -51,7 +51,7 @@ void cancelCommandExecution( const uno::Any & rException,
if ( xIH.is() )
{
rtl::Reference< ucbhelper::InteractionRequest > xRequest
- = new ucbhelper::InteractionRequest( rException );
+ = new ucbhelper::InteractionRequest( uno::makeAny(rException) );
uno::Sequence< uno::Reference< task::XInteractionContinuation > >
aContinuations( 1 );
@@ -69,11 +69,11 @@ void cancelCommandExecution( const uno::Any & rException,
throw ucb::CommandFailedException(
OUString(),
uno::Reference< uno::XInterface >(),
- rException );
+ uno::makeAny(rException) );
}
}
- cppu::throwException( rException );
+ cppu::throwException( uno::makeAny(rException) );
OSL_FAIL( "Return from cppu::throwException call!!!" );
throw uno::RuntimeException();
}