Author: arielch
Date: Fri May 3 17:35:40 2013
New Revision: 1478883
URL: http://svn.apache.org/r1478883
Log:
i120385 - apply patch from AOO34 branch
Modified:
openoffice/trunk/main/package/source/manifest/ManifestImport.cxx
Modified: openoffice/trunk/main/package/source/manifest/ManifestImport.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/package/source/manifest/ManifestImport.cxx?rev=1478883&r1=1478882&r2=1478883&view=diff
==============================================================================
--- openoffice/trunk/main/package/source/manifest/ManifestImport.cxx (original)
+++ openoffice/trunk/main/package/source/manifest/ManifestImport.cxx Fri May 3
17:35:40 2013
@@ -137,7 +137,7 @@ void SAL_CALL ManifestImport::startEleme
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::startEleme
{
if ( !bIgnoreEncryptData )
{
- long nCypherId = 0;
+ sal_Int32 nCypherId = 0;
const OUString& rAlgoName =
aConvertedAttribs[sAlgorithmNameAttribute];
if ( rAlgoName.equalsAscii( BLOWFISH_NAME )
|| rAlgoName.equalsAscii( BLOWFISH_URL ) )
