summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2013-05-03 17:35:40 +0000
committerAriel Constenla-Haile <arielch@apache.org>2013-05-03 17:35:40 +0000
commit2b634ab7db0dd20cb467b5b65b483c29c8cd0a71 (patch)
tree61f94162f819779be4234c911721d529ce9d706c
parentcdc8cb702630938c673255638aecbd2dd5c53ed7 (diff)
i120385 - apply patch from AOO34 branch
Notes
Notes: prefer: acc613a3236c61c8272bde1eadca5d8bf25f98f1
-rw-r--r--package/source/manifest/ManifestImport.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 13f5c752b85e..aaf67bb94cb3 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -137,7 +137,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
nDerivedKeySize = 0;
if ( !bIgnoreEncryptData )
{
- long nDigestId = 0;
+ sal_Int32 nDigestId = 0;
const OUString& rChecksumType = aConvertedAttribs[sChecksumTypeAttribute];
if( rChecksumType.equalsAscii( SHA1_1K_NAME )
|| rChecksumType.equalsAscii( SHA1_1K_URL ) )
@@ -164,7 +164,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
{
if ( !bIgnoreEncryptData )
{
- long nCypherId = 0;
+ sal_Int32 nCypherId = 0;
const OUString& rAlgoName = aConvertedAttribs[sAlgorithmNameAttribute];
if ( rAlgoName.equalsAscii( BLOWFISH_NAME )
|| rAlgoName.equalsAscii( BLOWFISH_URL ) )