From ff442e91b4f47056482cc83a48b53f24f74b10fd Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Mon, 10 May 2004 16:27:55 +0000
Subject: INTEGRATION: CWS fwkbugfix02 (1.3.12); FILE MERGED 2004/05/03
16:46:13 mav 1.3.12.1: #115510# transport the common key
---
package/source/xstor/ocompinstream.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'package')
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 2a26440a2727..ecd366552b4e 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ocompinstream.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: hr $ $Date: 2004-02-03 17:57:40 $
+ * last change: $Author: hr $ $Date: 2004-05-10 17:27:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -361,7 +361,8 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr
if ( aPropertyName.equalsAscii( "MediaType" )
|| aPropertyName.equalsAscii( "Size" )
|| aPropertyName.equalsAscii( "Encrypted" )
- || aPropertyName.equalsAscii( "Compressed" ) )
+ || aPropertyName.equalsAscii( "Compressed" )
+ || aPropertyName.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
{
for ( sal_Int32 aInd = 0; aInd < m_aProperties.getLength(); aInd++ )
{
@@ -371,7 +372,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr
}
}
}
- else if ( aPropertyName.equalsAscii( "EncriptionKey" ) )
+ else if ( aPropertyName.equalsAscii( "EncryptionKey" ) )
throw lang::WrappedTargetException(); // TODO: PropertyVetoException
throw beans::UnknownPropertyException();
--
cgit v1.2.3