diff options
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/filrset.cxx | 3 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/ftp/ftpurl.cxx | 12 |
3 files changed, 14 insertions, 6 deletions
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 90c9646e8dbb..470ec88d6f58 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -212,7 +212,8 @@ XResultSet_impl::OneMore() { m_aFolder.close(); isFinalChanged(); - return ( m_nIsOpen = false ); + m_nIsOpen = false; + return m_nIsOpen; } else if( err == osl::FileBase::E_None ) { diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 624e4e531dfa..8d839d726a57 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -2012,8 +2012,11 @@ TaskManager::copy_recursive( const OUString& srcUnqPath, osl::DirectoryItem aDirItem; - while( err == osl::FileBase::E_None && ( next = aDir.getNextItem( aDirItem ) ) == osl::FileBase::E_None ) + while( err == osl::FileBase::E_None ) { + next = aDir.getNextItem( aDirItem ); + if (next != osl::FileBase::E_None ) + break; bool IsDoc = false; osl::FileStatus aFileStatus( n_Mask ); aDirItem.getFileStatus( aFileStatus ); diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 93b7dc331cd9..74b77dec15be 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -226,10 +226,14 @@ void FTPURL::parse(const OUString& url) ""/*aAccount*/); // now check for something like ";type=i" at end of url - if(!m_aPathSegmentVec.empty() && - (l = m_aPathSegmentVec.back().indexOf(';')) != -1) { - m_aType = m_aPathSegmentVec.back().copy(l); - m_aPathSegmentVec.back() = m_aPathSegmentVec.back().copy(0,l); + if(!m_aPathSegmentVec.empty()) + { + l = m_aPathSegmentVec.back().indexOf(';'); + if (l != -1) + { + m_aType = m_aPathSegmentVec.back().copy(l); + m_aPathSegmentVec.back() = m_aPathSegmentVec.back().copy(0,l); + } } } |