From ddd43218e9900536381733735adf8681d345e775 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 5 Mar 2018 12:19:05 +0200 Subject: drop sax::tools::*base64 methods and use the underlying comphelper methods rather. This is so that I can break the dependency that tools has on sax, and can add methods that make sax depend on tools. Change-Id: I8a2d6ce2ffc3529a0020710ade6a1748ee5af7d5 Reviewed-on: https://gerrit.libreoffice.org/50767 Tested-by: Jenkins Reviewed-by: Noel Grandin --- tools/Library_tl.mk | 1 - tools/source/fsys/urlobj.cxx | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index ec19ac5100c4..69b3149251e4 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,tl,\ i18nlangtag \ cppu \ sal \ - sax \ )) diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index c6e74ddffc58..91326c0a81e0 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -45,6 +45,7 @@ #include #include #include +#include using namespace css; @@ -615,7 +616,7 @@ std::unique_ptr INetURLObject::getData() const nCharactersSkipped += strlen(";base64,"); OUString sBase64Data = sURLPath.copy( nCharactersSkipped ); css::uno::Sequence< sal_Int8 > aDecodedData; - if (sax::Converter::decodeBase64SomeChars(aDecodedData, sBase64Data) + if (comphelper::Base64::decodeSomeChars(aDecodedData, sBase64Data) == sBase64Data.getLength()) { return memoryStream( -- cgit v1.2.3