[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/qa xmlsecurity/source
Noel Grandin
noel at peralex.com
Mon Mar 14 11:28:57 UTC 2016
xmlsecurity/inc/xmlsecurity/biginteger.hxx | 4
xmlsecurity/inc/xmlsecurity/sigstruct.hxx | 6
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 34 +-
xmlsecurity/qa/certext/SanCertExt.cxx | 2
xmlsecurity/source/component/certificatecontainer.cxx | 18 -
xmlsecurity/source/component/documentdigitalsignatures.cxx | 16
xmlsecurity/source/component/documentdigitalsignatures.hxx | 66 ++--
xmlsecurity/source/dialogs/certificatechooser.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 22 -
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/source/dialogs/resourcemanager.cxx | 8
xmlsecurity/source/dialogs/resourcemanager.hxx | 8
xmlsecurity/source/framework/buffernode.hxx | 13
xmlsecurity/source/framework/decryptorimpl.hxx | 57 +--
xmlsecurity/source/framework/elementcollector.cxx | 4
xmlsecurity/source/framework/elementcollector.hxx | 19 -
xmlsecurity/source/framework/elementmark.hxx | 4
xmlsecurity/source/framework/encryptionengine.cxx | 2
xmlsecurity/source/framework/encryptionengine.hxx | 19 -
xmlsecurity/source/framework/encryptorimpl.hxx | 62 +--
xmlsecurity/source/framework/saxeventkeeperimpl.hxx | 152 ++++-----
xmlsecurity/source/framework/securityengine.cxx | 8
xmlsecurity/source/framework/securityengine.hxx | 25 -
xmlsecurity/source/framework/signaturecreatorimpl.hxx | 57 +--
xmlsecurity/source/framework/signatureengine.cxx | 6
xmlsecurity/source/framework/signatureengine.hxx | 35 --
xmlsecurity/source/framework/signatureverifierimpl.hxx | 57 +--
xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 18 -
xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx | 48 +-
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 35 --
xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx | 60 +--
xmlsecurity/source/helper/documentsignaturehelper.cxx | 6
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 18 -
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 28 -
xmlsecurity/source/helper/xmlsignaturehelper2.hxx | 66 +---
xmlsecurity/source/helper/xsecctl.cxx | 12
xmlsecurity/source/helper/xsecctl.hxx | 96 ++---
xmlsecurity/source/helper/xsecparser.hxx | 44 +-
xmlsecurity/source/helper/xsecsign.cxx | 6
xmlsecurity/source/helper/xsecverify.cxx | 2
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx | 6
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx | 12
xmlsecurity/source/xmlsec/errorcallback.hxx | 2
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 12
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 16
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 34 +-
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 114 +++---
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx | 41 +-
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 44 +-
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx | 55 +--
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 16
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx | 44 +-
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 18 -
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx | 42 +-
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 22 -
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx | 44 +-
xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 10
xmlsecurity/source/xmlsec/nss/digestcontext.hxx | 6
xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 32 -
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 12
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 16
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 18 -
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 68 ++--
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 33 --
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 58 +--
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx | 50 +--
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 12
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx | 46 +-
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 20 -
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx | 54 +--
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 22 -
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx | 44 +-
xmlsecurity/source/xmlsec/saxhelper.hxx | 18 -
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 4
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 165 ++++------
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 39 +-
xmlsecurity/source/xmlsec/xmlstreamio.cxx | 18 -
xmlsecurity/source/xmlsec/xmlstreamio.hxx | 2
78 files changed, 1156 insertions(+), 1260 deletions(-)
New commits:
commit 43d57d105d2acf97e79e90f8d640923b91ac64a8
Author: Noel Grandin <noel at peralex.com>
Date: Thu Nov 26 09:49:00 2015 +0200
com::sun::star->css in xmlsecurity/
Change-Id: I4b89f97671ab526e5731d2f1f99802e23f3fd4b5
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
index f4f64e2..dd9ca4b 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 3cb1e7d..5a7df3d 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 9b00b55..51c07d2 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 11cf6e9..43254fd 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 619c76c..a972dc3 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 11eb85f..5ccacf6 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 9752566..3bc155b 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 99fb5a1..214cdac 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 97cd7cd..f4a24b2 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 10b9115..0eaefdf 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 bf3979b..28d0ba2 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 992e339..cd31f35 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 9495beb..9d82014 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 42103834..9b5cd23 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 ccdcb72..8c28fa0 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 cec87b6..e14430b 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 ac86e87c..1ecb51e 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 cef5f66..b6265f0 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 bcf8bfb..a535c30 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 cc850d3..368fe94 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 e959017..8365c7c 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 10af491..85f3afb 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 c7eb3b2..171e4297 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 3915f48..2b14cad 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 d4b322f..41be0b8 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 b0a7a3d..fac0b68 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 de1f332..66dbe54 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 c260721..90e83c8 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 ec9f974..4e42b23 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(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list