mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XStream modification

Browse Source
This commit is contained in:
Andreas Bregas
2000-10-19 07:36:50 +00:00
parent 9aa4ef4b70
commit de42afa024
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
basic/source/runtime/iosys.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: iosys.cxx,v $ * $RCSfile: iosys.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: ab $ $Date: 2000-10-13 09:22:40 $ * last change: $Author: ab $ $Date: 2000-10-19 08:36:50 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -550,7 +550,11 @@ UCBStream::~UCBStream()
else if( xOS.is() ) else if( xOS.is() )
xOS->closeOutput(); xOS->closeOutput();
else if( xS.is() ) else if( xS.is() )
xS->closeStream(); {
Reference< XInputStream > xIS = xS->getInputStream();
if( xIS.is() )
xIS->closeInput();
}
} }
catch( Exception & ) catch( Exception & )
{ {
@@ -562,6 +566,7 @@ ULONG UCBStream::GetData( void* pData, ULONG nSize )
{ {
try try
{ {
Reference< XInputStream > xISFromS;
if( xIS.is() ) if( xIS.is() )
{ {
Sequence<sal_Int8> aData; Sequence<sal_Int8> aData;
@@ -569,10 +574,10 @@ ULONG UCBStream::GetData( void* pData, ULONG nSize )
rtl_copyMemory( pData, aData.getConstArray(), nSize ); rtl_copyMemory( pData, aData.getConstArray(), nSize );
return nSize; return nSize;
} }
else if( xS.is() ) else if( xS.is() && (xISFromS = xS->getInputStream()).is() )
{ {
Sequence<sal_Int8> aData; Sequence<sal_Int8> aData;
nSize = xS->readBytes( aData, nSize ); nSize = xISFromS->readBytes( aData, nSize );
rtl_copyMemory( pData, aData.getConstArray(), nSize ); rtl_copyMemory( pData, aData.getConstArray(), nSize );
return nSize; return nSize;
} }
@@ -590,16 +595,17 @@ ULONG UCBStream::PutData( const void* pData, ULONG nSize )
{ {
try try
{ {
Reference< XOutputStream > xOSFromS;
if( xOS.is() ) if( xOS.is() )
{ {
Sequence<sal_Int8> aData( (const sal_Int8 *)pData, nSize ); Sequence<sal_Int8> aData( (const sal_Int8 *)pData, nSize );
xOS->writeBytes( aData ); xOS->writeBytes( aData );
return nSize; return nSize;
} }
else if( xS.is() ) else if( xS.is() && (xOSFromS = xS->getOutputStream()).is() )
{ {
Sequence<sal_Int8> aData( (const sal_Int8 *)pData, nSize ); Sequence<sal_Int8> aData( (const sal_Int8 *)pData, nSize );
xS->writeBytes( aData ); xOSFromS->writeBytes( aData );
return nSize; return nSize;
} }
else else
@@ -638,10 +644,11 @@ void UCBStream::FlushData()
{ {
try try
{ {
Reference< XOutputStream > xOSFromS;
if( xOS.is() ) if( xOS.is() )
xOS->flush(); xOS->flush();
else if( xS.is() ) else if( xS.is() && (xOSFromS = xS->getOutputStream()).is() )
xS->flush(); xOSFromS->flush();
else else
SetError( ERRCODE_IO_GENERAL ); SetError( ERRCODE_IO_GENERAL );
} }