sal_Bool->bool in xmlsecurity
Change-Id: I80b20f5df179f994e5004c1ef390457c252478ef
This commit is contained in:
committed by
Michael Stahl
parent
b3c13b940a
commit
14916972c5
@@ -62,7 +62,7 @@ private:
|
|||||||
CancelButton maCancelBtn;
|
CancelButton maCancelBtn;
|
||||||
HelpButton maHelpBtn;
|
HelpButton maHelpBtn;
|
||||||
|
|
||||||
sal_Bool mbInitialized;
|
bool mbInitialized;
|
||||||
|
|
||||||
sal_uInt16 GetSelectedEntryPos( void ) const;
|
sal_uInt16 GetSelectedEntryPos( void ) const;
|
||||||
DECL_LINK(ViewButtonHdl, void *);
|
DECL_LINK(ViewButtonHdl, void *);
|
||||||
|
@@ -54,12 +54,12 @@ private:
|
|||||||
OKButton maOkBtn;
|
OKButton maOkBtn;
|
||||||
HelpButton maHelpBtn;
|
HelpButton maHelpBtn;
|
||||||
|
|
||||||
sal_Bool mbCheckForPrivateKey;
|
bool mbCheckForPrivateKey;
|
||||||
|
|
||||||
cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment;
|
cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment;
|
||||||
cssu::Reference< dcss::security::XCertificate > mxCert;
|
cssu::Reference< dcss::security::XCertificate > mxCert;
|
||||||
public:
|
public:
|
||||||
CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, sal_Bool bCheckForPrivateKey );
|
CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, bool bCheckForPrivateKey );
|
||||||
virtual ~CertificateViewer();
|
virtual ~CertificateViewer();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -143,8 +143,8 @@ private:
|
|||||||
|
|
||||||
cssu::Sequence< SvtSecurityOptions::Certificate > maTrustedAuthors;
|
cssu::Sequence< SvtSecurityOptions::Certificate > maTrustedAuthors;
|
||||||
|
|
||||||
sal_Bool mbAuthorsReadonly;
|
bool mbAuthorsReadonly;
|
||||||
sal_Bool mbURLsReadonly;
|
bool mbURLsReadonly;
|
||||||
|
|
||||||
DECL_LINK( ViewCertPBHdl, void* );
|
DECL_LINK( ViewCertPBHdl, void* );
|
||||||
DECL_LINK( RemoveCertPBHdl, void* );
|
DECL_LINK( RemoveCertPBHdl, void* );
|
||||||
|
@@ -76,7 +76,7 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X
|
|||||||
|
|
||||||
mxCtx = _rxCtx;
|
mxCtx = _rxCtx;
|
||||||
mxSecurityEnvironment = _rxSecurityEnvironment;
|
mxSecurityEnvironment = _rxSecurityEnvironment;
|
||||||
mbInitialized = sal_False;
|
mbInitialized = false;
|
||||||
|
|
||||||
// disable buttons
|
// disable buttons
|
||||||
CertificateHighlightHdl( NULL );
|
CertificateHighlightHdl( NULL );
|
||||||
@@ -183,7 +183,7 @@ void CertificateChooser::ImplInitialize()
|
|||||||
|
|
||||||
// enable/disable buttons
|
// enable/disable buttons
|
||||||
CertificateHighlightHdl( NULL );
|
CertificateHighlightHdl( NULL );
|
||||||
mbInitialized = sal_True;
|
mbInitialized = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -51,7 +51,7 @@ namespace
|
|||||||
CertificateViewer::CertificateViewer(
|
CertificateViewer::CertificateViewer(
|
||||||
Window* _pParent,
|
Window* _pParent,
|
||||||
const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment,
|
const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment,
|
||||||
const cssu::Reference< dcss::security::XCertificate >& _rXCert, sal_Bool bCheckForPrivateKey )
|
const cssu::Reference< dcss::security::XCertificate >& _rXCert, bool bCheckForPrivateKey )
|
||||||
:TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) )
|
:TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) )
|
||||||
,maTabCtrl ( this, XMLSEC_RES( 1 ) )
|
,maTabCtrl ( this, XMLSEC_RES( 1 ) )
|
||||||
,maOkBtn ( this, XMLSEC_RES( BTN_OK ) )
|
,maOkBtn ( this, XMLSEC_RES( BTN_OK ) )
|
||||||
@@ -456,7 +456,7 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl)
|
|||||||
SvLBoxEntry* pEntry = maCertPathLB.FirstSelected();
|
SvLBoxEntry* pEntry = maCertPathLB.FirstSelected();
|
||||||
if( pEntry )
|
if( pEntry )
|
||||||
{
|
{
|
||||||
CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, sal_False );
|
CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, false );
|
||||||
aViewer.Execute();
|
aViewer.Execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -751,7 +751,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
|
|||||||
DBG_ASSERT( xCert.is(), "Error getting cCertificate!" );
|
DBG_ASSERT( xCert.is(), "Error getting cCertificate!" );
|
||||||
if ( xCert.is() )
|
if ( xCert.is() )
|
||||||
{
|
{
|
||||||
CertificateViewer aViewer( this, maSignatureHelper.GetSecurityEnvironment(), xCert, sal_False );
|
CertificateViewer aViewer( this, maSignatureHelper.GetSecurityEnvironment(), xCert, false );
|
||||||
aViewer.Execute();
|
aViewer.Execute();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -203,7 +203,7 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl)
|
|||||||
|
|
||||||
if ( xCert.is() )
|
if ( xCert.is() )
|
||||||
{
|
{
|
||||||
CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, xCert, sal_False );
|
CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, xCert, false );
|
||||||
aViewer.Execute();
|
aViewer.Execute();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user