summaryrefslogtreecommitdiff
path: root/ucbhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sb@openoffice.org>2001-08-29 12:38:57 +0000
committerStephan Bergmann <sb@openoffice.org>2001-08-29 12:38:57 +0000
commit9e20c6e06069609af9c3513123ddd04e0debaaff (patch)
tree1685de1a86ebfb4b50d4646020a198018fb9c531 /ucbhelper
parent23f9aca7c3e9887fd5ccdbfb187029b81b63b3bd (diff)
#91676# Removed obsolete versions of cancelCommandExecution().
Diffstat (limited to 'ucbhelper')
-rw-r--r--ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx6
-rw-r--r--ucbhelper/source/provider/cancelcommandexecution.cxx6
2 files changed, 8 insertions, 4 deletions
diff --git a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
index 5b90924bae79..b316ed0a04b9 100644
--- a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
+++ b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cancelcommandexecution.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: kso $ $Date: 2001-06-25 07:07:40 $
+ * last change: $Author: sb $ $Date: 2001-08-29 13:32:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -106,6 +106,7 @@ void cancelCommandExecution( const com::sun::star::uno::Any & rException,
xEnv )
throw( com::sun::star::uno::Exception );
+#if SUPD < 641
/** Cancel the execution of a command by throwing the appropriate exception.
If an Interaction Handler is given with the command environment and the
handler handles the exception by selecting the supplied continuation,
@@ -190,6 +191,7 @@ void cancelCommandExecution( const com::sun::star::ucb::IOErrorCode eError,
com::sun::star::ucb::XCommandProcessor > &
xContext = 0 )
throw( com::sun::star::uno::Exception );
+#endif // SUPD, 641
/** Cancel the execution of a command by throwing the appropriate exception.
If an Interaction Handler is given with the command environment and the
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx
index 808e6ae1ca0e..a9a5bbb5667d 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cancelcommandexecution.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: kso $ $Date: 2001-07-04 13:06:32 $
+ * last change: $Author: sb $ $Date: 2001-08-29 13:34:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -133,6 +133,7 @@ void cancelCommandExecution( const uno::Any & rException,
throw uno::RuntimeException();
}
+#if SUPD < 641
//=========================================================================
void cancelCommandExecution( const ucb::IOErrorCode eError,
const rtl::OUString & rArg,
@@ -214,6 +215,7 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" );
throw uno::RuntimeException();
}
+#endif // SUPD, 641
//=========================================================================
void cancelCommandExecution( const ucb::IOErrorCode eError,