fdo#82577: Handle Window

Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

9 files changed, 26 insertions, 26 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;
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index a3c1676f5b1b..4ad295d74d33 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -48,7 +48,7 @@ sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const
     return (sal_uInt16) nSel;
 }
 
-CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore )
+CertificateChooser::CertificateChooser( vcl::Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore )
     : ModalDialog(_pParent, "SelectCertificateDialog", "xmlsec/ui/selectcertificatedialog.ui")
     , maCertsToIgnore( _rCertsToIgnore )
 {
@@ -99,8 +99,8 @@ short CertificateChooser::Execute()
     // Problem: This Dialog should be visible right now, and the parent should not be accessible.
     // Show, Update, DIsableInput...
 
-    Window* pMe = this;
-    Window* pParent = GetParent();
+    vcl::Window* pMe = this;
+    vcl::Window* pParent = GetParent();
     if ( pParent )
         pParent->EnableInput( false );
     pMe->Show();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 02ce1d8c64ac..d4f0f5a22d7e 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
 CertificateViewer::CertificateViewer(
-        Window* _pParent,
+        vcl::Window* _pParent,
         const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment,
         const css::uno::Reference< css::security::XCertificate >& _rXCert, bool bCheckForPrivateKey )
     : TabDialog(_pParent, "ViewCertDialog", "xmlsec/ui/viewcertdialog.ui" )
@@ -66,14 +66,14 @@ CertificateViewer::~CertificateViewer()
     delete mpTabCtrl->GetTabPage(mnPathId);
 }
 
-CertificateViewerTP::CertificateViewerTP( Window* _pParent, const OString& rID,
+CertificateViewerTP::CertificateViewerTP( vcl::Window* _pParent, const OString& rID,
     const OUString& rUIXMLDescription, CertificateViewer* _pDlg )
     : TabPage(_pParent, rID, rUIXMLDescription)
     , mpDlg(_pDlg)
 {
 }
 
-CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, CertificateViewer* _pDlg )
+CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, CertificateViewer* _pDlg )
     :CertificateViewerTP    ( _pParent, "CertGeneral", "xmlsec/ui/certgeneral.ui", _pDlg )
 {
     get( m_pCertImg, "certimage" );
@@ -174,7 +174,7 @@ void CertificateViewerDetailsTP::InsertElement( const OUString& _rField, const O
     pEntry->SetUserData( ( void* ) new Details_UserDatat( _rDetails, _bFixedWidthFont ) );
 }
 
-CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, CertificateViewer* _pDlg )
+CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, CertificateViewer* _pDlg )
     :CertificateViewerTP    ( _pParent, "CertDetails", "xmlsec/ui/certdetails.ui", _pDlg  )
     ,m_aFixedWidthFont( OutputDevice::GetDefaultFont( DEFAULTFONT_UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) )
 {
@@ -299,7 +299,7 @@ struct CertPath_UserData
 };
 
 
-CertificateViewerCertPathTP::CertificateViewerCertPathTP( Window* _pParent, CertificateViewer* _pDlg )
+CertificateViewerCertPathTP::CertificateViewerCertPathTP( vcl::Window* _pParent, CertificateViewer* _pDlg )
     : CertificateViewerTP(_pParent, "CertPage", "xmlsec/ui/certpage.ui", _pDlg)
     , mpParent(_pDlg)
     , mbFirstActivateDone(false)
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 032e6d63135c..1016a5f99c94 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -161,7 +161,7 @@ bool DigitalSignaturesDialog::isXML(const OUString& rURI )
 }
 
 DigitalSignaturesDialog::DigitalSignaturesDialog(
-    Window* pParent,
+    vcl::Window* pParent,
     uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
     bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature)
     : ModalDialog(pParent, "DigitalSignaturesDialog", "xmlsec/ui/digitalsignaturesdialog.ui")
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 28fa791d5c81..d76fdcde83d4 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -58,7 +58,7 @@ IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl)
     return 0;
 }
 
-MacroSecurity::MacroSecurity( Window* _pParent,
+MacroSecurity::MacroSecurity( vcl::Window* _pParent,
     const css::uno::Reference< css::uno::XComponentContext> &_rxCtx,
     const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment)
     : TabDialog(_pParent, "MacroSecurityDialog", "xmlsec/ui/macrosecuritydialog.ui")
@@ -88,14 +88,14 @@ MacroSecurity::~MacroSecurity()
     delete m_pTabCtrl->GetTabPage(m_nSecLevelId);
 }
 
-MacroSecurityTP::MacroSecurityTP(Window* _pParent, const OString& rID,
+MacroSecurityTP::MacroSecurityTP(vcl::Window* _pParent, const OString& rID,
     const OUString& rUIXMLDescription, MacroSecurity* _pDlg)
     : TabPage(_pParent, rID, rUIXMLDescription)
     , mpDlg(_pDlg)
 {
 }
 
-MacroSecurityLevelTP::MacroSecurityLevelTP(Window* _pParent, MacroSecurity* _pDlg)
+MacroSecurityLevelTP::MacroSecurityLevelTP(vcl::Window* _pParent, MacroSecurity* _pDlg)
     : MacroSecurityTP(_pParent, "SecurityLevelPage", "xmlsec/ui/securitylevelpage.ui", _pDlg)
 {
     get(m_pVeryHighRB, "vhigh");
@@ -339,7 +339,7 @@ public:
     }
 };
 
-MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, MacroSecurity* _pDlg)
+MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(vcl::Window* _pParent, MacroSecurity* _pDlg)
     : MacroSecurityTP(_pParent, "SecurityTrustPage", "xmlsec/ui/securitytrustpage.ui", _pDlg)
 {
     get(m_pTrustCertROFI, "lockcertimg");
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index f3c4db858d7a..77e665f76ed5 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -132,7 +132,7 @@ private:
     DECL_LINK(  StartVerifySignatureHdl, void* );
 
 public:
-                MyWin( Window* pParent, WinBits nWinStyle );
+                MyWin( vcl::Window* pParent, WinBits nWinStyle );
 
 };
 
@@ -144,7 +144,7 @@ void Main()
     Application::Execute();
 }
 
-MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
+MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
     WorkWindow( pParent, nWinStyle ),
     maTokenLine( this ),
     maTest1Line( this ),