diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:11:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:11:32 +0000 |
| commit | a0e811fec0a63475cd202bbfd54789b9776db7a1 (patch) | |
| tree | fbbb321be9272bf83989c8bcf2a8d512610ffeb2 /package/source/xstor | |
| parent | 4f5f90443cb927f030746e625066931be385b844 (diff) | |
INTEGRATION: CWS warnings01 (1.10.12); FILE MERGED
2006/04/07 21:37:16 sb 1.10.12.6: RESYNC: (1.15-1.16); FILE MERGED
2006/01/25 22:23:08 sb 1.10.12.5: RESYNC: (1.13-1.15); FILE MERGED
2005/11/07 20:27:19 pl 1.10.12.4: RESYNC: (1.11-1.13); FILE MERGED
2005/11/01 17:10:19 cd 1.10.12.3: #i53898# Warning free code for sun sparc compiler
2005/09/23 03:34:34 sb 1.10.12.2: RESYNC: (1.10-1.11); FILE MERGED
2005/09/15 15:27:57 abi 1.10.12.1: #i53898# warning free
Diffstat (limited to 'package/source/xstor')
| -rw-r--r-- | package/source/xstor/owriteablestream.cxx | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 853648822259..9c19cac97d8e 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -4,9 +4,9 @@ * * $RCSfile: owriteablestream.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2006-02-01 19:14:11 $ + * last change: $Author: hr $ $Date: 2006-06-20 06:11:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -234,9 +234,9 @@ OWriteStream_Impl::OWriteStream_Impl( OStorage_Impl* pParent, , m_xPackageStream( xPackageStream ) , m_xFactory( xFactory ) , m_pParent( pParent ) -, m_bHasCachedPassword( sal_False ) , m_bForceEncrypted( bForceEncrypted ) , m_bUseCommonPass( sal_False ) +, m_bHasCachedPassword( sal_False ) , m_xPackage( xPackage ) , m_bHasInsertedStreamOptimization( sal_False ) { @@ -336,11 +336,6 @@ sal_Bool OWriteStream_Impl::IsEncrypted() } else return bToBeEncr; - - OSL_ENSURE( sal_False, "Can't read encryption related properties!\n" ); - throw io::IOException(); // TODO - - return sal_False; // not reachable } //----------------------------------------------- @@ -1105,9 +1100,6 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre } throw lang::IllegalArgumentException(); // TODO - - // not reachable - return uno::Reference< io::XStream >(); } //----------------------------------------------- @@ -1161,7 +1153,7 @@ void OWriteStream_Impl::InputStreamDisposed( OInputCompStream* pStream ) } //----------------------------------------------- -void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io::XInputStream >& xDataToCopy, const uno::Sequence< beans::PropertyValue >& aProps, sal_Bool bUseCommonKey, uno::Reference< io::XStream >& xTargetStream ) +void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io::XInputStream >& xDataToCopy, const uno::Sequence< beans::PropertyValue >& aProps, sal_Bool, uno::Reference< io::XStream >& xTargetStream ) { uno::Reference < io::XStream > xTempFile; if ( !xTargetStream.is() ) @@ -2001,16 +1993,13 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp ) } throw beans::UnknownPropertyException(); // TODO - - // not reachable - return uno::Any(); } //----------------------------------------------- void SAL_CALL OWriteStream::addPropertyChangeListener( - const ::rtl::OUString& aPropertyName, - const uno::Reference< beans::XPropertyChangeListener >& xListener ) + const ::rtl::OUString& /*aPropertyName*/, + const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -2026,8 +2015,8 @@ void SAL_CALL OWriteStream::addPropertyChangeListener( //----------------------------------------------- void SAL_CALL OWriteStream::removePropertyChangeListener( - const ::rtl::OUString& aPropertyName, - const uno::Reference< beans::XPropertyChangeListener >& aListener ) + const ::rtl::OUString& /*aPropertyName*/, + const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -2043,8 +2032,8 @@ void SAL_CALL OWriteStream::removePropertyChangeListener( //----------------------------------------------- void SAL_CALL OWriteStream::addVetoableChangeListener( - const ::rtl::OUString& PropertyName, - const uno::Reference< beans::XVetoableChangeListener >& aListener ) + const ::rtl::OUString& /*PropertyName*/, + const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -2060,8 +2049,8 @@ void SAL_CALL OWriteStream::addVetoableChangeListener( //----------------------------------------------- void SAL_CALL OWriteStream::removeVetoableChangeListener( - const ::rtl::OUString& PropertyName, - const uno::Reference< beans::XVetoableChangeListener >& aListener ) + const ::rtl::OUString& /*PropertyName*/, + const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) |