vcl: VclPtr conversion in xmlsecurity
Change-Id: I90ab1b6a9474169bb2e328518527cad6afd9ec48
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index 40bafdd..811889c 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -65,6 +65,7 @@ private:
public:
CertificateChooser( vcl::Window* pParent, css::uno::Reference< css::uno::XComponentContext>& rxCtx, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const SignatureInformations& rCertsToIgnore );
virtual ~CertificateChooser();
virtual void dispose() SAL_OVERRIDE;
short Execute() SAL_OVERRIDE;
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index 4e91886..6c64af6 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -58,6 +58,7 @@ private:
public:
CertificateViewer( vcl::Window* pParent, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const css::uno::Reference< css::security::XCertificate >& rXCert, bool bCheckForPrivateKey );
virtual ~CertificateViewer();
virtual void dispose() SAL_OVERRIDE;
};
@@ -108,6 +109,7 @@ private:
public:
CertificateViewerDetailsTP( vcl::Window* pParent, CertificateViewer* _pDlg );
virtual ~CertificateViewerDetailsTP();
virtual void dispose() SAL_OVERRIDE;
virtual void ActivatePage() SAL_OVERRIDE;
};
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index c73fc3b..9ab5126 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -66,7 +66,7 @@ private:
FixedText* m_pHintDocFT;
FixedText* m_pHintBasicFT;
FixedText* m_pHintPackageFT;
SvSimpleTable* m_pSignaturesLB;
SvSimpleTable* m_pSignaturesLB;
FixedImage* m_pSigsValidImg;
FixedText* m_pSigsValidFI;
FixedImage* m_pSigsInvalidImg;
@@ -117,6 +117,7 @@ public:
css::uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature);
virtual ~DigitalSignaturesDialog();
virtual void dispose() SAL_OVERRIDE;
// Initialize the dialog and the security environment, returns TRUE on success
bool Init();
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 63c16d7..a56ce78 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -67,6 +67,7 @@ public:
const css::uno::Reference< css::uno::XComponentContext>& rxCtx,
const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment);
virtual ~MacroSecurity();
virtual void dispose() SAL_OVERRIDE;
inline void EnableReset(bool _bEnable = true)
{
@@ -140,6 +141,7 @@ private:
public:
MacroSecurityTrustedSourcesTP(vcl::Window* pParent, MacroSecurity* _pDlg);
virtual ~MacroSecurityTrustedSourcesTP();
virtual void dispose() SAL_OVERRIDE;
virtual void ActivatePage() SAL_OVERRIDE;
virtual void ClosePage( void ) SAL_OVERRIDE;
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index c475a3c..dfd3a54 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -81,7 +81,13 @@ CertificateChooser::CertificateChooser( vcl::Window* _pParent, uno::Reference< u
CertificateChooser::~CertificateChooser()
{
dispose();
}
void CertificateChooser::dispose()
{
delete m_pCertLB;
ModalDialog::dispose();
}
short CertificateChooser::Execute()
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 309a29a..4c67c84 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -61,9 +61,15 @@ CertificateViewer::CertificateViewer(
CertificateViewer::~CertificateViewer()
{
dispose();
}
void CertificateViewer::dispose()
{
delete mpTabCtrl->GetTabPage(mnGeneralId);
delete mpTabCtrl->GetTabPage(mnDetailsId);
delete mpTabCtrl->GetTabPage(mnPathId);
TabDialog::dispose();
}
CertificateViewerTP::CertificateViewerTP( vcl::Window* _pParent, const OString& rID,
@@ -256,8 +262,14 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, C
CertificateViewerDetailsTP::~CertificateViewerDetailsTP()
{
dispose();
}
void CertificateViewerDetailsTP::dispose()
{
Clear();
delete m_pElementsLB;
CertificateViewerTP::dispose();
}
void CertificateViewerDetailsTP::ActivatePage()
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 6f5db4d..948655c 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -235,7 +235,13 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
DigitalSignaturesDialog::~DigitalSignaturesDialog()
{
dispose();
}
void DigitalSignaturesDialog::dispose()
{
delete m_pSignaturesLB;
ModalDialog::dispose();
}
bool DigitalSignaturesDialog::Init()
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index e524661..3fc6065 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -84,8 +84,14 @@ MacroSecurity::MacroSecurity( vcl::Window* _pParent,
MacroSecurity::~MacroSecurity()
{
dispose();
}
void MacroSecurity::dispose()
{
delete m_pTabCtrl->GetTabPage(m_nSecTrustId);
delete m_pTabCtrl->GetTabPage(m_nSecLevelId);
TabDialog::dispose();
}
MacroSecurityTP::MacroSecurityTP(vcl::Window* _pParent, const OString& rID,
@@ -394,7 +400,13 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(vcl::Window* _pPare
MacroSecurityTrustedSourcesTP::~MacroSecurityTrustedSourcesTP()
{
dispose();
}
void MacroSecurityTrustedSourcesTP::dispose()
{
delete m_pTrustCertLB;
MacroSecurityTP::dispose();
}
void MacroSecurityTrustedSourcesTP::ActivatePage()
