diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:18:35 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
| commit | 1979ac8a7c2ae9be2fa1b75450f2428b3bf0ef75 (patch) | |
| tree | 127c4b92c30f6dcf21b8a121b66a1fdf21a8f9a9 /basic/source/runtime | |
| parent | 4ec839be778e5541c09b0f1a6e3b707ca29bae6d (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'basic/source/runtime')
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index b5259e4f14..97498a8a29 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -36,7 +36,7 @@ #include <osl/security.h> #include <osl/file.hxx> #include <tools/urlobj.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "runtime.hxx" @@ -67,7 +67,6 @@ #include <com/sun/star/bridge/XBridgeFactory.hpp> using namespace comphelper; -using namespace osl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ucb; @@ -344,7 +343,7 @@ BOOL hasUno( void ) class OslStream : public SvStream { - File maFile; + osl::File maFile; short mnStrmMode; public: @@ -376,14 +375,14 @@ OslStream::OslStream( const String& rName, short nStrmMode ) nFlags = OpenFlag_Read; } - FileBase::RC nRet = maFile.open( nFlags ); - if( nRet == FileBase::E_NOENT && nFlags != OpenFlag_Read ) + osl::FileBase::RC nRet = maFile.open( nFlags ); + if( nRet == osl::FileBase::E_NOENT && nFlags != OpenFlag_Read ) { nFlags |= OpenFlag_Create; nRet = maFile.open( nFlags ); } - if( nRet != FileBase::E_None ) + if( nRet != osl::FileBase::E_None ) { SetError( ERRCODE_IO_GENERAL ); } @@ -398,7 +397,7 @@ OslStream::~OslStream() ULONG OslStream::GetData( void* pData, ULONG nSize ) { sal_uInt64 nBytesRead = nSize; - FileBase::RC nRet = FileBase::E_None; + osl::FileBase::RC nRet = osl::FileBase::E_None; nRet = maFile.read( pData, nBytesRead, nBytesRead ); return (ULONG)nBytesRead; } @@ -406,14 +405,14 @@ ULONG OslStream::GetData( void* pData, ULONG nSize ) ULONG OslStream::PutData( const void* pData, ULONG nSize ) { sal_uInt64 nBytesWritten; - FileBase::RC nRet = FileBase::E_None; + osl::FileBase::RC nRet = osl::FileBase::E_None; nRet = maFile.write( pData, (sal_uInt64)nSize, nBytesWritten ); return (ULONG)nBytesWritten; } ULONG OslStream::SeekPos( ULONG nPos ) { - FileBase::RC nRet; + osl::FileBase::RC nRet; if( nPos == STREAM_SEEK_TO_END ) { nRet = maFile.setPos( Pos_End, 0 ); @@ -433,7 +432,7 @@ void OslStream::FlushData() void OslStream::SetSize( ULONG nSize ) { - FileBase::RC nRet = FileBase::E_None; + osl::FileBase::RC nRet = osl::FileBase::E_None; nRet = maFile.setSize( (sal_uInt64)nSize ); } |