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 /xmloff/source/transform | |
| 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 'xmloff/source/transform')
| -rw-r--r-- | xmloff/source/transform/OOo2Oasis.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/transform/Oasis2OOo.cxx | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index b3f7ccbefdcd..50eee3b7fb9e 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -20,6 +20,7 @@ #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <comphelper/base64.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> #include <sax/tools/converter.hxx> @@ -1414,7 +1415,7 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement( xPropSetInfo->hasPropertyByName( aPropName ) ) { Sequence < sal_Int8 > aKey; - ::sax::Converter::decodeBase64( aKey, + ::comphelper::Base64::decode( aKey, rAttrList->getValueByIndex( i ) ); rPropSet->setPropertyValue( aPropName, makeAny( aKey ) ); } diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index f3e234c390ed..555cafc04576 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/base64.hxx> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustrbuf.hxx> @@ -1498,7 +1499,7 @@ void XMLConfigItemTContext_Impl::EndElement() xPropSetInfo->hasPropertyByName( aPropName ) ) { Sequence < sal_Int8 > aKey; - ::sax::Converter::decodeBase64( aKey, m_aContent ); + ::comphelper::Base64::decode( aKey, m_aContent ); rPropSet->setPropertyValue( aPropName, makeAny( aKey ) ); } } @@ -1551,7 +1552,7 @@ void XMLTrackedChangesOASISTContext_Impl::StartElement( if( aKey.getLength() ) { OUStringBuffer aBuffer; - ::sax::Converter::encodeBase64( aBuffer, aKey ); + ::comphelper::Base64::encode( aBuffer, aKey ); XMLMutableAttributeList *pMutableAttrList = new XMLMutableAttributeList( xAttrList ); xAttrList = pMutableAttrList; |