diff options
18 files changed, 20 insertions, 20 deletions
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index d7cce5ccc285..1b01baa62bfa 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -512,7 +512,7 @@ Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw Reference< XInterface > DocumentDigitalSignatures_CreateInstance( const Reference< XComponentContext >& rCtx) throw ( Exception ) { - return (cppu::OWeakObject*) new DocumentDigitalSignatures( rCtx ); + return static_cast<cppu::OWeakObject*>(new DocumentDigitalSignatures( rCtx )); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 3ed07b59a80c..8dbd5e83f143 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -208,7 +208,7 @@ void CertificateViewerDetailsTP::InsertElement( const OUString& _rField, const O { SvTreeListEntry* pEntry = m_pElementsLB->InsertEntry( _rField ); m_pElementsLB->SetEntryText( _rValue, pEntry, 1 ); - pEntry->SetUserData( ( void* ) new Details_UserDatat( _rDetails, _bFixedWidthFont ) ); + pEntry->SetUserData( static_cast<void*>(new Details_UserDatat( _rDetails, _bFixedWidthFont )) ); } CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, CertificateViewer* _pDlg ) @@ -472,7 +472,7 @@ SvTreeListEntry* CertificateViewerCertPathTP::InsertCert( { Image aImage = bValid ? maCertImage : maCertNotValidatedImage; SvTreeListEntry* pEntry = mpCertPathLB->InsertEntry( _rName, aImage, aImage, _pParent ); - pEntry->SetUserData( ( void* ) new CertPath_UserData( rxCert, bValid ) ); + pEntry->SetUserData( static_cast<void*>(new CertPath_UserData( rxCert, bValid )) ); return pEntry; } diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx index bb41a3dce52f..03e15f618e02 100644 --- a/xmlsecurity/source/framework/decryptorimpl.cxx +++ b/xmlsecurity/source/framework/decryptorimpl.cxx @@ -196,7 +196,7 @@ cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& xMSF) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new DecryptorImpl( comphelper::getComponentContext( xMSF ) ); + return static_cast<cppu::OWeakObject*>(new DecryptorImpl( comphelper::getComponentContext( xMSF ) )); } /* XServiceInfo */ diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx index 6b74377c2aa2..30d8452605c9 100644 --- a/xmlsecurity/source/framework/encryptionengine.cxx +++ b/xmlsecurity/source/framework/encryptionengine.cxx @@ -162,7 +162,7 @@ void EncryptionEngine::clearUp( ) const xReferenceResolvedBroadcaster->removeReferenceResolvedListener( m_nIdOfTemplateEC, - static_cast<const Reference < cssxc::sax::XReferenceResolvedListener > >((SecurityEngine *)this)); + static_cast<const Reference < cssxc::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<EncryptionEngine *>(this)))); m_xSAXEventKeeper->removeElementCollector(m_nIdOfTemplateEC); diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx index 776b5327f3a6..291433031178 100644 --- a/xmlsecurity/source/framework/encryptorimpl.cxx +++ b/xmlsecurity/source/framework/encryptorimpl.cxx @@ -231,7 +231,7 @@ Reference< XInterface > SAL_CALL EncryptorImpl_createInstance( const Reference< cssl::XMultiServiceFactory >& xMSF) throw( Exception ) { - return (cppu::OWeakObject*) new EncryptorImpl( comphelper::getComponentContext( xMSF ) ); + return static_cast<cppu::OWeakObject*>(new EncryptorImpl( comphelper::getComponentContext( xMSF ) )); } /* XServiceInfo */ diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 652b0f18b6ec..e6fa9ee63a00 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -1378,7 +1378,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > &) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new SAXEventKeeperImpl(); + return static_cast<cppu::OWeakObject*>(new SAXEventKeeperImpl()); } /* XServiceInfo */ diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 68f0025bde7c..b9e3b6985613 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -245,7 +245,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance const cssu::Reference< cssl::XMultiServiceFactory >& xMSF ) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new SignatureCreatorImpl( comphelper::getComponentContext( xMSF ) ); + return static_cast<cppu::OWeakObject*>(new SignatureCreatorImpl( comphelper::getComponentContext( xMSF ) )); } /* XServiceInfo */ diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx index 655b317b7e7c..15285b52bdf0 100644 --- a/xmlsecurity/source/framework/signatureengine.cxx +++ b/xmlsecurity/source/framework/signatureengine.cxx @@ -176,7 +176,7 @@ void SignatureEngine::clearUp( ) const xReferenceResolvedBroadcaster( m_xSAXEventKeeper, cssu::UNO_QUERY ); xReferenceResolvedBroadcaster->removeReferenceResolvedListener( m_nIdOfTemplateEC, - static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >((SecurityEngine *)this)); + static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<SignatureEngine *>(this)))); m_xSAXEventKeeper->removeElementCollector(m_nIdOfTemplateEC); @@ -186,7 +186,7 @@ void SignatureEngine::clearUp( ) const { xReferenceResolvedBroadcaster->removeReferenceResolvedListener( *ii, - static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >((SecurityEngine *)this)); + static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<SignatureEngine *>(this)))); m_xSAXEventKeeper->removeElementCollector(*ii); } diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index 6ef0bedc79c3..9cad609e147f 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -191,7 +191,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstanc const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new SignatureVerifierImpl( comphelper::getComponentContext(rSMgr) ); + return static_cast<cppu::OWeakObject*>(new SignatureVerifierImpl( comphelper::getComponentContext(rSMgr) )); } /* XServiceInfo */ diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index 84004ae5ef70..96b190940cde 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -329,7 +329,7 @@ IMPL_LINK( XMLSignatureHelper, SignatureVerifyResultListener, XMLSignatureVerify IMPL_LINK( XMLSignatureHelper, StartVerifySignatureElement, const uno::Reference< com::sun::star::xml::sax::XAttributeList >*, pAttrs ) { - if ( !maStartVerifySignatureHdl.IsSet() || maStartVerifySignatureHdl.Call( (void*)pAttrs ) ) + if ( !maStartVerifySignatureHdl.IsSet() || maStartVerifySignatureHdl.Call( const_cast<css::uno::Reference<css::xml::sax::XAttributeList> *>(pAttrs) ) ) { sal_Int32 nSignatureId = mpXSecController->getNewSecurityId(); mpXSecController->addSignature( nSignatureId ); diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index 25934703dc7c..6033fe931be0 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -87,7 +87,7 @@ void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, con { if ( aName == "Signature" ) { - maStartVerifySignatureElementListener.Call( (void*)&xAttribs ); + maStartVerifySignatureElementListener.Call( const_cast<css::uno::Reference<css::xml::sax::XAttributeList> *>(&xAttribs) ); } if (m_xNextHandler.is()) diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index abca1c9ac601..2a2ad98368ba 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -481,7 +481,7 @@ cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( ) cssu::Reference< cssu::XInterface > SAL_CALL ONSSInitializer_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new ONSSInitializer( comphelper::getComponentContext(rSMgr) ); + return static_cast<cppu::OWeakObject*>(new ONSSInitializer( comphelper::getComponentContext(rSMgr) )); } /* XServiceInfo */ diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 7d2617144583..7b93d34dde0d 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -445,7 +445,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O return NULL; // no need for exception cf. i40394 } - derIssuer = SEC_ASN1EncodeItem( arena, NULL, ( void* )nmIssuer, SEC_ASN1_GET( CERT_NameTemplate ) ) ; + derIssuer = SEC_ASN1EncodeItem( arena, NULL, static_cast<void*>(nmIssuer), SEC_ASN1_GET( CERT_NameTemplate ) ) ; if( derIssuer == NULL ) { PL_strfree( chIssuer ) ; CERT_DestroyName( nmIssuer ) ; diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 684aebc7589d..3a88ffa91f46 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -130,7 +130,7 @@ uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceName uno::Reference< uno::XInterface > SAL_CALL SEInitializer_NssImpl_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rxMSF) throw( uno::Exception ) { - return (cppu::OWeakObject*) new SEInitializer_NssImpl(comphelper::getComponentContext(rxMSF)); + return static_cast<cppu::OWeakObject*>(new SEInitializer_NssImpl(comphelper::getComponentContext(rxMSF))); } /* XServiceInfo */ diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index b017efa2391b..ea5fd5105e7d 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -285,7 +285,7 @@ void SAXHelper::startElement( attrs[i] = NULL ; } - xmlFree( ( void* ) attrs ) ; + xmlFree( static_cast<void*>(attrs) ) ; attrs = NULL ; } } diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index efa60a91639c..efc008ae26a1 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -1074,7 +1074,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_creat const cssu::Reference< cssu::XComponentContext > &) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new XMLDocumentWrapper_XmlSecImpl( ); + return static_cast<cppu::OWeakObject*>(new XMLDocumentWrapper_XmlSecImpl( )); } /* XServiceInfo */ diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index 69f6c5130ab5..d8de87ac82a3 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -91,7 +91,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL const cssu::Reference< cssu::XComponentContext > &) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new XMLElementWrapper_XmlSecImpl(NULL); + return static_cast<cppu::OWeakObject*>(new XMLElementWrapper_XmlSecImpl(NULL)); } /* XServiceInfo */ diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 29fd95700b4a..cecd659cfd74 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -98,7 +98,7 @@ void* xmlStreamOpen( const char* uri ) ::com::sun::star::io::XInputStream* pInputStream ; pInputStream = xInputStream.get() ; pInputStream->acquire() ; - return ( void* )pInputStream ; + return static_cast<void*>(pInputStream) ; } } |