diff options
| author | Herbert Dürr <hdu@apache.org> | 2012-07-27 10:56:58 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2012-07-27 10:56:58 +0000 |
| commit | 3909704eebf3de1dd9ed6fe0c67082803c5f9e83 (patch) | |
| tree | 754d813de2aded87c6394f404249668daf9d51d0 /package | |
| parent | 0f04f29fbc7c1f3700343304c01e8934b6dad45b (diff) | |
#i120385# balance stack in manifest parsing and fix a typo
Patch-by: Jian Fang Zhang, Andre Fischer, Herbert Duerr
Found-by: Yan Ji
Review-by: Andre Fischer
Notes
Notes:
prefer: acc613a3236c61c8272bde1eadca5d8bf25f98f1
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/manifest/ManifestImport.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index ad0c58f498c6..ef10a242000c 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -158,7 +158,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re } } } - else if ( aIter->m_aConvertedName.equalsAscii( ELEMENT_ALGORITHM ) ) + else if ( aIter->m_aConvertedName.equalsAscii( ELEMENT_ENCRYPTION_DATA ) ) { if ( aConvertedName.equalsAscii( ELEMENT_ALGORITHM ) ) { @@ -255,13 +255,14 @@ void SAL_CALL ManifestImport::endElement( const OUString& aName ) return; const OUString aConvertedName = ConvertName( aName ); - if( !aConvertedName.equalsAscii( ELEMENT_FILE_ENTRY ) ) - return; if( !aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) ) return; aStack.pop_back(); + if( !aConvertedName.equalsAscii( ELEMENT_FILE_ENTRY ) ) + return; + // create the property sequence // Put full-path property first for MBA // TODO: get rid of fullpath-first requirement |