diff options
Diffstat (limited to 'sax')
-rw-r--r-- | sax/qa/cppunit/test_converter.cxx | 42 | ||||
-rw-r--r-- | sax/source/tools/converter.cxx | 18 |
2 files changed, 0 insertions, 60 deletions
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index 1487acbb8607..3426b51aa090 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -58,7 +58,6 @@ public: void testPercent(); void testColor(); void testNumber(); - void testBase64(); CPPUNIT_TEST_SUITE(ConverterTest); CPPUNIT_TEST(testDuration); @@ -70,7 +69,6 @@ public: CPPUNIT_TEST(testPercent); CPPUNIT_TEST(testColor); CPPUNIT_TEST(testNumber); - CPPUNIT_TEST(testBase64); CPPUNIT_TEST_SUITE_END(); private: @@ -617,46 +615,6 @@ void ConverterTest::testNumber() doTestStringToNumber(0, "666", -0, 0); } -void doTestEncodeBase64(char const*const pis, const uno::Sequence<sal_Int8>& aPass) -{ - OUString const is(OUString::createFromAscii(pis)); - OUStringBuffer buf; - Converter::encodeBase64(buf, aPass); - SAL_INFO("sax.cppunit","" << buf.toString()); - CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear()); -} - -void doTestDecodeBase64(const uno::Sequence<sal_Int8>& aPass, char const*const pis) -{ - OUString const is(OUString::createFromAscii(pis)); - uno::Sequence< sal_Int8 > tempSequence; - Converter::decodeBase64(tempSequence, is); - SAL_INFO("sax.cppunit","" << is); - bool b = (tempSequence==aPass); - CPPUNIT_ASSERT(b); -} - -void ConverterTest::testBase64() -{ - std::vector< sal_Int8 > tempSeq { 0, 0, 0, 0, 0, 1, 2, 3 }; - uno::Sequence< sal_Int8 > tempSequence = comphelper::containerToSequence(tempSeq); - doTestEncodeBase64("AAAAAAABAgM=", tempSequence); - doTestDecodeBase64(tempSequence, "AAAAAAABAgM="); - tempSeq[0] = sal_Int8(5); - tempSeq[1] = sal_Int8(2); - tempSeq[2] = sal_Int8(3); - tempSequence = comphelper::containerToSequence(tempSeq); - doTestEncodeBase64("BQIDAAABAgM=", tempSequence); - doTestDecodeBase64(tempSequence, "BQIDAAABAgM="); - tempSeq[0] = sal_Int8(sal_uInt8(200)); - tempSeq[1] = sal_Int8(31); - tempSeq[2] = sal_Int8(77); - tempSeq[3] = sal_Int8(111); - tempSequence = comphelper::containerToSequence(tempSeq); - doTestEncodeBase64("yB9NbwABAgM=", tempSequence); - doTestDecodeBase64(tempSequence, "yB9NbwABAgM="); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ConverterTest); } diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index d5618128a231..250c756e64e6 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -32,7 +32,6 @@ #include <rtl/math.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> -#include <comphelper/base64.hxx> #include <algorithm> @@ -1903,23 +1902,6 @@ sal_Int32 Converter::indexOfComma( const OUString& rStr, return -1; } -void Converter::encodeBase64(OUStringBuffer& aStrBuffer, const uno::Sequence<sal_Int8>& aPass) -{ - comphelper::Base64::encode(aStrBuffer, aPass); -} - -void Converter::decodeBase64(uno::Sequence<sal_Int8>& aBuffer, const OUString& sBuffer) -{ - comphelper::Base64::decode(aBuffer, sBuffer); -} - -sal_Int32 Converter::decodeBase64SomeChars( - uno::Sequence<sal_Int8>& rOutBuffer, - const OUString& rInBuffer) -{ - return comphelper::Base64::decodeSomeChars(rOutBuffer, rInBuffer); -} - double Converter::GetConversionFactor(OUStringBuffer& rUnit, sal_Int16 nSourceUnit, sal_Int16 nTargetUnit) { double fRetval(1.0); |