diff options
Diffstat (limited to 'xmlsecurity/source')
4 files changed, 7 insertions, 7 deletions
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 4ad295d74d33..c475a3c4be0e 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -43,7 +43,7 @@ sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const SvTreeListEntry* pSel = m_pCertLB->FirstSelected(); if( pSel ) - nSel = (sal_uInt16) ( sal_uIntPtr ) pSel->GetUserData(); + nSel = (sal_uInt16) reinterpret_cast<sal_uIntPtr>( pSel->GetUserData() ); return (sal_uInt16) nSel; } @@ -173,7 +173,7 @@ void CertificateChooser::ImplInitialize() SvTreeListEntry* pEntry = m_pCertLB->InsertEntry( XmlSec::GetContentPart( maCerts[ nC ]->getSubjectName() ) + "\t" + XmlSec::GetContentPart( maCerts[ nC ]->getIssuerName() ) + "\t" + XmlSec::GetDateString( maCerts[ nC ]->getNotValidAfter() ) ); - pEntry->SetUserData( ( void* )(sal_IntPtr)nC ); // missuse user data as index + pEntry->SetUserData( reinterpret_cast<void*>(nC) ); // missuse user data as index } // enable/disable buttons diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 7cfde0f8020e..3aad10c2c76f 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -513,7 +513,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl) { try { - sal_uInt16 nSelected = (sal_uInt16) (sal_uIntPtr) m_pSignaturesLB->FirstSelected()->GetUserData(); + sal_uInt16 nSelected = (sal_uInt16) reinterpret_cast<sal_uIntPtr>( m_pSignaturesLB->FirstSelected()->GetUserData() ); maCurrentSignatureInformations.erase( maCurrentSignatureInformations.begin()+nSelected ); // Export all other signatures... @@ -671,7 +671,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() m_pSignaturesLB->SetEntryText( aSubject, pEntry, 1 ); m_pSignaturesLB->SetEntryText( aIssuer, pEntry, 2 ); m_pSignaturesLB->SetEntryText( aDateTimeStr, pEntry, 3 ); - pEntry->SetUserData( ( void* ) n ); // missuse user data as index + pEntry->SetUserData( reinterpret_cast<void*>(n) ); // missuse user data as index } } @@ -726,7 +726,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails() { if( m_pSignaturesLB->FirstSelected() ) { - sal_uInt16 nSelected = (sal_uInt16) (sal_uIntPtr) m_pSignaturesLB->FirstSelected()->GetUserData(); + sal_uInt16 nSelected = (sal_uInt16) reinterpret_cast<sal_uIntPtr>( m_pSignaturesLB->FirstSelected()->GetUserData() ); const SignatureInformation& rInfo = maCurrentSignatureInformations[ nSelected ]; css::uno::Reference<css::xml::crypto::XSecurityEnvironment > xSecEnv = maSignatureHelper.GetSecurityEnvironment(); diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index d76fdcde83d4..33c37ba1be3b 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -315,7 +315,7 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void ) SvTreeListEntry* pLBEntry = m_pTrustCertLB->InsertEntry( XmlSec::GetContentPart( xCert->getSubjectName() ) ); m_pTrustCertLB->SetEntryText( XmlSec::GetContentPart( xCert->getIssuerName() ), pLBEntry, 1 ); m_pTrustCertLB->SetEntryText( XmlSec::GetDateTimeString( xCert->getNotValidAfter() ), pLBEntry, 2 ); - pLBEntry->SetUserData( ( void* ) (sal_IntPtr)nEntry ); // missuse user data as index + pLBEntry->SetUserData( reinterpret_cast<void*>(nEntry) ); // missuse user data as index } } } diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index 456186805833..e735c9418b8b 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -725,7 +725,7 @@ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL XMLDocumentWrapper_XmlSecI throw (cssu::RuntimeException, std::exception) { XMLElementWrapper_XmlSecImpl* pElement = new XMLElementWrapper_XmlSecImpl(m_pCurrentElement); - return (cssu::Reference< cssxw::XXMLElementWrapper >)pElement; + return cssu::Reference< cssxw::XXMLElementWrapper >(pElement); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setCurrentElement( const cssu::Reference< cssxw::XXMLElementWrapper >& element ) |