diff options
-rw-r--r-- | toolkit/Library_tk.mk | 1 | ||||
-rw-r--r-- | toolkit/Package_inc.mk | 1 | ||||
-rw-r--r-- | toolkit/inc/toolkit/helper/unomemorystream.hxx | 75 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 1 | ||||
-rw-r--r-- | toolkit/source/helper/unomemorystream.cxx | 108 |
5 files changed, 0 insertions, 186 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 8dabc0dd0745..efce186e06d5 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -124,7 +124,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/helper/registerservices \ toolkit/source/helper/servicenames \ toolkit/source/helper/tkresmgr \ - toolkit/source/helper/unomemorystream \ toolkit/source/helper/unopropertyarrayhelper \ toolkit/source/helper/unowrapper \ toolkit/source/helper/vclunohelper \ diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk index 64993f80e596..0e60190218dd 100644 --- a/toolkit/Package_inc.mk +++ b/toolkit/Package_inc.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/tkresmgr.hxx,toolkit/helper/tkresmgr.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unomemorystream.hxx,toolkit/helper/unomemorystream.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unopropertyarrayhelper.hxx,toolkit/helper/unopropertyarrayhelper.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx)) diff --git a/toolkit/inc/toolkit/helper/unomemorystream.hxx b/toolkit/inc/toolkit/helper/unomemorystream.hxx deleted file mode 100644 index 7cfeae03d8b1..000000000000 --- a/toolkit/inc/toolkit/helper/unomemorystream.hxx +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _TOOLKIT_HELPER_UNOMEMORYSTREAM_HXX_ -#define _TOOLKIT_HELPER_UNOMEMORYSTREAM_HXX_ - - -#include <com/sun/star/io/XInputStream.hpp> -#include <cppuhelper/weak.hxx> -#include <osl/mutex.hxx> - -#include <tools/stream.hxx> - -// ---------------------------------------------------- -// class UNOMEMORYSTREAM -// ---------------------------------------------------- - -class UnoMemoryStream : public SvMemoryStream, - public ::com::sun::star::io::XInputStream, - public ::cppu::OWeakObject -{ -private: - ::osl::Mutex maMutex; - -protected: - ::osl::Mutex& GetMutex() { return maMutex; } - - -public: - UnoMemoryStream( sal_uInt32 nInitSize = 0x3FFF, sal_uInt32 nResize = 0x3FFFF ); - - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } - - // ::com::sun::star::io::XInputStream - sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); -}; - - - - -#endif // _TOOLKIT_HELPER_UNOMEMORYSTREAM_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 4dc6628539f8..2e87784d282e 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -44,7 +44,6 @@ #include <toolkit/controls/stdtabcontroller.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/unopropertyarrayhelper.hxx> -#include <toolkit/helper/unomemorystream.hxx> #include <toolkit/helper/servicenames.hxx> #include <toolkit/helper/macros.hxx> #include <toolkit/helper/imagealign.hxx> diff --git a/toolkit/source/helper/unomemorystream.cxx b/toolkit/source/helper/unomemorystream.cxx deleted file mode 100644 index 97cb8d214cb5..000000000000 --- a/toolkit/source/helper/unomemorystream.cxx +++ /dev/null @@ -1,108 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - - -#include <toolkit/helper/unomemorystream.hxx> -#include <algorithm> - -// ---------------------------------------------------- -// class UnoMemoryStream -// ---------------------------------------------------- -UnoMemoryStream::UnoMemoryStream( sal_uInt32 nInitSize, sal_uInt32 nInitResize ) - : SvMemoryStream( nInitSize, nInitResize ) -{ -} - -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any UnoMemoryStream::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) -{ - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::io::XInputStream*, this ) ); - return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); -} - - -// ::com::sun::star::io::XInputStream -sal_Int32 UnoMemoryStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) -{ - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - sal_Int32 nRead = available(); - if ( nRead > nBytesToRead ) - nRead = nBytesToRead; - - rData = ::com::sun::star::uno::Sequence< sal_Int8 >( nRead ); - Read( rData.getArray(), nRead ); - - return nRead; -} - -sal_Int32 UnoMemoryStream::readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) -{ - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - sal_Int32 nAvailable = available(); - if( nAvailable ) - { - return readBytes( rData, std::min( nMaxBytesToRead , nAvailable ) ); - } - else - { - // Not the most effective method, but it sticks to the specification - return readBytes( rData, 1 ); - } -} - -void UnoMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) -{ - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - SeekRel( nBytesToSkip ); -} - -sal_Int32 UnoMemoryStream::available() throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) -{ - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - sal_uInt32 nStreamPos = Tell(); - sal_uInt32 nEnd = Seek( STREAM_SEEK_TO_END ); - Seek( nStreamPos ); - return nEnd - nStreamPos; -} - -void UnoMemoryStream::closeInput() throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) -{ - // nothing to do -} - - - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |