ucb/source/ucp/file/bc.cxx | 36 ++++----- ucb/source/ucp/file/filerror.hxx | 138 +++++++++++++++++------------------ ucb/source/ucp/file/filglob.cxx | 146 +++++++++++++++++++------------------- ucb/source/ucp/file/filglob.hxx | 3 ucb/source/ucp/file/filinpstr.cxx | 6 - ucb/source/ucp/file/filinpstr.hxx | 6 + ucb/source/ucp/file/filinsreq.cxx | 7 + ucb/source/ucp/file/filrset.cxx | 6 - ucb/source/ucp/file/filrset.hxx | 4 - ucb/source/ucp/file/filstr.cxx | 6 - ucb/source/ucp/file/filstr.hxx | 6 + ucb/source/ucp/file/filtask.cxx | 124 ++++++++++++++++---------------- ucb/source/ucp/file/filtask.hxx | 23 +++-- 13 files changed, 259 insertions(+), 252 deletions(-)
New commits: commit 49cb475862e12d3470ec88db518f6e84e7164d73 Author: Noel Grandin <[email protected]> AuthorDate: Fri Aug 16 08:44:52 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Aug 16 11:59:18 2024 +0200 convert TASKHANDLING constants to scoped enum Change-Id: I693765375fd372ed81a1efdc85c7821afb5ee666 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171945 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 454f6602e685..e9114142b96f 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -252,7 +252,7 @@ BaseContent::execute( const Command& aCommand, if( ! ( aCommand.Argument >>= sPropertyValues ) ) m_pMyShell->installError( CommandId, - TASKHANDLING_WRONG_SETPROPERTYVALUES_ARGUMENT ); + TaskHandlerErr::WRONG_SETPROPERTYVALUES_ARGUMENT ); else aAny <<= setPropertyValues( CommandId,sPropertyValues ); // calls endTask by itself } @@ -262,7 +262,7 @@ BaseContent::execute( const Command& aCommand, if( ! ( aCommand.Argument >>= ListOfRequestedProperties ) ) m_pMyShell->installError( CommandId, - TASKHANDLING_WRONG_GETPROPERTYVALUES_ARGUMENT ); + TaskHandlerErr::WRONG_GETPROPERTYVALUES_ARGUMENT ); else aAny <<= getPropertyValues( CommandId, ListOfRequestedProperties ); @@ -272,7 +272,7 @@ BaseContent::execute( const Command& aCommand, OpenCommandArgument2 aOpenArgument; if( ! ( aCommand.Argument >>= aOpenArgument ) ) m_pMyShell->installError( CommandId, - TASKHANDLING_WRONG_OPEN_ARGUMENT ); + TaskHandlerErr::WRONG_OPEN_ARGUMENT ); else { Reference< XDynamicResultSet > result = open( CommandId,aOpenArgument ); @@ -284,7 +284,7 @@ BaseContent::execute( const Command& aCommand, { if( ! aCommand.Argument.has< bool >() ) m_pMyShell->installError( CommandId, - TASKHANDLING_WRONG_DELETE_ARGUMENT ); + TaskHandlerErr::WRONG_DELETE_ARGUMENT ); else deleteContent( CommandId ); } @@ -293,7 +293,7 @@ BaseContent::execute( const Command& aCommand, TransferInfo aTransferInfo; if( ! ( aCommand.Argument >>= aTransferInfo ) ) m_pMyShell->installError( CommandId, - TASKHANDLING_WRONG_TRANSFER_ARGUMENT ); + TaskHandlerErr::WRONG_TRANSFER_ARGUMENT ); else transfer( CommandId, aTransferInfo ); } @@ -302,7 +302,7 @@ BaseContent::execute( const Command& aCommand, InsertCommandArgument aInsertArgument; if( ! ( aCommand.Argument >>= aInsertArgument ) ) m_pMyShell->installError( CommandId, - TASKHANDLING_WRONG_INSERT_ARGUMENT ); + TaskHandlerErr::WRONG_INSERT_ARGUMENT ); else insert( CommandId,aInsertArgument ); } @@ -318,13 +318,13 @@ BaseContent::execute( const Command& aCommand, ucb::ContentInfo aArg; if ( !( aCommand.Argument >>= aArg ) ) m_pMyShell->installError( CommandId, - TASKHANDLING_WRONG_CREATENEWCONTENT_ARGUMENT ); + TaskHandlerErr::WRONG_CREATENEWCONTENT_ARGUMENT ); else aAny <<= createNewContent( aArg ); } else m_pMyShell->installError( CommandId, - TASKHANDLER_UNSUPPORTED_COMMAND ); + TaskHandlerErr::UNSUPPORTED_COMMAND ); // This is the only function allowed to throw an exception @@ -821,12 +821,12 @@ BaseContent::open( if( m_nState & Deleted ) { m_pMyShell->installError( nMyCommandIdentifier, - TASKHANDLING_DELETED_STATE_IN_OPEN_COMMAND ); + TaskHandlerErr::DELETED_STATE_IN_OPEN_COMMAND ); } else if( m_nState & JustInserted ) { m_pMyShell->installError( nMyCommandIdentifier, - TASKHANDLING_INSERTED_STATE_IN_OPEN_COMMAND ); + TaskHandlerErr::INSERTED_STATE_IN_OPEN_COMMAND ); } else { @@ -875,11 +875,11 @@ BaseContent::open( // aCommandArgument.Mode == // OpenMode::DOCUMENT_SHARE_DENY_WRITE ) // m_pMyShell->installError( nMyCommandIdentifier, -// TASKHANDLING_UNSUPPORTED_OPEN_MODE, +// TaskHandlerErr::UNSUPPORTED_OPEN_MODE, // aCommandArgument.Mode); else m_pMyShell->installError( nMyCommandIdentifier, - TASKHANDLING_UNSUPPORTED_OPEN_MODE, + TaskHandlerErr::UNSUPPORTED_OPEN_MODE, aCommandArgument.Mode); } @@ -911,7 +911,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, if( !comphelper::isFileUrl(aTransferInfo.SourceURL) ) { m_pMyShell->installError( nMyCommandIdentifier, - TASKHANDLING_TRANSFER_INVALIDSCHEME ); + TaskHandlerErr::TRANSFER_INVALIDSCHEME ); return; } @@ -919,7 +919,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, if( fileaccess::TaskManager::getUnqFromUrl( aTransferInfo.SourceURL,srcUnc ) ) { m_pMyShell->installError( nMyCommandIdentifier, - TASKHANDLING_TRANSFER_INVALIDURL ); + TaskHandlerErr::TRANSFER_INVALIDURL ); return; } @@ -941,7 +941,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, if( xRow->wasNull() ) { // Destination file type could not be determined m_pMyShell->installError( nMyCommandIdentifier, - TASKHANDLING_TRANSFER_DESTFILETYPE ); + TaskHandlerErr::TRANSFER_DESTFILETYPE ); return; } @@ -981,7 +981,7 @@ void BaseContent::insert( sal_Int32 nMyCommandIdentifier, if( ! ( m_nState & JustInserted ) ) { m_pMyShell->installError( nMyCommandIdentifier, - TASKHANDLING_NOFRESHINSERT_IN_INSERT_COMMAND ); + TaskHandlerErr::NOFRESHINSERT_IN_INSERT_COMMAND ); return; } @@ -990,7 +990,7 @@ void BaseContent::insert( sal_Int32 nMyCommandIdentifier, if( ! (m_nState & NameForInsertionSet) ) { m_pMyShell->installError( nMyCommandIdentifier, - TASKHANDLING_NONAMESET_INSERT_COMMAND ); + TaskHandlerErr::NONAMESET_INSERT_COMMAND ); return; } @@ -1016,7 +1016,7 @@ void BaseContent::insert( sal_Int32 nMyCommandIdentifier, if( ! contentTypeSet ) { m_pMyShell->installError( nMyCommandIdentifier, - TASKHANDLING_NOCONTENTTYPE_INSERT_COMMAND ); + TaskHandlerErr::NOCONTENTTYPE_INSERT_COMMAND ); return; } diff --git a/ucb/source/ucp/file/filerror.hxx b/ucb/source/ucp/file/filerror.hxx index c75d11ea1956..ed6e34ce86b4 100644 --- a/ucb/source/ucp/file/filerror.hxx +++ b/ucb/source/ucp/file/filerror.hxx @@ -19,87 +19,87 @@ #pragma once -namespace fileaccess { +enum class TaskHandlerErr { // Error codes used to deliver the resulting exceptions -#define TASKHANDLER_NO_ERROR 0 -#define TASKHANDLER_UNSUPPORTED_COMMAND 1 -#define TASKHANDLING_WRONG_SETPROPERTYVALUES_ARGUMENT 2 -#define TASKHANDLING_WRONG_GETPROPERTYVALUES_ARGUMENT 3 -#define TASKHANDLING_WRONG_OPEN_ARGUMENT 4 -#define TASKHANDLING_WRONG_DELETE_ARGUMENT 5 -#define TASKHANDLING_WRONG_TRANSFER_ARGUMENT 6 -#define TASKHANDLING_WRONG_INSERT_ARGUMENT 7 -#define TASKHANDLING_WRONG_CREATENEWCONTENT_ARGUMENT 8 -#define TASKHANDLING_UNSUPPORTED_OPEN_MODE 9 + NO_ERROR , + UNSUPPORTED_COMMAND , + WRONG_SETPROPERTYVALUES_ARGUMENT , + WRONG_GETPROPERTYVALUES_ARGUMENT , + WRONG_OPEN_ARGUMENT , + WRONG_DELETE_ARGUMENT , + WRONG_TRANSFER_ARGUMENT , + WRONG_INSERT_ARGUMENT , + WRONG_CREATENEWCONTENT_ARGUMENT , + UNSUPPORTED_OPEN_MODE , -#define TASKHANDLING_DELETED_STATE_IN_OPEN_COMMAND 10 -#define TASKHANDLING_INSERTED_STATE_IN_OPEN_COMMAND 11 + DELETED_STATE_IN_OPEN_COMMAND , + INSERTED_STATE_IN_OPEN_COMMAND , -#define TASKHANDLING_OPEN_FILE_FOR_PAGING 12 -#define TASKHANDLING_NOTCONNECTED_FOR_PAGING 13 -#define TASKHANDLING_BUFFERSIZEEXCEEDED_FOR_PAGING 14 -#define TASKHANDLING_IOEXCEPTION_FOR_PAGING 15 -#define TASKHANDLING_READING_FILE_FOR_PAGING 16 + OPEN_FILE_FOR_PAGING , + NOTCONNECTED_FOR_PAGING , + BUFFERSIZEEXCEEDED_FOR_PAGING , + IOEXCEPTION_FOR_PAGING , + READING_FILE_FOR_PAGING , -#define TASKHANDLING_OPEN_FOR_INPUTSTREAM 17 -#define TASKHANDLING_OPEN_FOR_STREAM 18 -#define TASKHANDLING_OPEN_FOR_DIRECTORYLISTING 19 + OPEN_FOR_INPUTSTREAM , + OPEN_FOR_STREAM , + OPEN_FOR_DIRECTORYLISTING , -#define TASKHANDLING_NOFRESHINSERT_IN_INSERT_COMMAND 22 -#define TASKHANDLING_NONAMESET_INSERT_COMMAND 23 -#define TASKHANDLING_NOCONTENTTYPE_INSERT_COMMAND 24 + NOFRESHINSERT_IN_INSERT_COMMAND , + NONAMESET_INSERT_COMMAND , + NOCONTENTTYPE_INSERT_COMMAND , -#define TASKHANDLING_NO_OPEN_FILE_FOR_OVERWRITE 26 -#define TASKHANDLING_NO_OPEN_FILE_FOR_WRITE 27 -#define TASKHANDLING_NOTCONNECTED_FOR_WRITE 28 -#define TASKHANDLING_BUFFERSIZEEXCEEDED_FOR_WRITE 29 -#define TASKHANDLING_IOEXCEPTION_FOR_WRITE 30 -#define TASKHANDLING_FILEIOERROR_FOR_WRITE 31 -#define TASKHANDLING_FILEIOERROR_FOR_NO_SPACE 71 -#define TASKHANDLING_FILESIZE_FOR_WRITE 32 -#define TASKHANDLING_INPUTSTREAM_FOR_WRITE 33 -#define TASKHANDLING_NOREPLACE_FOR_WRITE 34 -#define TASKHANDLING_ENSUREDIR_FOR_WRITE 35 + NO_OPEN_FILE_FOR_OVERWRITE , + NO_OPEN_FILE_FOR_WRITE , + NOTCONNECTED_FOR_WRITE , + BUFFERSIZEEXCEEDED_FOR_WRITE , + IOEXCEPTION_FOR_WRITE , + FILEIOERROR_FOR_WRITE , + FILEIOERROR_FOR_NO_SPACE , + FILESIZE_FOR_WRITE , + INPUTSTREAM_FOR_WRITE , + NOREPLACE_FOR_WRITE , + ENSUREDIR_FOR_WRITE , -#define TASKHANDLING_FOLDER_EXISTS_MKDIR 69 -#define TASKHANDLING_INVALID_NAME_MKDIR 70 -#define TASKHANDLING_CREATEDIRECTORY_MKDIR 36 + FOLDER_EXISTS_MKDIR , + INVALID_NAME_MKDIR , + CREATEDIRECTORY_MKDIR , -#define TASKHANDLING_NOSUCHFILEORDIR_FOR_REMOVE 38 -#define TASKHANDLING_VALIDFILESTATUS_FOR_REMOVE 39 -#define TASKHANDLING_OPENDIRECTORY_FOR_REMOVE 40 -#define TASKHANDLING_DELETEFILE_FOR_REMOVE 41 -#define TASKHANDLING_DELETEDIRECTORY_FOR_REMOVE 42 -#define TASKHANDLING_FILETYPE_FOR_REMOVE 43 -#define TASKHANDLING_VALIDFILESTATUSWHILE_FOR_REMOVE 44 -#define TASKHANDLING_DIRECTORYEXHAUSTED_FOR_REMOVE 45 + NOSUCHFILEORDIR_FOR_REMOVE , + VALIDFILESTATUS_FOR_REMOVE , + OPENDIRECTORY_FOR_REMOVE , + DELETEFILE_FOR_REMOVE , + DELETEDIRECTORY_FOR_REMOVE , + FILETYPE_FOR_REMOVE , + VALIDFILESTATUSWHILE_FOR_REMOVE , + DIRECTORYEXHAUSTED_FOR_REMOVE , -#define TASKHANDLING_TRANSFER_ACCESSINGROOT 46 -#define TASKHANDLING_TRANSFER_INVALIDSCHEME 47 -#define TASKHANDLING_TRANSFER_INVALIDURL 48 -#define TASKHANDLING_TRANSFER_DESTFILETYPE 50 -#define TASKHANDLING_TRANSFER_BY_MOVE_SOURCE 51 -#define TASKHANDLING_TRANSFER_BY_MOVE_SOURCESTAT 52 -#define TASKHANDLING_KEEPERROR_FOR_MOVE 53 -#define TASKHANDLING_NAMECLASH_FOR_MOVE 54 -#define TASKHANDLING_NAMECLASHMOVE_FOR_MOVE 55 -#define TASKHANDLING_NAMECLASHSUPPORT_FOR_MOVE 56 -#define TASKHANDLING_OVERWRITE_FOR_MOVE 57 -#define TASKHANDLING_RENAME_FOR_MOVE 58 -#define TASKHANDLING_RENAMEMOVE_FOR_MOVE 59 + TRANSFER_ACCESSINGROOT , + TRANSFER_INVALIDSCHEME , + TRANSFER_INVALIDURL , + TRANSFER_DESTFILETYPE , + TRANSFER_BY_MOVE_SOURCE , + TRANSFER_BY_MOVE_SOURCESTAT , + KEEPERROR_FOR_MOVE , + NAMECLASH_FOR_MOVE , + NAMECLASHMOVE_FOR_MOVE , + NAMECLASHSUPPORT_FOR_MOVE , + OVERWRITE_FOR_MOVE , + RENAME_FOR_MOVE , + RENAMEMOVE_FOR_MOVE , -#define TASKHANDLING_TRANSFER_BY_COPY_SOURCE 60 -#define TASKHANDLING_TRANSFER_BY_COPY_SOURCESTAT 61 -#define TASKHANDLING_KEEPERROR_FOR_COPY 62 -#define TASKHANDLING_OVERWRITE_FOR_COPY 63 -#define TASKHANDLING_RENAME_FOR_COPY 64 -#define TASKHANDLING_RENAMEMOVE_FOR_COPY 65 -#define TASKHANDLING_NAMECLASH_FOR_COPY 66 -#define TASKHANDLING_NAMECLASHMOVE_FOR_COPY 67 -#define TASKHANDLING_NAMECLASHSUPPORT_FOR_COPY 68 + TRANSFER_BY_COPY_SOURCE , + TRANSFER_BY_COPY_SOURCESTAT , + KEEPERROR_FOR_COPY , + OVERWRITE_FOR_COPY , + RENAME_FOR_COPY , + RENAMEMOVE_FOR_COPY , + NAMECLASH_FOR_COPY , + NAMECLASHMOVE_FOR_COPY , + NAMECLASHSUPPORT_FOR_COPY , -} +}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 0d04bd4b2b74..ce719986961f 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -236,7 +236,7 @@ namespace fileaccess { } void throw_handler( - sal_Int32 errorCode, + TaskHandlerErr errorCode, sal_Int32 minorCode, const Reference< XCommandEnvironment >& xEnv, const OUString& aUncPath, @@ -247,46 +247,46 @@ namespace fileaccess { Any aAny; IOErrorCode ioErrorCode; - if( errorCode == TASKHANDLER_UNSUPPORTED_COMMAND ) + if( errorCode == TaskHandlerErr::UNSUPPORTED_COMMAND ) { aAny <<= UnsupportedCommandException( OSL_LOG_PREFIX ); cancelCommandExecution( aAny,xEnv ); } - else if( errorCode == TASKHANDLING_WRONG_SETPROPERTYVALUES_ARGUMENT || - errorCode == TASKHANDLING_WRONG_GETPROPERTYVALUES_ARGUMENT || - errorCode == TASKHANDLING_WRONG_OPEN_ARGUMENT || - errorCode == TASKHANDLING_WRONG_DELETE_ARGUMENT || - errorCode == TASKHANDLING_WRONG_TRANSFER_ARGUMENT || - errorCode == TASKHANDLING_WRONG_INSERT_ARGUMENT || - errorCode == TASKHANDLING_WRONG_CREATENEWCONTENT_ARGUMENT ) + else if( errorCode == TaskHandlerErr::WRONG_SETPROPERTYVALUES_ARGUMENT || + errorCode == TaskHandlerErr::WRONG_GETPROPERTYVALUES_ARGUMENT || + errorCode == TaskHandlerErr::WRONG_OPEN_ARGUMENT || + errorCode == TaskHandlerErr::WRONG_DELETE_ARGUMENT || + errorCode == TaskHandlerErr::WRONG_TRANSFER_ARGUMENT || + errorCode == TaskHandlerErr::WRONG_INSERT_ARGUMENT || + errorCode == TaskHandlerErr::WRONG_CREATENEWCONTENT_ARGUMENT ) { IllegalArgumentException excep; excep.ArgumentPosition = 0; cancelCommandExecution(Any(excep), xEnv); } - else if( errorCode == TASKHANDLING_UNSUPPORTED_OPEN_MODE ) + else if( errorCode == TaskHandlerErr::UNSUPPORTED_OPEN_MODE ) { UnsupportedOpenModeException excep; excep.Mode = sal::static_int_cast< sal_Int16 >(minorCode); cancelCommandExecution( Any(excep),xEnv ); } - else if(errorCode == TASKHANDLING_DELETED_STATE_IN_OPEN_COMMAND || - errorCode == TASKHANDLING_INSERTED_STATE_IN_OPEN_COMMAND || - errorCode == TASKHANDLING_NOFRESHINSERT_IN_INSERT_COMMAND ) + else if(errorCode == TaskHandlerErr::DELETED_STATE_IN_OPEN_COMMAND || + errorCode == TaskHandlerErr::INSERTED_STATE_IN_OPEN_COMMAND || + errorCode == TaskHandlerErr::NOFRESHINSERT_IN_INSERT_COMMAND ) { // What to do here? } else if( // error in opening file - errorCode == TASKHANDLING_NO_OPEN_FILE_FOR_OVERWRITE || + errorCode == TaskHandlerErr::NO_OPEN_FILE_FOR_OVERWRITE || // error in opening file - errorCode == TASKHANDLING_NO_OPEN_FILE_FOR_WRITE || + errorCode == TaskHandlerErr::NO_OPEN_FILE_FOR_WRITE || // error in opening file - errorCode == TASKHANDLING_OPEN_FOR_STREAM || + errorCode == TaskHandlerErr::OPEN_FOR_STREAM || // error in opening file - errorCode == TASKHANDLING_OPEN_FOR_INPUTSTREAM || + errorCode == TaskHandlerErr::OPEN_FOR_INPUTSTREAM || // error in opening file - errorCode == TASKHANDLING_OPEN_FILE_FOR_PAGING ) + errorCode == TaskHandlerErr::OPEN_FILE_FOR_PAGING ) { switch( minorCode ) { @@ -368,8 +368,8 @@ namespace fileaccess { u"an error occurred during file opening"_ustr, xComProc); } - else if( errorCode == TASKHANDLING_OPEN_FOR_DIRECTORYLISTING || - errorCode == TASKHANDLING_OPENDIRECTORY_FOR_REMOVE ) + else if( errorCode == TaskHandlerErr::OPEN_FOR_DIRECTORYLISTING || + errorCode == TaskHandlerErr::OPENDIRECTORY_FOR_REMOVE ) { switch( minorCode ) { @@ -421,12 +421,12 @@ namespace fileaccess { u"an error occurred during opening a directory"_ustr, xComProc); } - else if( errorCode == TASKHANDLING_NOTCONNECTED_FOR_WRITE || - errorCode == TASKHANDLING_BUFFERSIZEEXCEEDED_FOR_WRITE || - errorCode == TASKHANDLING_IOEXCEPTION_FOR_WRITE || - errorCode == TASKHANDLING_NOTCONNECTED_FOR_PAGING || - errorCode == TASKHANDLING_BUFFERSIZEEXCEEDED_FOR_PAGING || - errorCode == TASKHANDLING_IOEXCEPTION_FOR_PAGING ) + else if( errorCode == TaskHandlerErr::NOTCONNECTED_FOR_WRITE || + errorCode == TaskHandlerErr::BUFFERSIZEEXCEEDED_FOR_WRITE || + errorCode == TaskHandlerErr::IOEXCEPTION_FOR_WRITE || + errorCode == TaskHandlerErr::NOTCONNECTED_FOR_PAGING || + errorCode == TaskHandlerErr::BUFFERSIZEEXCEEDED_FOR_PAGING || + errorCode == TaskHandlerErr::IOEXCEPTION_FOR_PAGING ) { ioErrorCode = IOErrorCode_UNKNOWN; cancelCommandExecution( @@ -436,7 +436,7 @@ namespace fileaccess { u"an error occurred writing or reading from a file"_ustr, xComProc ); } - else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_NO_SPACE ) + else if( errorCode == TaskHandlerErr::FILEIOERROR_FOR_NO_SPACE ) { ioErrorCode = IOErrorCode_OUT_OF_DISK_SPACE; cancelCommandExecution( @@ -446,8 +446,8 @@ namespace fileaccess { u"device full"_ustr, xComProc); } - else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_WRITE || - errorCode == TASKHANDLING_READING_FILE_FOR_PAGING ) + else if( errorCode == TaskHandlerErr::FILEIOERROR_FOR_WRITE || + errorCode == TaskHandlerErr::READING_FILE_FOR_PAGING ) { switch( minorCode ) { @@ -498,12 +498,12 @@ namespace fileaccess { u"an error occurred during opening a file"_ustr, xComProc); } - else if( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND || - errorCode == TASKHANDLING_NOCONTENTTYPE_INSERT_COMMAND ) + else if( errorCode == TaskHandlerErr::NONAMESET_INSERT_COMMAND || + errorCode == TaskHandlerErr::NOCONTENTTYPE_INSERT_COMMAND ) { static constexpr OUString sTitle = u"Title"_ustr; static constexpr OUString sContentType = u"ContentType"_ustr; - Sequence< OUString > aSeq{ (errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND) + Sequence< OUString > aSeq{ (errorCode == TaskHandlerErr::NONAMESET_INSERT_COMMAND) ? sTitle : sContentType }; @@ -513,7 +513,7 @@ namespace fileaccess { aSeq); cancelCommandExecution(aAny,xEnv); } - else if( errorCode == TASKHANDLING_FILESIZE_FOR_WRITE ) + else if( errorCode == TaskHandlerErr::FILESIZE_FOR_WRITE ) { switch( minorCode ) { @@ -535,7 +535,7 @@ namespace fileaccess { u"there were problems with the filesize"_ustr, xComProc); } - else if(errorCode == TASKHANDLING_INPUTSTREAM_FOR_WRITE) + else if(errorCode == TaskHandlerErr::INPUTSTREAM_FOR_WRITE) { aAny <<= MissingInputStreamException( @@ -543,7 +543,7 @@ namespace fileaccess { xComProc); cancelCommandExecution(aAny,xEnv); } - else if( errorCode == TASKHANDLING_NOREPLACE_FOR_WRITE ) + else if( errorCode == TaskHandlerErr::NOREPLACE_FOR_WRITE ) // Overwrite = false and file exists { NameClashException excep(u"file exists and overwrite forbidden"_ustr, @@ -551,7 +551,7 @@ namespace fileaccess { InteractionClassification_ERROR, OUString(getTitle(aUncPath))); cancelCommandExecution( Any(excep), xEnv ); } - else if( errorCode == TASKHANDLING_INVALID_NAME_MKDIR ) + else if( errorCode == TaskHandlerErr::INVALID_NAME_MKDIR ) { PropertyValue prop; prop.Name = "ResourceName"; @@ -576,7 +576,7 @@ namespace fileaccess { // OUString( "the name contained invalid characters"), // xComProc ); } - else if( errorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR ) + else if( errorCode == TaskHandlerErr::FOLDER_EXISTS_MKDIR ) { NameClashException excep(u"folder exists and overwrite forbidden"_ustr, xComProc, InteractionClassification_ERROR, OUString(getTitle(aUncPath))); @@ -591,8 +591,8 @@ namespace fileaccess { // OUString( "the folder exists"), // xComProc ); } - else if( errorCode == TASKHANDLING_ENSUREDIR_FOR_WRITE || - errorCode == TASKHANDLING_CREATEDIRECTORY_MKDIR ) + else if( errorCode == TaskHandlerErr::ENSUREDIR_FOR_WRITE || + errorCode == TaskHandlerErr::CREATEDIRECTORY_MKDIR ) { switch( minorCode ) { @@ -617,9 +617,9 @@ namespace fileaccess { u"a folder could not be created"_ustr, xComProc ); } - else if( errorCode == TASKHANDLING_VALIDFILESTATUSWHILE_FOR_REMOVE || - errorCode == TASKHANDLING_VALIDFILESTATUS_FOR_REMOVE || - errorCode == TASKHANDLING_NOSUCHFILEORDIR_FOR_REMOVE ) + else if( errorCode == TaskHandlerErr::VALIDFILESTATUSWHILE_FOR_REMOVE || + errorCode == TaskHandlerErr::VALIDFILESTATUS_FOR_REMOVE || + errorCode == TaskHandlerErr::NOSUCHFILEORDIR_FOR_REMOVE ) { switch( minorCode ) { @@ -668,8 +668,8 @@ namespace fileaccess { u"a file status object could not be filled"_ustr, xComProc ); } - else if( errorCode == TASKHANDLING_DELETEFILE_FOR_REMOVE || - errorCode == TASKHANDLING_DELETEDIRECTORY_FOR_REMOVE ) + else if( errorCode == TaskHandlerErr::DELETEFILE_FOR_REMOVE || + errorCode == TaskHandlerErr::DELETEDIRECTORY_FOR_REMOVE ) { switch( minorCode ) { @@ -715,23 +715,23 @@ namespace fileaccess { u"a file or directory could not be deleted"_ustr, xComProc ); } - else if( errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCE || - errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCESTAT || - errorCode == TASKHANDLING_TRANSFER_BY_MOVE_SOURCE || - errorCode == TASKHANDLING_TRANSFER_BY_MOVE_SOURCESTAT || - errorCode == TASKHANDLING_TRANSFER_DESTFILETYPE || - errorCode == TASKHANDLING_FILETYPE_FOR_REMOVE || - errorCode == TASKHANDLING_DIRECTORYEXHAUSTED_FOR_REMOVE || - errorCode == TASKHANDLING_TRANSFER_INVALIDURL ) + else if( errorCode == TaskHandlerErr::TRANSFER_BY_COPY_SOURCE || + errorCode == TaskHandlerErr::TRANSFER_BY_COPY_SOURCESTAT || + errorCode == TaskHandlerErr::TRANSFER_BY_MOVE_SOURCE || + errorCode == TaskHandlerErr::TRANSFER_BY_MOVE_SOURCESTAT || + errorCode == TaskHandlerErr::TRANSFER_DESTFILETYPE || + errorCode == TaskHandlerErr::FILETYPE_FOR_REMOVE || + errorCode == TaskHandlerErr::DIRECTORYEXHAUSTED_FOR_REMOVE || + errorCode == TaskHandlerErr::TRANSFER_INVALIDURL ) { OUString aMsg; switch( minorCode ) { case FileBase::E_NOENT: // No such file or directory - if ( errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCE || - errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCESTAT || - errorCode == TASKHANDLING_TRANSFER_BY_MOVE_SOURCE || - errorCode == TASKHANDLING_TRANSFER_BY_MOVE_SOURCESTAT ) + if ( errorCode == TaskHandlerErr::TRANSFER_BY_COPY_SOURCE || + errorCode == TaskHandlerErr::TRANSFER_BY_COPY_SOURCESTAT || + errorCode == TaskHandlerErr::TRANSFER_BY_MOVE_SOURCE || + errorCode == TaskHandlerErr::TRANSFER_BY_MOVE_SOURCESTAT ) { ioErrorCode = IOErrorCode_NOT_EXISTING; aMsg = "source file/folder does not exist"; @@ -755,7 +755,7 @@ namespace fileaccess { aMsg, xComProc ); } - else if( errorCode == TASKHANDLING_TRANSFER_ACCESSINGROOT ) + else if( errorCode == TaskHandlerErr::TRANSFER_ACCESSINGROOT ) { ioErrorCode = IOErrorCode_WRITE_PROTECTED; cancelCommandExecution( @@ -765,23 +765,23 @@ namespace fileaccess { u"accessing the root during transfer"_ustr, xComProc ); } - else if( errorCode == TASKHANDLING_TRANSFER_INVALIDSCHEME ) + else if( errorCode == TaskHandlerErr::TRANSFER_INVALIDSCHEME ) { aAny <<= InteractiveBadTransferURLException( u"bad transfer url"_ustr, xComProc); cancelCommandExecution( aAny,xEnv ); } - else if( errorCode == TASKHANDLING_OVERWRITE_FOR_MOVE || - errorCode == TASKHANDLING_OVERWRITE_FOR_COPY || - errorCode == TASKHANDLING_NAMECLASHMOVE_FOR_MOVE || - errorCode == TASKHANDLING_NAMECLASHMOVE_FOR_COPY || - errorCode == TASKHANDLING_KEEPERROR_FOR_MOVE || - errorCode == TASKHANDLING_KEEPERROR_FOR_COPY || - errorCode == TASKHANDLING_RENAME_FOR_MOVE || - errorCode == TASKHANDLING_RENAME_FOR_COPY || - errorCode == TASKHANDLING_RENAMEMOVE_FOR_MOVE || - errorCode == TASKHANDLING_RENAMEMOVE_FOR_COPY ) + else if( errorCode == TaskHandlerErr::OVERWRITE_FOR_MOVE || + errorCode == TaskHandlerErr::OVERWRITE_FOR_COPY || + errorCode == TaskHandlerErr::NAMECLASHMOVE_FOR_MOVE || + errorCode == TaskHandlerErr::NAMECLASHMOVE_FOR_COPY || + errorCode == TaskHandlerErr::KEEPERROR_FOR_MOVE || + errorCode == TaskHandlerErr::KEEPERROR_FOR_COPY || + errorCode == TaskHandlerErr::RENAME_FOR_MOVE || + errorCode == TaskHandlerErr::RENAME_FOR_COPY || + errorCode == TaskHandlerErr::RENAMEMOVE_FOR_MOVE || + errorCode == TaskHandlerErr::RENAMEMOVE_FOR_COPY ) { OUString aMsg( u"general error during transfer"_ustr); @@ -824,8 +824,8 @@ namespace fileaccess { aMsg, xComProc ); } - else if( errorCode == TASKHANDLING_NAMECLASH_FOR_COPY || - errorCode == TASKHANDLING_NAMECLASH_FOR_MOVE ) + else if( errorCode == TaskHandlerErr::NAMECLASH_FOR_COPY || + errorCode == TaskHandlerErr::NAMECLASH_FOR_MOVE ) { NameClashException excep(u"name clash during copy or move"_ustr, Reference<XInterface>(xComProc, UNO_QUERY), @@ -833,8 +833,8 @@ namespace fileaccess { cancelCommandExecution(Any(excep), xEnv); } - else if( errorCode == TASKHANDLING_NAMECLASHSUPPORT_FOR_MOVE || - errorCode == TASKHANDLING_NAMECLASHSUPPORT_FOR_COPY ) + else if( errorCode == TaskHandlerErr::NAMECLASHSUPPORT_FOR_MOVE || + errorCode == TaskHandlerErr::NAMECLASHSUPPORT_FOR_COPY ) { UnsupportedNameClashException excep( u"name clash value not supported during copy or move"_ustr, @@ -844,7 +844,7 @@ namespace fileaccess { } else { - // case TASKHANDLER_NO_ERROR: + // case TaskHandlerErr::NO_ERROR: return; } } diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx index c113f62ecb03..b08942658303 100644 --- a/ucb/source/ucp/file/filglob.hxx +++ b/ucb/source/ucp/file/filglob.hxx @@ -26,6 +26,7 @@ #include <osl/file.hxx> #include <com/sun/star/ucb/XCommandEnvironment.hpp> +enum class TaskHandlerErr; namespace fileaccess { @@ -82,7 +83,7 @@ namespace fileaccess { // This function implements the global exception handler of the file_ucp; // It never returns; - extern void throw_handler( sal_Int32 errorCode, + extern void throw_handler( TaskHandlerErr errorCode, sal_Int32 minorCode, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const OUString& aUncPath, diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 09cfe1301bbf..70e80e384d2b 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -38,8 +38,8 @@ using namespace com::sun::star; XInputStream_impl::XInputStream_impl( const OUString& aUncPath, bool bLock ) : m_aFile( aUncPath ), - m_nErrorCode( TASKHANDLER_NO_ERROR ), - m_nMinorErrorCode( TASKHANDLER_NO_ERROR ) + m_nErrorCode( TaskHandlerErr::NO_ERROR ), + m_nMinorErrorCode( 0 ) { sal_uInt32 nFlags = osl_File_OpenFlag_Read; if ( !bLock ) @@ -51,7 +51,7 @@ XInputStream_impl::XInputStream_impl( const OUString& aUncPath, bool bLock ) m_nIsOpen = false; m_aFile.close(); - m_nErrorCode = TASKHANDLING_OPEN_FOR_INPUTSTREAM; + m_nErrorCode = TaskHandlerErr::OPEN_FOR_INPUTSTREAM; m_nMinorErrorCode = err; } else diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index 971872fdbb7f..f62fe4741170 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -25,6 +25,8 @@ #include "filrec.hxx" +enum class TaskHandlerErr; + namespace fileaccess { class TaskManager; @@ -42,7 +44,7 @@ namespace fileaccess { * Returns an error code as given by filerror.hxx */ - sal_Int32 CtorSuccess() const { return m_nErrorCode;} + TaskHandlerErr CtorSuccess() const { return m_nErrorCode;} sal_Int32 getMinorError() const { return m_nMinorErrorCode;} virtual sal_Int32 SAL_CALL @@ -79,7 +81,7 @@ namespace fileaccess { ReconnectingFile m_aFile; - sal_Int32 m_nErrorCode; + TaskHandlerErr m_nErrorCode; sal_Int32 m_nMinorErrorCode; }; } // end namespace XInputStream_impl diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index 62187c2c696c..c0af35edb013 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -45,20 +45,21 @@ XInteractionRequestImpl::XInteractionRequestImpl( p2( new XInteractionAbortImpl ), m_xOrigin(xOrigin) { - sal_Int32 nErrorCode(0), nMinorError(0); + TaskHandlerErr nErrorCode(TaskHandlerErr::NO_ERROR); + sal_Int32 nMinorError(0); if( pShell ) pShell->retrieveError(CommandId,nErrorCode,nMinorError); std::vector<uno::Reference<task::XInteractionContinuation>> continuations{ Reference<XInteractionContinuation>(p1), Reference<XInteractionContinuation>(p2) }; Any aAny; - if(nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR) + if(nErrorCode == TaskHandlerErr::FOLDER_EXISTS_MKDIR) { NameClashException excep(u"folder exists and overwrite forbidden"_ustr, m_xOrigin, InteractionClassification_ERROR, aClashingName); aAny <<= excep; } - else if(nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR) + else if(nErrorCode == TaskHandlerErr::INVALID_NAME_MKDIR) { PropertyValue prop; prop.Name = "ResourceName"; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index bce0a323af44..5aa3007d7b4d 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -61,8 +61,8 @@ XResultSet_impl::XResultSet_impl( TaskManager* pMyShell, , m_aFolder( aUnqPath ) , m_sProperty( seq ) , m_sSortingInfo( seqSort ) - , m_nErrorCode( TASKHANDLER_NO_ERROR ) - , m_nMinorErrorCode( TASKHANDLER_NO_ERROR ) + , m_nErrorCode( TaskHandlerErr::NO_ERROR ) + , m_nMinorErrorCode( 0 ) { osl::FileBase::RC err = m_aFolder.open(); if( err != osl::FileBase::E_None ) @@ -70,7 +70,7 @@ XResultSet_impl::XResultSet_impl( TaskManager* pMyShell, m_nIsOpen = false; m_aFolder.close(); - m_nErrorCode = TASKHANDLING_OPEN_FOR_DIRECTORYLISTING; + m_nErrorCode = TaskHandlerErr::OPEN_FOR_DIRECTORYLISTING; m_nMinorErrorCode = err; } else diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 3361405dd5ed..8c44982a4861 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -57,7 +57,7 @@ class XResultSet_impl : virtual ~XResultSet_impl() override; - sal_Int32 CtorSuccess() const { return m_nErrorCode;} + TaskHandlerErr CtorSuccess() const { return m_nErrorCode;} sal_Int32 getMinorError() const { return m_nMinorErrorCode;} // XEventListener @@ -415,7 +415,7 @@ class XResultSet_impl : css::uno::Reference< css::ucb::XDynamicResultSetListener > m_xListener; - sal_Int32 m_nErrorCode; + TaskHandlerErr m_nErrorCode; sal_Int32 m_nMinorErrorCode; // Methods diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index ab350f290ea1..a7bf7d446d43 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -46,8 +46,8 @@ XStream_impl::XStream_impl( const OUString& aUncPath, bool bLock ) : m_bInputStreamCalled( false ), m_bOutputStreamCalled( false ), m_aFile( aUncPath ), - m_nErrorCode( TASKHANDLER_NO_ERROR ), - m_nMinorErrorCode( TASKHANDLER_NO_ERROR ) + m_nErrorCode( TaskHandlerErr::NO_ERROR ), + m_nMinorErrorCode( 0 ) { sal_uInt32 nFlags = ( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); if ( !bLock ) @@ -59,7 +59,7 @@ XStream_impl::XStream_impl( const OUString& aUncPath, bool bLock ) m_nIsOpen = false; m_aFile.close(); - m_nErrorCode = TASKHANDLING_OPEN_FOR_STREAM; + m_nErrorCode = TaskHandlerErr::OPEN_FOR_STREAM; m_nMinorErrorCode = err; } else diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index acef94aa8c6d..13ada6cdb957 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -32,6 +32,8 @@ #include "filrec.hxx" +enum class TaskHandlerErr; + namespace fileaccess { // forward: @@ -55,7 +57,7 @@ class XStream_impl : public cppu::WeakImplHelper< * Returns an error code as given by filerror.hxx */ - sal_Int32 CtorSuccess() const { return m_nErrorCode;} + TaskHandlerErr CtorSuccess() const { return m_nErrorCode;} sal_Int32 getMinorError() const { return m_nMinorErrorCode;} virtual ~XStream_impl() override; @@ -137,7 +139,7 @@ class XStream_impl : public cppu::WeakImplHelper< ReconnectingFile m_aFile; - sal_Int32 m_nErrorCode; + TaskHandlerErr m_nErrorCode; sal_Int32 m_nMinorErrorCode; // Implementation methods diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 749c9b4acf5e..a088e9b63017 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -389,7 +389,7 @@ TaskManager::endTask( sal_Int32 CommandId, if( it == m_aTaskMap.end() ) return; - sal_Int32 ErrorCode = it->second.getInstalledError(); + TaskHandlerErr ErrorCode = it->second.getInstalledError(); sal_Int32 MinorCode = it->second.getMinorErrorCode(); bool isHandled = it->second.isHandled(); @@ -400,7 +400,7 @@ TaskManager::endTask( sal_Int32 CommandId, aGuard.unlock(); - if( ErrorCode != TASKHANDLER_NO_ERROR ) + if( ErrorCode != TaskHandlerErr::NO_ERROR ) throw_handler( ErrorCode, MinorCode, @@ -421,7 +421,7 @@ void TaskManager::clearError( sal_Int32 CommandId ) void TaskManager::retrieveError( sal_Int32 CommandId, - sal_Int32 &ErrorCode, + TaskHandlerErr &ErrorCode, sal_Int32 &minorCode) { std::unique_lock aGuard( m_aMutex ); @@ -435,7 +435,7 @@ void TaskManager::retrieveError( sal_Int32 CommandId, void TaskManager::installError( sal_Int32 CommandId, - sal_Int32 ErrorCode, + TaskHandlerErr ErrorCode, sal_Int32 MinorCode ) { std::unique_lock aGuard( m_aMutex ); @@ -631,7 +631,7 @@ void TaskManager::page( sal_Int32 CommandId, { aFile.close(); installError( CommandId, - TASKHANDLING_OPEN_FILE_FOR_PAGING, + TaskHandlerErr::OPEN_FILE_FOR_PAGING, err ); return; } @@ -654,26 +654,26 @@ void TaskManager::page( sal_Int32 CommandId, catch (const io::NotConnectedException&) { installError( CommandId, - TASKHANDLING_NOTCONNECTED_FOR_PAGING ); + TaskHandlerErr::NOTCONNECTED_FOR_PAGING ); break; } catch (const io::BufferSizeExceededException&) { installError( CommandId, - TASKHANDLING_BUFFERSIZEEXCEEDED_FOR_PAGING ); + TaskHandlerErr::BUFFERSIZEEXCEEDED_FOR_PAGING ); break; } catch (const io::IOException&) { installError( CommandId, - TASKHANDLING_IOEXCEPTION_FOR_PAGING ); + TaskHandlerErr::IOEXCEPTION_FOR_PAGING ); break; } } else { installError( CommandId, - TASKHANDLING_READING_FILE_FOR_PAGING, + TaskHandlerErr::READING_FILE_FOR_PAGING, err ); break; } @@ -715,9 +715,9 @@ TaskManager::open( sal_Int32 CommandId, { rtl::Reference<XInputStream_impl> pInputStream(new XInputStream_impl( aUnqPath, bLock )); // from filinpstr.hxx - sal_Int32 ErrorCode = pInputStream->CtorSuccess(); + TaskHandlerErr ErrorCode = pInputStream->CtorSuccess(); - if( ErrorCode != TASKHANDLER_NO_ERROR ) + if( ErrorCode != TaskHandlerErr::NO_ERROR ) { installError( CommandId, ErrorCode, @@ -747,9 +747,9 @@ TaskManager::open_rw( sal_Int32 CommandId, { rtl::Reference<XStream_impl> pStream(new XStream_impl( aUnqPath, bLock )); // from filstr.hxx - sal_Int32 ErrorCode = pStream->CtorSuccess(); + TaskHandlerErr ErrorCode = pStream->CtorSuccess(); - if( ErrorCode != TASKHANDLER_NO_ERROR ) + if( ErrorCode != TaskHandlerErr::NO_ERROR ) { installError( CommandId, ErrorCode, @@ -780,9 +780,9 @@ TaskManager::ls( sal_Int32 CommandId, { rtl::Reference<XResultSet_impl> p(new XResultSet_impl( this,aUnqPath,OpenMode,seq,seqSort )); - sal_Int32 ErrorCode = p->CtorSuccess(); + TaskHandlerErr ErrorCode = p->CtorSuccess(); - if( ErrorCode != TASKHANDLER_NO_ERROR ) + if( ErrorCode != TaskHandlerErr::NO_ERROR ) { installError( CommandId, ErrorCode, @@ -1082,14 +1082,14 @@ TaskManager::getv( sal_Int32 CommandId, osl::FileBase::RC nError1 = osl::DirectoryItem::get( aUnqPath,aDirItem ); if( nError1 != osl::FileBase::E_None ) installError(CommandId, - TASKHANDLING_OPEN_FILE_FOR_PAGING, // BEAWARE, REUSED + TaskHandlerErr::OPEN_FILE_FOR_PAGING, // BEAWARE, REUSED nError1); osl::FileBase::RC nError2 = aDirItem.getFileStatus( aFileStatus ); if( nError1 == osl::FileBase::E_None && nError2 != osl::FileBase::E_None ) installError(CommandId, - TASKHANDLING_OPEN_FILE_FOR_PAGING, // BEAWARE, REUSED + TaskHandlerErr::OPEN_FILE_FOR_PAGING, // BEAWARE, REUSED nError2); { @@ -1152,7 +1152,7 @@ TaskManager::move( sal_Int32 CommandId, if( nError != osl::FileBase::E_None && nError != osl::FileBase::E_EXIST ) { installError( CommandId, - TASKHANDLING_KEEPERROR_FOR_MOVE, + TaskHandlerErr::KEEPERROR_FOR_MOVE, nError ); return; } @@ -1180,7 +1180,7 @@ TaskManager::move( sal_Int32 CommandId, if( nError != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_OVERWRITE_FOR_MOVE, + TaskHandlerErr::OVERWRITE_FOR_MOVE, nError ); return; } @@ -1221,13 +1221,13 @@ TaskManager::move( sal_Int32 CommandId, if( nError == osl::FileBase::E_EXIST ) { installError( CommandId, - TASKHANDLING_RENAME_FOR_MOVE ); + TaskHandlerErr::RENAME_FOR_MOVE ); return; } else if( nError != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_RENAMEMOVE_FOR_MOVE, + TaskHandlerErr::RENAMEMOVE_FOR_MOVE, nError ); return; } @@ -1242,13 +1242,13 @@ TaskManager::move( sal_Int32 CommandId, if( nError == osl::FileBase::E_EXIST ) { installError( CommandId, - TASKHANDLING_NAMECLASH_FOR_MOVE ); + TaskHandlerErr::NAMECLASH_FOR_MOVE ); return; } else if( nError != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_NAMECLASHMOVE_FOR_MOVE, + TaskHandlerErr::NAMECLASHMOVE_FOR_MOVE, nError ); return; } @@ -1261,7 +1261,7 @@ TaskManager::move( sal_Int32 CommandId, if( nError == osl::FileBase::E_EXIST ) { installError( CommandId, - TASKHANDLING_NAMECLASHSUPPORT_FOR_MOVE, + TaskHandlerErr::NAMECLASHSUPPORT_FOR_MOVE, NameClash::ASK); return; } @@ -1275,7 +1275,7 @@ TaskManager::move( sal_Int32 CommandId, if( nError != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_TRANSFER_BY_MOVE_SOURCE, + TaskHandlerErr::TRANSFER_BY_MOVE_SOURCE, nError ); return; } @@ -1284,7 +1284,7 @@ TaskManager::move( sal_Int32 CommandId, if( nError != osl::FileBase::E_None || ! aStatus.isValid( osl_FileStatus_Mask_Type ) ) { installError( CommandId, - TASKHANDLING_TRANSFER_BY_MOVE_SOURCESTAT, + TaskHandlerErr::TRANSFER_BY_MOVE_SOURCESTAT, nError ); return; } @@ -1323,13 +1323,13 @@ bool getType( assert(item != nullptr && type != nullptr); osl::FileBase::RC err = osl::DirectoryItem::get(fileUrl, *item); if (err != osl::FileBase::E_None) { - task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCE, err); + task.installError(id, TaskHandlerErr::TRANSFER_BY_COPY_SOURCE, err); return false; } osl::FileStatus stat(osl_FileStatus_Mask_Type); err = item->getFileStatus(stat); if (err != osl::FileBase::E_None) { - task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCESTAT, err); + task.installError(id, TaskHandlerErr::TRANSFER_BY_COPY_SOURCESTAT, err); return false; } *type = stat.getFileType(); @@ -1364,7 +1364,7 @@ TaskManager::copy( nError = item.getFileStatus(stat); if (nError != osl::FileBase::E_None) { installError( - CommandId, TASKHANDLING_TRANSFER_BY_COPY_SOURCESTAT, nError); + CommandId, TaskHandlerErr::TRANSFER_BY_COPY_SOURCESTAT, nError); return; } rslvdSrcUnqPath = stat.getLinkTargetURL(); @@ -1387,7 +1387,7 @@ TaskManager::copy( if( nError != osl::FileBase::E_None && nError != osl::FileBase::E_EXIST ) { installError( CommandId, - TASKHANDLING_KEEPERROR_FOR_COPY, + TaskHandlerErr::KEEPERROR_FOR_COPY, nError ); return; } @@ -1403,7 +1403,7 @@ TaskManager::copy( if( nError != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_OVERWRITE_FOR_COPY, + TaskHandlerErr::OVERWRITE_FOR_COPY, nError ); return; } @@ -1445,13 +1445,13 @@ TaskManager::copy( if( nError == osl::FileBase::E_EXIST ) { installError( CommandId, - TASKHANDLING_RENAME_FOR_COPY ); + TaskHandlerErr::RENAME_FOR_COPY ); return; } else if( nError != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_RENAMEMOVE_FOR_COPY, + TaskHandlerErr::RENAMEMOVE_FOR_COPY, nError ); return; } @@ -1467,13 +1467,13 @@ TaskManager::copy( if( nError == osl::FileBase::E_EXIST ) { installError( CommandId, - TASKHANDLING_NAMECLASH_FOR_COPY ); + TaskHandlerErr::NAMECLASH_FOR_COPY ); return; } else if( nError != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_NAMECLASHMOVE_FOR_COPY, + TaskHandlerErr::NAMECLASHMOVE_FOR_COPY, nError ); return; } @@ -1487,7 +1487,7 @@ TaskManager::copy( if( nError == osl::FileBase::E_EXIST ) { installError( CommandId, - TASKHANDLING_NAMECLASHSUPPORT_FOR_COPY, + TaskHandlerErr::NAMECLASHSUPPORT_FOR_COPY, NameClash); return; } @@ -1530,7 +1530,7 @@ TaskManager::remove( sal_Int32 CommandId, if (MustExist) { installError( CommandId, - TASKHANDLING_NOSUCHFILEORDIR_FOR_REMOVE, + TaskHandlerErr::NOSUCHFILEORDIR_FOR_REMOVE, nError ); } return (!MustExist); @@ -1540,8 +1540,8 @@ TaskManager::remove( sal_Int32 CommandId, if( nError != osl::FileBase::E_None || ! aStatus.isValid( nMask ) ) { installError( CommandId, - TASKHANDLING_VALIDFILESTATUS_FOR_REMOVE, - nError != osl::FileBase::E_None ? nError : TASKHANDLER_NO_ERROR ); + TaskHandlerErr::VALIDFILESTATUS_FOR_REMOVE, + nError != osl::FileBase::E_None ? nError : 0 ); return false; } @@ -1562,7 +1562,7 @@ TaskManager::remove( sal_Int32 CommandId, if (MustExist) { installError( CommandId, - TASKHANDLING_DELETEFILE_FOR_REMOVE, + TaskHandlerErr::DELETEFILE_FOR_REMOVE, nError ); } return (!MustExist); @@ -1583,7 +1583,7 @@ TaskManager::remove( sal_Int32 CommandId, if (MustExist) { installError( CommandId, - TASKHANDLING_OPENDIRECTORY_FOR_REMOVE, + TaskHandlerErr::OPENDIRECTORY_FOR_REMOVE, nError ); } return (!MustExist); @@ -1600,8 +1600,8 @@ TaskManager::remove( sal_Int32 CommandId, if( nError != osl::FileBase::E_None || ! aStatus.isValid( nMask ) ) { installError( CommandId, - TASKHANDLING_VALIDFILESTATUSWHILE_FOR_REMOVE, - nError != osl::FileBase::E_None ? nError : TASKHANDLER_NO_ERROR ); + TaskHandlerErr::VALIDFILESTATUSWHILE_FOR_REMOVE, + nError != osl::FileBase::E_None ? nError : 0 ); whileSuccess = false; break; } @@ -1629,7 +1629,7 @@ TaskManager::remove( sal_Int32 CommandId, if( nError != osl::FileBase::E_NOENT ) { installError( CommandId, - TASKHANDLING_DIRECTORYEXHAUSTED_FOR_REMOVE, + TaskHandlerErr::DIRECTORYEXHAUSTED_FOR_REMOVE, nError ); return false; } @@ -1640,7 +1640,7 @@ TaskManager::remove( sal_Int32 CommandId, if (MustExist) { installError( CommandId, - TASKHANDLING_DELETEDIRECTORY_FOR_REMOVE, + TaskHandlerErr::DELETEDIRECTORY_FOR_REMOVE, nError ); } return (!MustExist); @@ -1654,7 +1654,7 @@ TaskManager::remove( sal_Int32 CommandId, else // Don't know what to remove { installError( CommandId, - TASKHANDLING_FILETYPE_FOR_REMOVE ); + TaskHandlerErr::FILETYPE_FOR_REMOVE ); return false; } @@ -1694,7 +1694,7 @@ TaskManager::mkdir( sal_Int32 CommandId, if( !OverWrite ) { installError( CommandId, - TASKHANDLING_FOLDER_EXISTS_MKDIR ); + TaskHandlerErr::FOLDER_EXISTS_MKDIR ); return false; } else @@ -1703,7 +1703,7 @@ TaskManager::mkdir( sal_Int32 CommandId, case osl::FileBase::E_INVAL: { installError(CommandId, - TASKHANDLING_INVALID_NAME_MKDIR); + TaskHandlerErr::INVALID_NAME_MKDIR); return false; } case osl::FileBase::E_None: @@ -1716,7 +1716,7 @@ TaskManager::mkdir( sal_Int32 CommandId, return ensuredir( CommandId, aUnqPath, - TASKHANDLING_CREATEDIRECTORY_MKDIR ); + TaskHandlerErr::CREATEDIRECTORY_MKDIR ); } } @@ -1772,14 +1772,14 @@ TaskManager::write( sal_Int32 CommandId, if( ! aInputStream.is() ) { installError( CommandId, - TASKHANDLING_INPUTSTREAM_FOR_WRITE ); + TaskHandlerErr::INPUTSTREAM_FOR_WRITE ); return false; } // Create parent path, if necessary. if ( ! ensuredir( CommandId, getParentName( aUnqPath ), - TASKHANDLING_ENSUREDIR_FOR_WRITE ) ) + TaskHandlerErr::ENSUREDIR_FOR_WRITE ) ) return false; osl::FileBase::RC err; @@ -1797,7 +1797,7 @@ TaskManager::write( sal_Int32 CommandId, if( err != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_NO_OPEN_FILE_FOR_OVERWRITE, + TaskHandlerErr::NO_OPEN_FILE_FOR_OVERWRITE, err ); return false; } @@ -1809,7 +1809,7 @@ TaskManager::write( sal_Int32 CommandId, if( err != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_FILESIZE_FOR_WRITE, + TaskHandlerErr::FILESIZE_FOR_WRITE, err ); return false; } @@ -1821,7 +1821,7 @@ TaskManager::write( sal_Int32 CommandId, if( err == osl::FileBase::E_None ) // The file exists and shall not be overwritten { installError( CommandId, - TASKHANDLING_NOREPLACE_FOR_WRITE, // Now an exception + TaskHandlerErr::NOREPLACE_FOR_WRITE, // Now an exception err ); aFile.close(); @@ -1836,7 +1836,7 @@ TaskManager::write( sal_Int32 CommandId, { aFile.close(); installError( CommandId, - TASKHANDLING_NO_OPEN_FILE_FOR_WRITE, + TaskHandlerErr::NO_OPEN_FILE_FOR_WRITE, err ); return false; } @@ -1858,21 +1858,21 @@ TaskManager::write( sal_Int32 CommandId, catch( const io::NotConnectedException& ) { installError( CommandId, - TASKHANDLING_NOTCONNECTED_FOR_WRITE ); + TaskHandlerErr::NOTCONNECTED_FOR_WRITE ); bSuccess = false; break; } catch( const io::BufferSizeExceededException& ) { installError( CommandId, - TASKHANDLING_BUFFERSIZEEXCEEDED_FOR_WRITE ); + TaskHandlerErr::BUFFERSIZEEXCEEDED_FOR_WRITE ); bSuccess = false; break; } catch( const io::IOException& ) { installError( CommandId, - TASKHANDLING_IOEXCEPTION_FOR_WRITE ); + TaskHandlerErr::IOEXCEPTION_FOR_WRITE ); bSuccess = false; break; } @@ -1888,7 +1888,7 @@ TaskManager::write( sal_Int32 CommandId, if( err != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_FILEIOERROR_FOR_WRITE, + TaskHandlerErr::FILEIOERROR_FOR_WRITE, err ); bSuccess = false; break; @@ -1896,7 +1896,7 @@ TaskManager::write( sal_Int32 CommandId, else if( nWrittenBytes != sal_uInt64( nReadBytes ) ) { installError( CommandId, - TASKHANDLING_FILEIOERROR_FOR_NO_SPACE ); + TaskHandlerErr::FILEIOERROR_FOR_NO_SPACE ); bSuccess = false; break; } @@ -1907,7 +1907,7 @@ TaskManager::write( sal_Int32 CommandId, if( err != osl::FileBase::E_None ) { installError( CommandId, - TASKHANDLING_FILEIOERROR_FOR_WRITE, + TaskHandlerErr::FILEIOERROR_FOR_WRITE, err ); bSuccess = false; } @@ -2068,7 +2068,7 @@ TaskManager::copy_recursive( const OUString& srcUnqPath, bool TaskManager::ensuredir( sal_Int32 CommandId, const OUString& rUnqPath, - sal_Int32 errorCode ) + TaskHandlerErr errorCode ) { OUString aPath; diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 9d4169255427..f2ad9c0eaa70 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -79,7 +79,8 @@ namespace fileaccess private: bool m_bHandled; - sal_Int32 m_nErrorCode,m_nMinorCode; + TaskHandlerErr m_nErrorCode; + sal_Int32 m_nMinorCode; css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHandler; css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnvironment; @@ -89,8 +90,8 @@ namespace fileaccess explicit TaskHandling( css::uno::Reference< css::ucb::XCommandEnvironment > xCommandEnv ) : m_bHandled( false ), - m_nErrorCode( TASKHANDLER_NO_ERROR ), - m_nMinorCode( TASKHANDLER_NO_ERROR ), + m_nErrorCode( TaskHandlerErr::NO_ERROR ), + m_nMinorCode( 0 ), m_xCommandEnvironment( std::move(xCommandEnv) ) { } @@ -107,18 +108,18 @@ namespace fileaccess void clearError() { - m_nErrorCode = TASKHANDLER_NO_ERROR; - m_nMinorCode = TASKHANDLER_NO_ERROR; + m_nErrorCode = TaskHandlerErr::NO_ERROR; + m_nMinorCode = 0; } - void installError( sal_Int32 nErrorCode, + void installError( TaskHandlerErr nErrorCode, sal_Int32 nMinorCode ) { m_nErrorCode = nErrorCode; m_nMinorCode = nMinorCode; } - sal_Int32 getInstalledError() const + TaskHandlerErr getInstalledError() const { return m_nErrorCode; } @@ -235,11 +236,11 @@ namespace fileaccess */ void installError( sal_Int32 CommandId, - sal_Int32 ErrorCode, - sal_Int32 minorCode = TASKHANDLER_NO_ERROR ); + TaskHandlerErr ErrorCode, + sal_Int32 minorCode = 0 ); void retrieveError( sal_Int32 CommandId, - sal_Int32 &ErrorCode, + TaskHandlerErr &ErrorCode, sal_Int32 &minorCode); /** @@ -616,7 +617,7 @@ namespace fileaccess bool ensuredir( sal_Int32 CommandId, const OUString& aDirectoryName, - sal_Int32 errorCode ); + TaskHandlerErr errorCode ); // General ContentMap m_aContent;
