diff options
author | Catalin Iacob <iacobcatalin@gmail.com> | 2012-02-10 23:10:42 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-13 15:56:30 +0000 |
commit | b05ace90d30d90d09a5521ca6aff47226d619204 (patch) | |
tree | 8e10c5c8159f5987996f5a3ceed4aacc5351202a /xmlsecurity | |
parent | 25f8330004409edf8007df0cc80ef540c03d18da (diff) |
Remove unused code in XMLSignatureHelper
Diffstat (limited to 'xmlsecurity')
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 11 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xmlsignaturehelper.cxx | 47 |
2 files changed, 0 insertions, 58 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx index d0d3bbe8d012..c83444add4f5 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx @@ -137,11 +137,6 @@ public: // Returns true for success. bool Init(); - // Set UriBinding to create input streams to open files. - // Default implementation is capable to open files from disk. - void SetUriBinding( com::sun::star::uno::Reference< com::sun::star::xml::crypto::XUriBinding >& rxUriBinding ); - com::sun::star::uno::Reference< com::sun::star::xml::crypto::XUriBinding > GetUriBinding() const; - // Set the storage which should be used by the default UriBinding // Must be set before StatrtMission(). //sODFVersion indicates the ODF version @@ -154,8 +149,6 @@ public: // Get the security environment ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > GetSecurityEnvironment(); - ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > GetSecurityEnvironmentByIndex(sal_Int32 nId); - sal_Int32 GetSecurityEnvironmentNumber(); // After signing/veryfieng, get information about signatures SignatureInformation GetSignatureInformation( sal_Int32 nSecurityId ) const; @@ -186,14 +179,10 @@ public: void SetX509Certificate(sal_Int32 nSecurityId, const rtl::OUString& ouX509IssuerName, const rtl::OUString& ouX509SerialNumber, const rtl::OUString& ouX509Cert); - void SetX509Certificate(sal_Int32 nSecurityId, sal_Int32 nSecurityEnvironmentIndex, - const rtl::OUString& ouX509IssuerName, const rtl::OUString& ouX509SerialNumber, - const rtl::OUString& ouX509Cert); void SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime ); void AddForSigning( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool bBinary ); bool CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler ); - bool CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream ); bool ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream ); // MT: ??? I think only for adding/removing, not for new signatures... diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index 203d3f23bb5c..c05ba8eda22b 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -91,16 +91,6 @@ void XMLSignatureHelper::ImplCreateSEInitializer() xMCF->createInstanceWithContext( sSEInitializer, mxCtx ), uno::UNO_QUERY ); } -void XMLSignatureHelper::SetUriBinding( com::sun::star::uno::Reference< com::sun::star::xml::crypto::XUriBinding >& rxUriBinding ) -{ - mxUriBinding = rxUriBinding; -} - -com::sun::star::uno::Reference< com::sun::star::xml::crypto::XUriBinding > XMLSignatureHelper::GetUriBinding() const -{ - return mxUriBinding; -} - void XMLSignatureHelper::SetStorage( const Reference < css::embed::XStorage >& rxStorage, ::rtl::OUString sODFVersion) @@ -149,21 +139,6 @@ void XMLSignatureHelper::SetX509Certificate( ouX509Cert); } -void XMLSignatureHelper::SetX509Certificate( - sal_Int32 nSecurityId, - sal_Int32 nSecurityEnvironmentIndex, - const rtl::OUString& ouX509IssuerName, - const rtl::OUString& ouX509SerialNumber, - const rtl::OUString& ouX509Cert) -{ - mpXSecController->setX509Certificate( - nSecurityId, - nSecurityEnvironmentIndex, - ouX509IssuerName, - ouX509SerialNumber, - ouX509Cert); -} - void XMLSignatureHelper::SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime ) { ::com::sun::star::util::DateTime stDateTime; @@ -272,18 +247,6 @@ bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax return !mbError; } -bool XMLSignatureHelper::CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream ) -{ - uno::Reference<xml::sax::XDocumentHandler> xDocHandler - = CreateDocumentHandlerWithHeader(xOutputStream); - - bool rc = CreateAndWriteSignature( xDocHandler ); - - CloseDocumentHandler(xDocHandler); - - return rc; -} - bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream ) { mbError = false; @@ -388,16 +351,6 @@ uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > XMLSignatu return (mxSecurityContext.is()?(mxSecurityContext->getSecurityEnvironment()): uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >()); } -uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > XMLSignatureHelper::GetSecurityEnvironmentByIndex(sal_Int32 nId) -{ - return (mxSecurityContext.is()?(mxSecurityContext->getSecurityEnvironmentByIndex(nId)): uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >()); -} - -sal_Int32 XMLSignatureHelper::GetSecurityEnvironmentNumber() -{ - return (mxSecurityContext.is()?(mxSecurityContext->getSecurityEnvironmentNumber()): 0); -} - IMPL_LINK( XMLSignatureHelper, SignatureCreationResultListener, XMLSignatureCreationResult*, pResult ) { maCreationResults.insert( maCreationResults.begin() + maCreationResults.size(), *pResult ); |