summaryrefslogtreecommitdiff
path: root/xmlsecurity/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /xmlsecurity/inc
parent7cbbefae224ab85343accb42b03f9431ec693a83 (diff)
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'xmlsecurity/inc')
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificatechooser.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificateviewer.hxx10
-rw-r--r--xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/macrosecurity.hxx8
4 files changed, 11 insertions, 11 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index f6d109d361d9..40bafdd4c755 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -63,7 +63,7 @@ private:
void ImplInitialize();
public:
- CertificateChooser( Window* pParent, css::uno::Reference< css::uno::XComponentContext>& rxCtx, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const SignatureInformations& rCertsToIgnore );
+ CertificateChooser( vcl::Window* pParent, css::uno::Reference< css::uno::XComponentContext>& rxCtx, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const SignatureInformations& rCertsToIgnore );
virtual ~CertificateChooser();
short Execute() SAL_OVERRIDE;
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index 85320659efe2..4e9188616099 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -56,7 +56,7 @@ private:
css::uno::Reference< css::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment;
css::uno::Reference< css::security::XCertificate > mxCert;
public:
- CertificateViewer( Window* pParent, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const css::uno::Reference< css::security::XCertificate >& rXCert, bool bCheckForPrivateKey );
+ 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();
};
@@ -66,7 +66,7 @@ class CertificateViewerTP : public TabPage
protected:
CertificateViewer* mpDlg;
public:
- CertificateViewerTP( Window* _pParent, const OString& rID,
+ CertificateViewerTP( vcl::Window* _pParent, const OString& rID,
const OUString& rUIXMLDescription, CertificateViewer* _pDlg );
void SetTabDlg( CertificateViewer* _pTabDlg )
{
@@ -86,7 +86,7 @@ private:
FixedImage* m_pKeyImg;
FixedText* m_pHintCorrespPrivKeyFI;
public:
- CertificateViewerGeneralTP( Window* pParent, CertificateViewer* _pDlg );
+ CertificateViewerGeneralTP( vcl::Window* pParent, CertificateViewer* _pDlg );
virtual void ActivatePage() SAL_OVERRIDE;
};
@@ -106,7 +106,7 @@ private:
void InsertElement( const OUString& _rField, const OUString& _rValue,
const OUString& _rDetails, bool _bFixedWidthFont = false );
public:
- CertificateViewerDetailsTP( Window* pParent, CertificateViewer* _pDlg );
+ CertificateViewerDetailsTP( vcl::Window* pParent, CertificateViewer* _pDlg );
virtual ~CertificateViewerDetailsTP();
virtual void ActivatePage() SAL_OVERRIDE;
@@ -135,7 +135,7 @@ private:
bool bValid);
public:
- CertificateViewerCertPathTP( Window* pParent, CertificateViewer* _pDlg );
+ CertificateViewerCertPathTP( vcl::Window* pParent, CertificateViewer* _pDlg );
virtual ~CertificateViewerCertPathTP();
virtual void ActivatePage() SAL_OVERRIDE;
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index c16ae4bacb22..c73fc3bbbd3b 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -113,7 +113,7 @@ private:
bool canAddRemove();
public:
- DigitalSignaturesDialog( Window* pParent, css::uno::Reference<
+ DigitalSignaturesDialog( vcl::Window* pParent, css::uno::Reference<
css::uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature);
virtual ~DigitalSignaturesDialog();
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 67b02140df42..63c16d71293f 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -63,7 +63,7 @@ private:
DECL_LINK( OkBtnHdl, void* );
public:
- MacroSecurity(Window* pParent,
+ MacroSecurity(vcl::Window* pParent,
const css::uno::Reference< css::uno::XComponentContext>& rxCtx,
const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment);
virtual ~MacroSecurity();
@@ -79,7 +79,7 @@ class MacroSecurityTP : public TabPage
protected:
MacroSecurity* mpDlg;
public:
- MacroSecurityTP(Window* _pParent, const OString& rID,
+ MacroSecurityTP(vcl::Window* _pParent, const OString& rID,
const OUString& rUIXMLDescription, MacroSecurity* _pDlg);
void SetTabDlg(MacroSecurity* pTabDlg)
@@ -104,7 +104,7 @@ protected:
DECL_LINK(RadioButtonHdl, void *);
public:
- MacroSecurityLevelTP( Window* pParent, MacroSecurity* _pDlg );
+ MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg );
virtual void ClosePage( void ) SAL_OVERRIDE;
};
@@ -138,7 +138,7 @@ private:
void ImplCheckButtons();
public:
- MacroSecurityTrustedSourcesTP(Window* pParent, MacroSecurity* _pDlg);
+ MacroSecurityTrustedSourcesTP(vcl::Window* pParent, MacroSecurity* _pDlg);
virtual ~MacroSecurityTrustedSourcesTP();
virtual void ActivatePage() SAL_OVERRIDE;