diff options
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/inc/xmlsignaturehelper.hxx | 4 | ||||
| -rw-r--r-- | xmlsecurity/source/helper/xmlsignaturehelper.cxx | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx index 6f9784f4a690..880293f68669 100644 --- a/xmlsecurity/inc/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsignaturehelper.hxx @@ -130,7 +130,7 @@ public: void SetDescription(sal_Int32 nSecurityId, const OUString& rDescription); void AddForSigning( sal_Int32 securityId, const OUString& uri, bool bBinary, bool bXAdESCompliantIfODF ); - bool CreateAndWriteSignature( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF ); + void CreateAndWriteSignature( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF ); bool ReadAndVerifySignature( const css::uno::Reference< css::io::XInputStream >& xInputStream ); // MT: ??? I think only for adding/removing, not for new signatures... @@ -152,7 +152,7 @@ public: /// Given that xStorage is an OOXML _xmlsignatures storage, create origin.sigs and its relations. void ExportSignatureRelations(const css::uno::Reference<css::embed::XStorage>& xStorage, int nSignatureCount); /// Given that xSignatureStorage is an OOXML _xmlsignatures storage, create and write a new signature. - bool CreateAndWriteOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::embed::XStorage>& xSignatureStorage, int nSignatureIndex); + void CreateAndWriteOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::embed::XStorage>& xSignatureStorage, int nSignatureIndex); /// Similar to CreateAndWriteOOXMLSignature(), but used to write the signature to the persistent storage, not the temporary one. void ExportOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::embed::XStorage>& xSignatureStorage, const SignatureInformation& rInformation, int nSignatureIndex); /// Given that xStorage is an OOXML root storage, advertise signatures in its [Content_Types].xml stream. diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index 0f7630171285..dcc30de40f61 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -221,7 +221,7 @@ void XMLSignatureHelper::ExportOOXMLSignature(const uno::Reference<embed::XStora } } -bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF ) +void XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF ) { mbError = false; @@ -229,8 +229,6 @@ bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax { mbError = true; } - - return !mbError; } bool XMLSignatureHelper::ReadAndVerifySignature( const css::uno::Reference< css::io::XInputStream >& xInputStream ) @@ -538,7 +536,7 @@ void XMLSignatureHelper::ExportSignatureContentTypes(const css::uno::Reference<c uno::Reference<embed::XTransactedObject> xTransact(xStorage, uno::UNO_QUERY); xTransact->commit(); } -bool XMLSignatureHelper::CreateAndWriteOOXMLSignature(const uno::Reference<embed::XStorage>& xRootStorage, const uno::Reference<embed::XStorage>& xSignatureStorage, int nSignatureIndex) +void XMLSignatureHelper::CreateAndWriteOOXMLSignature(const uno::Reference<embed::XStorage>& xRootStorage, const uno::Reference<embed::XStorage>& xSignatureStorage, int nSignatureIndex) { uno::Reference<io::XOutputStream> xOutputStream(xSignatureStorage->openStreamElement("sig" + OUString::number(nSignatureIndex) + ".xml", embed::ElementModes::READWRITE), uno::UNO_QUERY); uno::Reference<xml::sax::XWriter> xSaxWriter = xml::sax::Writer::create(mxCtx); @@ -551,8 +549,6 @@ bool XMLSignatureHelper::CreateAndWriteOOXMLSignature(const uno::Reference<embed mbError = true; xSaxWriter->endDocument(); - - return !mbError; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |