diff options
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/filglob.cxx | 8 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filinpstr.cxx | 3 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filstr.cxx | 9 |
3 files changed, 7 insertions, 13 deletions
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 83c6e2ca1a9c..04bf98cce9c0 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -571,9 +571,7 @@ namespace fileaccess { excep.Message = "the name contained invalid characters"; if(isHandled) throw excep; - else { - cancelCommandExecution( Any(excep), xEnv ); - } + cancelCommandExecution( Any(excep), xEnv ); // ioErrorCode = IOErrorCode_INVALID_CHARACTER; // cancelCommandExecution( // ioErrorCode, @@ -591,9 +589,7 @@ namespace fileaccess { excep.Message = "folder exists and overwrite forbidden"; if(isHandled) throw excep; - else { - cancelCommandExecution( Any(excep), xEnv ); - } + cancelCommandExecution( Any(excep), xEnv ); // ioErrorCode = IOErrorCode_ALREADY_EXISTING; // cancelCommandExecution( // ioErrorCode, diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 39448e16f6c9..bacdb6f6b1b9 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -197,8 +197,7 @@ XInputStream_impl::getLength() sal_uInt64 uEndPos; if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) throw io::IOException( THROW_WHERE ); - else - return sal_Int64( uEndPos ); + return sal_Int64( uEndPos ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index ce92a7dd8ae9..3a57ce65ad2d 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -250,11 +250,10 @@ XStream_impl::getPosition() sal_Int64 SAL_CALL XStream_impl::getLength() { - sal_uInt64 uEndPos; - if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) - throw io::IOException( THROW_WHERE ); - else - return sal_Int64( uEndPos ); + sal_uInt64 uEndPos; + if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) + throw io::IOException( THROW_WHERE ); + return sal_Int64( uEndPos ); } void SAL_CALL |