diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:10:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:10:43 +0000 |
| commit | c0bd39651703469702d112455dc1b60bc373cba0 (patch) | |
| tree | 3dde24da5691d175d438478c50fdb3874e9ebb1f /package/source | |
| parent | 61909d4a5e9647d3c5bcf53e609660e3a40c5984 (diff) | |
INTEGRATION: CWS warnings01 (1.10.4); FILE MERGED
2006/05/30 15:11:28 mav 1.10.4.4: #i53898# fix incompleted variable renaming
2006/04/07 21:37:08 sb 1.10.4.3: RESYNC: (1.11-1.12); FILE MERGED
2005/11/07 20:26:54 pl 1.10.4.2: RESYNC: (1.10-1.11); FILE MERGED
2005/11/01 17:10:17 cd 1.10.4.1: #i53898# Warning free code for sun sparc compiler
Diffstat (limited to 'package/source')
| -rw-r--r-- | package/source/manifest/ManifestExport.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 2fa804076730..1c0e39327d31 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ManifestExport.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2006-02-01 19:13:55 $ + * last change: $Author: hr $ $Date: 2006-06-20 06:10:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -226,51 +226,51 @@ ManifestExport::ManifestExport(Reference < XDocumentHandler > xHandler, const S xHandler->startElement( sFileEntryElement , xAttrList); if ( pVector && pSalt && pIterationCount ) { - AttributeList * pAttrList = new AttributeList; - Reference < XAttributeList > xAttrList (pAttrList); + AttributeList * pNewAttrList = new AttributeList; + Reference < XAttributeList > xNewAttrList (pNewAttrList); OUStringBuffer aBuffer; Sequence < sal_uInt8 > aSequence; xHandler->ignorableWhitespace ( sWhiteSpace ); if ( pDigest ) { - pAttrList->AddAttribute ( sChecksumTypeAttribute, sCdataAttribute, sChecksumType ); + pNewAttrList->AddAttribute ( sChecksumTypeAttribute, sCdataAttribute, sChecksumType ); pDigest->Value >>= aSequence; Base64Codec::encodeBase64 ( aBuffer, aSequence ); - pAttrList->AddAttribute ( sChecksumAttribute, sCdataAttribute, aBuffer.makeStringAndClear() ); + pNewAttrList->AddAttribute ( sChecksumAttribute, sCdataAttribute, aBuffer.makeStringAndClear() ); } - xHandler->startElement( sEncryptionDataElement , xAttrList); + xHandler->startElement( sEncryptionDataElement , xNewAttrList); - pAttrList = new AttributeList; - xAttrList = pAttrList; + pNewAttrList = new AttributeList; + xNewAttrList = pNewAttrList; - pAttrList->AddAttribute ( sAlgorithmNameAttribute, sCdataAttribute, sBlowfish ); + pNewAttrList->AddAttribute ( sAlgorithmNameAttribute, sCdataAttribute, sBlowfish ); pVector->Value >>= aSequence; Base64Codec::encodeBase64 ( aBuffer, aSequence ); - pAttrList->AddAttribute ( sInitialisationVectorAttribute, sCdataAttribute, aBuffer.makeStringAndClear() ); + pNewAttrList->AddAttribute ( sInitialisationVectorAttribute, sCdataAttribute, aBuffer.makeStringAndClear() ); xHandler->ignorableWhitespace ( sWhiteSpace ); - xHandler->startElement( sAlgorithmElement , xAttrList); + xHandler->startElement( sAlgorithmElement , xNewAttrList); xHandler->ignorableWhitespace ( sWhiteSpace ); xHandler->endElement( sAlgorithmElement ); - pAttrList = new AttributeList; - xAttrList = pAttrList; + pNewAttrList = new AttributeList; + xNewAttrList = pNewAttrList; - pAttrList->AddAttribute ( sKeyDerivationNameAttribute, sCdataAttribute, sPBKDF2 ); + pNewAttrList->AddAttribute ( sKeyDerivationNameAttribute, sCdataAttribute, sPBKDF2 ); sal_Int32 nCount; pIterationCount->Value >>= nCount; aBuffer.append (nCount); - pAttrList->AddAttribute ( sIterationCountAttribute, sCdataAttribute, aBuffer.makeStringAndClear() ); + pNewAttrList->AddAttribute ( sIterationCountAttribute, sCdataAttribute, aBuffer.makeStringAndClear() ); pSalt->Value >>= aSequence; Base64Codec::encodeBase64 ( aBuffer, aSequence ); - pAttrList->AddAttribute ( sSaltAttribute, sCdataAttribute, aBuffer.makeStringAndClear() ); + pNewAttrList->AddAttribute ( sSaltAttribute, sCdataAttribute, aBuffer.makeStringAndClear() ); xHandler->ignorableWhitespace ( sWhiteSpace ); - xHandler->startElement( sKeyDerivationElement , xAttrList); + xHandler->startElement( sKeyDerivationElement , xNewAttrList); xHandler->ignorableWhitespace ( sWhiteSpace ); xHandler->endElement( sKeyDerivationElement ); xHandler->ignorableWhitespace ( sWhiteSpace ); |