diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-07 07:42:42 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-07 07:42:42 +0000 |
| commit | 7a01eac000d0eb0a3ce5ec553cd1af79dba1b1fb (patch) | |
| tree | e5c5be1623fb2bb00af31f71b3d031fdcb7c2706 /ucbhelper | |
| parent | 3e2012f257bc545a0d26a2ee998f272156ef64c0 (diff) | |
INTEGRATION: CWS supdremove (1.12.48); FILE MERGED
2007/11/16 10:23:38 vg 1.12.48.1: #i83674# cleanup: remove obsolete SUPD macro use
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/provider/cancelcommandexecution.cxx | 87 |
1 files changed, 2 insertions, 85 deletions
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index 0ec9d6ea99c2..1ebb86937d91 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cancelcommandexecution.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: obo $ $Date: 2006-09-16 17:20:48 $ + * last change: $Author: obo $ $Date: 2008-01-07 08:42:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -110,89 +110,6 @@ void cancelCommandExecution( const uno::Any & rException, throw uno::RuntimeException(); } -#if SUPD < 641 -//========================================================================= -void cancelCommandExecution( const ucb::IOErrorCode eError, - const rtl::OUString & rArg, - const uno::Reference< - ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rMessage, - const uno::Reference< - ucb::XCommandProcessor > & xContext ) - throw( uno::Exception ) -{ - uno::Sequence< uno::Any > aArgs( 1 ); - aArgs[ 0 ] <<= rArg; - - rtl::Reference< ucbhelper::SimpleIOErrorRequest > xRequest - = new ucbhelper::SimpleIOErrorRequest( - eError, aArgs, rMessage, xContext ); - if ( xEnv.is() ) - { - uno::Reference< - task::XInteractionHandler > xIH = xEnv->getInteractionHandler(); - if ( xIH.is() ) - { - xIH->handle( xRequest.get() ); - - rtl::Reference< ucbhelper::InteractionContinuation > xSelection - = xRequest->getSelection(); - - if ( xSelection.is() ) - throw ucb::CommandFailedException( rtl::OUString(), - xContext, - xRequest->getRequest() ); - } - } - - cppu::throwException( xRequest->getRequest() ); - - OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" ); - throw uno::RuntimeException(); -} - -//========================================================================= -void cancelCommandExecution( const ucb::IOErrorCode eError, - const rtl::OUString & rArg1, - const rtl::OUString & rArg2, - const uno::Reference< - ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rMessage, - const uno::Reference< - ucb::XCommandProcessor > & xContext ) - throw( uno::Exception ) -{ - uno::Sequence< uno::Any > aArgs( 2 ); - aArgs[ 0 ] <<= rArg1; - aArgs[ 1 ] <<= rArg2; - - rtl::Reference< ucbhelper::SimpleIOErrorRequest > xRequest - = new ucbhelper::SimpleIOErrorRequest( - eError, aArgs, rMessage, xContext ); - if ( xEnv.is() ) - { - uno::Reference< - task::XInteractionHandler > xIH = xEnv->getInteractionHandler(); - if ( xIH.is() ) - { - xIH->handle( xRequest.get() ); - - rtl::Reference< ucbhelper::InteractionContinuation > xSelection - = xRequest->getSelection(); - - if ( xSelection.is() ) - throw ucb::CommandFailedException( rtl::OUString(), - xContext, - xRequest->getRequest() ); - } - } - - cppu::throwException( xRequest->getRequest() ); - - OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" ); - throw uno::RuntimeException(); -} -#endif // SUPD, 641 //========================================================================= void cancelCommandExecution( const ucb::IOErrorCode eError, |