mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS supdremove (1.12.48); FILE MERGED

Browse Source 
2007/11/16 10:23:38 vg 1.12.48.1: #i83674# cleanup: remove obsolete SUPD macro use
This commit is contained in:
Oliver Bolte
2008-01-07 07:42:42 +00:00
parent 3e2012f257
commit 7a01eac000
1 changed files with 2 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
ucbhelper/source/provider/cancelcommandexecution.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: cancelcommandexecution.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -110,89 +110,6 @@ void cancelCommandExecution( const uno::Any & rException,
throw uno::RuntimeException(); 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, void cancelCommandExecution( const ucb::IOErrorCode eError,