summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmlsecurity/inc/xmlsecurity/biginteger.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/sigstruct.hxx6
-rw-r--r--xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx34
-rw-r--r--xmlsecurity/qa/certext/SanCertExt.cxx2
-rw-r--r--xmlsecurity/source/component/certificatecontainer.cxx18
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx16
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.hxx66
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx2
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx22
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx2
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.cxx8
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.hxx8
-rw-r--r--xmlsecurity/source/framework/buffernode.hxx13
-rw-r--r--xmlsecurity/source/framework/decryptorimpl.hxx57
-rw-r--r--xmlsecurity/source/framework/elementcollector.cxx4
-rw-r--r--xmlsecurity/source/framework/elementcollector.hxx19
-rw-r--r--xmlsecurity/source/framework/elementmark.hxx4
-rw-r--r--xmlsecurity/source/framework/encryptionengine.cxx2
-rw-r--r--xmlsecurity/source/framework/encryptionengine.hxx19
-rw-r--r--xmlsecurity/source/framework/encryptorimpl.hxx62
-rw-r--r--xmlsecurity/source/framework/saxeventkeeperimpl.hxx152
-rw-r--r--xmlsecurity/source/framework/securityengine.cxx8
-rw-r--r--xmlsecurity/source/framework/securityengine.hxx25
-rw-r--r--xmlsecurity/source/framework/signaturecreatorimpl.hxx57
-rw-r--r--xmlsecurity/source/framework/signatureengine.cxx6
-rw-r--r--xmlsecurity/source/framework/signatureengine.hxx35
-rw-r--r--xmlsecurity/source/framework/signatureverifierimpl.hxx57
-rw-r--r--xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx18
-rw-r--r--xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx48
-rw-r--r--xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx35
-rw-r--r--xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx60
-rw-r--r--xmlsecurity/source/helper/documentsignaturehelper.cxx6
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper.cxx18
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.cxx28
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.hxx66
-rw-r--r--xmlsecurity/source/helper/xsecctl.cxx12
-rw-r--r--xmlsecurity/source/helper/xsecctl.hxx96
-rw-r--r--xmlsecurity/source/helper/xsecparser.hxx44
-rw-r--r--xmlsecurity/source/helper/xsecsign.cxx6
-rw-r--r--xmlsecurity/source/helper/xsecverify.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx6
-rw-r--r--xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx12
-rw-r--r--xmlsecurity/source/xmlsec/errorcallback.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx12
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx16
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx34
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx114
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx41
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx44
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx55
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx16
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx44
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx18
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx42
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx22
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx44
-rw-r--r--xmlsecurity/source/xmlsec/nss/ciphercontext.hxx10
-rw-r--r--xmlsecurity/source/xmlsec/nss/digestcontext.hxx6
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.hxx32
-rw-r--r--xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx12
-rw-r--r--xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx16
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx18
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx68
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx33
-rw-r--r--xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx58
-rw-r--r--xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx50
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx12
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx46
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx20
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx54
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx22
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx44
-rw-r--r--xmlsecurity/source/xmlsec/saxhelper.hxx18
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx165
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx39
-rw-r--r--xmlsecurity/source/xmlsec/xmlstreamio.cxx18
-rw-r--r--xmlsecurity/source/xmlsec/xmlstreamio.hxx2
78 files changed, 1156 insertions, 1260 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);
diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx
index 11cf6e971c50..43254fdd7873 100644
--- a/xmlsecurity/qa/certext/SanCertExt.cxx
+++ b/xmlsecurity/qa/certext/SanCertExt.cxx
@@ -166,7 +166,7 @@ namespace {
{
if (altNames[n].Type == security::ExtAltNameType_OTHER_NAME)
{
- ::com::sun::star::beans::NamedValue otherNameProp;
+ css::beans::NamedValue otherNameProp;
if (altNames[n].Value >>= otherNameProp)
{
CPPUNIT_ASSERT_EQUAL( OUString("1.2.3.4"), otherNameProp.Name);
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 619c76c9eeed..a972dc33dc09 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -46,21 +46,21 @@ CertificateContainer::searchMap( const OUString & url, const OUString & certific
bool
CertificateContainer::isTemporaryCertificate ( const OUString & url, const OUString & certificate_name )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
return searchMap( url, certificate_name, certMap);
}
bool
CertificateContainer::isCertificateTrust ( const OUString & url, const OUString & certificate_name )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
return searchMap( url, certificate_name, certTrustMap);
}
sal_Bool
CertificateContainer::addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
certMap.insert( Map::value_type( url, certificate_name ) );
@@ -72,7 +72,7 @@ CertificateContainer::addCertificate( const OUString & url, const OUString & cer
}
::security::CertificateContainerStatus
-CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException, std::exception)
{
if ( isTemporaryCertificate( url, certificate_name ) )
{
@@ -88,28 +88,28 @@ CertificateContainer::hasCertificate( const OUString & url, const OUString & cer
OUString SAL_CALL
CertificateContainer::getImplementationName( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
return impl_getStaticImplementationName();
}
sal_Bool SAL_CALL
CertificateContainer::supportsService( const OUString& ServiceName )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
return cppu::supportsService( this, ServiceName );
}
Sequence< OUString > SAL_CALL
CertificateContainer::getSupportedServiceNames( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
+ throw(css::uno::RuntimeException, std::exception)
{
return impl_getStaticSupportedServiceNames();
}
Sequence< OUString > SAL_CALL
CertificateContainer::impl_getStaticSupportedServiceNames( )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
Sequence< OUString > aRet { "com.sun.star.security.CertificateContainer" };
return aRet;
@@ -117,7 +117,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames( )
OUString SAL_CALL
CertificateContainer::impl_getStaticImplementationName()
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
return OUString("com.sun.star.security.CertificateContainer");
}
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 11eb85f83479..5ccacf67b43c 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -198,7 +198,7 @@ void DocumentDigitalSignatures::showPackageSignatures(
}
OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return DocumentSignatureHelper::GetPackageSignatureDefaultStreamName();
}
@@ -274,7 +274,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
}
if (!xInputStream.is() && aStreamHelper.nStorageFormat != embed::StorageFormats::OFOPXML)
- return Sequence< ::com::sun::star::security::DocumentSignatureInformation >(0);
+ return Sequence< css::security::DocumentSignatureInformation >(0);
XMLSignatureHelper aSignatureHelper( mxCtx );
@@ -284,7 +284,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
DBG_ASSERT( bInit, "Error initializing security context!" );
if ( !bInit )
- return Sequence< ::com::sun::star::security::DocumentSignatureInformation >(0);
+ return Sequence< css::security::DocumentSignatureInformation >(0);
aSignatureHelper.SetStorage(rxStorage, m_sODFVersion);
@@ -297,7 +297,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
aSignatureHelper.EndMission();
- Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecEnv = aSignatureHelper.GetSecurityEnvironment();
+ Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv = aSignatureHelper.GetSecurityEnvironment();
SignatureInformations aSignInfos = aSignatureHelper.GetSignatureInformations();
int nInfos = aSignInfos.size();
@@ -307,7 +307,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
if ( nInfos )
{
Reference<security::XSerialNumberAdapter> xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
+ css::security::SerialNumberAdapter::create(mxCtx);
for( int n = 0; n < nInfos; ++n )
{
@@ -356,7 +356,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
rSigInfo.CertificateStatus = css::security::CertificateValidity::INVALID;
}
- rSigInfo.SignatureIsValid = ( rInfo.nStatus == ::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
+ rSigInfo.SignatureIsValid = ( rInfo.nStatus == css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
// OOXML intentionally doesn't sign metadata.
@@ -420,7 +420,7 @@ sal_Bool DocumentDigitalSignatures::isAuthorTrusted(
bool bFound = false;
Reference<security::XSerialNumberAdapter> xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
+ css::security::SerialNumberAdapter::create(mxCtx);
OUString sSerialNum = xSerialNumberAdapter->toString( Author->getSerialNumber() );
@@ -473,7 +473,7 @@ void DocumentDigitalSignatures::addAuthorToTrustedSources(
SvtSecurityOptions aSecOpts;
Reference<security::XSerialNumberAdapter> xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
+ css::security::SerialNumberAdapter::create(mxCtx);
SvtSecurityOptions::Certificate aNewCert( 3 );
aNewCert[ 0 ] = Author->getIssuerName();
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index 975256603c37..3bc155b4657f 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -38,13 +38,13 @@ namespace com { namespace sun { namespace star {
class DocumentDigitalSignatures : public cppu::WeakImplHelper
<
- com::sun::star::security::XDocumentDigitalSignatures,
- com::sun::star::lang::XInitialization,
+ css::security::XDocumentDigitalSignatures,
+ css::lang::XInitialization,
css::lang::XServiceInfo
>
{
private:
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxCtx;
+ css::uno::Reference< css::uno::XComponentContext > mxCtx;
// will be set by XInitialization. If not we assume true. false means an earlier version.
OUString m_sODFVersion;
//The number of arguments which were passed in XInitialization::initialize
@@ -52,20 +52,20 @@ private:
//Indicates if the document already contains a document signature
bool m_bHasDocumentSignature;
- bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (css::uno::RuntimeException, std::exception);
- void ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > ImplVerifySignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (::com::sun::star::uno::RuntimeException);
+ bool ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (css::uno::RuntimeException, std::exception);
+ void ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (css::uno::RuntimeException, std::exception);
+ css::uno::Sequence< css::security::DocumentSignatureInformation > ImplVerifySignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (css::uno::RuntimeException);
public:
- explicit DocumentDigitalSignatures( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext>& rxCtx );
+ explicit DocumentDigitalSignatures( const css::uno::Reference< css::uno::XComponentContext>& rxCtx );
// for service registration...
- static OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException);
- static ::com::sun::star::uno::Sequence < OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+ static OUString GetImplementationName() throw (css::uno::RuntimeException);
+ static css::uno::Sequence < OUString > GetSupportedServiceNames() throw (css::uno::RuntimeException);
//XInitialization
- void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
@@ -77,30 +77,30 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
// XDocumentDigitalSignatures
- sal_Bool SAL_CALL signDocumentContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL showDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL signScriptingContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL showScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL signPackage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL showPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- OUString SAL_CALL getPackageSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL showCertificate( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Certificate ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL manageTrustedSources( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL isAuthorTrusted( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL addAuthorToTrustedSources( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL chooseCertificate( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL signDocumentContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL showDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) throw (css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL signScriptingContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL showScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) throw (css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL signPackage( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XStream >& xSignStream ) throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL showPackageSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getPackageSignatureDefaultStreamName( ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL showCertificate( const css::uno::Reference< css::security::XCertificate >& Certificate ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL manageTrustedSources( ) throw (css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL isAuthorTrusted( const css::uno::Reference< css::security::XCertificate >& Author ) throw (css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL addAuthorToTrustedSources( const css::uno::Reference< css::security::XCertificate >& Author ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (css::uno::RuntimeException, std::exception) override;
+
+ css::uno::Reference< css::security::XCertificate > SAL_CALL chooseCertificate( ) throw (css::uno::RuntimeException, std::exception) override;
};
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance(
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rCtx) throw ( com::sun::star::uno::Exception );
+css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance(
+ const css::uno::Reference< css::uno::XComponentContext >& rCtx) throw ( css::uno::Exception );
#endif // INCLUDED_XMLSECURITY_SOURCE_COMPONENT_DOCUMENTDIGITALSIGNATURES_HXX
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 99fb5a1f406d..214cdacce59d 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -132,7 +132,7 @@ void CertificateChooser::ImplInitialize()
}
uno::Reference< css::security::XSerialNumberAdapter> xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
+ css::security::SerialNumberAdapter::create(mxCtx);
sal_Int32 nCertificates = maCerts.getLength();
for( sal_Int32 nCert = nCertificates; nCert; )
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 97cd7cd56b99..f4a24b2216ac 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -68,7 +68,7 @@ namespace
virtual void ImplCommit() override;
public:
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
SaveODFItem();
//See group ODF in Common.xcs
bool isLessODF1_2()
@@ -78,7 +78,7 @@ namespace
};
void SaveODFItem::ImplCommit() {}
-void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SaveODFItem::Notify( const css::uno::Sequence< OUString >& ) {}
SaveODFItem::SaveODFItem(): utl::ConfigItem(OUString(
"Office.Common/Save")), m_nODF(0)
@@ -214,7 +214,7 @@ bool DigitalSignaturesDialog::Init()
return bInit;
}
-void DigitalSignaturesDialog::SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStore )
+void DigitalSignaturesDialog::SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStore )
{
maSignatureManager.mxStore = rxStore;
maSignatureManager.maSignatureHelper.SetStorage( maSignatureManager.mxStore, m_sODFVersion);
@@ -350,7 +350,7 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void)
return;
try
{
- uno::Reference<com::sun::star::xml::crypto::XSecurityEnvironment> xSecEnv = maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
+ uno::Reference<css::xml::crypto::XSecurityEnvironment> xSecEnv = maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
ScopedVclPtrInstance< CertificateChooser > aChooser( this, mxCtx, xSecEnv );
if ( aChooser->Execute() == RET_OK )
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void)
sal_Int32 nStatus = maSignatureManager.maSignatureHelper.GetSignatureInformation( nSecurityId ).nStatus;
- if ( nStatus == ::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED )
+ if ( nStatus == css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED )
{
mbSignaturesChanged = true;
@@ -419,11 +419,11 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
{
m_pSignaturesLB->Clear();
- uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecEnv = maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
- uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
+ uno::Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv = maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
+ uno::Reference<css::security::XSerialNumberAdapter> xSerialNumberAdapter =
+ css::security::SerialNumberAdapter::create(mxCtx);
- uno::Reference< ::com::sun::star::security::XCertificate > xCert;
+ uno::Reference< css::security::XCertificate > xCert;
size_t nInfos = maSignatureManager.maCurrentSignatureInformations.size();
size_t nValidSigs = 0, nValidCerts = 0;
@@ -489,7 +489,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
aDateTimeStr = XmlSec::GetDateTimeString( rInfo.stDateTime );
aDescription = rInfo.ouDescription;
}
- bSigValid = ( rInfo.nStatus == ::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
+ bSigValid = ( rInfo.nStatus == css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
if ( bSigValid )
{
@@ -581,7 +581,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
css::uno::Reference<css::xml::crypto::XSecurityEnvironment > xSecEnv =
maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
css::uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
+ css::security::SerialNumberAdapter::create(mxCtx);
// Use Certificate from doc, not from key store
uno::Reference< css::security::XCertificate > xCert;
if (!rInfo.ouX509Certificate.isEmpty())
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 10b911559f34..0eaefdf75c22 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -222,7 +222,7 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, voi
sal_uInt16 nSelected = sal_uInt16( sal_uIntPtr( m_pTrustCertLB->FirstSelected()->GetUserData() ) );
uno::Reference< css::security::XSerialNumberAdapter > xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mpDlg->mxCtx);
+ css::security::SerialNumberAdapter::create(mpDlg->mxCtx);
uno::Reference< css::security::XCertificate > xCert = mpDlg->mxSecurityEnvironment->getCertificate( maTrustedAuthors[nSelected][0], xSerialNumberAdapter->toSequence( maTrustedAuthors[nSelected][1] ) );
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index bf3979b81981..28d0ba2b7b58 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -50,12 +50,12 @@ namespace XmlSec
return pSysLocale->GetLocaleData();
}
- DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT )
+ DateTime GetDateTime( const css::util::DateTime& _rDT )
{
return DateTime(_rDT);
}
- OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT )
+ OUString GetDateTimeString( const css::util::DateTime& _rDT )
{
// String with date and time information (#i20172#)
DateTime aDT( GetDateTime( _rDT ) );
@@ -64,7 +64,7 @@ namespace XmlSec
return rLoDa.getDate( aDT ) + " " + rLoDa.getTime( aDT );
}
- OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT )
+ OUString GetDateString( const css::util::DateTime& _rDT )
{
return GetLocaleData().getDate( GetDateTime( _rDT ) );
}
@@ -311,7 +311,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
return retVal;
}
- OUString GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, sal_uInt16 _nLineBreak )
+ OUString GetHexString( const css::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, sal_uInt16 _nLineBreak )
{
const sal_Int8* pSerNumSeq = _rSeq.getConstArray();
int nCnt = _rSeq.getLength();
diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx
index 992e33909e74..cd31f358d885 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.hxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.hxx
@@ -37,9 +37,9 @@ namespace XmlSec
ResMgr* GetResMgr();
const LocaleDataWrapper& GetLocaleData();
- DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT );
- OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT );
- OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT );
+ DateTime GetDateTime( const css::util::DateTime& _rDT );
+ OUString GetDateTimeString( const css::util::DateTime& _rDT );
+ OUString GetDateString( const css::util::DateTime& _rDT );
std::vector< std::pair< OUString, OUString> >
parseDN(const OUString& rRawString);
@@ -47,7 +47,7 @@ namespace XmlSec
const OUString & rRawString);
OUString GetContentPart( const OUString& _rRawString );
- OUString GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", sal_uInt16 _nLineBreak = 0xFFFF );
+ OUString GetHexString( const css::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", sal_uInt16 _nLineBreak = 0xFFFF );
}
#define XMLSEC_RES(id) ResId(id,*XmlSec::GetResMgr())
diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx
index 9495bebeeb72..9d82014adda5 100644
--- a/xmlsecurity/source/framework/buffernode.hxx
+++ b/xmlsecurity/source/framework/buffernode.hxx
@@ -67,8 +67,7 @@ private:
bool m_bAllReceived;
/* the XMLElementWrapper of the bufferred element */
- com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper > m_xXMLElement;
+ css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > m_xXMLElement;
private:
bool isECInSubTreeIncluded(sal_Int32 nIgnoredSecurityId) const;
@@ -78,8 +77,7 @@ private:
public:
explicit BufferNode(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement);
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& xXMLElement);
virtual ~BufferNode() {};
bool isECOfBeforeModifyIncluded(sal_Int32 nIgnoredSecurityId) const;
@@ -104,10 +102,9 @@ public:
const BufferNode* isAncestor(const BufferNode* pDescendant) const;
bool isPrevious(const BufferNode* pFollowing) const;
const BufferNode* getNextNodeByTreeOrder() const;
- com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper > getXMLElement() const { return m_xXMLElement;}
- void setXMLElement(const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement);
+ css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > getXMLElement() const { return m_xXMLElement;}
+ void setXMLElement(const css::uno::Reference<
+ css::xml::wrapper::XXMLElementWrapper >& xXMLElement);
void notifyBranch();
void elementCollectorNotify();
void freeAllChildren();
diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx
index 4210383437ac..9b5cd239becd 100644
--- a/xmlsecurity/source/framework/decryptorimpl.hxx
+++ b/xmlsecurity/source/framework/decryptorimpl.hxx
@@ -33,9 +33,9 @@
typedef cppu::ImplInheritanceHelper
<
EncryptionEngine,
- com::sun::star::xml::crypto::sax::XDecryptionResultBroadcaster,
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo
+ css::xml::crypto::sax::XDecryptionResultBroadcaster,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo
> DecryptorImpl_Base;
class DecryptorImpl : public DecryptorImpl_Base
/****** DecryptorImpl.hxx/CLASS DecryptorImpl *********************************
@@ -49,58 +49,51 @@ class DecryptorImpl : public DecryptorImpl_Base
******************************************************************************/
{
private:
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
+ css::uno::Reference< css::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
virtual void notifyResultListener() const
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
virtual bool checkReady() const override;
- virtual void startEngine( const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLEncryptionTemplate >&
+ virtual void startEngine( const css::uno::Reference<
+ css::xml::crypto::XXMLEncryptionTemplate >&
xEncryptionTemplate)
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
public:
- explicit DecryptorImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext);
+ explicit DecryptorImpl(const css::uno::Reference< css::uno::XComponentContext > & xContext);
virtual ~DecryptorImpl();
/* XDecryptionResultBroadcaster */
virtual void SAL_CALL addDecryptionResultListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XDecryptionResultListener >&
- listener )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeDecryptionResultListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XDecryptionResultListener >&
- listener )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener )
+ throw (css::uno::RuntimeException, std::exception) override;
/* XInitialization */
virtual void SAL_CALL initialize(
- const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XServiceInfo */
virtual OUString SAL_CALL getImplementationName( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) override;
};
OUString DecryptorImpl_getImplementationName()
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( )
- throw ( com::sun::star::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( )
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL DecryptorImpl_createInstance(
- const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&
- rSMgr)
- throw ( com::sun::star::uno::Exception );
+css::uno::Reference< css::uno::XInterface >
+SAL_CALL DecryptorImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr)
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/framework/elementcollector.cxx b/xmlsecurity/source/framework/elementcollector.cxx
index ccdcb723bc26..8c28fa01d5ae 100644
--- a/xmlsecurity/source/framework/elementcollector.cxx
+++ b/xmlsecurity/source/framework/elementcollector.cxx
@@ -31,9 +31,7 @@ ElementCollector::ElementCollector(
sal_Int32 nBufferId,
cssxc::sax::ElementMarkPriority nPriority,
bool bToModify,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener >&
- xReferenceResolvedListener)
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& xReferenceResolvedListener)
:ElementMark(nSecurityId, nBufferId),
m_nPriority(nPriority),
m_bToModify(bToModify),
diff --git a/xmlsecurity/source/framework/elementcollector.hxx b/xmlsecurity/source/framework/elementcollector.hxx
index cec87b6cdc44..e14430b65c3d 100644
--- a/xmlsecurity/source/framework/elementcollector.hxx
+++ b/xmlsecurity/source/framework/elementcollector.hxx
@@ -44,7 +44,7 @@ private:
* BEFOREMODIFY - this ElementCollector must notify before any
* internal modification happens.
*/
- com::sun::star::xml::crypto::sax::ElementMarkPriority m_nPriority;
+ css::xml::crypto::sax::ElementMarkPriority m_nPriority;
/*
* the modify flag, representing whether which elementcollector will
@@ -59,31 +59,26 @@ private:
bool m_bNotified;
/* the listener to be notified */
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener > m_xReferenceResolvedListener;
+ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > m_xReferenceResolvedListener;
public:
ElementCollector(
sal_Int32 nSecurityId,
sal_Int32 nBufferId,
- com::sun::star::xml::crypto::sax::ElementMarkPriority nPriority,
+ css::xml::crypto::sax::ElementMarkPriority nPriority,
bool bToModify,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener >&
- xReferenceResolvedListener);
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& xReferenceResolvedListener);
virtual ~ElementCollector() {};
- com::sun::star::xml::crypto::sax::ElementMarkPriority getPriority() const { return m_nPriority;}
+ css::xml::crypto::sax::ElementMarkPriority getPriority() const { return m_nPriority;}
bool getModify() const { return m_bToModify;}
void notifyListener();
void setReferenceResolvedListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener >&
- referenceResolvedListener);
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& referenceResolvedListener);
void doNotify();
ElementCollector* clone(
sal_Int32 nId,
- com::sun::star::xml::crypto::sax::ElementMarkPriority nPriority ) const;
+ css::xml::crypto::sax::ElementMarkPriority nPriority ) const;
};
#endif
diff --git a/xmlsecurity/source/framework/elementmark.hxx b/xmlsecurity/source/framework/elementmark.hxx
index ac86e87cdd78..1ecb51ecc817 100644
--- a/xmlsecurity/source/framework/elementmark.hxx
+++ b/xmlsecurity/source/framework/elementmark.hxx
@@ -52,7 +52,7 @@ protected:
* not changed
* TYPEOFELEMENTCOLLECTOR - represents an ElementCollector
*/
- com::sun::star::xml::crypto::sax::ElementMarkType m_type;
+ css::xml::crypto::sax::ElementMarkType m_type;
public:
ElementMark(sal_Int32 nSecurityId, sal_Int32 nBufferId);
@@ -62,7 +62,7 @@ public:
void setBufferNode(const BufferNode* pBufferNode);
sal_Int32 getSecurityId() const { return m_nSecurityId;}
void setSecurityId(sal_Int32 nSecurityId);
- com::sun::star::xml::crypto::sax::ElementMarkType getType() const { return m_type;}
+ css::xml::crypto::sax::ElementMarkType getType() const { return m_type;}
sal_Int32 getBufferId() const { return m_nBufferId;}
};
diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx
index cef5f66479f9..b6265f01c3a7 100644
--- a/xmlsecurity/source/framework/encryptionengine.cxx
+++ b/xmlsecurity/source/framework/encryptionengine.cxx
@@ -152,7 +152,7 @@ void EncryptionEngine::clearUp( ) const
/* XBlockerMonitor */
void SAL_CALL EncryptionEngine::setBlockerId( sal_Int32 id )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
m_nIdOfBlocker = id;
tryToPerform();
diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx
index bcf8bfb80b31..a535c30414d6 100644
--- a/xmlsecurity/source/framework/encryptionengine.hxx
+++ b/xmlsecurity/source/framework/encryptionengine.hxx
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace uno {
class EncryptionEngine : public cppu::ImplInheritanceHelper
<
SecurityEngine,
- com::sun::star::xml::crypto::sax::XBlockerMonitor
+ css::xml::crypto::sax::XBlockerMonitor
>
/****** encryptionEngine.hxx/CLASS encryptionEngine ***************************
*
@@ -51,16 +51,14 @@ class EncryptionEngine : public cppu::ImplInheritanceHelper
******************************************************************************/
{
private:
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
protected:
/*
* the Encryption bridge component, which performs encrypt and decrypt
* operation based on xmlsec library.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLEncryption > m_xXMLEncryption;
+ css::uno::Reference< css::xml::crypto::XXMLEncryption > m_xXMLEncryption;
/*
* the Id of template blocker.
@@ -68,11 +66,11 @@ protected:
sal_Int32 m_nIdOfBlocker;
protected:
- explicit EncryptionEngine( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext );
+ explicit EncryptionEngine( const css::uno::Reference< css::uno::XComponentContext > & xContext );
virtual ~EncryptionEngine(){};
virtual void tryToPerform( )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
virtual void clearUp( ) const override;
virtual bool checkReady() const override;
@@ -81,15 +79,14 @@ protected:
* For a Encryptor, it performs encryption operation;
* for a Decryptor, decryption operation is performed.
*/
- virtual void startEngine( const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLEncryptionTemplate >&)
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
+ virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >&)
+ throw (css::uno::Exception, css::uno::RuntimeException)
{};
public:
/* XBlockerMonitor */
virtual void SAL_CALL setBlockerId( sal_Int32 id )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx
index cc850d397de4..368fe94a430e 100644
--- a/xmlsecurity/source/framework/encryptorimpl.hxx
+++ b/xmlsecurity/source/framework/encryptorimpl.hxx
@@ -34,10 +34,10 @@
typedef cppu::ImplInheritanceHelper
<
EncryptionEngine,
- com::sun::star::xml::crypto::sax::XEncryptionResultBroadcaster,
- com::sun::star::xml::crypto::sax::XReferenceCollector,
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo
+ css::xml::crypto::sax::XEncryptionResultBroadcaster,
+ css::xml::crypto::sax::XReferenceCollector,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo
> EncryptorImpl_Base;
class EncryptorImpl : public EncryptorImpl_Base
@@ -57,64 +57,64 @@ private:
*/
sal_Int32 m_nReferenceId;
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
+ css::uno::Reference<
+ css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
virtual void notifyResultListener() const
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
virtual bool checkReady() const override;
- virtual void startEngine( const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLEncryptionTemplate >&
+ virtual void startEngine( const css::uno::Reference<
+ css::xml::crypto::XXMLEncryptionTemplate >&
xEncryptionTemplate)
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
public:
- explicit EncryptorImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext);
+ explicit EncryptorImpl(const css::uno::Reference< css::uno::XComponentContext > & xContext);
virtual ~EncryptorImpl();
/* XEncryptionResultBroadcaster */
virtual void SAL_CALL addEncryptionResultListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XEncryptionResultListener >&
+ const css::uno::Reference<
+ css::xml::crypto::sax::XEncryptionResultListener >&
listener )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEncryptionResultListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XEncryptionResultListener >&
+ const css::uno::Reference<
+ css::xml::crypto::sax::XEncryptionResultListener >&
listener )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/* XReferenceCollector */
virtual void SAL_CALL setReferenceCount( sal_Int32 count )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setReferenceId( sal_Int32 id )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XInitialization */
virtual void SAL_CALL initialize(
- const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XServiceInfo */
virtual OUString SAL_CALL getImplementationName( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) override;
};
OUString EncryptorImpl_getImplementationName()
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( )
- throw ( com::sun::star::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( )
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+css::uno::Reference< css::uno::XInterface >
SAL_CALL EncryptorImpl_createInstance(
- const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr)
- throw ( com::sun::star::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr)
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
index e959017b010b..8365c7c22077 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
@@ -40,12 +40,12 @@
class SAXEventKeeperImpl : public cppu::WeakImplHelper
<
- com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper,
- com::sun::star::xml::crypto::sax::XReferenceResolvedBroadcaster,
- com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeBroadcaster,
- com::sun::star::xml::sax::XDocumentHandler,
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo
+ css::xml::crypto::sax::XSecuritySAXEventKeeper,
+ css::xml::crypto::sax::XReferenceResolvedBroadcaster,
+ css::xml::crypto::sax::XSAXEventKeeperStatusChangeBroadcaster,
+ css::xml::sax::XDocumentHandler,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo
>
/****** SAXEventKeeperImpl.hxx/CLASS SAXEventKeeperImpl ***********************
*
@@ -62,23 +62,20 @@ private:
* the XMLDocumentWrapper component which maintains all bufferred SAX
* in DOM format.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLDocumentWrapper >
+ css::uno::Reference< css::xml::wrapper::XXMLDocumentWrapper >
m_xXMLDocument;
/*
* the document handler provided by the XMLDocumentWrapper component.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler > m_xDocumentHandler;
+ css::uno::Reference< css::xml::sax::XDocumentHandler > m_xDocumentHandler;
/*
* the compressed document handler provided by the XMLDocumentWrapper
* component, the handler has more efficient method definition that the
* normal document handler.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::csax::XCompressedDocumentHandler >
+ css::uno::Reference< css::xml::csax::XCompressedDocumentHandler >
m_xCompressedDocumentHandler;
/*
@@ -88,8 +85,7 @@ private:
* SAXEventKeeper should chain on/chain off the SAX chain, or whether
* the SAXEventKeeper is useless any long.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >
+ css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >
m_xSAXEventKeeperStatusChangeListener;
/*
@@ -142,8 +138,7 @@ private:
* the document handler to which all received SAX events will be
* forwarded.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler > m_xNextHandler;
+ css::uno::Reference< css::xml::sax::XDocumentHandler > m_xNextHandler;
/*
* the current BufferNode which prevents the SAX events to be
@@ -192,8 +187,7 @@ private:
OUString printBufferNode(
BufferNode* pBufferNode, sal_Int32 nIndent) const;
- static com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper > >
+ static css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > >
collectChildWorkingElement(BufferNode* pBufferNode);
void smashBufferNode(
@@ -209,11 +203,9 @@ private:
void markElementMarkBuffer(sal_Int32 nId);
sal_Int32 createElementCollector(
- com::sun::star::xml::crypto::sax::ElementMarkPriority nPriority,
+ css::xml::crypto::sax::ElementMarkPriority nPriority,
bool bModifyElement,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener>&
- xReferenceResolvedListener);
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener>& xReferenceResolvedListener);
sal_Int32 createBlocker();
@@ -223,121 +215,109 @@ public:
/* XSAXEventKeeper */
virtual sal_Int32 SAL_CALL addElementCollector( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeElementCollector( sal_Int32 id )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL addBlocker( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeBlocker( sal_Int32 id )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isBlocking( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL
getElement( sal_Int32 id )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setElement(
sal_Int32 id,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >&
- aElement )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler > SAL_CALL
- setNextHandler( const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler >& xNewHandler )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aElement )
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::xml::sax::XDocumentHandler > SAL_CALL
+ setNextHandler( const css::uno::Reference<
+ css::xml::sax::XDocumentHandler >& xNewHandler )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL printBufferNodeTree()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL
getCurrentBlockingNode()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/* XSecuritySAXEventKeeper */
virtual sal_Int32 SAL_CALL addSecurityElementCollector(
- com::sun::star::xml::crypto::sax::ElementMarkPriority priority,
+ css::xml::crypto::sax::ElementMarkPriority priority,
sal_Bool modifyElement )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL cloneElementCollector(
sal_Int32 referenceId,
- com::sun::star::xml::crypto::sax::ElementMarkPriority priority )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ css::xml::crypto::sax::ElementMarkPriority priority )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setSecurityId( sal_Int32 id, sal_Int32 securityId )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/* XReferenceResolvedBroadcaster */
virtual void SAL_CALL addReferenceResolvedListener(
sal_Int32 referenceId,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener >&
- listener )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeReferenceResolvedListener(
sal_Int32 referenceId,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener >&
- listener )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener )
+ throw (css::uno::RuntimeException, std::exception) override;
/* XSAXEventKeeperStatusChangeBroadcaster */
virtual void SAL_CALL addSAXEventKeeperStatusChangeListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >&
- listener )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeSAXEventKeeperStatusChangeListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >&
- listener )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener )
+ throw (css::uno::RuntimeException, std::exception) override;
/* XDocumentHandler */
virtual void SAL_CALL startDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startElement(
const OUString& aName,
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >&
+ const css::uno::Reference< css::xml::sax::XAttributeList >&
xAttribs )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endElement( const OUString& aName )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL processingInstruction(
const OUString& aTarget, const OUString& aData )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator(
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
/* XInitialization */
virtual void SAL_CALL initialize(
- const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XServiceInfo */
virtual OUString SAL_CALL getImplementationName( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) override;
};
OUString SAXEventKeeperImpl_getImplementationName()
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( )
- throw ( com::sun::star::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( )
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL SAXEventKeeperImpl_createInstance( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr)
- throw ( com::sun::star::uno::Exception );
+css::uno::Reference< css::uno::XInterface >
+SAL_CALL SAXEventKeeperImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/framework/securityengine.cxx b/xmlsecurity/source/framework/securityengine.cxx
index 10af4918b5e3..85f3afbba66c 100644
--- a/xmlsecurity/source/framework/securityengine.cxx
+++ b/xmlsecurity/source/framework/securityengine.cxx
@@ -30,13 +30,13 @@ SecurityEngine::SecurityEngine()
m_nIdOfKeyEC(-1),
m_bMissionDone(false),
m_nSecurityId(-1),
- m_nStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN)
+ m_nStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN)
{
}
/* XReferenceResolvedListener */
void SAL_CALL SecurityEngine::referenceResolved( sal_Int32 /*referenceId*/)
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
m_nNumOfResolvedReferences++;
tryToPerform();
@@ -44,7 +44,7 @@ void SAL_CALL SecurityEngine::referenceResolved( sal_Int32 /*referenceId*/)
/* XKeyCollector */
void SAL_CALL SecurityEngine::setKeyId( sal_Int32 id )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
m_nIdOfKeyEC = id;
tryToPerform();
@@ -52,7 +52,7 @@ void SAL_CALL SecurityEngine::setKeyId( sal_Int32 id )
/* XMissionTaker */
sal_Bool SAL_CALL SecurityEngine::endMission( )
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
bool rc = m_bMissionDone;
diff --git a/xmlsecurity/source/framework/securityengine.hxx b/xmlsecurity/source/framework/securityengine.hxx
index c7eb3b262aed..171e4297d65a 100644
--- a/xmlsecurity/source/framework/securityengine.hxx
+++ b/xmlsecurity/source/framework/securityengine.hxx
@@ -31,9 +31,9 @@
class SecurityEngine : public cppu::WeakImplHelper
<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener,
- com::sun::star::xml::crypto::sax::XKeyCollector,
- com::sun::star::xml::crypto::sax::XMissionTaker
+ css::xml::crypto::sax::XReferenceResolvedListener,
+ css::xml::crypto::sax::XKeyCollector,
+ css::xml::crypto::sax::XMissionTaker
>
/****** securityengine.hxx/CLASS SecurityEngine *******************************
*
@@ -52,8 +52,7 @@ protected:
* operation needs. The m_xSAXEventKeeper member is used to release
* those resources when the security operation finishes.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XSAXEventKeeper > m_xSAXEventKeeper;
+ css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeper > m_xSAXEventKeeper;
/*
* the id of ElementCollector of the template element.
@@ -90,14 +89,12 @@ protected:
/*
* the status of the operation
*/
- com::sun::star::xml::crypto::SecurityOperationStatus m_nStatus;
+ css::xml::crypto::SecurityOperationStatus m_nStatus;
/*
* the result listener, which will receives the security operation result.
*/
- com::sun::star::uno::Reference<
- com::sun::star::uno::XInterface >
- m_xResultListener;
+ css::uno::Reference< css::uno::XInterface > m_xResultListener;
protected:
explicit SecurityEngine();
@@ -108,7 +105,7 @@ protected:
* Any derived class will implement this method respectively.
*/
virtual void tryToPerform( )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException){};
+ throw (css::uno::Exception, css::uno::RuntimeException){};
/*
* clear up all resources used by this operation.
@@ -125,7 +122,7 @@ protected:
* Any derived class will implement this method respectively.
*/
virtual void notifyResultListener() const
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
+ throw (css::uno::Exception, css::uno::RuntimeException)
{};
/*
@@ -137,15 +134,15 @@ protected:
public:
/* XReferenceResolvedListener */
virtual void SAL_CALL referenceResolved( sal_Int32 referenceId )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XKeyCollector */
virtual void SAL_CALL setKeyId( sal_Int32 id )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XMissionTaker */
virtual sal_Bool SAL_CALL endMission( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
index 3915f483e07a..2b14cad9cd20 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
@@ -34,10 +34,10 @@
typedef cppu::ImplInheritanceHelper
<
SignatureEngine,
- com::sun::star::xml::crypto::sax::XBlockerMonitor,
- com::sun::star::xml::crypto::sax::XSignatureCreationResultBroadcaster,
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo
+ css::xml::crypto::sax::XBlockerMonitor,
+ css::xml::crypto::sax::XSignatureCreationResultBroadcaster,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo
> SignatureCreatorImpl_Base;
class SignatureCreatorImpl : public SignatureCreatorImpl_Base
@@ -57,61 +57,56 @@ private:
*/
sal_Int32 m_nIdOfBlocker;
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
+ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
virtual void notifyResultListener() const
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
virtual void clearUp( ) const override;
virtual bool checkReady() const override;
- virtual void startEngine( const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSignatureTemplate >&
- xSignatureTemplate)
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate)
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
public:
- explicit SignatureCreatorImpl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext );
+ explicit SignatureCreatorImpl( const css::uno::Reference< css::uno::XComponentContext > & xContext );
virtual ~SignatureCreatorImpl();
/* XBlockerMonitor */
virtual void SAL_CALL setBlockerId( sal_Int32 id )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XSignatureCreationResultBroadcaster */
void SAL_CALL addSignatureCreationResultListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XSignatureCreationResultListener >& listener )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
void SAL_CALL removeSignatureCreationResultListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XSignatureCreationResultListener >& listener )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener )
+ throw (css::uno::RuntimeException, std::exception) override;
/* XInitialization */
virtual void SAL_CALL initialize(
- const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XServiceInfo */
virtual OUString SAL_CALL getImplementationName( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) override;
};
OUString SignatureCreatorImpl_getImplementationName()
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( )
- throw ( com::sun::star::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( )
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+css::uno::Reference< css::uno::XInterface >
SAL_CALL SignatureCreatorImpl_createInstance(
- const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr)
- throw ( com::sun::star::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx
index d4b322fde9aa..41be0b8c5c32 100644
--- a/xmlsecurity/source/framework/signatureengine.cxx
+++ b/xmlsecurity/source/framework/signatureengine.cxx
@@ -180,17 +180,17 @@ void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id )
/* XUriBinding */
void SAL_CALL SignatureEngine::setUriBinding(
const OUString& uri,
- const cssu::Reference< com::sun::star::io::XInputStream >& aInputStream )
+ const cssu::Reference< css::io::XInputStream >& aInputStream )
throw (cssu::Exception, cssu::RuntimeException, std::exception)
{
m_vUris.push_back(uri);
m_vXInputStreams.push_back(aInputStream);
}
-cssu::Reference< com::sun::star::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const OUString& uri )
+cssu::Reference< css::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const OUString& uri )
throw (cssu::Exception, cssu::RuntimeException, std::exception)
{
- cssu::Reference< com::sun::star::io::XInputStream > xInputStream;
+ cssu::Reference< css::io::XInputStream > xInputStream;
int size = m_vUris.size();
diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx
index b0a7a3d0d165..fac0b6840855 100644
--- a/xmlsecurity/source/framework/signatureengine.hxx
+++ b/xmlsecurity/source/framework/signatureengine.hxx
@@ -41,8 +41,8 @@
class SignatureEngine : public cppu::ImplInheritanceHelper
<
SecurityEngine,
- com::sun::star::xml::crypto::sax::XReferenceCollector,
- com::sun::star::xml::crypto::XUriBinding
+ css::xml::crypto::sax::XReferenceCollector,
+ css::xml::crypto::XUriBinding
>
/****** signatureengine.hxx/CLASS SignatureEngine *****************************
*
@@ -54,7 +54,7 @@ class SignatureEngine : public cppu::ImplInheritanceHelper
******************************************************************************/
{
private:
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
protected:
@@ -62,8 +62,7 @@ protected:
* the Signature bridge component, which performs signature generation
* and verification based on xmlsec library.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSignature > m_xXMLSignature;
+ css::uno::Reference< css::xml::crypto::XXMLSignature > m_xXMLSignature;
/*
* a collection of ElementCollector's ids. Each ElementCollector
@@ -83,15 +82,14 @@ protected:
* to hold corresponding binded XInputStream interface.
*/
std::vector< OUString > m_vUris;
- std::vector< com::sun::star::uno::Reference<
- com::sun::star::io::XInputStream > > m_vXInputStreams;
+ std::vector< css::uno::Reference< css::io::XInputStream > > m_vXInputStreams;
protected:
- explicit SignatureEngine( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext);
+ explicit SignatureEngine( const css::uno::Reference< css::uno::XComponentContext > & xContext);
virtual ~SignatureEngine() {};
virtual void tryToPerform( )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
virtual void clearUp( ) const override;
virtual bool checkReady() const override;
@@ -100,28 +98,27 @@ protected:
* For a SignatureCreator, it performs signing operation;
* for a SignatureVerifier, verification operation is performed.
*/
- virtual void startEngine( const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSignatureTemplate >&)
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
+ virtual void startEngine( const css::uno::Reference<
+ css::xml::crypto::XXMLSignatureTemplate >&)
+ throw (css::uno::Exception, css::uno::RuntimeException)
{};
public:
/* XReferenceCollector */
virtual void SAL_CALL setReferenceCount( sal_Int32 count )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setReferenceId( sal_Int32 id )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XUriBinding */
virtual void SAL_CALL setUriBinding(
const OUString& uri,
- const com::sun::star::uno::Reference<
- com::sun::star::io::XInputStream >& aInputStream )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
+ const css::uno::Reference< css::io::XInputStream >& aInputStream )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::io::XInputStream >
SAL_CALL getUriBinding( const OUString& uri )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx
index de1f3322a70d..66dbe548b8d8 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx
@@ -34,9 +34,9 @@
typedef cppu::ImplInheritanceHelper
<
SignatureEngine,
- com::sun::star::xml::crypto::sax::XSignatureVerifyResultBroadcaster,
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo
+ css::xml::crypto::sax::XSignatureVerifyResultBroadcaster,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo
> SignatureVerifierImpl_Base;
class SignatureVerifierImpl : public SignatureVerifierImpl_Base
@@ -51,58 +51,51 @@ class SignatureVerifierImpl : public SignatureVerifierImpl_Base
******************************************************************************/
{
private:
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
+ css::uno::Reference< css::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
virtual void notifyResultListener() const
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
virtual bool checkReady() const override;
- virtual void startEngine( const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSignatureTemplate >&
- xSignatureTemplate)
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override;
+ virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate)
+ throw (css::uno::Exception, css::uno::RuntimeException) override;
public:
- explicit SignatureVerifierImpl( const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >& rxContext);
+ explicit SignatureVerifierImpl( const css::uno::Reference<
+ css::uno::XComponentContext >& rxContext);
virtual ~SignatureVerifierImpl();
/* XSignatureVerifyResultBroadcaster */
virtual void SAL_CALL addSignatureVerifyResultListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener >&
- listener )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeSignatureVerifyResultListener(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener >&
- listener )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener )
+ throw (css::uno::RuntimeException, std::exception) override;
/* XInitialization */
virtual void SAL_CALL initialize(
- const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
- throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
/* XServiceInfo */
virtual OUString SAL_CALL getImplementationName( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) override;
};
OUString SignatureVerifierImpl_getImplementationName()
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( )
- throw ( com::sun::star::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( )
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+css::uno::Reference< css::uno::XInterface >
SAL_CALL SignatureVerifierImpl_createInstance(
- const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr)
- throw ( com::sun::star::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
index c260721ba69c..90e83c8c6f6a 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
@@ -31,7 +31,7 @@ using ::com::sun::star::xml::crypto::XXMLEncryptionTemplate ;
XMLEncryptionTemplateImpl::XMLEncryptionTemplateImpl()
: m_xTemplate( nullptr ),
m_xTarget( nullptr ),
- m_nStatus ( ::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN ) {
+ m_nStatus ( css::xml::crypto::SecurityOperationStatus_UNKNOWN ) {
}
XMLEncryptionTemplateImpl::~XMLEncryptionTemplateImpl() {
@@ -39,40 +39,40 @@ XMLEncryptionTemplateImpl::~XMLEncryptionTemplateImpl() {
/* XXMLEncryptionTemplate */
void SAL_CALL XMLEncryptionTemplateImpl::setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
- throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception)
+ throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
{
m_xTemplate = aTemplate ;
}
/* XXMLEncryptionTemplate */
Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTemplate()
-throw (com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
return m_xTemplate ;
}
/* XXMLEncryptionTemplate */
void SAL_CALL XMLEncryptionTemplateImpl::setTarget( const Reference< XXMLElementWrapper >& aTarget )
- throw( com::sun::star::lang::IllegalArgumentException, std::exception ) {
+ throw( css::lang::IllegalArgumentException, std::exception ) {
m_xTarget = aTarget ;
}
/* XXMLEncryptionTemplate */
Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTarget()
-throw (com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
return m_xTarget ;
}
void SAL_CALL XMLEncryptionTemplateImpl::setStatus(
- ::com::sun::star::xml::crypto::SecurityOperationStatus status )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+ css::xml::crypto::SecurityOperationStatus status )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
m_nStatus = status;
}
-::com::sun::star::xml::crypto::SecurityOperationStatus SAL_CALL XMLEncryptionTemplateImpl::getStatus( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::xml::crypto::SecurityOperationStatus SAL_CALL XMLEncryptionTemplateImpl::getStatus( )
+ throw (css::uno::RuntimeException, std::exception)
{
return m_nStatus;
}
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
index ec9f974f3eca..4e42b23bd9bc 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
@@ -35,13 +35,13 @@
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XXMLEncryptionTemplate ,
- ::com::sun::star::lang::XServiceInfo >
+ css::xml::crypto::XXMLEncryptionTemplate ,
+ css::lang::XServiceInfo >
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > m_xTemplate;
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > m_xTarget;
- ::com::sun::star::xml::crypto::SecurityOperationStatus m_nStatus;
+ css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > m_xTemplate;
+ css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > m_xTarget;
+ css::xml::crypto::SecurityOperationStatus m_nStatus;
public:
explicit XMLEncryptionTemplateImpl();
@@ -49,45 +49,45 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper<
//Methods from XXMLEncryptionTemplate
virtual void SAL_CALL setTemplate(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
)
- throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) override;
+ throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate(
- ) throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate(
+ ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setTarget(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement
- ) throw( com::sun::star::lang::IllegalArgumentException, std::exception) override;
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
+ ) throw( css::lang::IllegalArgumentException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTarget(
- ) throw (com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTarget(
+ ) throw (css::uno::RuntimeException, std::exception) override ;
virtual void SAL_CALL setStatus(
- ::com::sun::star::xml::crypto::SecurityOperationStatus status )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::xml::crypto::SecurityOperationStatus
+ css::xml::crypto::SecurityOperationStatus status )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::xml::crypto::SecurityOperationStatus
SAL_CALL getStatus( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ ) throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
} ;
#endif // _XMLENCRYPTIONTEMPLATE_XMLSECIMPL_HXX_
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index 03f866e05749..6d465502be89 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -31,7 +31,7 @@ using ::com::sun::star::xml::crypto::XXMLSignatureTemplate ;
XMLSignatureTemplateImpl::XMLSignatureTemplateImpl()
:m_xTemplate( nullptr ),
- m_nStatus ( ::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN )
+ m_nStatus ( css::xml::crypto::SecurityOperationStatus_UNKNOWN )
{
}
@@ -40,31 +40,29 @@ XMLSignatureTemplateImpl::~XMLSignatureTemplateImpl() {
/* XXMLSignatureTemplate */
void SAL_CALL XMLSignatureTemplateImpl::setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
- throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception)
+ throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
{
m_xTemplate = aTemplate ;
}
/* XXMLSignatureTemplate */
Reference< XXMLElementWrapper > SAL_CALL XMLSignatureTemplateImpl::getTemplate()
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return m_xTemplate ;
}
-void SAL_CALL XMLSignatureTemplateImpl::setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement )
- throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception)
+void SAL_CALL XMLSignatureTemplateImpl::setTarget( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement )
+ throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
{
targets.push_back( aXmlElement );
}
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL XMLSignatureTemplateImpl::getTargets()
- throw (com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > SAL_CALL XMLSignatureTemplateImpl::getTargets()
+ throw (css::uno::RuntimeException, std::exception)
{
sal_Int32 length = targets.size();
- ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >
- > aTargets (length);
+ css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > aTargets (length);
sal_Int32 i;
@@ -77,28 +75,27 @@ void SAL_CALL XMLSignatureTemplateImpl::setTarget( const ::com::sun::star::uno::
}
void SAL_CALL XMLSignatureTemplateImpl::setBinding(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+ const css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
m_xUriBinding = aUriBinding;
}
-::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding > SAL_CALL XMLSignatureTemplateImpl::getBinding()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::xml::crypto::XUriBinding > SAL_CALL XMLSignatureTemplateImpl::getBinding()
+ throw (css::uno::RuntimeException, std::exception)
{
return m_xUriBinding;
}
void SAL_CALL XMLSignatureTemplateImpl::setStatus(
- ::com::sun::star::xml::crypto::SecurityOperationStatus status )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+ css::xml::crypto::SecurityOperationStatus status )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
m_nStatus = status;
}
-::com::sun::star::xml::crypto::SecurityOperationStatus SAL_CALL XMLSignatureTemplateImpl::getStatus( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::xml::crypto::SecurityOperationStatus SAL_CALL XMLSignatureTemplateImpl::getStatus( )
+ throw (css::uno::RuntimeException, std::exception)
{
return m_nStatus;
}
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
index 0b6544b65690..2f90cbf41584 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
@@ -36,14 +36,14 @@
#include <vector>
class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XXMLSignatureTemplate ,
- ::com::sun::star::lang::XServiceInfo >
+ css::xml::crypto::XXMLSignatureTemplate ,
+ css::lang::XServiceInfo >
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > m_xTemplate;
- std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > targets;
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding > m_xUriBinding;
- ::com::sun::star::xml::crypto::SecurityOperationStatus m_nStatus;
+ css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > m_xTemplate ;
+ std::vector< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > targets;
+ css::uno::Reference< css::xml::crypto::XUriBinding > m_xUriBinding;
+ css::xml::crypto::SecurityOperationStatus m_nStatus;
public:
explicit XMLSignatureTemplateImpl();
@@ -51,53 +51,51 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper<
//Methods from XXMLSignatureTemplate
virtual void SAL_CALL setTemplate(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement
- ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) override;
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
+ ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate(
- ) throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate(
+ ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setTarget(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement
- ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) override;
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
+ ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL getTargets(
- ) throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > SAL_CALL getTargets(
+ ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setBinding(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::crypto::XUriBinding >
+ const css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::xml::crypto::XUriBinding >
SAL_CALL getBinding( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setStatus(
- ::com::sun::star::xml::crypto::SecurityOperationStatus status )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::xml::crypto::SecurityOperationStatus
+ css::xml::crypto::SecurityOperationStatus status )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::xml::crypto::SecurityOperationStatus
SAL_CALL getStatus( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ ) throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
} ;
#endif // _XMLSIGNATURETEMPLATE_XMLSECIMPL_HXX_
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index b0097368d560..30dbede00a1f 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -240,7 +240,7 @@ DocumentSignatureHelper::CreateElementList(
}
}
}
- catch( com::sun::star::io::IOException& )
+ catch( css::io::IOException& )
{
; // Doesn't have to exist...
}
@@ -261,7 +261,7 @@ DocumentSignatureHelper::CreateElementList(
Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
ImplFillElementList(aElements, xSubStore, aSubStorageName+aSep, true, mode);
}
- catch( com::sun::star::io::IOException& )
+ catch( css::io::IOException& )
{
; // Doesn't have to exist...
}
@@ -273,7 +273,7 @@ DocumentSignatureHelper::CreateElementList(
Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
ImplFillElementList(aElements, xSubStore, aSubStorageName+aSep, true, mode);
}
- catch( com::sun::star::io::IOException& )
+ catch( css::io::IOException& )
{
; // Doesn't have to exist...
}
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index aeee71a0bfa8..1a3effb253d0 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -77,7 +77,7 @@ bool XMLSignatureHelper::Init()
DBG_ASSERT( !mxSEInitializer.is(), "XMLSignatureHelper::Init - mxSEInitializer already set!" );
DBG_ASSERT( !mxSecurityContext.is(), "XMLSignatureHelper::Init - mxSecurityContext already set!" );
- mxSEInitializer = com::sun::star::xml::crypto::SEInitializer::create( mxCtx );
+ mxSEInitializer = css::xml::crypto::SEInitializer::create( mxCtx );
if ( mxSEInitializer.is() )
mxSecurityContext = mxSEInitializer->createSecurityContext( OUString() );
@@ -153,7 +153,7 @@ void XMLSignatureHelper::AddForSigning( sal_Int32 nSecurityId, const OUString& u
uno::Reference<xml::sax::XWriter> XMLSignatureHelper::CreateDocumentHandlerWithHeader(
- const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream )
+ const css::uno::Reference< css::io::XOutputStream >& xOutputStream )
{
/*
* get SAX writer component
@@ -185,7 +185,7 @@ uno::Reference<xml::sax::XWriter> XMLSignatureHelper::CreateDocumentHandlerWithH
xSaxWriter->startDocument();
xSaxWriter->startElement(
tag_AllSignatures,
- uno::Reference< com::sun::star::xml::sax::XAttributeList > (pAttributeList));
+ uno::Reference< css::xml::sax::XAttributeList > (pAttributeList));
return xSaxWriter;
}
@@ -252,7 +252,7 @@ bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax
return !mbError;
}
-bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream )
+bool XMLSignatureHelper::ReadAndVerifySignature( const css::uno::Reference< css::io::XInputStream >& xInputStream )
{
mbError = false;
@@ -309,7 +309,7 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe
{
mbError = true;
}
- catch( com::sun::star::io::IOException& )
+ catch( css::io::IOException& )
{
mbError = true;
}
@@ -345,22 +345,22 @@ SignatureInformations XMLSignatureHelper::GetSignatureInformations() const
return mpXSecController->getSignatureInformations();
}
-uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > XMLSignatureHelper::GetSecurityEnvironment()
+uno::Reference< css::xml::crypto::XSecurityEnvironment > XMLSignatureHelper::GetSecurityEnvironment()
{
- return (mxSecurityContext.is()?(mxSecurityContext->getSecurityEnvironment()): uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >());
+ return (mxSecurityContext.is()?(mxSecurityContext->getSecurityEnvironment()): uno::Reference< css::xml::crypto::XSecurityEnvironment >());
}
IMPL_LINK_TYPED( XMLSignatureHelper, SignatureCreationResultListener, XMLSignatureCreationResult&, rResult, void )
{
maCreationResults.insert( maCreationResults.begin() + maCreationResults.size(), rResult );
- if ( rResult.nSignatureCreationResult != com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED )
+ if ( rResult.nSignatureCreationResult != css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED )
mbError = true;
}
IMPL_LINK_TYPED( XMLSignatureHelper, SignatureVerifyResultListener, XMLSignatureVerifyResult&, rResult, void )
{
maVerifyResults.insert( maVerifyResults.begin() + maVerifyResults.size(), rResult );
- if ( rResult.nSignatureVerifyResult != com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED )
+ if ( rResult.nSignatureVerifyResult != css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED )
mbError = true;
}
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 314079510efa..9fcf9ab5dfd3 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -51,15 +51,15 @@ void ImplXMLSignatureListener::setNextHandler(
m_xNextHandler = xNextHandler;
}
-void SAL_CALL ImplXMLSignatureListener::signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
- throw (com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ImplXMLSignatureListener::signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
+ throw (css::uno::RuntimeException, std::exception)
{
XMLSignatureCreationResult aResult( securityId, nResult );
maCreationResultListenerListener.Call( aResult );
}
-void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
- throw (com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
+ throw (css::uno::RuntimeException, std::exception)
{
XMLSignatureVerifyResult aResult( securityId, nResult );
maVerifyResultListenerListener.Call( aResult );
@@ -67,7 +67,7 @@ void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId,
// XDocumentHandler
void SAL_CALL ImplXMLSignatureListener::startDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
{
if (m_xNextHandler.is())
{
@@ -76,7 +76,7 @@ void SAL_CALL ImplXMLSignatureListener::startDocument( )
}
void SAL_CALL ImplXMLSignatureListener::endDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
{
if (m_xNextHandler.is())
{
@@ -85,7 +85,7 @@ void SAL_CALL ImplXMLSignatureListener::endDocument( )
}
void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
{
if ( aName == "Signature" )
{
@@ -99,7 +99,7 @@ void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, con
}
void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
{
if (m_xNextHandler.is())
{
@@ -108,7 +108,7 @@ void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName )
}
void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
{
if (m_xNextHandler.is())
{
@@ -117,7 +117,7 @@ void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars )
}
void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWhitespaces )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
{
if (m_xNextHandler.is())
{
@@ -126,7 +126,7 @@ void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWh
}
void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& aTarget, const OUString& aData )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
{
if (m_xNextHandler.is())
{
@@ -134,8 +134,8 @@ void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& a
}
}
-void SAL_CALL ImplXMLSignatureListener::setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ImplXMLSignatureListener::setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
{
if (m_xNextHandler.is())
{
@@ -149,7 +149,7 @@ UriBindingHelper::UriBindingHelper()
{
}
-UriBindingHelper::UriBindingHelper( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage )
+UriBindingHelper::UriBindingHelper( const css::uno::Reference < css::embed::XStorage >& rxStorage )
{
mxStorage = rxStorage;
}
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
index cf5de060d7d8..f8d3d5b5429a 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
@@ -42,9 +42,9 @@ namespace embed {
class ImplXMLSignatureListener : public cppu::WeakImplHelper
<
- com::sun::star::xml::crypto::sax::XSignatureCreationResultListener,
- com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener,
- com::sun::star::xml::sax::XDocumentHandler
+ css::xml::crypto::sax::XSignatureCreationResultListener,
+ css::xml::crypto::sax::XSignatureVerifyResultListener,
+ css::xml::sax::XDocumentHandler
>
{
private:
@@ -52,8 +52,8 @@ private:
Link<XMLSignatureVerifyResult&,void> maVerifyResultListenerListener;
Link<LinkParamNone*,void> maStartVerifySignatureElementListener;
- com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler > m_xNextHandler;
+ css::uno::Reference<
+ css::xml::sax::XDocumentHandler > m_xNextHandler;
public:
ImplXMLSignatureListener(const Link<XMLSignatureCreationResult&,void>& rCreationResultListenerListener,
@@ -61,64 +61,60 @@ public:
const Link<LinkParamNone*, void>& rStartVerifySignatureElement);
virtual ~ImplXMLSignatureListener();
- void setNextHandler(com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler > xNextHandler);
+ void setNextHandler(css::uno::Reference< css::xml::sax::XDocumentHandler > xNextHandler);
- // com::sun::star::xml::crypto::sax::XSignatureCreationResultListener
- virtual void SAL_CALL signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus creationResult )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::xml::crypto::sax::XSignatureCreationResultListener
+ virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus creationResult )
+ throw (css::uno::RuntimeException, std::exception) override;
- // com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener
- virtual void SAL_CALL signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus verifyResult )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::xml::crypto::sax::XSignatureVerifyResultListener
+ virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus verifyResult )
+ throw (css::uno::RuntimeException, std::exception) override;
- // com::sun::star::xml::sax::XDocumentHandler
- virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::xml::sax::XDocumentHandler
+ virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endElement( const OUString& aName )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
};
// XUriBinding
-class UriBindingHelper : public cppu::WeakImplHelper
-<
- com::sun::star::xml::crypto::XUriBinding
->
+class UriBindingHelper : public cppu::WeakImplHelper< css::xml::crypto::XUriBinding >
{
private:
- com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorage;
+ css::uno::Reference < css::embed::XStorage > mxStorage;
public:
UriBindingHelper();
- explicit UriBindingHelper( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage );
+ explicit UriBindingHelper( const css::uno::Reference < css::embed::XStorage >& rxStorage );
- void SAL_CALL setUriBinding( const OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream )
- throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setUriBinding( const OUString& uri, const css::uno::Reference< css::io::XInputStream >& aInputStream )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri )
- throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- static com::sun::star::uno::Reference < com::sun::star::io::XInputStream > OpenInputStream( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStore, const OUString& rURI );
+ static css::uno::Reference < css::io::XInputStream > OpenInputStream( const css::uno::Reference < css::embed::XStorage >& rxStore, const OUString& rURI );
};
#endif // INCLUDED_XMLSECURITY_SOURCE_HELPER_XMLSIGNATUREHELPER2_HXX
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index f0271b81a67c..b9f21ec33cd0 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -399,7 +399,7 @@ void XSecController::initializeSAXChain()
chainOff();
}
-cssu::Reference< com::sun::star::io::XInputStream >
+cssu::Reference< css::io::XInputStream >
XSecController::getObjectInputStream( const OUString& objectURL )
/****** XSecController/getObjectInputStream ************************************
*
@@ -416,7 +416,7 @@ cssu::Reference< com::sun::star::io::XInputStream >
* xInputStream - the XInputStream interface
******************************************************************************/
{
- cssu::Reference< com::sun::star::io::XInputStream > xObjectInputStream;
+ cssu::Reference< css::io::XInputStream > xObjectInputStream;
DBG_ASSERT( m_xUriBinding.is(), "Need XUriBinding!" );
@@ -925,8 +925,8 @@ void SAL_CALL XSecController::bufferStatusChanged( sal_Bool /*isBufferEmpty*/)
/*
* XSignatureCreationResultListener
*/
-void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
- throw (com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
+ throw (css::uno::RuntimeException, std::exception)
{
int index = findSignatureInfor(securityId);
assert(index != -1 && "Signature Not Found!");
@@ -937,8 +937,8 @@ void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, com::sun::
/*
* XSignatureVerifyResultListener
*/
-void SAL_CALL XSecController::signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
- throw (com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL XSecController::signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
+ throw (css::uno::RuntimeException, std::exception)
{
int index = findSignatureInfor(securityId);
assert(index != -1 && "Signature Not Found!");
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 36f6dc2e9e8b..4f124a2dc07e 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -131,16 +131,13 @@ class InternalSignatureInformation
public:
SignatureInformation signatureInfor;
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener >
- xReferenceResolvedListener;
+ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > xReferenceResolvedListener;
::std::vector< sal_Int32 > vKeeperIds;
InternalSignatureInformation(
sal_Int32 nId,
- com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XReferenceResolvedListener >
- xListener)
+ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > xListener)
:signatureInfor(nId)
{
xReferenceResolvedListener = xListener;
@@ -156,11 +153,11 @@ public:
class XSecController : public cppu::WeakImplHelper
<
- com::sun::star::xml::crypto::sax::XSecurityController,
- //com::sun::star::beans::XFastPropertySet,
- com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener,
- com::sun::star::xml::crypto::sax::XSignatureCreationResultListener,
- com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener
+ css::xml::crypto::sax::XSecurityController,
+ //css::beans::XFastPropertySet,
+ css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener,
+ css::xml::crypto::sax::XSignatureCreationResultListener,
+ css::xml::crypto::sax::XSignatureVerifyResultListener
>
/****** XSecController.hxx/CLASS XSecController *******************************
*
@@ -181,31 +178,27 @@ class XSecController : public cppu::WeakImplHelper
friend class OOXMLSecParser;
private:
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext> mxCtx;
+ css::uno::Reference< css::uno::XComponentContext> mxCtx;
/*
* used to buffer SAX events
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLDocumentWrapper > m_xXMLDocumentWrapper;
+ css::uno::Reference< css::xml::wrapper::XXMLDocumentWrapper > m_xXMLDocumentWrapper;
/*
* the SAX events keeper
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper > m_xSAXEventKeeper;
+ css::uno::Reference< css::xml::crypto::sax::XSecuritySAXEventKeeper > m_xSAXEventKeeper;
/*
* the bridge component which creates/verifies signature
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSignature > m_xXMLSignature;
+ css::uno::Reference< css::xml::crypto::XXMLSignature > m_xXMLSignature;
/*
* the Security Context
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSecurityContext > m_xSecurityContext;
+ css::uno::Reference< css::xml::crypto::XXMLSecurityContext > m_xSecurityContext;
/*
* the security id incrementer, in order to make any security id unique
@@ -227,8 +220,7 @@ private:
* and importing, and there is no other common interface they
* can provided.
*/
- com::sun::star::uno::Reference<
- com::sun::star::uno::XInterface > m_xPreviousNodeOnSAXChain;
+ css::uno::Reference< css::uno::XInterface > m_xPreviousNodeOnSAXChain;
/*
* whether the previous node can provide an XInitialize interface,
* use this variable in order to typecast the XInterface to the
@@ -240,8 +232,7 @@ private:
* the next node on the SAX chain.
* it can always provide an XDocumentHandler interface.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler > m_xNextNodeOnSAXChain;
+ css::uno::Reference< css::xml::sax::XDocumentHandler > m_xNextNodeOnSAXChain;
/*
* the ElementStackKeeper is used to reserve the key SAX events.
@@ -279,8 +270,7 @@ private:
* startElement(<D>), endElement(<D>), endElement(<C>),
* endElement(<A>).
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XElementStackKeeper > m_xElementStackKeeper;
+ css::uno::Reference< css::xml::crypto::sax::XElementStackKeeper > m_xElementStackKeeper;
/*
* a flag representing whether the SAXEventKeeper is now on the
@@ -339,8 +329,7 @@ public:
/*
* An xUriBinding is provided to map Uris to XInputStream interfaces.
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XUriBinding > m_xUriBinding;
+ css::uno::Reference< css::xml::crypto::XUriBinding > m_xUriBinding;
private:
@@ -354,8 +343,7 @@ private:
void checkChainingStatus();
void initializeSAXChain();
- com::sun::star::uno::Reference<
- com::sun::star::io::XInputStream > getObjectInputStream( const OUString& objectURL );
+ css::uno::Reference< css::io::XInputStream > getObjectInputStream( const OUString& objectURL );
//sal_Int32 getFastPropertyIndex(sal_Int32 nHandle) const;
@@ -363,8 +351,7 @@ private:
* For signature generation
*/
static OUString createId();
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToWrite(
+ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToWrite(
InternalSignatureInformation& signatureInfo, sal_Int32 nStorageFormat = 0 );
/*
@@ -393,28 +380,24 @@ private:
void setId( OUString& ouId );
void setPropertyId( OUString& ouPropertyId );
- com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToRead(
+ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToRead(
sal_Int32 nSecurityId );
public:
- explicit XSecController(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rxCtx);
+ explicit XSecController(const css::uno::Reference<css::uno::XComponentContext>& rxCtx);
virtual ~XSecController();
sal_Int32 getNewSecurityId( );
- void startMission( const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XUriBinding >& xUriBinding,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSecurityContext >& xSecurityContext );
+ void startMission( const css::uno::Reference<
+ css::xml::crypto::XUriBinding >& xUriBinding,
+ const css::uno::Reference<
+ css::xml::crypto::XXMLSecurityContext >& xSecurityContext );
void setSAXChainConnector(
- const com::sun::star::uno::Reference<
- com::sun::star::lang::XInitialization >& xInitialization,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::sax::XElementStackKeeper >& xElementStackKeeper);
+ const css::uno::Reference< css::lang::XInitialization >& xInitialization,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler,
+ const css::uno::Reference< css::xml::crypto::sax::XElementStackKeeper >& xElementStackKeeper);
void clearSAXChainConnector();
void endMission();
@@ -423,8 +406,7 @@ public:
SignatureInformations getSignatureInformations() const;
static void exportSignature(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler,
const SignatureInformation& signatureInfo );
@@ -469,20 +451,18 @@ public:
void setDate(
sal_Int32 nSecurityId,
- const ::com::sun::star::util::DateTime& rDateTime );
+ const css::util::DateTime& rDateTime );
void setDescription(sal_Int32 nSecurityId, const OUString& rDescription);
-
bool WriteSignature(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler );
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler );
/*
* For signature verification
*/
void collectToVerify( const OUString& referenceId );
void addSignature( sal_Int32 nSignatureId );
- com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > createSignatureReader(sal_Int32 nType = 0);
+ css::uno::Reference< css::xml::sax::XDocumentHandler > createSignatureReader(sal_Int32 nType = 0);
void releaseSignatureReader();
public:
@@ -502,24 +482,24 @@ public:
* XSAXEventKeeperStatusChangeListener
*/
virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL collectionStatusChanged(
sal_Bool isInsideCollectedElement )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL bufferStatusChanged( sal_Bool isBufferEmpty )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/*
* XSignatureCreationResultListener
*/
- virtual void SAL_CALL signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
+ throw (css::uno::RuntimeException, std::exception) override;
/*
* XSignatureVerifyResultListener
*/
- virtual void SAL_CALL signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
+ throw (css::uno::RuntimeException, std::exception) override;
/// Writes XML elements inside a single OOXML signature's <Signature> element.
bool WriteOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::xml::sax::XDocumentHandler>& xDocumentHandler);
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index 92ec43608651..1b0bf766b9ec 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -31,8 +31,8 @@
class XSecParser: public cppu::WeakImplHelper
<
- com::sun::star::xml::sax::XDocumentHandler,
- com::sun::star::lang::XInitialization
+ css::xml::sax::XDocumentHandler,
+ css::lang::XInitialization
>
/****** XSecController.hxx/CLASS XSecParser ***********************************
*
@@ -82,8 +82,8 @@ private:
/*
* the next XDocumentHandler on the SAX chain
*/
- com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler > m_xNextHandler;
+ css::uno::Reference<
+ css::xml::sax::XDocumentHandler > m_xNextHandler;
/*
* this string is used to remember the current handled reference's URI,
@@ -96,55 +96,55 @@ private:
bool m_bReferenceUnresolved;
private:
- static OUString getIdAttr(const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XAttributeList >& xAttribs );
+ static OUString getIdAttr(const css::uno::Reference<
+ css::xml::sax::XAttributeList >& xAttribs );
public:
XSecParser( XSecController* pXSecController,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler >& xNextHandler );
+ const css::uno::Reference<
+ css::xml::sax::XDocumentHandler >& xNextHandler );
virtual ~XSecParser(){};
/*
* XDocumentHandler
*/
virtual void SAL_CALL startDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startElement(
const OUString& aName,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XAttributeList >& xAttribs )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList >& xAttribs )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endElement( const OUString& aName )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL processingInstruction(
const OUString& aTarget,
const OUString& aData )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XLocator >& xLocator )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference<
+ css::xml::sax::XLocator >& xLocator )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
/*
* XInitialization
*/
virtual void SAL_CALL initialize(
- const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
- throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index 92274a7d20a8..44898669e1ed 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -153,7 +153,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
{
const SignatureReferenceInformation& refInfor = vReferenceInfors[i];
- cssu::Reference< com::sun::star::io::XInputStream > xInputStream
+ cssu::Reference< css::io::XInputStream > xInputStream
= getObjectInputStream( refInfor.ouURI );
if (xInputStream.is())
@@ -266,7 +266,7 @@ void XSecController::setX509Certificate(
void XSecController::setDate(
sal_Int32 nSecurityId,
- const ::com::sun::star::util::DateTime& rDateTime )
+ const css::util::DateTime& rDateTime )
{
int index = findSignatureInfor( nSecurityId );
@@ -354,7 +354,7 @@ bool XSecController::WriteSignature(
{
m_pErrorMessage = ERROR_SAXEXCEPTIONDURINGCREATION;
}
- catch( com::sun::star::io::IOException& )
+ catch( css::io::IOException& )
{
m_pErrorMessage = ERROR_IOEXCEPTIONDURINGCREATION;
}
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index bef6fa706945..8ca52f53d9d8 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -143,7 +143,7 @@ void XSecController::addStreamReference(
/*
* get the input stream
*/
- cssu::Reference< com::sun::star::io::XInputStream > xObjectInputStream
+ cssu::Reference< css::io::XInputStream > xObjectInputStream
= getObjectInputStream( ouUri );
if ( xObjectInputStream.is() )
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
index 93f25448ba79..c62648f120f6 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
@@ -38,15 +38,15 @@ CertificateExtension_XmlSecImpl::~CertificateExtension_XmlSecImpl() {
//Methods from XCertificateExtension
-sal_Bool SAL_CALL CertificateExtension_XmlSecImpl::isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+sal_Bool SAL_CALL CertificateExtension_XmlSecImpl::isCritical() throw( css::uno::RuntimeException, std::exception ) {
return m_critical ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl::getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl::getExtensionId() throw( css::uno::RuntimeException, std::exception ) {
return m_xExtnId ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl::getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl::getExtensionValue() throw( css::uno::RuntimeException, std::exception ) {
return m_xExtnValue ;
}
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
index 0b2318d7317d..0fcbca1a0a83 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
@@ -29,23 +29,23 @@
#include <com/sun/star/security/XCertificateExtension.hpp>
class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::security::XCertificateExtension >
+ css::security::XCertificateExtension >
{
private:
bool m_critical ;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnId ;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ;
+ css::uno::Sequence< sal_Int8 > m_xExtnId ;
+ css::uno::Sequence< sal_Int8 > m_xExtnValue ;
public:
CertificateExtension_XmlSecImpl() ;
virtual ~CertificateExtension_XmlSecImpl() ;
//Methods from XCertificateExtension
- virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual sal_Bool SAL_CALL isCritical() throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( css::uno::RuntimeException, std::exception ) override ;
void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical ) ;
} ;
diff --git a/xmlsecurity/source/xmlsec/errorcallback.hxx b/xmlsecurity/source/xmlsec/errorcallback.hxx
index 2a96da122c8a..61f23aaa6b0e 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.hxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.hxx
@@ -27,7 +27,7 @@
// Only used for logging
void setErrorRecorder();
//ToDo
-//void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& xTemplate);
+//void setErrorRecorder(const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& xTemplate);
void clearErrorRecorder();
#endif
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
index f9988da073d6..63f3f8a5ee4e 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
@@ -45,20 +45,20 @@ SanExtensionImpl::~SanExtensionImpl() {
//Methods from XCertificateExtension
-sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( ::com::sun::star::uno::RuntimeException ) {
+sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( css::uno::RuntimeException ) {
return m_critical ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() throw( ::com::sun::star::uno::RuntimeException ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() throw( css::uno::RuntimeException ) {
return m_xExtnId ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() throw( ::com::sun::star::uno::RuntimeException ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() throw( css::uno::RuntimeException ) {
return m_xExtnValue ;
}
//Methods from XSanExtension
-::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException ){
+css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( css::uno::RuntimeException ){
if (!m_Entries.hasElements())
{
@@ -77,7 +77,7 @@ sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( ::com::sun::star::uno::R
arrCertAltNameEntry[i].Type = ExtAltNameType_OTHER_NAME;
PCERT_OTHER_NAME pOtherName = pEntry->pOtherName;
- ::com::sun::star::beans::NamedValue otherNameProp;
+ css::beans::NamedValue otherNameProp;
otherNameProp.Name = OUString::createFromAscii(pOtherName->pszObjId);
Sequence< sal_Int8 > otherName( pOtherName->Value.cbData ) ;
@@ -123,7 +123,7 @@ sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( ::com::sun::star::uno::R
break;
}
}
- m_Entries = ::comphelper::arrayToSequence< com::sun::star::security::CertAltNameEntry >(arrCertAltNameEntry, subjectName->cAltEntry);
+ m_Entries = ::comphelper::arrayToSequence< css::security::CertAltNameEntry >(arrCertAltNameEntry, subjectName->cAltEntry);
delete [] arrCertAltNameEntry;
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
index c88a68ac9200..5bd90dcfbea6 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
@@ -39,29 +39,29 @@
#include <com/sun/star/security/CertAltNameEntry.hpp>
class SanExtensionImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::security::XSanExtension >
+ css::security::XSanExtension >
{
private:
sal_Bool m_critical ;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnId ;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ;
+ css::uno::Sequence< sal_Int8 > m_xExtnId ;
+ css::uno::Sequence< sal_Int8 > m_xExtnValue ;
- ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > m_Entries;
+ css::uno::Sequence< css::security::CertAltNameEntry > m_Entries;
public:
SanExtensionImpl() ;
virtual ~SanExtensionImpl() ;
//Methods from XCertificateExtension
- virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual sal_Bool SAL_CALL isCritical() throw( css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( css::uno::RuntimeException ) ;
//Methods from XSanExtension
- virtual ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( css::uno::RuntimeException ) ;
//Helper method
void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index f78eeaa07afc..2717d1c6d118 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -247,11 +247,11 @@ SecurityEnvironment_MSCryptImpl* SecurityEnvironment_MSCryptImpl::getImplementat
}
/* Native methods */
-HCRYPTPROV SecurityEnvironment_MSCryptImpl::getCryptoProvider() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
+HCRYPTPROV SecurityEnvironment_MSCryptImpl::getCryptoProvider() throw( css::uno::Exception , css::uno::RuntimeException ) {
return m_hProv ;
}
-void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) throw( css::uno::Exception , css::uno::RuntimeException ) {
if( m_hProv != NULL ) {
CryptReleaseContext( m_hProv, 0 ) ;
m_hProv = NULL ;
@@ -262,11 +262,11 @@ void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) thro
}
}
-LPCTSTR SecurityEnvironment_MSCryptImpl::getKeyContainer() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
+LPCTSTR SecurityEnvironment_MSCryptImpl::getKeyContainer() throw( css::uno::Exception , css::uno::RuntimeException ) {
return m_pszContainer ;
}
-void SecurityEnvironment_MSCryptImpl::setKeyContainer( LPCTSTR aKeyContainer ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setKeyContainer( LPCTSTR aKeyContainer ) throw( css::uno::Exception , css::uno::RuntimeException ) {
//TODO: Don't know whether or not it should be copied.
m_pszContainer = aKeyContainer ;
}
@@ -801,7 +801,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFrom
HCERTSTORE getCertStoreForIntermediatCerts(
- const Sequence< Reference< ::com::sun::star::security::XCertificate > >& seqCerts)
+ const Sequence< Reference< css::security::XCertificate > >& seqCerts)
{
HCERTSTORE store = NULL;
store = CertOpenStore(
@@ -829,9 +829,9 @@ HCERTSTORE getCertStoreForIntermediatCerts(
//errors occur. See also
//http://wiki.openoffice.org/wiki/Certificate_Path_Validation#Validation_status
sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate(
- const Reference< ::com::sun::star::security::XCertificate >& aCert,
- const Sequence< Reference< ::com::sun::star::security::XCertificate > >& seqCerts)
- throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException )
+ const Reference< css::security::XCertificate >& aCert,
+ const Sequence< Reference< css::security::XCertificate > >& seqCerts)
+ throw( css::uno::SecurityException, css::uno::RuntimeException )
{
sal_Int32 validity = 0;
PCCERT_CHAIN_CONTEXT pChainContext = NULL;
@@ -958,7 +958,7 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate(
&& pChainContext->rgpChain[0]->TrustStatus.dwErrorStatus == CERT_TRUST_NO_ERROR)
{
SAL_INFO("xmlsecurity.xmlsec", "Certificate is valid.");
- validity = ::com::sun::star::security::CertificateValidity::VALID;
+ validity = css::security::CertificateValidity::VALID;
}
else
{
@@ -969,14 +969,14 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate(
{
//valid and revocation information available
SAL_INFO("xmlsecurity.xmlsec", "Certificate is valid.");
- validity = ::com::sun::star::security::CertificateValidity::VALID;
+ validity = css::security::CertificateValidity::VALID;
}
}
else
{
//invalid
SAL_INFO("xmlsecurity.xmlsec", "Certificate is invalid.");
- validity = ::com::sun::star::security::CertificateValidity::INVALID ;
+ validity = css::security::CertificateValidity::INVALID ;
}
}
else
@@ -1000,7 +1000,7 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate(
return validity ;
}
-sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& aCert ) throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException ) {
+sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& aCert ) throw( css::uno::SecurityException, css::uno::RuntimeException ) {
sal_Int32 characters ;
PCCERT_CONTEXT pCertContext ;
const X509Certificate_MSCryptImpl* xcert ;
@@ -1021,9 +1021,9 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const ::com
//Firstly, make sentence whether or not the cert is self-signed.
if( CertCompareCertificateName( X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, &(pCertContext->pCertInfo->Subject), &(pCertContext->pCertInfo->Issuer) ) ) {
- characters |= ::com::sun::star::security::CertificateCharacters::SELF_SIGNED ;
+ characters |= css::security::CertificateCharacters::SELF_SIGNED ;
} else {
- characters &= ~ ::com::sun::star::security::CertificateCharacters::SELF_SIGNED ;
+ characters &= ~ css::security::CertificateCharacters::SELF_SIGNED ;
}
//Secondly, make sentence whether or not the cert has a private key.
@@ -1038,12 +1038,12 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const ::com
&( dwKeySpec ) ,
&( fCallerFreeProv ) )
) {
- characters |= ::com::sun::star::security::CertificateCharacters::HAS_PRIVATE_KEY ;
+ characters |= css::security::CertificateCharacters::HAS_PRIVATE_KEY ;
if( hProv != NULL && fCallerFreeProv )
CryptReleaseContext( hProv, 0 ) ;
} else {
- characters &= ~ ::com::sun::star::security::CertificateCharacters::HAS_PRIVATE_KEY ;
+ characters &= ~ css::security::CertificateCharacters::HAS_PRIVATE_KEY ;
}
}
return characters ;
@@ -1071,7 +1071,7 @@ X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cert )
return xcert ;
}
-OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
+OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( css::uno::RuntimeException )
{
return OUString("Microsoft Crypto API");
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index e3b2c3121fb1..ddb812bc5292 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -51,9 +51,9 @@
class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XSecurityEnvironment ,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::lang::XUnoTunnel >
+ css::xml::crypto::XSecurityEnvironment ,
+ css::lang::XServiceInfo,
+ css::lang::XUnoTunnel >
{
private:
//crypto provider and key container
@@ -81,108 +81,108 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper<
std::list< HCRYPTKEY > m_tPriKeyList ;
//Service manager
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ;
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceManager ;
public:
- explicit SecurityEnvironment_MSCryptImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aFactory ) ;
+ explicit SecurityEnvironment_MSCryptImpl( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory ) ;
virtual ~SecurityEnvironment_MSCryptImpl() ;
//Methods from XSecurityEnvironment
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates()
- throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates()
+ throw( css::uno::SecurityException , css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate(
+ virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate(
const OUString& issuerName,
- const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber )
- throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
+ const css::uno::Sequence< sal_Int8 >& serialNumber )
+ throw( css::uno::SecurityException , css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate(
+ virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate(
const OUString& issuerName,
const OUString& serialNumber )
- throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
+ throw( css::uno::SecurityException , css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath(
- const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& beginCert )
- throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL buildCertificatePath(
+ const css::uno::Reference< css::security::XCertificate >& beginCert )
+ throw( css::uno::SecurityException , css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromRaw(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& rawCertificate )
- throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromRaw(
+ const css::uno::Sequence< sal_Int8 >& rawCertificate )
+ throw( css::uno::SecurityException , css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii(
+ virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromAscii(
const OUString& asciiCertificate )
- throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
+ throw( css::uno::SecurityException , css::uno::RuntimeException ) ;
virtual ::sal_Int32 SAL_CALL verifyCertificate(
- const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
- ::com::sun::star::security::XCertificate > >& intermediateCertificates)
- throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException) ;
+ const css::uno::Reference< css::security::XCertificate >& xCert,
+ const css::uno::Sequence< css::uno::Reference<
+ css::security::XCertificate > >& intermediateCertificates)
+ throw (css::uno::SecurityException, css::uno::RuntimeException) ;
virtual ::sal_Int32 SAL_CALL getCertificateCharacters(
- const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert )
- throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException) ;
+ const css::uno::Reference< css::security::XCertificate >& xCert )
+ throw (css::uno::SecurityException, css::uno::RuntimeException) ;
virtual OUString SAL_CALL getSecurityEnvironmentInformation( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ ) throw( css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager )
- throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager )
+ throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory(
+ const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
//Methods from XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
+ throw (css::uno::RuntimeException);
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
- static SecurityEnvironment_MSCryptImpl* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rObj ) ;
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
+ static SecurityEnvironment_MSCryptImpl* getImplementation( const css::uno::Reference< css::uno::XInterface >& rObj ) ;
//Native methods
- virtual HCRYPTPROV getCryptoProvider() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- virtual void setCryptoProvider( HCRYPTPROV aProv ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual HCRYPTPROV getCryptoProvider() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ virtual void setCryptoProvider( HCRYPTPROV aProv ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- virtual LPCTSTR getKeyContainer() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- virtual void setKeyContainer( LPCTSTR aKeyContainer ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual LPCTSTR getKeyContainer() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ virtual void setKeyContainer( LPCTSTR aKeyContainer ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- virtual HCERTSTORE getCryptoSlot() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- virtual void setCryptoSlot( HCERTSTORE aKeyStore ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual HCERTSTORE getCryptoSlot() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ virtual void setCryptoSlot( HCERTSTORE aKeyStore ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- virtual HCERTSTORE getCertDb() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- virtual void setCertDb( HCERTSTORE aCertDb ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual HCERTSTORE getCertDb() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ virtual void setCertDb( HCERTSTORE aCertDb ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- virtual void adoptSymKey( HCRYPTKEY aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- virtual HCRYPTKEY getSymKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual void adoptSymKey( HCRYPTKEY aSymKey ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ virtual HCRYPTKEY getSymKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- virtual HCRYPTKEY getPubKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual HCRYPTKEY getPubKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- virtual HCRYPTKEY getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual HCRYPTKEY getPriKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- virtual void enableDefaultCrypt( sal_Bool enable ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- virtual sal_Bool defaultEnabled() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual void enableDefaultCrypt( sal_Bool enable ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ virtual sal_Bool defaultEnabled() throw( css::uno::Exception , css::uno::RuntimeException ) ;
//Native methods
- virtual xmlSecKeysMngrPtr createKeysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual xmlSecKeysMngrPtr createKeysManager() throw( css::uno::Exception , css::uno::RuntimeException ) ;
- virtual void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( css::uno::Exception , css::uno::RuntimeException ) ;
} ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SECURITYENVIRONMENT_MSCRYPTIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
index a0f368b92ab7..1ffd04ff2f06 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
@@ -32,8 +32,8 @@
class SEInitializer_MSCryptImpl : public cppu::WeakImplHelper
<
- com::sun::star::xml::crypto::XSEInitializer,
- com::sun::star::lang::XServiceInfo
+ css::xml::crypto::XSEInitializer,
+ css::lang::XServiceInfo
>
/****** SEInitializer_MSCryptImpl.hxx/CLASS SEInitializer_MSCryptImpl ***********
*
@@ -48,45 +48,44 @@ class SEInitializer_MSCryptImpl : public cppu::WeakImplHelper
******************************************************************************/
{
private:
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
public:
- explicit SEInitializer_MSCryptImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > &rxContext);
+ explicit SEInitializer_MSCryptImpl(const css::uno::Reference< css::uno::XComponentContext > &rxContext);
virtual ~SEInitializer_MSCryptImpl();
/* XSEInitializer */
- virtual com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSecurityContext >
+ virtual css::uno::Reference< css::xml::crypto::XXMLSecurityContext >
SAL_CALL createSecurityContext( const OUString& certDB )
- throw (com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
- virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSecurityContext >& securityContext )
- throw (com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL freeSecurityContext( const css::uno::Reference<
+ css::xml::crypto::XXMLSecurityContext >& securityContext )
+ throw (css::uno::RuntimeException);
/* XServiceInfo */
virtual OUString SAL_CALL getImplementationName( )
- throw (com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (com::sun::star::uno::RuntimeException);
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException);
};
OUString SEInitializer_MSCryptImpl_getImplementationName()
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const OUString& ServiceName )
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( )
- throw ( com::sun::star::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( )
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL SEInitializer_MSCryptImpl_createInstance( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr)
- throw ( com::sun::star::uno::Exception );
+css::uno::Reference< css::uno::XInterface >
+SAL_CALL SEInitializer_MSCryptImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index af5abeac4d38..7e27dafd008d 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -177,7 +177,7 @@ X509Certificate_MSCryptImpl::~X509Certificate_MSCryptImpl() {
}
//Methods from XCertificate
-sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() throw ( ::com::sun::star::uno::RuntimeException) {
+sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() throw ( css::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
return ( char )m_pCertContext->pCertInfo->dwVersion ;
} else {
@@ -185,7 +185,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() throw ( ::com::sun:
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSerialNumber() throw ( ::com::sun::star::uno::RuntimeException) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSerialNumber() throw ( css::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
Sequence< sal_Int8 > serial( m_pCertContext->pCertInfo->SerialNumber.cbData ) ;
for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->SerialNumber.cbData ; i ++ )
@@ -197,7 +197,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() throw ( ::com::sun:
}
}
-OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) {
+OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() throw ( css::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
DWORD cbIssuer ;
@@ -243,7 +243,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() throw ( ::com::su
}
}
-OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( css::uno::RuntimeException)
{
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
{
@@ -287,7 +287,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::s
}
}
-::com::sun::star::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidBefore() throw ( ::com::sun::star::uno::RuntimeException ) {
+css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidBefore() throw ( css::uno::RuntimeException ) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
SYSTEMTIME explTime ;
DateTime dateTime ;
@@ -313,7 +313,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::s
}
}
-::com::sun::star::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidAfter() throw ( ::com::sun::star::uno::RuntimeException) {
+css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidAfter() throw ( css::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
SYSTEMTIME explTime ;
DateTime dateTime ;
@@ -339,7 +339,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::s
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getIssuerUniqueID() throw ( ::com::sun::star::uno::RuntimeException) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getIssuerUniqueID() throw ( css::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
Sequence< sal_Int8 > issuerUid( m_pCertContext->pCertInfo->IssuerUniqueId.cbData ) ;
for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->IssuerUniqueId.cbData; i ++ )
@@ -351,7 +351,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::s
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectUniqueID() throw ( ::com::sun::star::uno::RuntimeException ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectUniqueID() throw ( css::uno::RuntimeException ) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
Sequence< sal_Int8 > subjectUid( m_pCertContext->pCertInfo->SubjectUniqueId.cbData ) ;
for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->SubjectUniqueId.cbData; i ++ )
@@ -363,7 +363,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::s
}
}
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL X509Certificate_MSCryptImpl::getExtensions() throw ( ::com::sun::star::uno::RuntimeException ) {
+css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_MSCryptImpl::getExtensions() throw ( css::uno::RuntimeException ) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL && m_pCertContext->pCertInfo->cExtension != 0 ) {
CertificateExtension_XmlSecImpl* xExtn ;
Sequence< Reference< XCertificateExtension > > xExtns( m_pCertContext->pCertInfo->cExtension ) ;
@@ -392,7 +392,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::s
}
}
-::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL X509Certificate_MSCryptImpl::findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*oid*/ ) throw (::com::sun::star::uno::RuntimeException) {
+css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_MSCryptImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& /*oid*/ ) throw (css::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL && m_pCertContext->pCertInfo->cExtension != 0 ) {
CertificateExtension_XmlSecImpl* xExtn ;
@@ -417,7 +417,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::s
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getEncoded() throw ( ::com::sun::star::uno::RuntimeException) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getEncoded() throw ( css::uno::RuntimeException) {
if( m_pCertContext != NULL && m_pCertContext->cbCertEncoded > 0 ) {
Sequence< sal_Int8 > rawCert( m_pCertContext->cbCertEncoded ) ;
@@ -450,7 +450,7 @@ const CERT_CONTEXT* X509Certificate_MSCryptImpl::getMswcryCert() const {
}
}
-void X509Certificate_MSCryptImpl::setRawCert( Sequence< sal_Int8 > rawCert ) throw ( ::com::sun::star::uno::RuntimeException) {
+void X509Certificate_MSCryptImpl::setRawCert( Sequence< sal_Int8 > rawCert ) throw ( css::uno::RuntimeException) {
if( m_pCertContext != NULL ) {
CertFreeCertificateContext( m_pCertContext ) ;
m_pCertContext = NULL ;
@@ -504,7 +504,7 @@ OUString findOIDDescription(char *oid)
return OUString() ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > getThumbprint(const CERT_CONTEXT* pCertContext, DWORD dwPropId)
+css::uno::Sequence< sal_Int8 > getThumbprint(const CERT_CONTEXT* pCertContext, DWORD dwPropId)
{
if( pCertContext != NULL )
{
@@ -531,7 +531,7 @@ OUString findOIDDescription(char *oid)
}
OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm()
- throw ( ::com::sun::star::uno::RuntimeException)
+ throw ( css::uno::RuntimeException)
{
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
{
@@ -544,8 +544,8 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm()
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyValue()
- throw ( ::com::sun::star::uno::RuntimeException)
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyValue()
+ throw ( css::uno::RuntimeException)
{
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
{
@@ -566,7 +566,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm()
}
OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm()
- throw ( ::com::sun::star::uno::RuntimeException)
+ throw ( css::uno::RuntimeException)
{
if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
{
@@ -584,20 +584,20 @@ uno::Sequence<sal_Int8> X509Certificate_MSCryptImpl::getSHA256Thumbprint() throw
return getThumbprint(m_pCertContext, CERT_SHA256_HASH_PROP_ID);
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSHA1Thumbprint()
- throw ( ::com::sun::star::uno::RuntimeException)
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSHA1Thumbprint()
+ throw ( css::uno::RuntimeException)
{
return getThumbprint(m_pCertContext, CERT_SHA1_HASH_PROP_ID);
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getMD5Thumbprint()
- throw ( ::com::sun::star::uno::RuntimeException)
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getMD5Thumbprint()
+ throw ( css::uno::RuntimeException)
{
return getThumbprint(m_pCertContext, CERT_MD5_HASH_PROP_ID);
}
sal_Int32 SAL_CALL X509Certificate_MSCryptImpl::getCertificateUsage( )
- throw ( ::com::sun::star::uno::RuntimeException)
+ throw ( css::uno::RuntimeException)
{
sal_Int32 usage =
CERT_DATA_ENCIPHERMENT_KEY_USAGE |
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index e83ea6e5f868..54deb32c815c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -39,8 +39,8 @@
#include <certificate.hxx>
class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::security::XCertificate ,
- ::com::sun::star::lang::XUnoTunnel > , public xmlsecurity::Certificate
+ css::security::XCertificate ,
+ css::lang::XUnoTunnel > , public xmlsecurity::Certificate
{
private:
const CERT_CONTEXT* m_pCertContext ;
@@ -50,44 +50,41 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper<
virtual ~X509Certificate_MSCryptImpl() ;
//Methods from XCertificate
- virtual sal_Int16 SAL_CALL getVersion() throw ( ::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int16 SAL_CALL getVersion() throw ( css::uno::RuntimeException) ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber() throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual OUString SAL_CALL getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual OUString SAL_CALL getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidBefore() throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidAfter() throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID() throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL getExtensions() throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getEncoded() throw ( ::com::sun::star::uno::RuntimeException) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber() throw ( css::uno::RuntimeException) ;
+ virtual OUString SAL_CALL getIssuerName() throw ( css::uno::RuntimeException) ;
+ virtual OUString SAL_CALL getSubjectName() throw ( css::uno::RuntimeException) ;
+ virtual css::util::DateTime SAL_CALL getNotValidBefore() throw ( css::uno::RuntimeException) ;
+ virtual css::util::DateTime SAL_CALL getNotValidAfter() throw ( css::uno::RuntimeException) ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() throw ( css::uno::RuntimeException) ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID() throw ( css::uno::RuntimeException) ;
+ virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions() throw ( css::uno::RuntimeException) ;
+ virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException) ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded() throw ( css::uno::RuntimeException) ;
virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm()
- throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
- throw ( ::com::sun::star::uno::RuntimeException) override;
+ throw ( css::uno::RuntimeException) ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
+ throw ( css::uno::RuntimeException) ;
virtual OUString SAL_CALL getSignatureAlgorithm()
- throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
- throw ( ::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint()
- throw ( ::com::sun::star::uno::RuntimeException) override;
+ throw ( css::uno::RuntimeException) ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
+ throw ( css::uno::RuntimeException) ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint()
+ throw ( css::uno::RuntimeException) ;
- virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( ::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( css::uno::RuntimeException) ;
//Methods from XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException);
- /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
- virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() throw (css::uno::RuntimeException, std::exception) override;
-
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
- static X509Certificate_MSCryptImpl* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rObj ) ;
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
+ static X509Certificate_MSCryptImpl* getImplementation( const css::uno::Reference< css::uno::XInterface >& rObj ) ;
//Helper methods
void setMswcryCert( const CERT_CONTEXT* cert ) ;
const CERT_CONTEXT* getMswcryCert() const ;
- void setRawCert( ::com::sun::star::uno::Sequence< sal_Int8 > rawCert ) throw ( ::com::sun::star::uno::RuntimeException) ;
+ void setRawCert( css::uno::Sequence< sal_Int8 > rawCert ) throw ( css::uno::RuntimeException) ;
} ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_X509CERTIFICATE_MSCRYPTIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 3d59737e6ef4..c9cbc7295c86 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -58,8 +58,8 @@ Reference< XXMLEncryptionTemplate >
SAL_CALL XMLEncryption_MSCryptImpl::encrypt(
const Reference< XXMLEncryptionTemplate >& aTemplate ,
const Reference< XSecurityEnvironment >& aEnvironment
-) throw( com::sun::star::xml::crypto::XMLEncryptionException,
- com::sun::star::uno::SecurityException )
+) throw( css::xml::crypto::XMLEncryptionException,
+ css::uno::SecurityException )
{
xmlSecKeysMngrPtr pMngr = NULL ;
xmlSecEncCtxPtr pEncCtx = NULL ;
@@ -165,13 +165,13 @@ SAL_CALL XMLEncryption_MSCryptImpl::encrypt(
//Encrypt the template
if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 ) {
- aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
xmlSecEncCtxDestroy( pEncCtx ) ;
pSecEnv->destroyKeysManager( pMngr );
clearErrorRecorder();
return aTemplate;
}
- aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
xmlSecEncCtxDestroy( pEncCtx ) ;
pSecEnv->destroyKeysManager( pMngr );
@@ -194,8 +194,8 @@ Reference< XXMLEncryptionTemplate > SAL_CALL
XMLEncryption_MSCryptImpl::decrypt(
const Reference< XXMLEncryptionTemplate >& aTemplate ,
const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( com::sun::star::xml::crypto::XMLEncryptionException ,
- com::sun::star::uno::SecurityException) {
+) throw( css::xml::crypto::XMLEncryptionException ,
+ css::uno::SecurityException) {
xmlSecKeysMngrPtr pMngr = NULL ;
xmlSecEncCtxPtr pEncCtx = NULL ;
xmlNodePtr pEncryptedData = NULL ;
@@ -271,7 +271,7 @@ XMLEncryption_MSCryptImpl::decrypt(
//Decrypt the template
if( xmlSecEncCtxDecrypt( pEncCtx , pEncryptedData ) < 0 || pEncCtx->result == NULL ) {
- aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
xmlSecEncCtxDestroy( pEncCtx ) ;
pSecEnv->destroyKeysManager( pMngr );
@@ -279,7 +279,7 @@ XMLEncryption_MSCryptImpl::decrypt(
clearErrorRecorder();
return aTemplate;
}
- aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
#if 0 // This code block has been commented out since 2004,
// but let's keep it here in case it contains some useful hints
// for future work.
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
index cbecf06a40ae..87c9408c7afd 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
@@ -35,48 +35,48 @@
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XXMLEncryption ,
- ::com::sun::star::lang::XServiceInfo >
+ css::xml::crypto::XXMLEncryption ,
+ css::lang::XServiceInfo >
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ;
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceManager ;
public:
explicit XMLEncryption_MSCryptImpl(const css::uno::Reference<css::lang::XMultiServiceFactory>& rFactory);
virtual ~XMLEncryption_MSCryptImpl() ;
//Methods from XXMLEncryption
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate > SAL_CALL encrypt(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aEnvironment)
- // ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- throw ( com::sun::star::xml::crypto::XMLEncryptionException ,
- com::sun::star::uno::SecurityException);
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext
- ) throw( com::sun::star::xml::crypto::XMLEncryptionException ,
- com::sun::star::uno::SecurityException) ;
+ virtual css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate > SAL_CALL encrypt(
+ const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment)
+ // ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ throw ( css::xml::crypto::XMLEncryptionException ,
+ css::uno::SecurityException);
+
+ virtual css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt(
+ const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
+ const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext
+ ) throw( css::xml::crypto::XMLEncryptionException ,
+ css::uno::SecurityException) ;
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ ) throw( css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
} ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_XMLENCRYPTION_MSCRYPTIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 39fa1e2bf235..21dd902b0cfc 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -64,8 +64,8 @@ XMLSecurityContext_MSCryptImpl::~XMLSecurityContext_MSCryptImpl() {
}
sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::addSecurityEnvironment(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment)
- throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException)
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment)
+ throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException)
{
if( !aSecurityEnvironment.is() )
{
@@ -79,14 +79,14 @@ sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::addSecurityEnvironment(
sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentNumber( )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
return 1;
}
-::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
+css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentByIndex( sal_Int32 index )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
if (index == 0)
{
@@ -96,21 +96,21 @@ sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentNumber(
throw RuntimeException() ;
}
-::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
+css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
XMLSecurityContext_MSCryptImpl::getSecurityEnvironment( )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
return m_xSecurityEnvironment;
}
sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::getDefaultSecurityEnvironmentIndex( )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
return 0;
}
void SAL_CALL XMLSecurityContext_MSCryptImpl::setDefaultSecurityEnvironmentIndex( sal_Int32 /*nDefaultEnvIndex*/ )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
//dummy
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
index a51ca82b6b7a..516546221f22 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
@@ -36,12 +36,12 @@
class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XXMLSecurityContext ,
- ::com::sun::star::lang::XServiceInfo >
+ css::xml::crypto::XXMLSecurityContext ,
+ css::lang::XServiceInfo >
{
private:
//xmlSecKeysMngrPtr m_pKeysMngr ;
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment ;
+ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment ;
public:
XMLSecurityContext_MSCryptImpl();
@@ -49,47 +49,47 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper<
//Methods from XXMLSecurityContext
virtual sal_Int32 SAL_CALL addSecurityEnvironment(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment
- ) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException);
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment
+ ) throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
+ virtual css::uno::Reference<
+ css::xml::crypto::XSecurityEnvironment > SAL_CALL
getSecurityEnvironmentByIndex( ::sal_Int32 index )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
+ virtual css::uno::Reference<
+ css::xml::crypto::XSecurityEnvironment > SAL_CALL
getSecurityEnvironment( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ ) throw( css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
} ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 84fb6d2afc14..e350282a3afd 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -55,8 +55,8 @@ Reference< XXMLSignatureTemplate >
SAL_CALL XMLSignature_MSCryptImpl::generate(
const Reference< XXMLSignatureTemplate >& aTemplate ,
const Reference< XSecurityEnvironment >& aEnvironment
-) throw( com::sun::star::xml::crypto::XMLSignatureException,
- com::sun::star::uno::SecurityException )
+) throw( css::xml::crypto::XMLSignatureException,
+ css::uno::SecurityException )
{
xmlSecKeysMngrPtr pMngr = NULL ;
xmlSecDSigCtxPtr pDsigCtx = NULL ;
@@ -125,13 +125,13 @@ SAL_CALL XMLSignature_MSCryptImpl::generate(
if( xmlSecDSigCtxSign( pDsigCtx , pNode ) == 0 )
{
if (pDsigCtx->status == xmlSecDSigStatusSucceeded)
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
else
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
}
else
{
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
}
@@ -151,9 +151,9 @@ Reference< XXMLSignatureTemplate >
SAL_CALL XMLSignature_MSCryptImpl::validate(
const Reference< XXMLSignatureTemplate >& aTemplate ,
const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( com::sun::star::uno::RuntimeException,
- com::sun::star::uno::SecurityException,
- com::sun::star::xml::crypto::XMLSignatureException ) {
+) throw( css::uno::RuntimeException,
+ css::uno::SecurityException,
+ css::xml::crypto::XMLSignatureException ) {
xmlSecKeysMngrPtr pMngr = NULL ;
xmlSecDSigCtxPtr pDsigCtx = NULL ;
xmlNodePtr pNode = NULL ;
@@ -243,13 +243,13 @@ SAL_CALL XMLSignature_MSCryptImpl::validate(
if (rs == 0 && nReferenceCount == nReferenceGood)
{
if (pDsigCtx->status == xmlSecDSigStatusSucceeded)
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
else
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
}
else
{
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
}
xmlSecDSigCtxDestroy( pDsigCtx ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
index 4acbab9645cd..bc8b1540628f 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
@@ -35,48 +35,48 @@
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XXMLSignature ,
- ::com::sun::star::lang::XServiceInfo >
+ css::xml::crypto::XXMLSignature ,
+ css::lang::XServiceInfo >
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ;
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceManager ;
public:
explicit XMLSignature_MSCryptImpl(const css::uno::Reference<css::lang::XMultiServiceFactory >& rFactory);
virtual ~XMLSignature_MSCryptImpl() ;
//Methods from XXMLSignature
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aEnvironment
- ) throw( com::sun::star::xml::crypto::XMLSignatureException,
- com::sun::star::uno::SecurityException) ;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext
- ) throw( com::sun::star::uno::RuntimeException,
- com::sun::star::uno::SecurityException,
- com::sun::star::xml::crypto::XMLSignatureException);
+ virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate(
+ const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment
+ ) throw( css::xml::crypto::XMLSignatureException,
+ css::uno::SecurityException) ;
+
+ virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate(
+ const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
+ const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext
+ ) throw( css::uno::RuntimeException,
+ css::uno::SecurityException,
+ css::xml::crypto::XMLSignatureException);
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ ) throw( css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
} ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_XMLSIGNATURE_MSCRYPTIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
index 3dd190778e38..8d474b819e1b 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
@@ -26,7 +26,7 @@
#include <osl/mutex.hxx>
#include <pk11pub.h>
-class OCipherContext : public cppu::WeakImplHelper< ::com::sun::star::xml::crypto::XCipherContext >
+class OCipherContext : public cppu::WeakImplHelper< css::xml::crypto::XCipherContext >
{
private:
::osl::Mutex m_aMutex;
@@ -37,7 +37,7 @@ private:
PK11Context* m_pContext;
sal_Int32 m_nBlockSize;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_aLastBlock;
+ css::uno::Sequence< sal_Int8 > m_aLastBlock;
bool m_bEncryption;
bool m_bPadding;
@@ -70,11 +70,11 @@ public:
Dispose();
}
- static ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > Create( CK_MECHANISM_TYPE nNSSCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, bool bEncryption, bool bW3CPadding );
+ static css::uno::Reference< css::xml::crypto::XCipherContext > Create( CK_MECHANISM_TYPE nNSSCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, bool bEncryption, bool bW3CPadding );
// XCipherContext
- virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::IllegalArgumentException, css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
index 5f6783bb4f41..56882a57852e 100644
--- a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
@@ -25,7 +25,7 @@
#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
-class ODigestContext : public cppu::WeakImplHelper< ::com::sun::star::xml::crypto::XDigestContext >
+class ODigestContext : public cppu::WeakImplHelper< css::xml::crypto::XDigestContext >
{
private:
::osl::Mutex m_aMutex;
@@ -52,8 +52,8 @@ public:
// XDigestContext
- virtual void SAL_CALL updateDigest( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
index 270184f8296b..9dc198b1a51c 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
@@ -30,12 +30,12 @@
class ONSSInitializer : public cppu::WeakImplHelper
<
- ::com::sun::star::xml::crypto::XNSSInitializer,
- ::com::sun::star::lang::XServiceInfo
+ css::xml::crypto::XNSSInitializer,
+ css::lang::XServiceInfo
>
{
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
ONSSInitializer()
{}
@@ -44,34 +44,34 @@ public:
explicit ONSSInitializer(const css::uno::Reference<css::uno::XComponentContext> &rxContext);
virtual ~ONSSInitializer();
- static bool initNSS( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext );
+ static bool initNSS( const css::uno::Reference< css::uno::XComponentContext > &rxContext );
/* XDigestContextSupplier */
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const css::uno::Sequence< css::beans::NamedValue >& aParams ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
/* XCipherContextSupplier */
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const css::uno::Sequence< css::beans::NamedValue >& aParams ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
/* XServiceInfo */
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw (css::uno::RuntimeException, std::exception) override;
};
OUString ONSSInitializer_getImplementationName()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames()
- throw ( ::com::sun::star::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames()
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL ONSSInitializer_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr )
- throw ( ::com::sun::star::uno::Exception );
+css::uno::Reference< css::uno::XInterface >
+SAL_CALL ONSSInitializer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index 50dcade130ee..0e0fd3ee767f 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -50,15 +50,15 @@ SanExtensionImpl::~SanExtensionImpl() {
//Methods from XCertificateExtension
-sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( css::uno::RuntimeException, std::exception ) {
return m_critical ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() throw( css::uno::RuntimeException, std::exception ) {
return m_xExtnId ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() throw( css::uno::RuntimeException, std::exception ) {
return m_xExtnValue ;
}
@@ -82,7 +82,7 @@ namespace {
}
//Methods from XSanExtension
-::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ){
+css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( css::uno::RuntimeException, std::exception ){
if (!m_Entries.hasElements())
{
@@ -109,7 +109,7 @@ namespace {
switch (current->type) {
case certOtherName: {
arrCertAltNameEntry[i].Type = ExtAltNameType_OTHER_NAME;
- ::com::sun::star::beans::PropertyValue otherNameProp;
+ css::beans::PropertyValue otherNameProp;
otherNameProp.Name = OUString::createFromAscii(CERT_GetOidString(&current->name.OthName.oid));
Sequence< sal_Int8 > otherName( current->name.OthName.name.len ) ;
@@ -170,7 +170,7 @@ namespace {
current = CERT_GetNextGeneralName(current);
}
- m_Entries = ::comphelper::arrayToSequence< com::sun::star::security::CertAltNameEntry >(arrCertAltNameEntry, size);
+ m_Entries = ::comphelper::arrayToSequence< css::security::CertAltNameEntry >(arrCertAltNameEntry, size);
delete [] arrCertAltNameEntry;
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
index b7f138435ca1..dfbe91fac7bb 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
@@ -31,13 +31,13 @@
#include <com/sun/star/security/CertAltNameEntry.hpp>
class SanExtensionImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::security::XSanExtension >
+ css::security::XSanExtension >
{
private:
bool m_critical ;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnId ;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ;
- ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > m_Entries;
+ css::uno::Sequence< sal_Int8 > m_xExtnId ;
+ css::uno::Sequence< sal_Int8 > m_xExtnValue ;
+ css::uno::Sequence< css::security::CertAltNameEntry > m_Entries;
static OString removeOIDFromString( const OString &oid);
@@ -46,15 +46,15 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper<
virtual ~SanExtensionImpl() ;
//Methods from XCertificateExtension
- virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual sal_Bool SAL_CALL isCritical() throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( css::uno::RuntimeException, std::exception ) override ;
//Methods from XSanExtension
- virtual ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( css::uno::RuntimeException, std::exception ) override ;
} ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SANEXTENSION_NSSIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index bfee17606d19..43abf22ad7e0 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -203,7 +203,7 @@ const Sequence< sal_Int8>& SecurityEnvironment_NssImpl::getUnoTunnelId() {
return theSecurityEnvironment_NssImplUnoTunnelId::get().getSeq();
}
-OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException, std::exception )
+OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( css::uno::RuntimeException, std::exception )
{
OUStringBuffer buff;
for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); is++)
@@ -280,7 +280,7 @@ SECKEYPublicKey* SecurityEnvironment_NssImpl::getPubKey( unsigned int position )
return pubkey ;
}
-SECKEYPrivateKey* SecurityEnvironment_NssImpl::getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) {
+SECKEYPrivateKey* SecurityEnvironment_NssImpl::getPriKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) {
SECKEYPrivateKey* prikey ;
std::list< SECKEYPrivateKey* >::iterator keyIt ;
unsigned int pos ;
@@ -574,7 +574,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromAsci
sal_Int32 SecurityEnvironment_NssImpl ::
verifyCertificate( const Reference< csss::XCertificate >& aCert,
const Sequence< Reference< csss::XCertificate > >& intermediateCerts )
- throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception )
+ throw( css::uno::SecurityException, css::uno::RuntimeException, std::exception )
{
sal_Int32 validity = csss::CertificateValidity::INVALID;
const X509Certificate_NssImpl* xcert ;
@@ -785,7 +785,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
}
else
{
- validity = ::com::sun::star::security::CertificateValidity::INVALID ;
+ validity = css::security::CertificateValidity::INVALID ;
}
//Destroying the temporary certificates
@@ -799,7 +799,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
}
sal_Int32 SecurityEnvironment_NssImpl::getCertificateCharacters(
- const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& aCert ) throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception ) {
+ const css::uno::Reference< css::security::XCertificate >& aCert ) throw( css::uno::SecurityException, css::uno::RuntimeException, std::exception ) {
sal_Int32 characters ;
const X509Certificate_NssImpl* xcert ;
const CERTCertificate* cert ;
@@ -821,9 +821,9 @@ sal_Int32 SecurityEnvironment_NssImpl::getCertificateCharacters(
//Firstly, find out whether or not the cert is self-signed.
if( SECITEM_CompareItem( &(cert->derIssuer), &(cert->derSubject) ) == SECEqual ) {
- characters |= ::com::sun::star::security::CertificateCharacters::SELF_SIGNED ;
+ characters |= css::security::CertificateCharacters::SELF_SIGNED ;
} else {
- characters &= ~ ::com::sun::star::security::CertificateCharacters::SELF_SIGNED ;
+ characters &= ~ css::security::CertificateCharacters::SELF_SIGNED ;
}
//Secondly, find out whether or not the cert has a private key.
@@ -849,11 +849,11 @@ sal_Int32 SecurityEnvironment_NssImpl::getCertificateCharacters(
}
}
if( priKey != nullptr ) {
- characters |= ::com::sun::star::security::CertificateCharacters::HAS_PRIVATE_KEY ;
+ characters |= css::security::CertificateCharacters::HAS_PRIVATE_KEY ;
SECKEY_DestroyPrivateKey( priKey ) ;
} else {
- characters &= ~ ::com::sun::star::security::CertificateCharacters::HAS_PRIVATE_KEY ;
+ characters &= ~ css::security::CertificateCharacters::HAS_PRIVATE_KEY ;
}
return characters ;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index d1a6253f25be..58b91ffc2749 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -46,9 +46,9 @@
#include "xmlsecurity/xmlsec-wrapper.h"
class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XSecurityEnvironment ,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::lang::XUnoTunnel >
+ css::xml::crypto::XSecurityEnvironment ,
+ css::lang::XServiceInfo,
+ css::lang::XUnoTunnel >
{
private:
@@ -69,72 +69,72 @@ private:
//Methods from XSecurityEnvironment
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ ) throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
virtual ::sal_Int32 SAL_CALL verifyCertificate(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::security::XCertificate >& xCert,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > &
+ const css::uno::Reference<
+ css::security::XCertificate >& xCert,
+ const css::uno::Sequence<
+ css::uno::Reference< css::security::XCertificate > > &
intermediateCerts)
- throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::uno::SecurityException, css::uno::RuntimeException, std::exception) override ;
- virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert ) throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& xCert ) throw (css::uno::SecurityException, css::uno::RuntimeException, std::exception) override ;
- virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (css::uno::RuntimeException, std::exception) override;
//Methods from XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
+ throw (css::uno::RuntimeException, std::exception) override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
//Native methods
- CERTCertDBHandle* getCertDb() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ CERTCertDBHandle* getCertDb() throw( css::uno::Exception , css::uno::RuntimeException ) ;
- void setCertDb( CERTCertDBHandle* aCertDb ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ void setCertDb( CERTCertDBHandle* aCertDb ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- void adoptSymKey( PK11SymKey* aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- PK11SymKey* getSymKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ void adoptSymKey( PK11SymKey* aSymKey ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ PK11SymKey* getSymKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- SECKEYPublicKey* getPubKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ SECKEYPublicKey* getPubKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- SECKEYPrivateKey* getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ SECKEYPrivateKey* getPriKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const css::uno::Sequence< sal_Int8 >& serialNumber ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& beginCert ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL buildCertificatePath( const css::uno::Reference< css::security::XCertificate >& beginCert ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromRaw( const ::com::sun::star::uno::Sequence< sal_Int8 >& rawCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromRaw( const css::uno::Sequence< sal_Int8 >& rawCertificate ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
//Native methods
- xmlSecKeysMngrPtr createKeysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ xmlSecKeysMngrPtr createKeysManager() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( css::uno::Exception , css::uno::RuntimeException ) ;
private:
void updateSlots();
- void addCryptoSlot( PK11SlotInfo* aSlot ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ void addCryptoSlot( PK11SlotInfo* aSlot ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
} ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SECURITYENVIRONMENT_NSSIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index 563a574e4ca3..ecfd4a1674a2 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -32,7 +32,7 @@
class SEInitializer_NssImpl : public cppu::ImplInheritanceHelper
<
ONSSInitializer,
- ::com::sun::star::xml::crypto::XSEInitializer
+ css::xml::crypto::XSEInitializer
>
{
public:
@@ -40,35 +40,34 @@ public:
virtual ~SEInitializer_NssImpl();
/* XSEInitializer */
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::crypto::XXMLSecurityContext >
+ virtual css::uno::Reference< css::xml::crypto::XXMLSecurityContext >
SAL_CALL createSecurityContext( const OUString& )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference<
- com::sun::star::xml::crypto::XXMLSecurityContext >& securityContext )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL freeSecurityContext( const css::uno::Reference<
+ css::xml::crypto::XXMLSecurityContext >& securityContext )
+ throw (css::uno::RuntimeException, std::exception) override;
/* XServiceInfo */
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) override;
};
OUString SEInitializer_NssImpl_getImplementationName()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( )
- throw ( ::com::sun::star::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( )
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL SEInitializer_NssImpl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rxMSF)
- throw ( ::com::sun::star::uno::Exception );
+css::uno::Reference< css::uno::XInterface >
+SAL_CALL SEInitializer_NssImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxMSF)
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 9d7cd557db20..392d1b9bc600 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -54,7 +54,7 @@ X509Certificate_NssImpl::~X509Certificate_NssImpl() {
}
//Methods from XCertificate
-sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr ) {
if( m_pCert->version.len > 0 ) {
return ( char )*( m_pCert->version.data ) ;
@@ -65,7 +65,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() throw ( ::com::sun::sta
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSerialNumber() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSerialNumber() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr && m_pCert->serialNumber.len > 0 ) {
Sequence< sal_Int8 > serial( m_pCert->serialNumber.len ) ;
for( unsigned int i = 0 ; i < m_pCert->serialNumber.len ; i ++ )
@@ -73,11 +73,11 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() throw ( ::com::sun::sta
return serial ;
} else {
- return ::com::sun::star::uno::Sequence< sal_Int8 >();
+ return css::uno::Sequence< sal_Int8 >();
}
}
-OUString SAL_CALL X509Certificate_NssImpl::getIssuerName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+OUString SAL_CALL X509Certificate_NssImpl::getIssuerName() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr ) {
return OUString(m_pCert->issuerName , PL_strlen(m_pCert->issuerName) , RTL_TEXTENCODING_UTF8) ;
} else {
@@ -85,7 +85,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getIssuerName() throw ( ::com::sun::s
}
}
-OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr ) {
return OUString(m_pCert->subjectName , PL_strlen(m_pCert->subjectName) , RTL_TEXTENCODING_UTF8);
} else {
@@ -93,7 +93,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( ::com::sun::
}
}
-::com::sun::star::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidBefore() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidBefore() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr ) {
SECStatus rv ;
PRTime notBefore ;
@@ -122,7 +122,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( ::com::sun::
}
}
-::com::sun::star::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidAfter() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidAfter() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr ) {
SECStatus rv ;
PRTime notAfter ;
@@ -151,7 +151,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( ::com::sun::
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getIssuerUniqueID() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getIssuerUniqueID() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr && m_pCert->issuerID.len > 0 ) {
Sequence< sal_Int8 > issuerUid( m_pCert->issuerID.len ) ;
for( unsigned int i = 0 ; i < m_pCert->issuerID.len ; i ++ )
@@ -159,11 +159,11 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( ::com::sun::
return issuerUid ;
} else {
- return ::com::sun::star::uno::Sequence< sal_Int8 >();
+ return css::uno::Sequence< sal_Int8 >();
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectUniqueID() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectUniqueID() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr && m_pCert->subjectID.len > 0 ) {
Sequence< sal_Int8 > subjectUid( m_pCert->subjectID.len ) ;
for( unsigned int i = 0 ; i < m_pCert->subjectID.len ; i ++ )
@@ -171,11 +171,11 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( ::com::sun::
return subjectUid ;
} else {
- return ::com::sun::star::uno::Sequence< sal_Int8 >();
+ return css::uno::Sequence< sal_Int8 >();
}
}
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL X509Certificate_NssImpl::getExtensions() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_NssImpl::getExtensions() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr && m_pCert->extensions != nullptr ) {
CERTCertExtension** extns ;
CertificateExtension_XmlSecImpl* pExtn ;
@@ -213,11 +213,11 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( ::com::sun::
return xExtns ;
} else {
- return ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > ();
+ return css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > ();
}
}
-::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL X509Certificate_NssImpl::findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException, std::exception) {
+css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_NssImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr && m_pCert->extensions != nullptr ) {
CertificateExtension_XmlSecImpl* pExtn ;
CERTCertExtension** extns ;
@@ -252,7 +252,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( ::com::sun::
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getEncoded() throw ( ::com::sun::star::uno::RuntimeException, std::exception) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getEncoded() throw ( css::uno::RuntimeException, std::exception) {
if( m_pCert != nullptr && m_pCert->derCert.len > 0 ) {
Sequence< sal_Int8 > rawCert( m_pCert->derCert.len ) ;
@@ -261,7 +261,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( ::com::sun::
return rawCert ;
} else {
- return ::com::sun::star::uno::Sequence< sal_Int8 >();
+ return css::uno::Sequence< sal_Int8 >();
}
}
@@ -285,7 +285,7 @@ const CERTCertificate* X509Certificate_NssImpl::getNssCert() const {
}
}
-void X509Certificate_NssImpl::setRawCert( const Sequence< sal_Int8 >& rawCert ) throw ( ::com::sun::star::uno::RuntimeException) {
+void X509Certificate_NssImpl::setRawCert( const Sequence< sal_Int8 >& rawCert ) throw ( css::uno::RuntimeException) {
CERTCertificate* cert ;
SECItem certItem ;
@@ -333,7 +333,7 @@ OUString getAlgorithmDescription(SECAlgorithmID *aid)
return OUString::createFromAscii( pDesc ) ;
}
-::com::sun::star::uno::Sequence< sal_Int8 > getThumbprint(CERTCertificate *pCert, SECOidTag id)
+css::uno::Sequence< sal_Int8 > getThumbprint(CERTCertificate *pCert, SECOidTag id)
{
if( pCert != nullptr )
{
@@ -366,11 +366,11 @@ OUString getAlgorithmDescription(SECAlgorithmID *aid)
return thumbprint;
}
}
- return ::com::sun::star::uno::Sequence< sal_Int8 >();
+ return css::uno::Sequence< sal_Int8 >();
}
OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception)
+ throw ( css::uno::RuntimeException, std::exception)
{
if( m_pCert != nullptr )
{
@@ -382,8 +382,8 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm()
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyValue()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyValue()
+ throw ( css::uno::RuntimeException, std::exception)
{
if( m_pCert != nullptr )
{
@@ -402,11 +402,11 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm()
}
}
- return ::com::sun::star::uno::Sequence< sal_Int8 >();
+ return css::uno::Sequence< sal_Int8 >();
}
OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception)
+ throw ( css::uno::RuntimeException, std::exception)
{
if( m_pCert != nullptr )
{
@@ -418,8 +418,8 @@ OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm()
}
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSHA1Thumbprint()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSHA1Thumbprint()
+ throw ( css::uno::RuntimeException, std::exception)
{
return getThumbprint(m_pCert, SEC_OID_SHA1);
}
@@ -429,14 +429,14 @@ uno::Sequence<sal_Int8> X509Certificate_NssImpl::getSHA256Thumbprint() throw (un
return getThumbprint(m_pCert, SEC_OID_SHA256);
}
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getMD5Thumbprint()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getMD5Thumbprint()
+ throw ( css::uno::RuntimeException, std::exception)
{
return getThumbprint(m_pCert, SEC_OID_MD5);
}
sal_Int32 SAL_CALL X509Certificate_NssImpl::getCertificateUsage( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception)
+ throw ( css::uno::RuntimeException, std::exception)
{
SECStatus rv;
SECItem tmpitem;
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
index 7bad209b7177..038abe507182 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
@@ -33,8 +33,8 @@
#include "cert.h"
class X509Certificate_NssImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::security::XCertificate ,
- ::com::sun::star::lang::XUnoTunnel > , public xmlsecurity::Certificate
+ css::security::XCertificate ,
+ css::lang::XUnoTunnel > , public xmlsecurity::Certificate
{
private:
CERTCertificate* m_pCert ;
@@ -44,54 +44,54 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper<
virtual ~X509Certificate_NssImpl() ;
//Methods from XCertificate
- virtual sal_Int16 SAL_CALL getVersion( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual sal_Int16 SAL_CALL getVersion( ) throw ( css::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber( ) throw ( css::uno::RuntimeException, std::exception) override ;
- virtual OUString SAL_CALL getIssuerName( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
- virtual OUString SAL_CALL getSubjectName( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual OUString SAL_CALL getIssuerName( ) throw ( css::uno::RuntimeException, std::exception) override ;
+ virtual OUString SAL_CALL getSubjectName( ) throw ( css::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidBefore( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidAfter( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::util::DateTime SAL_CALL getNotValidBefore( ) throw ( css::uno::RuntimeException, std::exception) override ;
+ virtual css::util::DateTime SAL_CALL getNotValidAfter( ) throw ( css::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID( ) throw ( css::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID( ) throw ( css::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL getExtensions( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions( ) throw ( css::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getEncoded( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded( ) throw ( css::uno::RuntimeException, std::exception) override ;
virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw ( css::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
+ throw ( css::uno::RuntimeException, std::exception) override ;
virtual OUString SAL_CALL getSignatureAlgorithm()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw ( css::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
+ throw ( css::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint()
+ throw ( css::uno::RuntimeException, std::exception) override ;
- virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( css::uno::RuntimeException, std::exception) override ;
//Methods from XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
/// @see xmlsecurity::Certificate::getSHA256Thumbprint().
virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() throw (css::uno::RuntimeException, std::exception) override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
//Helper methods
void setCert( CERTCertificate* cert ) ;
const CERTCertificate* getNssCert() const ;
- void setRawCert( const ::com::sun::star::uno::Sequence< sal_Int8 >& rawCert ) throw ( ::com::sun::star::uno::RuntimeException) ;
+ void setRawCert( const css::uno::Sequence< sal_Int8 >& rawCert ) throw ( css::uno::RuntimeException) ;
} ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_X509CERTIFICATE_NSSIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index b9fca5d158ef..1a871d664e7c 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -54,9 +54,9 @@ Reference< XXMLEncryptionTemplate >
SAL_CALL XMLEncryption_NssImpl::encrypt(
const Reference< XXMLEncryptionTemplate >& aTemplate ,
const Reference< XSecurityEnvironment >& aEnvironment
-) throw (com::sun::star::xml::crypto::XMLEncryptionException,
- com::sun::star::uno::SecurityException,
- com::sun::star::uno::RuntimeException, std::exception)
+) throw (css::xml::crypto::XMLEncryptionException,
+ css::uno::SecurityException,
+ css::uno::RuntimeException, std::exception)
{
xmlSecKeysMngrPtr pMngr = nullptr ;
xmlSecEncCtxPtr pEncCtx = nullptr ;
@@ -193,9 +193,9 @@ Reference< XXMLEncryptionTemplate >
SAL_CALL XMLEncryption_NssImpl::decrypt(
const Reference< XXMLEncryptionTemplate >& aTemplate ,
const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw (com::sun::star::xml::crypto::XMLEncryptionException ,
- com::sun::star::uno::SecurityException,
- com::sun::star::uno::RuntimeException, std::exception)
+) throw (css::xml::crypto::XMLEncryptionException ,
+ css::uno::SecurityException,
+ css::uno::RuntimeException, std::exception)
{
xmlSecKeysMngrPtr pMngr = nullptr ;
xmlSecEncCtxPtr pEncCtx = nullptr ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index 9c17f3479a81..8670ba316fe2 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -35,47 +35,47 @@
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XXMLEncryption ,
- ::com::sun::star::lang::XServiceInfo >
+ css::xml::crypto::XXMLEncryption ,
+ css::lang::XServiceInfo >
{
public:
explicit XMLEncryption_NssImpl();
virtual ~XMLEncryption_NssImpl() ;
//Methods from XXMLEncryption
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate > SAL_CALL encrypt(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aEnvironment)
- // ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- throw (com::sun::star::xml::crypto::XMLEncryptionException ,
- com::sun::star::uno::SecurityException,
- com::sun::star::uno::RuntimeException, std::exception) override;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext
- ) throw (com::sun::star::xml::crypto::XMLEncryptionException ,
- com::sun::star::uno::SecurityException,
- com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate > SAL_CALL encrypt(
+ const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment)
+ // ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+ throw (css::xml::crypto::XMLEncryptionException ,
+ css::uno::SecurityException,
+ css::uno::RuntimeException, std::exception) override;
+
+ virtual css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt(
+ const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
+ const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext
+ ) throw (css::xml::crypto::XMLEncryptionException ,
+ css::uno::SecurityException,
+ css::uno::RuntimeException, std::exception) override;
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ ) throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
} ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_XMLENCRYPTION_NSSIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index 7cd8ba5b8d7a..1c78f5723023 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -64,8 +64,8 @@ XMLSecurityContext_NssImpl::~XMLSecurityContext_NssImpl()
}
sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment)
- throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException, std::exception)
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment)
+ throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException, std::exception)
{
if( !aSecurityEnvironment.is() )
{
@@ -79,16 +79,16 @@ sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment(
sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentNumber( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return m_vSecurityEnvironments.size();
}
-::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
+css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
XMLSecurityContext_NssImpl::getSecurityEnvironmentByIndex( sal_Int32 index )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment;
+ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > xSecurityEnvironment;
if (index >= 0 && index < ( sal_Int32 )m_vSecurityEnvironments.size())
{
@@ -100,9 +100,9 @@ sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentNumber( )
return xSecurityEnvironment;
}
-::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
+css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
XMLSecurityContext_NssImpl::getSecurityEnvironment( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
if (m_nDefaultEnvIndex >= 0 && m_nDefaultEnvIndex < ( sal_Int32 )m_vSecurityEnvironments.size())
return getSecurityEnvironmentByIndex(m_nDefaultEnvIndex);
@@ -111,13 +111,13 @@ sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentNumber( )
}
sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getDefaultSecurityEnvironmentIndex( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return m_nDefaultEnvIndex ;
}
void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
m_nDefaultEnvIndex = nDefaultEnvIndex;
}
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index 25229b83d68e..1ca0e58b6cc9 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -37,13 +37,11 @@
#include <vector>
class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XXMLSecurityContext ,
- ::com::sun::star::lang::XServiceInfo >
+ css::xml::crypto::XXMLSecurityContext ,
+ css::lang::XServiceInfo >
{
private:
- //xmlSecKeysMngrPtr m_pKeysMngr ;
- //::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment ;
- std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > > m_vSecurityEnvironments;
+ std::vector< css::uno::Reference< css::xml::crypto::XSecurityEnvironment > > m_vSecurityEnvironments;
sal_Int32 m_nDefaultEnvIndex;
@@ -53,60 +51,60 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper<
//Methods from XXMLSecurityContext
virtual sal_Int32 SAL_CALL addSecurityEnvironment(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment
- ) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment
+ ) throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
+ virtual css::uno::Reference<
+ css::xml::crypto::XSecurityEnvironment > SAL_CALL
getSecurityEnvironmentByIndex( ::sal_Int32 index )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
+ virtual css::uno::Reference<
+ css::xml::crypto::XSecurityEnvironment > SAL_CALL
getSecurityEnvironment( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ ) throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
/*
* Because of the issue of multi-securityenvironment, so the keyManager method is not useful any longer.
*
//Methods from XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw (com::sun::star::uno::RuntimeException);
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
+ throw (css::uno::RuntimeException);
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
- static XMLSecurityContext_NssImpl* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xObj ) ;
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
+ static XMLSecurityContext_NssImpl* getImplementation( const css::uno::Reference< css::uno::XInterface > xObj ) ;
//Native methods
- virtual xmlSecKeysMngrPtr keysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ virtual xmlSecKeysMngrPtr keysManager() throw( css::uno::Exception , css::uno::RuntimeException ) ;
*/
} ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 6e7f07245521..28468cb55df3 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -58,9 +58,9 @@ Reference< XXMLSignatureTemplate >
SAL_CALL XMLSignature_NssImpl::generate(
const Reference< XXMLSignatureTemplate >& aTemplate ,
const Reference< XSecurityEnvironment >& aEnvironment
-) throw( com::sun::star::xml::crypto::XMLSignatureException,
- com::sun::star::uno::SecurityException,
- com::sun::star::uno::RuntimeException, std::exception )
+) throw( css::xml::crypto::XMLSignatureException,
+ css::uno::SecurityException,
+ css::uno::RuntimeException, std::exception )
{
xmlSecKeysMngrPtr pMngr = nullptr ;
xmlSecDSigCtxPtr pDsigCtx = nullptr ;
@@ -137,13 +137,13 @@ SAL_CALL XMLSignature_NssImpl::generate(
if( xmlSecDSigCtxSign( pDsigCtx , pNode ) == 0 )
{
if (pDsigCtx->status == xmlSecDSigStatusSucceeded)
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
else
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
}
else
{
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
}
@@ -163,9 +163,9 @@ Reference< XXMLSignatureTemplate >
SAL_CALL XMLSignature_NssImpl::validate(
const Reference< XXMLSignatureTemplate >& aTemplate ,
const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( com::sun::star::uno::RuntimeException,
- com::sun::star::uno::SecurityException,
- com::sun::star::xml::crypto::XMLSignatureException, std::exception ) {
+) throw( css::uno::RuntimeException,
+ css::uno::SecurityException,
+ css::xml::crypto::XMLSignatureException, std::exception ) {
xmlSecKeysMngrPtr pMngr = nullptr ;
xmlSecDSigCtxPtr pDsigCtx = nullptr ;
xmlNodePtr pNode = nullptr ;
@@ -260,14 +260,14 @@ SAL_CALL XMLSignature_NssImpl::validate(
if (rs == 0 && pDsigCtx->status == xmlSecDSigStatusSucceeded && nReferenceCount == nReferenceGood)
{
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
xmlSecDSigCtxDestroy( pDsigCtx ) ;
SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
break;
}
else
{
- aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
+ aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
}
xmlSecDSigCtxDestroy( pDsigCtx ) ;
SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index 2ccff9a44061..a8ffaf4836fd 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -35,46 +35,46 @@
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
class XMLSignature_NssImpl : public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::crypto::XXMLSignature ,
- ::com::sun::star::lang::XServiceInfo >
+ css::xml::crypto::XXMLSignature ,
+ css::lang::XServiceInfo >
{
public:
explicit XMLSignature_NssImpl();
virtual ~XMLSignature_NssImpl() ;
//Methods from XXMLSignature
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aEnvironment
- ) throw (com::sun::star::xml::crypto::XMLSignatureException,
- com::sun::star::uno::SecurityException,
- com::sun::star::uno::RuntimeException, std::exception) override ;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext
- ) throw( com::sun::star::uno::RuntimeException,
- com::sun::star::uno::SecurityException,
- com::sun::star::xml::crypto::XMLSignatureException, std::exception) override;
+ virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate(
+ const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment
+ ) throw (css::xml::crypto::XMLSignatureException,
+ css::uno::SecurityException,
+ css::uno::RuntimeException, std::exception) override ;
+
+ virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate(
+ const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
+ const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext
+ ) throw( css::uno::RuntimeException,
+ css::uno::SecurityException,
+ css::xml::crypto::XMLSignatureException, std::exception) override;
//Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ ) throw( css::uno::RuntimeException, std::exception ) override ;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ;
//Helper for XServiceInfo
- static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
+ static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
- static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+ static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
//Helper for registry
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
} ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_XMLSIGNATURE_NSSIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/saxhelper.hxx b/xmlsecurity/source/xmlsec/saxhelper.hxx
index b4523a43b2ab..b89081a89163 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.hxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.hxx
@@ -46,30 +46,30 @@ class SAXHelper
xmlDocPtr getDocument() { return m_pParserCtxt->myDoc;}
void startDocument()
- throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
+ throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
void endDocument()
- throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
+ throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
void startElement(
const OUString& aName ,
- const com::sun::star::uno::Sequence<
- com::sun::star::xml::csax::XMLAttribute >& aAttributes )
- throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
+ const css::uno::Sequence<
+ css::xml::csax::XMLAttribute >& aAttributes )
+ throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
void endElement( const OUString& aName )
- throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
+ throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
void characters( const OUString& aChars )
- throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
+ throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
void ignorableWhitespace( const OUString& aWhitespaces )
- throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
+ throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
void processingInstruction(
const OUString& aTarget ,
const OUString& aData )
- throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
+ throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
} ;
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 9fba4068a0bb..b05f7c89a50f 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -856,8 +856,8 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents(
}
void SAL_CALL XMLDocumentWrapper_XmlSecImpl::rebuildIDLink(
- const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node )
+ throw (css::uno::RuntimeException, std::exception)
{
xmlNodePtr pNode = checkElement( node );
rebuildIDLink(pNode);
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index 5905ad1f4c3c..8be52ae51358 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -40,10 +40,10 @@ namespace com { namespace sun { namespace star { namespace uno {
class XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper
<
- com::sun::star::xml::wrapper::XXMLDocumentWrapper,
- com::sun::star::xml::sax::XDocumentHandler,
- com::sun::star::xml::csax::XCompressedDocumentHandler,
- com::sun::star::lang::XServiceInfo
+ css::xml::wrapper::XXMLDocumentWrapper,
+ css::xml::sax::XDocumentHandler,
+ css::xml::csax::XCompressedDocumentHandler,
+ css::lang::XServiceInfo
>
/****** XMLDocumentWrapper_XmlSecImpl.hxx/CLASS XMLDocumentWrapper_XmlSecImpl *
*
@@ -83,30 +83,29 @@ private:
*/
xmlNodePtr m_pStopAtNode;
xmlNodePtr m_pCurrentReservedNode;
- com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper > > m_aReservedNodes;
+ css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > m_aReservedNodes;
sal_Int32 m_nReservedNodeIndex;
private:
void getNextSAXEvent();
static void sendStartElement(
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2,
const xmlNodePtr pNode)
- throw (com::sun::star::xml::sax::SAXException);
+ throw (css::xml::sax::SAXException);
static void sendEndElement(
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2,
const xmlNodePtr pNode)
- throw (com::sun::star::xml::sax::SAXException);
+ throw (css::xml::sax::SAXException);
static void sendNode(
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2,
const xmlNodePtr pNode)
- throw (com::sun::star::xml::sax::SAXException);
+ throw (css::xml::sax::SAXException);
static OString getNodeQName(const xmlNodePtr pNode);
@@ -117,8 +116,7 @@ private:
void removeNode( const xmlNodePtr pNode) const;
static xmlNodePtr checkElement(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement);
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& xXMLElement);
void buildIDAttr( xmlNodePtr pNode ) const;
void rebuildIDLink( xmlNodePtr pNode ) const;
@@ -127,140 +125,133 @@ public:
XMLDocumentWrapper_XmlSecImpl();
virtual ~XMLDocumentWrapper_XmlSecImpl();
- /* com::sun::star::xml::wrapper::XXMLDocumentWrapper */
- virtual com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ /* css::xml::wrapper::XXMLDocumentWrapper */
+ virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement( )
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setCurrentElement( const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& element )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setCurrentElement( const css::uno::Reference<
+ css::xml::wrapper::XXMLElementWrapper >& element )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeCurrentElement( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isCurrent( const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isCurrent( const css::uno::Reference<
+ css::xml::wrapper::XXMLElementWrapper >& node )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isCurrentElementEmpty( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getNodeName( const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getNodeName( const css::uno::Reference<
+ css::xml::wrapper::XXMLElementWrapper >& node )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL clearUselessData(
- const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& node,
- const com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper > >& reservedDescendants,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& stopAtNode )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
-
- virtual void SAL_CALL collapse( const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node,
+ const css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > >& reservedDescendants,
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& stopAtNode )
+ throw (css::uno::RuntimeException, std::exception) override;
+
+ virtual void SAL_CALL collapse( const css::uno::Reference<
+ css::xml::wrapper::XXMLElementWrapper >& node )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL generateSAXEvents(
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& handler,
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xEventKeeperHandler,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& startNode,
- const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& endNode )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& handler,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xEventKeeperHandler,
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& startNode,
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& endNode )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL getTree(
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& handler )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& handler )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL rebuildIDLink(
- const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node )
+ throw (css::uno::RuntimeException, std::exception) override;
- /* com::sun::star::xml::sax::XDocumentHandler */
+ /* css::xml::sax::XDocumentHandler */
virtual void SAL_CALL startDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startElement(
const OUString& aName,
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endElement( const OUString& aName )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
- /* com::sun::star::xml::csax::XCompressedDocumentHandler */
+ /* css::xml::csax::XCompressedDocumentHandler */
virtual void SAL_CALL compressedStartDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL compressedEndDocument( )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL compressedStartElement(
const OUString& aName,
- const com::sun::star::uno::Sequence<
- com::sun::star::xml::csax::XMLAttribute >& aAttributes )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::xml::csax::XMLAttribute >& aAttributes )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL compressedEndElement( const OUString& aName )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL compressedCharacters( const OUString& aChars )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL compressedIgnorableWhitespace( const OUString& aWhitespaces )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL compressedProcessingInstruction( const OUString& aTarget, const OUString& aData )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL compressedSetDocumentLocator(
sal_Int32 columnNumber,
sal_Int32 lineNumber,
const OUString& publicId,
const OUString& systemId )
- throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
- /* com::sun::star::lang::XServiceInfo */
+ /* css::lang::XServiceInfo */
virtual OUString SAL_CALL getImplementationName( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) override;
};
OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName()
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString > SAL_CALL
XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( )
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+css::uno::Reference< css::uno::XInterface >
SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance(
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > &)
- throw ( com::sun::star::uno::Exception );
+ const css::uno::Reference< css::uno::XComponentContext > &)
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index c29a7c7cb143..1ed0d5ec5550 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -34,9 +34,9 @@ namespace com { namespace sun { namespace star { namespace uno {
class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper
<
- com::sun::star::xml::wrapper::XXMLElementWrapper,
- com::sun::star::lang::XUnoTunnel,
- com::sun::star::lang::XServiceInfo
+ css::xml::wrapper::XXMLElementWrapper,
+ css::lang::XUnoTunnel,
+ css::lang::XServiceInfo
>
/****** XMLElementWrapper_XmlSecImpl.hxx/CLASS XMLElementWrapper_XmlSecImpl ***
*
@@ -58,19 +58,19 @@ public:
/* XXMLElementWrapper */
- /* com::sun::star::lang::XUnoTunnel */
- virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId()
- throw(com::sun::star::uno::RuntimeException);
+ /* css::lang::XUnoTunnel */
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
+ throw (css::uno::RuntimeException, std::exception) override;
+ static css::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId()
+ throw(css::uno::RuntimeException);
- /* com::sun::star::lang::XServiceInfo */
+ /* css::lang::XServiceInfo */
virtual OUString SAL_CALL getImplementationName( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) override;
public:
/*
@@ -88,16 +88,15 @@ public:
};
OUString XMLElementWrapper_XmlSecImpl_getImplementationName()
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( )
- throw ( com::sun::star::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( )
+ throw ( css::uno::RuntimeException );
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+css::uno::Reference< css::uno::XInterface >
SAL_CALL XMLElementWrapper_XmlSecImpl_createInstance(
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > &)
- throw ( com::sun::star::uno::Exception );
+ const css::uno::Reference< css::uno::XComponentContext > &)
+ throw ( css::uno::Exception );
#endif
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index 144965231285..2370bd6bd7e1 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -37,12 +37,12 @@
*/
static char enableXmlStreamIO = 0x00 ;
-::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding > m_xUriBinding ;
+css::uno::Reference< css::xml::crypto::XUriBinding > m_xUriBinding ;
extern "C"
int xmlStreamMatch( const char* uri )
{
- ::com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInputStream ;
+ css::uno::Reference< css::io::XInputStream > xInputStream ;
if( ( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) &&
( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) {
@@ -74,7 +74,7 @@ int xmlStreamMatch( const char* uri )
extern "C"
void* xmlStreamOpen( const char* uri )
{
- ::com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInputStream ;
+ css::uno::Reference< css::io::XInputStream > xInputStream ;
if( ( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) &&
( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) {
@@ -95,7 +95,7 @@ void* xmlStreamOpen( const char* uri )
}
if( xInputStream.is() ) {
- ::com::sun::star::io::XInputStream* pInputStream ;
+ css::io::XInputStream* pInputStream ;
pInputStream = xInputStream.get() ;
pInputStream->acquire() ;
return static_cast<void*>(pInputStream) ;
@@ -109,14 +109,14 @@ extern "C"
int xmlStreamRead( void* context, char* buffer, int len )
{
int numbers ;
- ::com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInputStream ;
- ::com::sun::star::uno::Sequence< sal_Int8 > outSeqs( len ) ;
+ css::uno::Reference< css::io::XInputStream > xInputStream ;
+ css::uno::Sequence< sal_Int8 > outSeqs( len ) ;
numbers = 0 ;
if( ( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) &&
( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) {
if( context != nullptr ) {
- xInputStream = static_cast<com::sun::star::io::XInputStream*>(context);
+ xInputStream = static_cast<css::io::XInputStream*>(context);
if( !xInputStream.is() )
return 0 ;
@@ -136,7 +136,7 @@ int xmlStreamClose( void * context )
if( ( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) &&
( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) {
if( context != nullptr ) {
- ::com::sun::star::io::XInputStream* pInputStream ;
+ css::io::XInputStream* pInputStream ;
pInputStream = static_cast<css::io::XInputStream*>(context);
pInputStream->release() ;
}
@@ -181,7 +181,7 @@ int xmlEnableStreamInputCallbacks()
}
int xmlRegisterStreamInputCallbacks(
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding
+ css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding
) {
if( !( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) ) {
if( xmlEnableStreamInputCallbacks() < 0 )
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.hxx b/xmlsecurity/source/xmlsec/xmlstreamio.hxx
index 4765a0299816..6676dc68aeab 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.hxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.hxx
@@ -27,7 +27,7 @@ int xmlEnableStreamInputCallbacks() ;
void xmlDisableStreamInputCallbacks() ;
int xmlRegisterStreamInputCallbacks(
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding
+ css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding
) ;
int xmlUnregisterStreamInputCallbacks() ;