summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/file
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2017-01-29 11:57:08 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-01 12:17:56 +0000
commit4739b31dafc5154a2c7d6b3f0ee90686863656f0 (patch)
tree0437d82f929131f3c900b5feb74cee4b1595499b /ucb/source/ucp/file
parent385c207e3a0b2d946ff29a9003b36f81a8946c55 (diff)
cancelCommandExecution - no need to pass exception by Any
all the call sites are passing an uno::Exception subtype Change-Id: I6de1f00810e063e75ef620314561d7e2d6445ada Reviewed-on: https://gerrit.libreoffice.org/33657 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb/source/ucp/file')
-rw-r--r--ucb/source/ucp/file/filglob.cxx42
1 files changed, 21 insertions, 21 deletions
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 32010ebf050e..782407ba58ce 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -245,13 +245,11 @@ namespace fileaccess {
bool isHandled )
{
Reference<XCommandProcessor> xComProc(pContent);
- Any aAny;
IOErrorCode ioErrorCode;
if( errorCode == TASKHANDLER_UNSUPPORTED_COMMAND )
{
- aAny <<= UnsupportedCommandException( OSL_LOG_PREFIX );
- cancelCommandExecution( aAny,xEnv );
+ cancelCommandExecution( UnsupportedCommandException( OSL_LOG_PREFIX ), xEnv );
}
else if( errorCode == TASKHANDLING_WRONG_SETPROPERTYVALUES_ARGUMENT ||
errorCode == TASKHANDLING_WRONG_GETPROPERTYVALUES_ARGUMENT ||
@@ -263,13 +261,13 @@ namespace fileaccess {
{
IllegalArgumentException excep;
excep.ArgumentPosition = 0;
- cancelCommandExecution(Any(excep), xEnv);
+ cancelCommandExecution(excep, xEnv);
}
else if( errorCode == TASKHANDLING_UNSUPPORTED_OPEN_MODE )
{
UnsupportedOpenModeException excep;
excep.Mode = sal::static_int_cast< sal_Int16 >(minorCode);
- cancelCommandExecution( Any(excep),xEnv );
+ cancelCommandExecution( excep,xEnv );
}
else if(errorCode == TASKHANDLING_DELETED_STATE_IN_OPEN_COMMAND ||
errorCode == TASKHANDLING_INSERTED_STATE_IN_OPEN_COMMAND ||
@@ -505,11 +503,12 @@ namespace fileaccess {
OUString("Title") :
OUString("ContentType");
- aAny <<= MissingPropertiesException(
- "a property is missing, necessary to create a content",
- xComProc,
- aSeq);
- cancelCommandExecution(aAny,xEnv);
+ cancelCommandExecution(
+ MissingPropertiesException(
+ "a property is missing, necessary to create a content",
+ xComProc,
+ aSeq),
+ xEnv);
}
else if( errorCode == TASKHANDLING_FILESIZE_FOR_WRITE )
{
@@ -535,11 +534,11 @@ namespace fileaccess {
}
else if(errorCode == TASKHANDLING_INPUTSTREAM_FOR_WRITE)
{
- aAny <<=
+ cancelCommandExecution(
MissingInputStreamException(
"the inputstream is missing, necessary to create a content",
- xComProc);
- cancelCommandExecution(aAny,xEnv);
+ xComProc),
+ xEnv);
}
else if( errorCode == TASKHANDLING_NOREPLACE_FOR_WRITE )
// Overwrite = false and file exists
@@ -549,7 +548,7 @@ namespace fileaccess {
excep.Classification = InteractionClassification_ERROR;
excep.Context = Reference<XInterface>( xComProc, UNO_QUERY );
excep.Message = "file exists and overwrite forbidden";
- cancelCommandExecution( Any(excep), xEnv );
+ cancelCommandExecution( excep, xEnv );
}
else if( errorCode == TASKHANDLING_INVALID_NAME_MKDIR )
{
@@ -573,7 +572,7 @@ namespace fileaccess {
if(isHandled)
throw excep;
else {
- cancelCommandExecution( Any(excep), xEnv );
+ cancelCommandExecution( excep, xEnv );
}
// ioErrorCode = IOErrorCode_INVALID_CHARACTER;
// cancelCommandExecution(
@@ -593,7 +592,7 @@ namespace fileaccess {
if(isHandled)
throw excep;
else {
- cancelCommandExecution( Any(excep), xEnv );
+ cancelCommandExecution( excep, xEnv );
}
// ioErrorCode = IOErrorCode_ALREADY_EXISTING;
// cancelCommandExecution(
@@ -779,10 +778,11 @@ namespace fileaccess {
}
else if( errorCode == TASKHANDLING_TRANSFER_INVALIDSCHEME )
{
- aAny <<= InteractiveBadTransferURLException(
+ cancelCommandExecution(
+ InteractiveBadTransferURLException(
"bad transfer url",
- xComProc);
- cancelCommandExecution( aAny,xEnv );
+ xComProc),
+ xEnv );
}
else if( errorCode == TASKHANDLING_OVERWRITE_FOR_MOVE ||
errorCode == TASKHANDLING_OVERWRITE_FOR_COPY ||
@@ -845,7 +845,7 @@ namespace fileaccess {
excep.Context = Reference<XInterface>( xComProc, UNO_QUERY );
excep.Message = "name clash during copy or move";
- cancelCommandExecution(Any(excep), xEnv);
+ cancelCommandExecution(excep, xEnv);
}
else if( errorCode == TASKHANDLING_NAMECLASHSUPPORT_FOR_MOVE ||
errorCode == TASKHANDLING_NAMECLASHSUPPORT_FOR_COPY )
@@ -855,7 +855,7 @@ namespace fileaccess {
excep.Context = Reference<XInterface>( xComProc, UNO_QUERY );
excep.Message = "name clash value not supported during copy or move";
- cancelCommandExecution(Any(excep), xEnv);
+ cancelCommandExecution(excep, xEnv);
}
else
{