diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:18:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:18:25 +0000 |
| commit | e813bdfeeb582ed990b86c607cf48cd47f20a2e2 (patch) | |
| tree | 5b720adec1c554a6620356a8c4f434ac8016e686 /package | |
| parent | 11d16dcf4c6ea5b1f3b38d4fbf75c72ec8eef632 (diff) | |
INTEGRATION: CWS fwk88 (1.7.8); FILE MERGED
2008/05/27 15:57:23 mav 1.7.8.1: #i86348# integrate the patch
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/xstor/oseekinstream.cxx | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx index e214ff951090..c7b071f44f47 100644 --- a/package/source/xstor/oseekinstream.cxx +++ b/package/source/xstor/oseekinstream.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: oseekinstream.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -40,26 +40,6 @@ using namespace ::com::sun::star; OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl, - uno::Reference < io::XStream > xStream, - const uno::Sequence< beans::PropertyValue >& aProps, - sal_Int16 nStorageType ) -: OInputCompStream( pImpl, nStorageType ) -{ - OSL_ENSURE( xStream.is(), "No stream is provided!\n" ); - - if ( xStream.is() ) - { - m_xStream = xStream->getInputStream(); - m_xSeekable = uno::Reference< io::XSeekable >( xStream, uno::UNO_QUERY ); - - OSL_ENSURE( m_xStream.is(), "No input stream is provided!\n" ); - OSL_ENSURE( m_xSeekable.is(), "No seeking support!\n" ); - } - - m_aProperties = aProps; -} - -OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl, uno::Reference < io::XInputStream > xStream, const uno::Sequence< beans::PropertyValue >& aProps, sal_Int16 nStorageType ) @@ -72,25 +52,6 @@ OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl, } } -OInputSeekStream::OInputSeekStream( uno::Reference < io::XStream > xStream, - const uno::Sequence< beans::PropertyValue >& aProps, - sal_Int16 nStorageType ) -: OInputCompStream( nStorageType ) -{ - OSL_ENSURE( xStream.is(), "No stream is provided!\n" ); - - if ( xStream.is() ) - { - m_xStream = xStream->getInputStream(); - m_xSeekable = uno::Reference< io::XSeekable >( xStream, uno::UNO_QUERY ); - - OSL_ENSURE( m_xStream.is(), "No input stream is provided!\n" ); - OSL_ENSURE( m_xSeekable.is(), "No seeking support!\n" ); - } - - m_aProperties = aProps; -} - OInputSeekStream::OInputSeekStream( uno::Reference < io::XInputStream > xStream, const uno::Sequence< beans::PropertyValue >& aProps, sal_Int16 nStorageType ) |