diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-10-11 14:19:00 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-10-11 17:57:00 +0200 |
| commit | 3ca2bef76886450058d1667703aeafe4c2e456c3 (patch) | |
| tree | b18d70f79bfcfd2b2e34790e86edafb4c4337a80 /xmlsecurity | |
| parent | 02c32e0f0e75a9df80888051d1ec189fa14129bd (diff) | |
#i108468#: clean up xmluconv code duplication, part 1:
move convertNumber64 from SvXMLUnitConverter to sax::converter.
remove duplicate methods from SvXMLUnitConverter:
convertBool, convertPercent, convertColor, convertNumber, convertDouble,
indexOfComma, encodeBase64, decodeBase64, decodeBase64SomeChars,
clearUndefinedChars
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/Library_xmlsecurity.mk | 1 | ||||
| -rw-r--r-- | xmlsecurity/source/component/documentdigitalsignatures.cxx | 4 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index e40709f17a70..ea02e1a189e9 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,xmlsecurity,\ cppu \ cppuhelper \ sal \ + sax \ svl \ svt \ svxcore \ diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index b503a391aff5..e55976575cb1 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -37,7 +37,7 @@ #include <xmlsecurity/biginteger.hxx> #include <xmlsecurity/global.hrc> -#include <xmloff/xmluconv.hxx> +#include <sax/tools/converter.hxx> #include <../dialogs/resourcemanager.hxx> #include <com/sun/star/embed/XStorage.hpp> @@ -469,7 +469,7 @@ void DocumentDigitalSignatures::addAuthorToTrustedSources( aNewCert[ 1 ] = xSerialNumberAdapter->toString( Author->getSerialNumber() ); rtl::OUStringBuffer aStrBuffer; - SvXMLUnitConverter::encodeBase64(aStrBuffer, Author->getEncoded()); + ::sax::Converter::encodeBase64(aStrBuffer, Author->getEncoded()); aNewCert[ 2 ] = aStrBuffer.makeStringAndClear(); diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 471e7fbb6f9e..cc99b6aaa327 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -32,7 +32,8 @@ #include <xmlsecurity/certificatechooser.hxx> #include <xmlsecurity/certificateviewer.hxx> #include <xmlsecurity/biginteger.hxx> -#include <xmloff/xmluconv.hxx> +#include <sax/tools/converter.hxx> + #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/io/XSeekable.hpp> @@ -453,7 +454,7 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG ) sal_Int32 nSecurityId = maSignatureHelper.GetNewSecurityId(); rtl::OUStringBuffer aStrBuffer; - SvXMLUnitConverter::encodeBase64(aStrBuffer, xCert->getEncoded()); + ::sax::Converter::encodeBase64(aStrBuffer, xCert->getEncoded()); maSignatureHelper.SetX509Certificate( nSecurityId, xCert->getIssuerName(), aCertSerial, |