You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2012/07/27 13:56:59 UTC
svn commit: r1366350 -
/incubator/ooo/trunk/main/package/source/manifest/ManifestImport.cxx
Author: hdu
Date: Fri Jul 27 11:56:58 2012
New Revision: 1366350
URL: http://svn.apache.org/viewvc?rev=1366350&view=rev
Log:
#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
Modified:
incubator/ooo/trunk/main/package/source/manifest/ManifestImport.cxx
Modified: incubator/ooo/trunk/main/package/source/manifest/ManifestImport.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/package/source/manifest/ManifestImport.cxx?rev=1366350&r1=1366349&r2=1366350&view=diff
==============================================================================
--- incubator/ooo/trunk/main/package/source/manifest/ManifestImport.cxx (original)
+++ incubator/ooo/trunk/main/package/source/manifest/ManifestImport.cxx Fri Jul 27 11:56:58 2012
@@ -158,7 +158,7 @@ void SAL_CALL ManifestImport::startEleme
}
}
}
- else if ( aIter->m_aConvertedName.equalsAscii( ELEMENT_ALGORITHM ) )
+ else if ( aIter->m_aConvertedName.equalsAscii( ELEMENT_ENCRYPTION_DATA ) )
{
if ( aConvertedName.equalsAscii( ELEMENT_ALGORITHM ) )
{
@@ -255,12 +255,13 @@ void SAL_CALL ManifestImport::endElement
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