incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1366353 - in /incubator/ooo/branches/AOO34: ./ ext_libraries/ main/ main/framework/ main/package/source/manifest/ManifestImport.cxx
Date Fri, 27 Jul 2012 12:03:44 GMT
Author: hdu
Date: Fri Jul 27 12:03:44 2012
New Revision: 1366353

URL: http://svn.apache.org/viewvc?rev=1366353&view=rev
Log:
120385# 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/branches/AOO34/   (props changed)
    incubator/ooo/branches/AOO34/ext_libraries/   (props changed)
    incubator/ooo/branches/AOO34/main/   (props changed)
    incubator/ooo/branches/AOO34/main/framework/   (props changed)
    incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestImport.cxx

Propchange: incubator/ooo/branches/AOO34/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk:r1355401,1366350

Propchange: incubator/ooo/branches/AOO34/ext_libraries/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk/ext_libraries:r1355401,1366350

Propchange: incubator/ooo/branches/AOO34/main/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk/main:r1355401,1366350

Propchange: incubator/ooo/branches/AOO34/main/framework/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk/main/framework:r1355401,1366350

Modified: incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestImport.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestImport.cxx?rev=1366353&r1=1366352&r2=1366353&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestImport.cxx (original)
+++ incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestImport.cxx Fri Jul 27
12:03:44 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



Mime
View raw message