diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-22 14:52:28 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-22 14:52:28 +0200 |
commit | 2d8911d9396a10ad794eb42b6d5a44e8f5af4d91 (patch) | |
tree | 05868189ccda3448cd5b554340b73df4b194de16 /ucbhelper | |
parent | 12c152ccbf2890378b92e7d00ecc532fee36b83f (diff) |
ucbhelper::Std{In,Out}putStream are only used in ucb/source/ucb/cmis/
...where their use of boost::shared_ptr (instead of std::shared_ptr) matches the
use in libcmis, but makes them unlikely to be useful anywhere else. So move
them into ucb/source/ucb/cmis/.
Change-Id: I68359be6b43d6889af4f241dcdcbdc0d9d70d717
Diffstat (limited to 'ucbhelper')
-rw-r--r-- | ucbhelper/Library_ucbhelper.mk | 4 | ||||
-rw-r--r-- | ucbhelper/source/provider/std_inputstream.cxx | 191 | ||||
-rw-r--r-- | ucbhelper/source/provider/std_outputstream.cxx | 102 |
3 files changed, 0 insertions, 297 deletions
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index 6c338507e5d0..5226d9e76528 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -11,8 +11,6 @@ $(eval $(call gb_Library_Library,ucbhelper)) $(eval $(call gb_Library_use_sdk_api,ucbhelper)) -$(eval $(call gb_Library_use_external,ucbhelper,boost_headers)) - $(eval $(call gb_Library_use_libraries,ucbhelper,\ cppu \ cppuhelper \ @@ -51,8 +49,6 @@ $(eval $(call gb_Library_add_exception_objects,ucbhelper,\ ucbhelper/source/provider/simpleinteractionrequest \ ucbhelper/source/provider/simpleioerrorrequest \ ucbhelper/source/provider/simplenameclashresolverequest \ - ucbhelper/source/provider/std_inputstream \ - ucbhelper/source/provider/std_outputstream \ )) # vim: set noet sw=4 ts=4: diff --git a/ucbhelper/source/provider/std_inputstream.cxx b/ucbhelper/source/provider/std_inputstream.cxx deleted file mode 100644 index 506e953e9e48..000000000000 --- a/ucbhelper/source/provider/std_inputstream.cxx +++ /dev/null @@ -1,191 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include <sal/config.h> - -#include <sal/log.hxx> - -#include "ucbhelper/std_inputstream.hxx" - -using namespace std; -using namespace com::sun::star; - -namespace ucbhelper -{ - StdInputStream::StdInputStream( boost::shared_ptr< istream > const & pStream ) : - m_pStream( pStream ), - m_nLength( 0 ) - { - if ( m_pStream.get() ) - { - streampos nInitPos = m_pStream->tellg( ); - m_pStream->seekg( 0, ios_base::end ); - streampos nEndPos = m_pStream->tellg( ); - m_pStream->seekg( nInitPos, ios_base::beg ); - - m_nLength = sal_Int64( nEndPos - nInitPos ); - } - } - - StdInputStream::~StdInputStream() - { - } - - uno::Any SAL_CALL StdInputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception ) - { - uno::Any aRet = ::cppu::queryInterface( rType, - ( static_cast< XInputStream* >( this ) ), - ( static_cast< XSeekable* >( this ) ) ); - - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); - } - - void SAL_CALL StdInputStream::acquire( ) throw( ) - { - OWeakObject::acquire(); - } - - void SAL_CALL StdInputStream::release( ) throw( ) - { - OWeakObject::release(); - } - - sal_Int32 SAL_CALL StdInputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception) - { - osl::MutexGuard aGuard( m_aMutex ); - - if ( 0 <= nBytesToRead && aData.getLength() < nBytesToRead ) - aData.realloc( nBytesToRead ); - - if ( !m_pStream.get() ) - throw io::IOException( ); - - sal_Int32 nRead = 0; - try - { - m_pStream->read( reinterpret_cast< char* >( aData.getArray( ) ), nBytesToRead ); - nRead = m_pStream->gcount(); - } - catch ( const ios_base::failure& e ) - { - SAL_INFO( "ucbhelper", "StdInputStream::readBytes() error: " << e.what() ); - throw io::IOException( ); - } - - return nRead; - } - - sal_Int32 SAL_CALL StdInputStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, - sal_Int32 nMaxBytesToRead ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception) - { - osl::MutexGuard aGuard( m_aMutex ); - - if ( 0 <= nMaxBytesToRead && aData.getLength() < nMaxBytesToRead ) - aData.realloc( nMaxBytesToRead ); - - if ( !m_pStream.get() ) - throw io::IOException( ); - - sal_Int32 nRead = 0; - try - { - nRead = m_pStream->readsome( reinterpret_cast< char* >( aData.getArray( ) ), nMaxBytesToRead ); - } - catch ( const ios_base::failure& e ) - { - SAL_INFO( "ucbhelper", "StdInputStream::readBytes() error: " << e.what() ); - throw io::IOException( ); - } - return nRead; - } - - void SAL_CALL StdInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) - { - osl::MutexGuard aGuard( m_aMutex ); - - if ( !m_pStream.get() ) - throw io::IOException( ); - - try - { - m_pStream->seekg( nBytesToSkip, ios_base::cur ); - } - catch ( const ios_base::failure& e ) - { - SAL_INFO( "ucbhelper", "StdInputStream::readBytes() error: " << e.what() ); - throw io::IOException( ); - } - } - - sal_Int32 SAL_CALL StdInputStream::available( ) - throw(io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception ) - { - return sal::static_int_cast< sal_Int32 >( m_nLength - getPosition() ); - } - - void SAL_CALL StdInputStream::closeInput( ) - throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) - { - // No need to implement this for an istream - } - - void SAL_CALL StdInputStream::seek( sal_Int64 location ) - throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception ) - { - osl::MutexGuard aGuard( m_aMutex ); - - if ( location < 0 || location > m_nLength ) - throw lang::IllegalArgumentException( - "Location can't be negative or greater than the length", - static_cast< cppu::OWeakObject* >( this ), 0 ); - - if ( !m_pStream.get() ) - throw io::IOException( ); - - try - { - m_pStream->clear( ); // may be needed to rewind the stream - m_pStream->seekg( location, ios_base::beg ); - } - catch ( const ios_base::failure& e ) - { - SAL_INFO( "ucbhelper", "StdInputStream::readBytes() error: " << e.what() ); - throw io::IOException( ); - } - } - - sal_Int64 SAL_CALL StdInputStream::getPosition( ) - throw( io::IOException, uno::RuntimeException, std::exception ) - { - osl::MutexGuard aGuard( m_aMutex ); - - if ( !m_pStream.get() ) - throw io::IOException( ); - - sal_Int64 nPos = m_pStream->tellg( ); - if ( -1 == nPos ) - throw io::IOException( ); - - return nPos; - } - - sal_Int64 SAL_CALL StdInputStream::getLength( ) - throw ( io::IOException, uno::RuntimeException, std::exception ) - { - return m_nLength; - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/std_outputstream.cxx b/ucbhelper/source/provider/std_outputstream.cxx deleted file mode 100644 index bfe5efa0ea39..000000000000 --- a/ucbhelper/source/provider/std_outputstream.cxx +++ /dev/null @@ -1,102 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include <sal/config.h> - -#include <sal/log.hxx> - -#include "ucbhelper/std_outputstream.hxx" - -using namespace std; -using namespace com::sun::star; - -namespace ucbhelper -{ - StdOutputStream::StdOutputStream( boost::shared_ptr< ostream > const & pStream ) : - m_pStream( pStream ) - { - } - - StdOutputStream::~StdOutputStream() - { - if ( m_pStream.get( ) ) - m_pStream->setstate( ios::eofbit ); - } - - uno::Any SAL_CALL StdOutputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception ) - { - uno::Any aRet = ::cppu::queryInterface( rType, ( static_cast< XOutputStream* >( this ) ) ); - - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); - } - - void SAL_CALL StdOutputStream::acquire( ) throw( ) - { - OWeakObject::acquire(); - } - - void SAL_CALL StdOutputStream::release( ) throw( ) - { - OWeakObject::release(); - } - - void SAL_CALL StdOutputStream::writeBytes ( const uno::Sequence< sal_Int8 >& aData ) - throw ( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) - { - osl::MutexGuard aGuard( m_aMutex ); - - if ( !m_pStream.get() ) - throw io::IOException( ); - - try - { - m_pStream->write( reinterpret_cast< const char* >( aData.getConstArray( ) ), aData.getLength( ) ); - } - catch ( const ios_base::failure& e ) - { - SAL_INFO( "ucbhelper", "Exception caught when calling write: " << e.what() ); - throw io::IOException( ); - } - } - - void SAL_CALL StdOutputStream::flush ( ) - throw ( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) - { - osl::MutexGuard aGuard( m_aMutex ); - - if ( !m_pStream.get() ) - throw io::IOException( ); - - try - { - m_pStream->flush( ); - } - catch ( const ios_base::failure& e ) - { - SAL_INFO( "ucbhelper", "Exception caught when calling flush: " << e.what() ); - throw io::IOException( ); - } - } - - void SAL_CALL StdOutputStream::closeOutput ( ) - throw ( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) - { - osl::MutexGuard aGuard( m_aMutex ); - - if ( !m_pStream.get() ) - throw io::IOException( ); - - m_pStream->setstate( ios_base::eofbit ); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |