summaryrefslogtreecommitdiff
path: root/xmlsecurity/source
diff options
context:
space:
mode:
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx6
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx10
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx12
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx4
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx16
-rw-r--r--xmlsecurity/source/dialogs/warnings.cxx2
6 files changed, 25 insertions, 25 deletions
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index afb6c36818a1..542518917fbc 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -363,7 +363,7 @@ void DocumentDigitalSignatures::manageTrustedSources( ) throw (RuntimeException
// Macro Security also has some options where no security environment is needed, so raise dialog anyway.
// Later I should change the code so the Dialog creates the SecEnv on demand...
- Reference< dcss::xml::crypto::XSecurityEnvironment > xSecEnv;
+ Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv;
XMLSignatureHelper aSignatureHelper( mxCtx );
if ( aSignatureHelper.Init() )
@@ -418,7 +418,7 @@ void DocumentDigitalSignatures::showCertificate(
Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificate() throw (RuntimeException)
{
- Reference< dcss::xml::crypto::XSecurityEnvironment > xSecEnv;
+ Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv;
XMLSignatureHelper aSignatureHelper( mxCtx );
if ( aSignatureHelper.Init() )
@@ -495,7 +495,7 @@ rtl::OUString DocumentDigitalSignatures::GetImplementationName() throw (RuntimeE
return rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" );
}
-Sequence< rtl::OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (cssu::RuntimeException)
+Sequence< rtl::OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (css::uno::RuntimeException)
{
Sequence < rtl::OUString > aRet(1);
rtl::OUString* pArray = aRet.getArray();
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index be940fb6ae40..f57ab567afce 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -48,7 +48,7 @@ sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const
return (sal_uInt16) nSel;
}
-CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore )
+CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore )
: ModalDialog(_pParent, "SelectCertificateDialog", "xmlsec/ui/selectcertificatedialog.ui")
, maCertsToIgnore( _rCertsToIgnore )
{
@@ -128,7 +128,7 @@ void CertificateChooser::ImplInitialize()
{
}
- uno::Reference< dcss::security::XSerialNumberAdapter> xSerialNumberAdapter =
+ uno::Reference< css::security::XSerialNumberAdapter> xSerialNumberAdapter =
::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
sal_Int32 nCertificates = maCerts.getLength();
@@ -190,9 +190,9 @@ void CertificateChooser::ImplInitialize()
}
-uno::Reference< dcss::security::XCertificate > CertificateChooser::GetSelectedCertificate()
+uno::Reference< css::security::XCertificate > CertificateChooser::GetSelectedCertificate()
{
- uno::Reference< dcss::security::XCertificate > xCert;
+ uno::Reference< css::security::XCertificate > xCert;
sal_uInt16 nSelected = GetSelectedEntryPos();
if ( nSelected < maCerts.getLength() )
xCert = maCerts[ nSelected ];
@@ -221,7 +221,7 @@ IMPL_LINK_NOARG(CertificateChooser, ViewButtonHdl)
void CertificateChooser::ImplShowCertificateDetails()
{
- uno::Reference< dcss::security::XCertificate > xCert = GetSelectedCertificate();
+ uno::Reference< css::security::XCertificate > xCert = GetSelectedCertificate();
if( xCert.is() )
{
CertificateViewer aViewer( this, mxSecurityEnvironment, xCert, sal_True );
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index dd4d2198ff62..3703542c7cf3 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -49,8 +49,8 @@ namespace
CertificateViewer::CertificateViewer(
Window* _pParent,
- const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment,
- const cssu::Reference< dcss::security::XCertificate >& _rXCert, bool bCheckForPrivateKey )
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment,
+ const css::uno::Reference< css::security::XCertificate >& _rXCert, bool bCheckForPrivateKey )
:TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) )
,maTabCtrl ( this, XMLSEC_RES( 1 ) )
,maOkBtn ( this, XMLSEC_RES( BTN_OK ) )
@@ -139,7 +139,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
maValidDateFI.SetFont( aFnt );
// insert data
- cssu::Reference< dcss::security::XCertificate > xCert = mpDlg->mxCert;
+ css::uno::Reference< css::security::XCertificate > xCert = mpDlg->mxCert;
maIssuedToFI.SetText( XmlSec::GetContentPart( xCert->getSubjectName() ) );
maIssuedByFI.SetText( XmlSec::GetContentPart( xCert->getIssuerName() ) );
@@ -355,11 +355,11 @@ IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl)
struct CertPath_UserData
{
- cssu::Reference< dcss::security::XCertificate > mxCert;
+ css::uno::Reference< css::security::XCertificate > mxCert;
OUString maStatus;
bool mbValid;
- CertPath_UserData( cssu::Reference< dcss::security::XCertificate > xCert, bool bValid):
+ CertPath_UserData( css::uno::Reference< css::security::XCertificate > xCert, bool bValid):
mxCert(xCert),
mbValid(bValid)
{
@@ -494,7 +494,7 @@ void CertificateViewerCertPathTP::Clear( void )
}
SvTreeListEntry* CertificateViewerCertPathTP::InsertCert(
- SvTreeListEntry* _pParent, const OUString& _rName, cssu::Reference< dcss::security::XCertificate > rxCert,
+ SvTreeListEntry* _pParent, const OUString& _rName, css::uno::Reference< css::security::XCertificate > rxCert,
bool bValid)
{
Image aImage = bValid ? maCertImage : maCertNotValidatedImage;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 3adc177db5c3..58c5e8b7e2b4 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -279,7 +279,7 @@ void DigitalSignaturesDialog::SetStorage( const com::sun::star::uno::Reference <
m_manifest = xReader->readManifestSequence(xStream);
}
-void DigitalSignaturesDialog::SetSignatureStream( const cssu::Reference < css::io::XStream >& rxStream )
+void DigitalSignaturesDialog::SetSignatureStream( const css::uno::Reference < css::io::XStream >& rxStream )
{
mxSignatureStream = rxStream;
}
@@ -744,7 +744,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
css::uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
// Use Certificate from doc, not from key store
- uno::Reference< dcss::security::XCertificate > xCert;
+ uno::Reference< css::security::XCertificate > xCert;
if (!rInfo.ouX509Certificate.isEmpty())
xCert = xSecEnv->createCertificateFromAscii(rInfo.ouX509Certificate);
//fallback if no certificate is embedded, get if from store
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 0063b0fdc739..ab8cd6d5ec02 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -64,8 +64,8 @@ IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl)
}
MacroSecurity::MacroSecurity( Window* _pParent,
- const cssu::Reference< cssu::XComponentContext> &_rxCtx,
- const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment)
+ const css::uno::Reference< css::uno::XComponentContext> &_rxCtx,
+ const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment)
: TabDialog(_pParent, "MacroSecurityDialog", "xmlsec/ui/macrosecuritydialog.ui")
, mxCtx(_rxCtx)
, mxSecurityEnvironment(_rxSecurityEnvironment)
@@ -194,10 +194,10 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl)
{
sal_uInt16 nSelected = sal_uInt16( sal_uIntPtr( m_pTrustCertLB->FirstSelected()->GetUserData() ) );
- uno::Reference< dcss::security::XSerialNumberAdapter > xSerialNumberAdapter =
+ uno::Reference< css::security::XSerialNumberAdapter > xSerialNumberAdapter =
::com::sun::star::security::SerialNumberAdapter::create(mpDlg->mxCtx);
- uno::Reference< dcss::security::XCertificate > xCert = mpDlg->mxSecurityEnvironment->getCertificate( maTrustedAuthors[nSelected][0], xSerialNumberAdapter->toSequence( maTrustedAuthors[nSelected][1] ) );
+ uno::Reference< css::security::XCertificate > xCert = mpDlg->mxSecurityEnvironment->getCertificate( maTrustedAuthors[nSelected][0], xSerialNumberAdapter->toSequence( maTrustedAuthors[nSelected][1] ) );
// If we don't get it, create it from signature data:
if ( !xCert.is() )
@@ -311,7 +311,7 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void )
{
for( sal_uInt32 nEntry = 0 ; nEntry < nEntries ; ++nEntry )
{
- cssu::Sequence< ::rtl::OUString >& rEntry = maTrustedAuthors[ nEntry ];
+ css::uno::Sequence< ::rtl::OUString >& rEntry = maTrustedAuthors[ nEntry ];
uno::Reference< css::security::XCertificate > xCert;
// create from RawData
@@ -384,7 +384,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, M
FillCertLB();
- cssu::Sequence< rtl::OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs();
+ css::uno::Sequence< rtl::OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs();
mbURLsReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_SECUREURLS );
m_pTrustFileROFI->Show( mbURLsReadonly );
m_pTrustFileLocLB->Enable( !mbURLsReadonly );
@@ -415,7 +415,7 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
sal_uInt16 nEntryCnt = m_pTrustFileLocLB->GetEntryCount();
if( nEntryCnt )
{
- cssu::Sequence< rtl::OUString > aSecureURLs( nEntryCnt );
+ css::uno::Sequence< rtl::OUString > aSecureURLs( nEntryCnt );
for( sal_uInt16 i = 0 ; i < nEntryCnt ; ++i )
{
::rtl::OUString aURL( m_pTrustFileLocLB->GetEntry( i ) );
@@ -428,7 +428,7 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
// Trusted Path could not be removed (#i33584#)
// don't forget to remove the old saved SecureURLs
else
- mpDlg->maSecOptions.SetSecureURLs( cssu::Sequence< rtl::OUString >() );
+ mpDlg->maSecOptions.SetSecureURLs( css::uno::Sequence< rtl::OUString >() );
mpDlg->maSecOptions.SetTrustedAuthors( maTrustedAuthors );
}
diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx
index 0320910844c3..ac441dc56d25 100644
--- a/xmlsecurity/source/dialogs/warnings.cxx
+++ b/xmlsecurity/source/dialogs/warnings.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::security;
using namespace ::com::sun::star;
-MacroWarning::MacroWarning( Window* _pParent, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, cssu::Reference< dcss::security::XCertificate >& _rxCert )
+MacroWarning::MacroWarning( Window* _pParent, uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, css::uno::Reference< css::security::XCertificate >& _rxCert )
:ModalDialog ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROWARN ) )
,maDocNameFI ( this, ResId( FI_DOCNAME ) )
,maDescr1aFI ( this, ResId( FI_DESCR1A ) )
generated by cgit (git 2.34.1) at 2025-01-21 10:50:53 +0000