From 2684858c79877d81f8ec20b70abda43ca72f060d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 4 Jun 2013 11:27:18 +0100 Subject: fix build, bad merge Change-Id: I153b5ac4c2c75aca055ef49920cbccf3bd7720d4 --- ucbhelper/source/provider/fd_inputstream.cxx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'ucbhelper') diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx index f70a6e9478eb..b7857b601e47 100644 --- a/ucbhelper/source/provider/fd_inputstream.cxx +++ b/ucbhelper/source/provider/fd_inputstream.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star::io; namespace ucbhelper { - FdInputStream:::FdInputStream:( oslFileHandle tmpfl ) + FdInputStream::FdInputStream( oslFileHandle tmpfl ) : m_tmpfl(tmpfl) , m_nLength( 0 ) { @@ -41,7 +41,8 @@ namespace ucbhelper sal_uInt64 nFileSize = 0; if ( osl_getFilePos( m_tmpfl, &nFileSize ) == osl_File_E_None ) m_nLength = nFileSize; - osl_setFilePos( m_tmpfl, osl_Pos_Absolut, 0 ); + oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolut, 0 ); + SAL_WARN_IF(rc != osl_File_E_None, "ucbhelper", "osl_setFilePos failed"); } } @@ -101,7 +102,8 @@ namespace ucbhelper if(!m_tmpfl) throw IOException(); - osl_setFilePos( m_tmpfl, osl_Pos_Current, nBytesToSkip ); + oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Current, nBytesToSkip ); + SAL_WARN_IF(rc != osl_File_E_None, "ucbhelper", "osl_setFilePos failed"); } @@ -123,7 +125,7 @@ namespace ucbhelper { osl::MutexGuard aGuard(m_aMutex); if(m_tmpfl) - fclose(m_tmpfl),m_tmpfl = 0; + osl_closeFile(m_tmpfl),m_tmpfl = 0; } @@ -137,7 +139,8 @@ namespace ucbhelper if(!m_tmpfl) throw IOException(); - fseek(m_tmpfl,long(location),SEEK_SET); + oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolut, location ); + SAL_WARN_IF(rc != osl_File_E_None, "ucbhelper", "osl_setFilePos failed"); } -- cgit