Author: af
Date: Fri Aug 3 14:08:26 2012
New Revision: 1368968
URL: http://svn.apache.org/viewvc?rev=1368968&view=rev
Log:
#i120456# Replace Base64 encoder/decoder with the one from sax.
Removed:
incubator/ooo/branches/AOO34/main/package/source/manifest/Base64Codec.cxx
incubator/ooo/branches/AOO34/main/package/source/manifest/Base64Codec.hxx
Modified:
incubator/ooo/branches/AOO34/main/package/prj/build.lst
incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestExport.cxx
incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestImport.cxx
incubator/ooo/branches/AOO34/main/package/util/makefile.mk
Modified: incubator/ooo/branches/AOO34/main/package/prj/build.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/package/prj/build.lst?rev=1368968&r1=1368967&r2=1368968&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/package/prj/build.lst (original)
+++ incubator/ooo/branches/AOO34/main/package/prj/build.lst Fri Aug 3 14:08:26
2012
@@ -1,4 +1,4 @@
-pk package : cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib
LIBXSLT:libxslt NULL
+pk package : cppu cppuhelper comphelper ucbhelper sal sax ZLIB:zlib
LIBXSLT:libxslt NULL
pk package
usr1 - all pk_mkout NULL
pk package\inc
nmake - all pk_inc NULL
pk package\source\zipapi nmake -
all pk_zipapi pk_inc NULL
Modified:
incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestExport.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestExport.cxx?rev=1368968&r1=1368967&r2=1368968&view=diff
==============================================================================
---
incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestExport.cxx
(original)
+++
incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestExport.cxx
Fri Aug 3 14:08:26 2012
@@ -34,7 +34,7 @@
#include <ManifestDefines.hxx>
#include <ManifestExport.hxx>
-#include <Base64Codec.hxx>
+#include <sax/tools/converter.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/documentconstants.hxx>
@@ -273,7 +273,7 @@ ManifestExport::ManifestExport( uno::Ref
pNewAttrList->AddAttribute ( sChecksumTypeAttribute,
sCdataAttribute, sChecksumType );
*pDigest >>= aSequence;
- Base64Codec::encodeBase64( aBuffer, aSequence );
+ ::sax::Converter::encodeBase64( aBuffer, aSequence );
pNewAttrList->AddAttribute ( sChecksumAttribute, sCdataAttribute,
aBuffer.makeStringAndClear() );
xHandler->startElement( sEncryptionDataElement ,
xNewAttrList);
@@ -306,7 +306,7 @@ ManifestExport::ManifestExport( uno::Ref
pNewAttrList->AddAttribute ( sAlgorithmNameAttribute,
sCdataAttribute, sEncAlgName );
*pVector >>= aSequence;
- Base64Codec::encodeBase64 ( aBuffer, aSequence );
+ ::sax::Converter::encodeBase64 ( aBuffer, aSequence );
pNewAttrList->AddAttribute (
sInitialisationVectorAttribute, sCdataAttribute, aBuffer.makeStringAndClear() );
xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -332,7 +332,7 @@ ManifestExport::ManifestExport( uno::Ref
pNewAttrList->AddAttribute ( sIterationCountAttribute,
sCdataAttribute, aBuffer.makeStringAndClear() );
*pSalt >>= aSequence;
- Base64Codec::encodeBase64 ( aBuffer, aSequence );
+ ::sax::Converter::encodeBase64 ( aBuffer, aSequence );
pNewAttrList->AddAttribute ( sSaltAttribute,
sCdataAttribute, aBuffer.makeStringAndClear() );
xHandler->ignorableWhitespace ( sWhiteSpace );
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=1368968&r1=1368967&r2=1368968&view=diff
==============================================================================
---
incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestImport.cxx
(original)
+++
incubator/ooo/branches/AOO34/main/package/source/manifest/ManifestImport.cxx
Fri Aug 3 14:08:26 2012
@@ -25,7 +25,7 @@
#include "precompiled_package.hxx"
#include <ManifestImport.hxx>
#include <ManifestDefines.hxx>
-#include <Base64Codec.hxx>
+#include <sax/tools/converter.hxx>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/xml/crypto/DigestID.hpp>
@@ -152,7 +152,7 @@ void SAL_CALL ManifestImport::startEleme
setProperty( PKG_MNFST_DIGESTALG, nDigestId );
const OUString& sChecksumData =
aConvertedAttribs[sChecksumAttribute];
uno::Sequence < sal_Int8 > aDecodeBuffer;
- Base64Codec::decodeBase64( aDecodeBuffer,
sChecksumData );
+ ::sax::Converter::decodeBase64( aDecodeBuffer,
sChecksumData );
setProperty( PKG_MNFST_DIGEST, aDecodeBuffer );
}
}
@@ -195,7 +195,7 @@ void SAL_CALL ManifestImport::startEleme
setProperty( PKG_MNFST_ENCALG, nCypherId );
const OUString& sInitVector =
aConvertedAttribs[sInitialisationVectorAttribute];
uno::Sequence < sal_Int8 > aDecodeBuffer;
- Base64Codec::decodeBase64 ( aDecodeBuffer, sInitVector
);
+ ::sax::Converter::decodeBase64 ( aDecodeBuffer,
sInitVector );
setProperty( PKG_MNFST_INIVECTOR, aDecodeBuffer );
}
}
@@ -209,7 +209,7 @@ void SAL_CALL ManifestImport::startEleme
{
const OUString& rSaltString =
aConvertedAttribs[sSaltAttribute];
uno::Sequence < sal_Int8 > aDecodeBuffer;
- Base64Codec::decodeBase64 ( aDecodeBuffer, rSaltString
);
+ ::sax::Converter::decodeBase64 ( aDecodeBuffer,
rSaltString );
setProperty( PKG_MNFST_SALT, aDecodeBuffer );
const OUString& rIterationCount =
aConvertedAttribs[sIterationCountAttribute];
Modified: incubator/ooo/branches/AOO34/main/package/util/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/package/util/makefile.mk?rev=1368968&r1=1368967&r2=1368968&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/package/util/makefile.mk (original)
+++ incubator/ooo/branches/AOO34/main/package/util/makefile.mk Fri Aug 3
14:08:26 2012
@@ -59,7 +59,8 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(COMPHELPERLIB) \
$(SALLIB) \
- $(ZLIB3RDLIB)
+ $(ZLIB3RDLIB) \
+ $(SAXLIB)
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1LIBS=$(LIB1TARGET)
