diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-01-27 11:23:31 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-27 11:23:31 +0000 |
commit | 34b5dc33d450661bcd9c9f474ed18df8e98634ba (patch) | |
tree | 019fe77b89bf0582cc7af24d5118e22067d79d1c /xmlsecurity | |
parent | 02dd8a0e32464aaab863c558322af67b7ba4e121 (diff) |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'xmlsecurity')
-rw-r--r-- | xmlsecurity/source/dialogs/certificatechooser.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 18 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index d07f5071e618..f7fe55b9bcdc 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -188,7 +188,7 @@ void CertificateChooser::ImplInitialize() sEntry += '\t'; sEntry += XmlSec::GetDateString( maCerts[ nC ]->getNotValidAfter() ); SvLBoxEntry* pEntry = maCertLB.InsertEntry( sEntry ); - pEntry->SetUserData( ( void* )nC ); // missuse user data as index + pEntry->SetUserData( ( void* )(sal_IntPtr)nC ); // missuse user data as index } // enable/disable buttons diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 79f7ba04298c..9dafad5a9c8b 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -391,8 +391,8 @@ IMPL_LINK( DigitalSignaturesDialog, OKButtonHdl, void*, EMPTYARG ) uno::Reference< com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler = maSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream ); - int nInfos = maCurrentSignatureInformations.size(); - for( int n = 0 ; n < nInfos ; ++n ) + size_t nInfos = maCurrentSignatureInformations.size(); + for( size_t n = 0 ; n < nInfos ; ++n ) maSignatureHelper.ExportSignature( xDocumentHandler, maCurrentSignatureInformations[ n ] ); @@ -485,8 +485,8 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG ) maSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream ); // Export old signatures... - int nInfos = maCurrentSignatureInformations.size(); - for ( int n = 0; n < nInfos; n++ ) + size_t nInfos = maCurrentSignatureInformations.size(); + for ( size_t n = 0; n < nInfos; n++ ) maSignatureHelper.ExportSignature( xDocumentHandler, maCurrentSignatureInformations[n]); // Create a new one... @@ -547,8 +547,8 @@ IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG ) Reference< css::xml::sax::XDocumentHandler> xDocumentHandler = maSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream ); - int nInfos = maCurrentSignatureInformations.size(); - for( int n = 0 ; n < nInfos ; ++n ) + size_t nInfos = maCurrentSignatureInformations.size(); + for( size_t n = 0 ; n < nInfos ; ++n ) maSignatureHelper.ExportSignature( xDocumentHandler, maCurrentSignatureInformations[ n ] ); maSignatureHelper.CloseDocumentHandler( xDocumentHandler); @@ -587,13 +587,13 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() uno::Reference< ::com::sun::star::security::XCertificate > xCert; String aNullStr; - int nInfos = maCurrentSignatureInformations.size(); - int nValidSigs = 0, nValidCerts = 0; + size_t nInfos = maCurrentSignatureInformations.size(); + size_t nValidSigs = 0, nValidCerts = 0; bool bAllNewSignatures = true; if( nInfos ) { - for( int n = 0; n < nInfos; ++n ) + for( size_t n = 0; n < nInfos; ++n ) { DocumentSignatureAlgorithm mode = DocumentSignatureHelper::getDocumentAlgorithm( m_sODFVersion, maCurrentSignatureInformations[n]); diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 06e6d33b392a..f1b1728a205b 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -329,7 +329,7 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void ) SvLBoxEntry* pLBEntry = maTrustCertLB.InsertEntry( XmlSec::GetContentPart( xCert->getSubjectName() ) ); maTrustCertLB.SetEntryText( XmlSec::GetContentPart( xCert->getIssuerName() ), pLBEntry, 1 ); maTrustCertLB.SetEntryText( XmlSec::GetDateTimeString( xCert->getNotValidAfter() ), pLBEntry, 2 ); - pLBEntry->SetUserData( ( void* ) sal_Int32( nEntry ) ); // missuse user data as index + pLBEntry->SetUserData( ( void* ) (sal_IntPtr)nEntry ); // missuse user data as index } } } |