diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 16:52:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 16:52:08 +0000 |
| commit | 29b28a3aa0f1e5ac9018c1b0cd6fae78b8d2991d (patch) | |
| tree | a923da86cec99329097ae9b5ab0299e4e6791976 | |
| parent | e3709f3616387d8d9dcd876b6a6479f4aea68f22 (diff) | |
INTEGRATION: CWS pj65 (1.107.8); FILE MERGED
2006/10/31 13:32:17 pjanik 1.107.8.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 089eaeeb1843..e287b24a31fe 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ZipPackage.cxx,v $ * - * $Revision: 1.107 $ + * $Revision: 1.108 $ * - * last change: $Author: mav $ $Date: 2006-10-19 14:30:06 $ + * last change: $Author: vg $ $Date: 2006-11-21 17:52:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -382,7 +382,7 @@ void ZipPackage::parseManifest() if (pSalt && pVector && pCount && pSize) { Sequence < sal_uInt8 > aSequence; - sal_Int32 nCount, nSize; + sal_Int32 nCount = 0, nSize = 0; pStream->SetToBeEncrypted ( sal_True ); *pSalt >>= aSequence; @@ -654,7 +654,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments ) Content aContent ( sURL, Reference < XCommandEnvironment >() ); Any aAny = aContent.getPropertyValue( OUString::createFromAscii( "Size" ) ); - sal_uInt64 aSize; + sal_uInt64 aSize = 0; // kind of optimisation: treat empty files as nonexistent files // and write to such files directly if( ( aAny >>= aSize ) && aSize ) |