summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-08-12 10:55:22 +0000
committerOliver Bolte <obo@openoffice.org>2004-08-12 10:55:22 +0000
commit4a129d593127b5b57cc9266a91c89d3598f503bb (patch)
tree4ffe4609626b3f2bd68c6b9af351c56c56ab091e /package
parent9c5431a9410aa4f53414d0c434420bcc9bd18b4f (diff)
INTEGRATION: CWS unotlc (1.38.28); FILE MERGED
2004/08/04 12:06:35 mav 1.38.28.1: #i32418# vnd.sun.star.zip scheme
Diffstat (limited to 'package')
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx13
1 files changed, 11 insertions, 2 deletions
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 8e2721024a7a..06bb250f0232 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageStream.cxx,v $
*
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
*
- * last change: $Author: hr $ $Date: 2004-05-10 17:29:52 $
+ * last change: $Author: obo $ $Date: 2004-08-12 11:55:22 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -567,6 +567,9 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName,
{
if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")))
{
+ if ( !rZipPackage.isInPackageFormat() )
+ throw beans::PropertyVetoException();
+
if ( aValue >>= sMediaType )
{
if (sMediaType.getLength() > 0)
@@ -593,6 +596,9 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName,
}
else if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Encrypted") ) )
{
+ if ( !rZipPackage.isInPackageFormat() )
+ throw beans::PropertyVetoException();
+
sal_Bool bEnc = sal_False;
if ( aValue >>= bEnc )
{
@@ -614,6 +620,9 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName,
}
else if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EncryptionKey") ) )
{
+ if ( !rZipPackage.isInPackageFormat() )
+ throw beans::PropertyVetoException();
+
Sequence < sal_Int8 > aNewKey;
if ( !( aValue >>= aNewKey ) )