From 4b313fd5661ca5ac096e60d46691b1a9857877d9 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 18 Oct 2012 16:28:20 +0200 Subject: Merge SvListEntry and SvLBoxEntry into SvTreeListEntry. Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee --- xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 2 +- xmlsecurity/source/dialogs/certificatechooser.cxx | 4 ++-- xmlsecurity/source/dialogs/certificateviewer.cxx | 20 ++++++++++---------- .../source/dialogs/digitalsignaturesdialog.cxx | 2 +- xmlsecurity/source/dialogs/macrosecurity.cxx | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 26b03fb06582..91def5575271 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -142,7 +142,7 @@ private: DECL_LINK( ViewCertHdl, void* ); DECL_LINK( CertSelectHdl, void* ); void Clear( void ); - SvLBoxEntry* InsertCert( SvLBoxEntry* _pParent, const OUString& _rName, + SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, cssu::Reference< dcss::security::XCertificate > rxCert, bool bValid); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 27a486dca6fd..cfc0db0f22f3 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -46,7 +46,7 @@ sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const { sal_uInt16 nSel = INVAL_SEL; - SvLBoxEntry* pSel = maCertLB.FirstSelected(); + SvTreeListEntry* pSel = maCertLB.FirstSelected(); if( pSel ) nSel = (sal_uInt16) ( sal_uIntPtr ) pSel->GetUserData(); @@ -177,7 +177,7 @@ void CertificateChooser::ImplInitialize() sEntry.append( XmlSec::GetContentPart( maCerts[ nC ]->getIssuerName() ) ); sEntry.append( '\t' ); sEntry.append( XmlSec::GetDateString( maCerts[ nC ]->getNotValidAfter() ) ); - SvLBoxEntry* pEntry = maCertLB.InsertEntry( sEntry.makeStringAndClear() ); + SvTreeListEntry* pEntry = maCertLB.InsertEntry( sEntry.makeStringAndClear() ); pEntry->SetUserData( ( void* )(sal_IntPtr)nC ); // missuse user data as index } diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 7a7486e229c8..de1076006189 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -223,7 +223,7 @@ void CertificateViewerDetailsTP::Clear( void ) { maElementML.SetText( OUString() ); sal_uLong i = 0; - SvLBoxEntry* pEntry = maElementsLB.GetEntry( i ); + SvTreeListEntry* pEntry = maElementsLB.GetEntry( i ); while( pEntry ) { delete ( Details_UserDatat* ) pEntry->GetUserData(); @@ -237,7 +237,7 @@ void CertificateViewerDetailsTP::Clear( void ) void CertificateViewerDetailsTP::InsertElement( const OUString& _rField, const OUString& _rValue, const OUString& _rDetails, bool _bFixedWidthFont ) { - SvLBoxEntry* pEntry = maElementsLB.InsertEntry( _rField ); + SvTreeListEntry* pEntry = maElementsLB.InsertEntry( _rField ); maElementsLB.SetEntryText( _rValue, pEntry, 1 ); pEntry->SetUserData( ( void* ) new Details_UserDatat( _rDetails, _bFixedWidthFont ) ); } @@ -335,7 +335,7 @@ void CertificateViewerDetailsTP::ActivatePage() IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl) { - SvLBoxEntry* pEntry = maElementsLB.FirstSelected(); + SvTreeListEntry* pEntry = maElementsLB.FirstSelected(); OUString aElementText; bool bFixedWidthFont; if( pEntry ) @@ -426,7 +426,7 @@ void CertificateViewerCertPathTP::ActivatePage() const Reference< security::XCertificate >* pCertPath = aCertPath.getConstArray(); sal_Int32 i, nCnt = aCertPath.getLength(); - SvLBoxEntry* pParent = NULL; + SvTreeListEntry* pParent = NULL; for( i = nCnt; i; ) { const Reference< security::XCertificate > rCert = pCertPath[ --i ]; @@ -453,7 +453,7 @@ void CertificateViewerCertPathTP::ActivatePage() IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl) { - SvLBoxEntry* pEntry = maCertPathLB.FirstSelected(); + SvTreeListEntry* pEntry = maCertPathLB.FirstSelected(); if( pEntry ) { CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, false ); @@ -466,7 +466,7 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl) IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl) { OUString sStatus; - SvLBoxEntry* pEntry = maCertPathLB.FirstSelected(); + SvTreeListEntry* pEntry = maCertPathLB.FirstSelected(); if( pEntry ) { CertPath_UserData* pData = (CertPath_UserData*) pEntry->GetUserData(); @@ -483,7 +483,7 @@ void CertificateViewerCertPathTP::Clear( void ) { maCertStatusML.SetText( OUString() ); sal_uLong i = 0; - SvLBoxEntry* pEntry = maCertPathLB.GetEntry( i ); + SvTreeListEntry* pEntry = maCertPathLB.GetEntry( i ); while( pEntry ) { delete ( CertPath_UserData* ) pEntry->GetUserData(); @@ -494,12 +494,12 @@ void CertificateViewerCertPathTP::Clear( void ) maCertPathLB.Clear(); } -SvLBoxEntry* CertificateViewerCertPathTP::InsertCert( - SvLBoxEntry* _pParent, const OUString& _rName, cssu::Reference< dcss::security::XCertificate > rxCert, +SvTreeListEntry* CertificateViewerCertPathTP::InsertCert( + SvTreeListEntry* _pParent, const OUString& _rName, cssu::Reference< dcss::security::XCertificate > rxCert, bool bValid) { Image aImage = bValid ? maCertImage : maCertNotValidatedImage; - SvLBoxEntry* pEntry = maCertPathLB.InsertEntry( _rName, aImage, aImage, _pParent ); + SvTreeListEntry* pEntry = maCertPathLB.InsertEntry( _rName, aImage, aImage, _pParent ); pEntry->SetUserData( ( void* ) new CertPath_UserData( rxCert, bValid ) ); return pEntry; diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 951ed3171c72..9cee3b5bfee3 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -679,7 +679,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() aImage = maSigsValidImg.GetImage(); } - SvLBoxEntry* pEntry = maSignaturesLB.InsertEntry( OUString(), aImage, aImage ); + SvTreeListEntry* pEntry = maSignaturesLB.InsertEntry( OUString(), aImage, aImage ); maSignaturesLB.SetEntryText( aSubject, pEntry, 1 ); maSignaturesLB.SetEntryText( aIssuer, pEntry, 2 ); maSignaturesLB.SetEntryText( aDateTimeStr, pEntry, 3 ); diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index c814c5968cba..a86fca3fc7c1 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -314,7 +314,7 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void ) // create from RawData xCert = mpDlg->mxSecurityEnvironment->createCertificateFromAscii( rEntry[ 2 ] ); - SvLBoxEntry* pLBEntry = maTrustCertLB.InsertEntry( XmlSec::GetContentPart( xCert->getSubjectName() ) ); + SvTreeListEntry* 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_IntPtr)nEntry ); // missuse user data as index -- cgit