summaryrefslogtreecommitdiff
path: root/package/source/manifest/ManifestImport.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'package/source/manifest/ManifestImport.cxx')
-rw-r--r--package/source/manifest/ManifestImport.cxx7
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