#87187# - Activated new error handling code.

1 files changed, 2 insertions, 33 deletions

diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx
index 6c8e38d58119..808e6ae1ca0e 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cancelcommandexecution.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: kso $ $Date: 2001-07-04 12:14:35 $
+ *  last change: $Author: kso $ $Date: 2001-07-04 13:06:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,6 @@
  *
  ************************************************************************/
 
-//#define OLD_UCB_ERROR_HANDLING
-
 /**************************************************************************
                                 TODO
  **************************************************************************
@@ -89,15 +87,6 @@
 #include <ucbhelper/simpleioerrorrequest.hxx>
 #endif
 
-#ifdef OLD_UCB_ERROR_HANDLING
-#ifndef _COM_SUN_STAR_UCB_COMMANDABORTEDEXCEPTION_HPP_
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_INTERACTIVEBADTRANSFERURLEXCEPTION_HPP_
-#include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
-#endif
-#endif
-
 using namespace com::sun::star;
 
 namespace ucbhelper
@@ -109,13 +98,6 @@ void cancelCommandExecution( const uno::Any & rException,
                                         ucb::XCommandEnvironment > & xEnv )
     throw( uno::Exception )
 {
-#ifdef OLD_UCB_ERROR_HANDLING
-    ucb::InteractiveBadTransferURLException e;
-    if ( rException >>= e )
-        throw e;
-
-    throw ucb::CommandAbortedException();
-#else
     if ( xEnv.is() )
     {
         uno::Reference<
@@ -149,7 +131,6 @@ void cancelCommandExecution( const uno::Any & rException,
 
     OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" );
     throw uno::RuntimeException();
-#endif
 }
 
 //=========================================================================
@@ -162,9 +143,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
                                     ucb::XCommandProcessor > & xContext )
     throw( uno::Exception )
 {
-#ifdef OLD_UCB_ERROR_HANDLING
-    throw ucb::CommandAbortedException();
-#else
     uno::Sequence< uno::Any > aArgs( 1 );
     aArgs[ 0 ] <<= rArg;
 
@@ -193,7 +171,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
 
     OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" );
     throw uno::RuntimeException();
-#endif
 }
 
 //=========================================================================
@@ -207,9 +184,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
                                     ucb::XCommandProcessor > & xContext )
     throw( uno::Exception )
 {
-#ifdef OLD_UCB_ERROR_HANDLING
-    throw ucb::CommandAbortedException();
-#else
     uno::Sequence< uno::Any > aArgs( 2 );
     aArgs[ 0 ] <<= rArg1;
     aArgs[ 1 ] <<= rArg2;
@@ -239,7 +213,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
 
     OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" );
     throw uno::RuntimeException();
-#endif
 }
 
 //=========================================================================
@@ -252,9 +225,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
                                     ucb::XCommandProcessor > & xContext )
     throw( uno::Exception )
 {
-#ifdef OLD_UCB_ERROR_HANDLING
-    throw ucb::CommandAbortedException();
-#else
     rtl::Reference< ucbhelper::SimpleIOErrorRequest > xRequest
         = new ucbhelper::SimpleIOErrorRequest(
                                     eError, rArgs, rMessage, xContext );
@@ -280,7 +250,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
 
     OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" );
     throw uno::RuntimeException();
-#endif
 }
 
 }