diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 09:32:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 09:32:41 +0000 |
| commit | 2dd56a16b14d24d08fb785ad99e272ad84a73b8d (patch) | |
| tree | 4b89e6643535f2f2fb9b0de1ae97f5edd20a5514 /package | |
| parent | 0c45c0b14f11eb3eca4e50c95510a28ff9be78ad (diff) | |
INTEGRATION: CWS jl93 (1.10.58); FILE MERGED
2008/05/06 10:46:23 jl 1.10.58.3: #i86651# wrong order of initialization of members in constructor
2008/05/05 13:28:24 jl 1.10.58.2: RESYNC: (1.10-1.11); FILE MERGED
2008/04/08 15:43:27 mav 1.10.58.1: #i86651# add Version property
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/manifest/ManifestImport.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 409ba9aee041..44b451b1361d 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ManifestImport.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -57,6 +57,7 @@ ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManV , sCdataAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CDATA ) ) , sMediaTypeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_MEDIA_TYPE ) ) +, sVersionAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_VERSION ) ) , sFullPathAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_FULL_PATH ) ) , sSizeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SIZE ) ) , sSaltAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SALT ) ) @@ -69,6 +70,7 @@ ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManV , sFullPathProperty ( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) ) , sMediaTypeProperty ( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) ) +, sVersionProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Version" ) ) , sIterationCountProperty ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) ) , sSaltProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Salt" ) ) , sInitialisationVectorProperty ( RTL_CONSTASCII_USTRINGPARAM ( "InitialisationVector" ) ) @@ -98,7 +100,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re if (aName == sFileEntryElement) { aStack.push( e_FileEntry ); - aSequence.realloc ( 7 ); // Can have at most 6 entries (currently, will realloc to actual number in endElement) + aSequence.realloc ( PKG_SIZE_ENCR_MNFST ); // Put full-path property first for MBA aSequence[nNumProperty].Name = sFullPathProperty; @@ -106,6 +108,13 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re aSequence[nNumProperty].Name = sMediaTypeProperty; aSequence[nNumProperty++].Value <<= xAttribs->getValueByName( sMediaTypeAttribute ); + OUString sVersion = xAttribs->getValueByName ( sVersionAttribute ); + if ( sVersion.getLength() ) + { + aSequence[nNumProperty].Name = sVersionProperty; + aSequence[nNumProperty++].Value <<= sVersion; + } + OUString sSize = xAttribs->getValueByName ( sSizeAttribute ); if (sSize.getLength()) { |