filter/Library_placeware.mk | 2 filter/source/placeware/Base64Codec.cxx | 143 ------------------- filter/source/placeware/Base64Codec.hxx | 50 ------ filter/source/placeware/exporter.cxx | 4 libexttextcat/android.patch | 4 libexttextcat/libexttextcat-visibility.patch | 10 - libexttextcat/makefile.mk | 8 - libexttextcat/prj/d.lst | 2 ooo.lst.in | 2 package/Library_package2.mk | 2 package/prj/build.lst | 2 package/source/manifest/Base64Codec.cxx | 201 --------------------------- package/source/manifest/Base64Codec.hxx | 48 ------ package/source/manifest/ManifestExport.cxx | 8 - package/source/manifest/ManifestImport.cxx | 8 - 15 files changed, 21 insertions(+), 473 deletions(-)
New commits: commit 41961997bed0c607920df447848e690cc858ec5f Author: Caolán McNamara <[email protected]> Date: Wed May 30 15:10:25 2012 +0100 merge three base64 encoders/decoders together Change-Id: Ic123c081fcf6ddcf5d61c5d5a3eab01db470014c diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index 9b2f09c..6976f3e 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -34,11 +34,11 @@ $(eval $(call gb_Library_use_libraries,placeware,\ cppuhelper \ cppu \ sal \ + sax \ $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,placeware,\ - filter/source/placeware/Base64Codec \ filter/source/placeware/exporter \ filter/source/placeware/filter \ filter/source/placeware/tempfile \ diff --git a/filter/source/placeware/Base64Codec.cxx b/filter/source/placeware/Base64Codec.cxx deleted file mode 100644 index 99b93ed..0000000 --- a/filter/source/placeware/Base64Codec.cxx +++ /dev/null @@ -1,143 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "Base64Codec.hxx" -#include <rtl/ustrbuf.hxx> -#include <osl/diagnose.h> -using namespace osl; -using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -const - sal_Char aBase64EncodeTable[] = - { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', - 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', - 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' }; - -const - sal_uInt8 aBase64DecodeTable[] = - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0-15 - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 16-31 - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, 63, // 32-47 -// + / - - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, 0, 0, 0, 0, // 48-63 -// 0 1 2 3 4 5 6 7 8 9 = - - 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 64-79 -// A B C D E F G H I J K L M N O - - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 0, 0, 0, 0, 0, // 80-95 -// P Q R S T U V W X Y Z - - 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 96-111 -// a b c d e f g h i j k l m n o - - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 0, 0, 0, 0, 0, // 112-127 -// p q r s t u v w x y z - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - - -void ThreeByteToFourByte (const sal_uInt8* pBuffer, const sal_Int32 nStart, const sal_Int32 nFullLen, rtl::OUStringBuffer& sBuffer) -{ - sal_Int32 nLen(nFullLen - nStart); - if (nLen > 3) - nLen = 3; - if (nLen == 0) - { - return; - } - - sal_Int32 nBinaer; - switch (nLen) - { - case 1: - { - nBinaer = ((sal_uInt8)pBuffer[nStart + 0]) << 16; - } - break; - case 2: - { - nBinaer = (((sal_uInt8)pBuffer[nStart + 0]) << 16) + - (((sal_uInt8)pBuffer[nStart + 1]) << 8); - } - break; - default: - { - nBinaer = (((sal_uInt8)pBuffer[nStart + 0]) << 16) + - (((sal_uInt8)pBuffer[nStart + 1]) << 8) + - ((sal_uInt8)pBuffer[nStart + 2]); - } - break; - } - - sal_Unicode buf[] = { '=', '=', '=', '=' }; - - sal_uInt8 nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0000) >> 18); - buf[0] = aBase64EncodeTable [nIndex]; - - nIndex = static_cast< sal_uInt8 >((nBinaer & 0x3F000) >> 12); - buf[1] = aBase64EncodeTable [nIndex]; - if (nLen > 1) - { - nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0) >> 6); - buf[2] = aBase64EncodeTable [nIndex]; - if (nLen > 2) - { - nIndex = static_cast< sal_uInt8 >((nBinaer & 0x3F)); - buf[3] = aBase64EncodeTable [nIndex]; - } - } - sBuffer.append(buf, SAL_N_ELEMENTS(buf)); -} - -void Base64Codec::encodeBase64(rtl::OUStringBuffer& aStrBuffer, const uno::Sequence < sal_Int8 >& aPass) -{ - sal_Int32 i(0); - sal_Int32 nBufferLength(aPass.getLength()); - const sal_Int8* pBuffer = aPass.getConstArray(); - while (i < nBufferLength) - { - ThreeByteToFourByte ((const sal_uInt8*)pBuffer, i, nBufferLength, aStrBuffer); - i += 3; - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/placeware/Base64Codec.hxx b/filter/source/placeware/Base64Codec.hxx deleted file mode 100644 index b635b1e..0000000 --- a/filter/source/placeware/Base64Codec.hxx +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BASE64_CODEC_HXX -#define _BASE64_CODEC_HXX - -#include <com/sun/star/uno/Sequence.hxx> - -namespace rtl -{ -class OUString; -class OUStringBuffer; -} - -class Base64Codec -{ -public: - static void encodeBase64(rtl::OUStringBuffer& aStrBuffer, const com::sun::star::uno::Sequence<sal_Int8>& aPass); -#if 0 - static void decodeBase64(com::sun::star::uno::Sequence<sal_uInt8>& aPass, const rtl::OUString& sBuffer); -#endif -}; -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index 8473e38..8840d9b 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -39,12 +39,12 @@ #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <rtl/ustrbuf.hxx> #include <rtl/string.hxx> +#include <sax/tools/converter.hxx> #include <osl/diagnose.h> #include <vector> #include "exporter.hxx" -#include "Base64Codec.hxx" #include "zip.hxx" #include "tempfile.hxx" @@ -161,7 +161,7 @@ static void encodeFile( osl::File& rSourceFile, Reference< XOutputStream >& xOut nLen -= nRead; rtl::OUStringBuffer aStrBuffer; - Base64Codec::encodeBase64( aStrBuffer, aInBuffer ); + ::sax::Converter::encodeBase64(aStrBuffer, aInBuffer); sal_Int32 nCount = aStrBuffer.getLength(); diff --git a/package/Library_package2.mk b/package/Library_package2.mk index 223e280..987c342 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,package2,\ cppu \ cppuhelper \ sal \ + sax \ ucbhelper \ $(gb_STDLIBS) \ )) @@ -60,7 +61,6 @@ $(eval $(call gb_Library_use_externals,package2,\ )) $(eval $(call gb_Library_add_exception_objects,package2,\ - package/source/manifest/Base64Codec \ package/source/manifest/ManifestExport \ package/source/manifest/ManifestImport \ package/source/manifest/ManifestReader \ diff --git a/package/prj/build.lst b/package/prj/build.lst index e1a2c11..35b408d 100644 --- a/package/prj/build.lst +++ b/package/prj/build.lst @@ -1,2 +1,2 @@ -pk package : cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib LIBXSLT:libxslt NULL +pk package : cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib LIBXSLT:libxslt sax NULL pk package\prj nmake - all pk_prj NULL diff --git a/package/source/manifest/Base64Codec.cxx b/package/source/manifest/Base64Codec.cxx deleted file mode 100644 index 1953100..0000000 --- a/package/source/manifest/Base64Codec.cxx +++ /dev/null @@ -1,201 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "Base64Codec.hxx" -#include <rtl/ustrbuf.hxx> -#include <osl/diagnose.h> -using namespace osl; -using namespace com::sun::star; - -using ::rtl::OUStringBuffer; - -const - sal_Char aBase64EncodeTable[] = - { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', - 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', - 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' }; - -const - sal_uInt8 aBase64DecodeTable[] = - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0-15 - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 16-31 - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, 63, // 32-47 -// + / - - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, 0, 0, 0, 0, // 48-63 -// 0 1 2 3 4 5 6 7 8 9 = - - 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 64-79 -// A B C D E F G H I J K L M N O - - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 0, 0, 0, 0, 0, // 80-95 -// P Q R S T U V W X Y Z - - 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 96-111 -// a b c d e f g h i j k l m n o - - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 0, 0, 0, 0, 0, // 112-127 -// p q r s t u v w x y z - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - - -void ThreeByteToFourByte (const sal_uInt8* pBuffer, const sal_Int32 nStart, const sal_Int32 nFullLen, rtl::OUStringBuffer& sBuffer) -{ - sal_Int32 nLen(nFullLen - nStart); - if (nLen > 3) - nLen = 3; - if (nLen == 0) - { - return; - } - - sal_Int32 nBinaer; - switch (nLen) - { - case 1: - { - nBinaer = ((sal_uInt8)pBuffer[nStart + 0]) << 16; - } - break; - case 2: - { - nBinaer = (((sal_uInt8)pBuffer[nStart + 0]) << 16) + - (((sal_uInt8)pBuffer[nStart + 1]) << 8); - } - break; - default: - { - nBinaer = (((sal_uInt8)pBuffer[nStart + 0]) << 16) + - (((sal_uInt8)pBuffer[nStart + 1]) << 8) + - ((sal_uInt8)pBuffer[nStart + 2]); - } - break; - } - - sal_Unicode buf[] = { '=', '=', '=', '=' }; - - sal_uInt8 nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0000) >> 18); - buf[0] = aBase64EncodeTable [nIndex]; - - nIndex = static_cast< sal_uInt8 >((nBinaer & 0x3F000) >> 12); - buf[1] = aBase64EncodeTable [nIndex]; - if (nLen > 1) - { - nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0) >> 6); - buf[2] = aBase64EncodeTable [nIndex]; - if (nLen > 2) - { - nIndex = static_cast< sal_uInt8 >(nBinaer & 0x3F); - buf[3] = aBase64EncodeTable [nIndex]; - } - } - sBuffer.append(buf, SAL_N_ELEMENTS(buf)); -} - -void Base64Codec::encodeBase64(rtl::OUStringBuffer& aStrBuffer, const uno::Sequence < sal_Int8 >& aPass) -{ - sal_Int32 i(0); - sal_Int32 nBufferLength(aPass.getLength()); - const sal_uInt8* pBuffer = reinterpret_cast< const sal_uInt8* >( aPass.getConstArray() ); - while (i < nBufferLength) - { - ThreeByteToFourByte (pBuffer, i, nBufferLength, aStrBuffer); - i += 3; - } -} - -void FourByteToThreeByte (sal_uInt8* pBuffer, sal_Int32& nLength, const sal_Int32 nStart, const rtl::OUString& sString) -{ - nLength = 0; - sal_Int32 nLen (sString.getLength()); - - OSL_ASSERT( nLen == 4 ); - if (nLen != 4) - return; - - if (sString.indexOfAsciiL(RTL_CONSTASCII_STRINGPARAM("==")) == 2) - nLength = 1; - else if (sString.indexOf('=') == 3) - nLength = 2; - else - nLength = 3; - - sal_Int32 nBinaer ((aBase64DecodeTable [sString [0]] << 18) + - (aBase64DecodeTable [sString [1]] << 12) + - (aBase64DecodeTable [sString [2]] << 6) + - (aBase64DecodeTable [sString [3]])); - - sal_uInt8 OneByte = static_cast< sal_uInt8 >((nBinaer & 0xFF0000) >> 16); - pBuffer[nStart + 0] = (sal_uInt8)OneByte; - - if (nLength == 1) - return; - - OneByte = static_cast< sal_uInt8 >((nBinaer & 0xFF00) >> 8); - pBuffer[nStart + 1] = OneByte; - - if (nLength == 2) - return; - - OneByte = static_cast< sal_uInt8 >(nBinaer & 0xFF); - pBuffer[nStart + 2] = OneByte; -} - -void Base64Codec::decodeBase64(uno::Sequence< sal_Int8 >& aBuffer, const rtl::OUString& sBuffer) -{ - sal_Int32 nFirstLength((sBuffer.getLength() / 4) * 3); - sal_uInt8* pBuffer = new sal_uInt8[nFirstLength]; - sal_Int32 nSecondLength(0); - sal_Int32 nLength(0); - sal_Int32 i = 0; - sal_Int32 k = 0; - while (i < sBuffer.getLength()) - { - FourByteToThreeByte (pBuffer, nLength, k, sBuffer.copy(i, 4)); - nSecondLength += nLength; - nLength = 0; - i += 4; - k += 3; - } - aBuffer = uno::Sequence<sal_Int8>( reinterpret_cast< sal_Int8* >( pBuffer ), nSecondLength ); - delete[] pBuffer; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/Base64Codec.hxx b/package/source/manifest/Base64Codec.hxx deleted file mode 100644 index 60bd018..0000000 --- a/package/source/manifest/Base64Codec.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BASE64_CODEC_HXX -#define _BASE64_CODEC_HXX - -#include <com/sun/star/uno/Sequence.hxx> - -namespace rtl -{ -class OUString; -class OUStringBuffer; -} - -class Base64Codec -{ -public: - static void encodeBase64(rtl::OUStringBuffer& aStrBuffer, const com::sun::star::uno::Sequence<sal_Int8>& aPass); - static void decodeBase64(com::sun::star::uno::Sequence<sal_Int8>& aPass, const rtl::OUString& sBuffer); -}; -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 8bbb4ce..65ee1fb 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -37,7 +37,7 @@ #include <ManifestDefines.hxx> #include <ManifestExport.hxx> -#include <Base64Codec.hxx> +#include <sax/tools/converter.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/documentconstants.hxx> @@ -274,7 +274,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa 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); @@ -307,7 +307,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa 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 ); @@ -333,7 +333,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa 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 ); diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 977a454..5e9a310 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -29,7 +29,7 @@ // MARKER( update_precomp.py ): autogen include statement, do not remove #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> #include <com/sun/star/xml/crypto/CipherID.hpp> @@ -188,7 +188,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re { aString = aConvertedAttribs[sChecksumAttribute]; uno::Sequence < sal_Int8 > aDecodeBuffer; - Base64Codec::decodeBase64( aDecodeBuffer, aString ); + ::sax::Converter::decodeBase64(aDecodeBuffer, aString); aSequence[nNumProperty].Name = sDigestProperty; aSequence[nNumProperty++].Value <<= aDecodeBuffer; } @@ -235,7 +235,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re { aString = aConvertedAttribs[sInitialisationVectorAttribute]; uno::Sequence < sal_Int8 > aDecodeBuffer; - Base64Codec::decodeBase64 ( aDecodeBuffer, aString ); + ::sax::Converter::decodeBase64(aDecodeBuffer, aString); aSequence[nNumProperty].Name = sInitialisationVectorProperty; aSequence[nNumProperty++].Value <<= aDecodeBuffer; } @@ -250,7 +250,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re { aString = aConvertedAttribs[sSaltAttribute]; uno::Sequence < sal_Int8 > aDecodeBuffer; - Base64Codec::decodeBase64 ( aDecodeBuffer, aString ); + ::sax::Converter::decodeBase64(aDecodeBuffer, aString); aSequence[nNumProperty].Name = sSaltProperty; aSequence[nNumProperty++].Value <<= aDecodeBuffer; commit f8c753fd3bf770777ec82428a40b5779279b33d6 Author: Caolán McNamara <[email protected]> Date: Wed May 30 14:03:16 2012 +0100 bump to libexttextcat-3.3.1 and drop visibility patch Change-Id: Id0e42068a1cd614a2e66e7f050c55b351999f2ae diff --git a/libexttextcat/android.patch b/libexttextcat/android.patch index bca8fe1..36abf18 100644 --- a/libexttextcat/android.patch +++ b/libexttextcat/android.patch @@ -1,5 +1,5 @@ ---- misc/libexttextcat-3.3.0/config.sub -+++ misc/build/libexttextcat-3.3.0/config.sub +--- misc/libexttextcat-3.3.1/config.sub ++++ misc/build/libexttextcat-3.3.1/config.sub @@ -120,7 +120,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` diff --git a/libexttextcat/libexttextcat-visibility.patch b/libexttextcat/libexttextcat-visibility.patch deleted file mode 100644 index 86c0efb..0000000 --- a/libexttextcat/libexttextcat-visibility.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/libexttextcat-3.3.0/src/makefile.mk 2011-10-07 00:09:38.000000000 +0200 -+++ misc/build/libexttextcat-3.3.0/src/makefile.mk 2011-11-15 13:57:19.742958488 +0100 -@@ -33,6 +33,7 @@ - - USE_DEFFILE=TRUE - EXTERNAL_WARNINGS_NOT_ERRORS := TRUE -+VISIBILITY_HIDDEN=TRUE - UWINAPILIB= - - .INCLUDE : settings.mk diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk index 5e18911..a0733fd 100644 --- a/libexttextcat/makefile.mk +++ b/libexttextcat/makefile.mk @@ -44,10 +44,10 @@ all: # See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream # sources, far better to commit your changes in there -TARFILE_NAME=libexttextcat-3.3.0 -TARFILE_MD5=dc8fc13710a987edd59f0bcae004fec2 -TARFILE_ROOTDIR=libexttextcat-3.3.0 -PATCH_FILES=libexttextcat-visibility.patch android.patch +TARFILE_NAME=libexttextcat-3.3.1 +TARFILE_MD5=6097739c841f671cb21332b9cc593ae7 +TARFILE_ROOTDIR=libexttextcat-3.3.1 +PATCH_FILES=android.patch .IF "$(GUI)"=="UNX" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" diff --git a/libexttextcat/prj/d.lst b/libexttextcat/prj/d.lst index 5bc6031..f96c724 100644 --- a/libexttextcat/prj/d.lst +++ b/libexttextcat/prj/d.lst @@ -4,7 +4,7 @@ ..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll mkdir: %_DEST%\inc\external\libexttextcat -..\%__SRC%\misc\build\libexttextcat-3.3.0\src\*.h %_DEST%\inc\external\libexttextcat\*.h +..\%__SRC%\misc\build\libexttextcat-3.3.1\src\*.h %_DEST%\inc\external\libexttextcat\*.h # data for language guessing ..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck\*.zip diff --git a/ooo.lst.in b/ooo.lst.in index 507d2d8..de264a8 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -3,7 +3,7 @@ http://dev-www.libreoffice.org/src 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt -dc8fc13710a987edd59f0bcae004fec2-libexttextcat-3.3.0.tar.bz2 +6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
