summaryrefslogtreecommitdiff
path: root/xmlsecurity/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-26 09:49:00 +0200
committerNoel Grandin <noel@peralex.com>2016-03-14 13:28:04 +0200
commit43d57d105d2acf97e79e90f8d640923b91ac64a8 (patch)
tree356fe2074ab6d5fbb9678848dc8a9e3d377c7297 /xmlsecurity/inc
parentc3605e91a8ecc12b4cd5b5239616541f6d50068a (diff)
com::sun::star->css in xmlsecurity/
Change-Id: I4b89f97671ab526e5731d2f1f99802e23f3fd4b5
Diffstat (limited to 'xmlsecurity/inc')
-rw-r--r--xmlsecurity/inc/xmlsecurity/biginteger.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/sigstruct.hxx6
-rw-r--r--xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx34
3 files changed, 22 insertions, 22 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
index f4f64e23cc93..dd9ca4b2e4a9 100644
--- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx
+++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
@@ -26,8 +26,8 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.h>
-OUString bigIntegerToNumericString( const ::com::sun::star::uno::Sequence< sal_Int8 >& serial );
-::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( const OUString& serialNumber );
+OUString bigIntegerToNumericString( const css::uno::Sequence< sal_Int8 >& serial );
+css::uno::Sequence< sal_Int8 > numericStringToBigInteger ( const OUString& serialNumber );
#endif
diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
index 3cb1e7d46924..5a7df3dedd76 100644
--- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
+++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
@@ -56,13 +56,13 @@ struct SignatureInformation
{
sal_Int32 nSecurityId;
sal_Int32 nSecurityEnvironmentIndex;
- ::com::sun::star::xml::crypto::SecurityOperationStatus nStatus;
+ css::xml::crypto::SecurityOperationStatus nStatus;
SignatureReferenceInformations vSignatureReferenceInfors;
OUString ouX509IssuerName;
OUString ouX509SerialNumber;
OUString ouX509Certificate;
OUString ouSignatureValue;
- ::com::sun::star::util::DateTime stDateTime;
+ css::util::DateTime stDateTime;
//We also keep the date and time as string. This is done when this
//structure is created as a result of a XML signature being read.
@@ -90,7 +90,7 @@ struct SignatureInformation
SignatureInformation( sal_Int32 nId )
{
nSecurityId = nId;
- nStatus = ::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN;
+ nStatus = css::xml::crypto::SecurityOperationStatus_UNKNOWN;
nSecurityEnvironmentIndex = -1;
}
};
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 9b00b55771f5..51c07d26952b 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -52,9 +52,9 @@ namespace embed {
struct XMLSignatureCreationResult
{
sal_Int32 nSecurityId;
- com::sun::star::xml::crypto::SecurityOperationStatus nSignatureCreationResult;
+ css::xml::crypto::SecurityOperationStatus nSignatureCreationResult;
- XMLSignatureCreationResult( sal_Int32 nId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
+ XMLSignatureCreationResult( sal_Int32 nId, css::xml::crypto::SecurityOperationStatus nResult )
{
nSecurityId = nId;
nSignatureCreationResult = nResult;
@@ -64,9 +64,9 @@ struct XMLSignatureCreationResult
struct XMLSignatureVerifyResult
{
sal_Int32 nSecurityId;
- com::sun::star::xml::crypto::SecurityOperationStatus nSignatureVerifyResult;
+ css::xml::crypto::SecurityOperationStatus nSignatureVerifyResult;
- XMLSignatureVerifyResult( sal_Int32 nId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
+ XMLSignatureVerifyResult( sal_Int32 nId, css::xml::crypto::SecurityOperationStatus nResult )
{
nSecurityId = nId;
nSignatureVerifyResult = nResult;
@@ -90,12 +90,12 @@ struct XMLSignatureVerifyResult
class XMLSECURITY_DLLPUBLIC XMLSignatureHelper
{
private:
- ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxCtx;
- ::com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSecurityController > mxSecurityController;
- ::com::sun::star::uno::Reference< com::sun::star::xml::crypto::XUriBinding > mxUriBinding;
+ css::uno::Reference< css::uno::XComponentContext > mxCtx;
+ css::uno::Reference< css::xml::crypto::sax::XSecurityController > mxSecurityController;
+ css::uno::Reference< css::xml::crypto::XUriBinding > mxUriBinding;
- ::com::sun::star::uno::Reference< com::sun::star::xml::crypto::XSEInitializer > mxSEInitializer;
- ::com::sun::star::uno::Reference< com::sun::star::xml::crypto::XXMLSecurityContext > mxSecurityContext;
+ css::uno::Reference< css::xml::crypto::XSEInitializer > mxSEInitializer;
+ css::uno::Reference< css::xml::crypto::XXMLSecurityContext > mxSecurityContext;
std::vector<XMLSignatureCreationResult>
maCreationResults;
@@ -114,7 +114,7 @@ private:
XMLSignatureHelper(const XMLSignatureHelper&) = delete;
public:
- XMLSignatureHelper(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& mrCtx );
+ XMLSignatureHelper(const css::uno::Reference< css::uno::XComponentContext >& mrCtx );
~XMLSignatureHelper();
// Initialize the security context with default crypto token.
@@ -124,7 +124,7 @@ public:
// Set the storage which should be used by the default UriBinding
// Must be set before StatrtMission().
//sODFVersion indicates the ODF version
- void SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage, const OUString& sODFVersion );
+ void SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStorage, const OUString& sODFVersion );
// Argument for the Link is a uno::Reference< xml::sax::XAttributeList >*
// Return 1 to verify, 0 to skip.
@@ -132,7 +132,7 @@ public:
void SetStartVerifySignatureHdl( const Link<LinkParamNone*,bool>& rLink );
// Get the security environment
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > GetSecurityEnvironment();
+ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > GetSecurityEnvironment();
// After signing/verifying, get information about signatures
SignatureInformation GetSignatureInformation( sal_Int32 nSecurityId ) const;
@@ -167,15 +167,15 @@ public:
void SetDescription(sal_Int32 nSecurityId, const OUString& rDescription);
void AddForSigning( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, bool bBinary );
- bool CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler );
- bool ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream );
+ bool CreateAndWriteSignature( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler );
+ bool ReadAndVerifySignature( const css::uno::Reference< css::io::XInputStream >& xInputStream );
// MT: ??? I think only for adding/removing, not for new signatures...
// MM: Yes, but if you want to insert a new signature into an existing signature file, those function
// will be very useful, see Mission 3 in the new "multisigdemo" program :-)
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XWriter> CreateDocumentHandlerWithHeader( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream );
- static void CloseDocumentHandler( const ::com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler>& xDocumentHandler );
- static void ExportSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler, const SignatureInformation& signatureInfo );
+ css::uno::Reference< css::xml::sax::XWriter> CreateDocumentHandlerWithHeader( const css::uno::Reference< css::io::XOutputStream >& xOutputStream );
+ static void CloseDocumentHandler( const css::uno::Reference< css::xml::sax::XDocumentHandler>& xDocumentHandler );
+ static void ExportSignature( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler, const SignatureInformation& signatureInfo );
/// Read and verify OOXML signatures.
bool ReadAndVerifySignatureStorage(const css::uno::Reference<css::embed::XStorage>& xStorage, bool bCacheLastSignature = true);