diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 12:19:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 14:25:02 +0100 |
| commit | ddd43218e9900536381733735adf8681d345e775 (patch) | |
| tree | 5bb211e63d9b739d20eb248f1ab9f0fb481e118d /sfx2 | |
| parent | 9c036b1d3db253a1fd43ce76ce1d919e2029af59 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/control/recentdocsview.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 2aaccbc6001a..cb9b54426d2b 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -20,6 +20,7 @@ #include <config_features.h> #include <comphelper/lok.hxx> +#include <comphelper/base64.hxx> #include <com/sun/star/document/XDocumentProperties.hpp> #include <unotools/historyoptions.hxx> #include <unotools/useroptions.hxx> @@ -157,7 +158,7 @@ void SfxPickListImpl::AddDocumentToPickList( SfxObjectShell* pDocSh ) { Sequence<sal_Int8> aSequence(static_cast<const sal_Int8*>(aStream.GetData()), aStream.Tell()); OUStringBuffer aBuffer; - ::sax::Converter::encodeBase64(aBuffer, aSequence); + ::comphelper::Base64::encode(aBuffer, aSequence); aThumbnail = aBuffer.makeStringAndClear(); } } diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 3be2690f0688..1a5af971af4f 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/base64.hxx> #include <sax/tools/converter.hxx> #include <sfx2/recentdocsview.hxx> #include <sfx2/templatelocalview.hxx> @@ -190,7 +191,7 @@ void RecentDocsView::Reload() if (!aBase64.isEmpty()) { Sequence<sal_Int8> aDecoded; - sax::Converter::decodeBase64(aDecoded, aBase64); + comphelper::Base64::decode(aDecoded, aBase64); SvMemoryStream aStream(aDecoded.getArray(), aDecoded.getLength(), StreamMode::READ); vcl::PNGReader aReader(aStream); |