From 88dde756eb18d4b65283008b940aa432f6146e50 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 1 Feb 2017 15:20:53 +0200
Subject: 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.
---
 ucbhelper/source/client/content.cxx                  | 12 ++++++------
 ucbhelper/source/provider/cancelcommandexecution.cxx |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 251c56a27f8e..cdf39ef5bc78 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(
-            IllegalArgumentException(
+            makeAny( 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(
-         UnknownPropertyException(
+         makeAny( 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(
-         UnknownPropertyException(
+         makeAny( 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 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();
 }
-- 
cgit