fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

12 files changed, 30 insertions, 30 deletions

diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx
index 9c073d07c279..63d458f1c955 100644
--- a/sfx2/source/doc/QuerySaveDocument.cxx
+++ b/sfx2/source/doc/QuerySaveDocument.cxx
@@ -21,7 +21,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 
-short ExecuteQuerySaveDocument(Window* _pParent, const OUString& _rTitle)
+short ExecuteQuerySaveDocument(vcl::Window* _pParent, const OUString& _rTitle)
 {
     if (Application::IsHeadlessModeEnabled())
     {
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 1922cad4c5b7..6ee6c0f18b47 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -665,7 +665,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus )
           && GetMediaDescr().find( aVersionCommentString ) == GetMediaDescr().end() )
         {
             // notify the user that SaveAs is going to be done
-            Window* pWin = SfxStoringHelper::GetModelWindow( m_xModel );
+            vcl::Window* pWin = SfxStoringHelper::GetModelWindow( m_xModel );
             MessageDialog aMessageBox(pWin, SfxResId(STR_NEW_FILENAME_SAVE),
                                       VCL_MESSAGE_QUESTION, VCL_BUTTONS_OK_CANCEL);
             if ( aMessageBox.Execute() == RET_OK )
@@ -1855,15 +1855,15 @@ bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XMod
     if ( !SvtSaveOptions().IsWarnAlienFormat() )
         return true;
 
-    Window* pWin = SfxStoringHelper::GetModelWindow( xModel );
+    vcl::Window* pWin = SfxStoringHelper::GetModelWindow( xModel );
     SfxAlienWarningDialog aDlg( pWin, aOldUIName );
 
     return aDlg.Execute() == RET_OK;
 }
 
-Window* SfxStoringHelper::GetModelWindow( const uno::Reference< frame::XModel >& xModel )
+vcl::Window* SfxStoringHelper::GetModelWindow( const uno::Reference< frame::XModel >& xModel )
 {
-    Window* pWin = 0;
+    vcl::Window* pWin = 0;
     try {
         if ( xModel.is() )
         {
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index bfa748502772..f2650dcd9096 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -105,17 +105,17 @@ public:
     virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class IFrameWindow_Impl : public Window
+class IFrameWindow_Impl : public vcl::Window
 {
     uno::Reference < frame::XFrame2 > mxFrame;
 
 public:
-    IFrameWindow_Impl( Window *pParent,
+    IFrameWindow_Impl( vcl::Window *pParent,
                        bool bHasBorder,
                        WinBits nWinBits = 0 );
 };
 
-IFrameWindow_Impl::IFrameWindow_Impl( Window *pParent, bool bHasBorder, WinBits nWinBits )
+IFrameWindow_Impl::IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder, WinBits nWinBits )
     : Window( pParent, nWinBits | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER )
 {
     if ( !bHasBorder )
@@ -173,7 +173,7 @@ throw( uno::RuntimeException, std::exception )
     if ( SvtMiscOptions().IsPluginsEnabled() )
     {
         DBG_ASSERT( !mxFrame.is(), "Frame already existing!" );
-        Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+        vcl::Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
         IFrameWindow_Impl* pWin = new IFrameWindow_Impl( pParent, maFrmDescr.IsFrameBorderOn() );
         pWin->SetSizePixel( pParent->GetOutputSizePixel() );
         pWin->SetBackground();
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 9997782dc649..65dfc7e2237e 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -49,7 +49,7 @@ void SfxPreviewBase_Impl::SetObjectShell( SfxObjectShell* pObj )
 }
 
 SfxPreviewBase_Impl::SfxPreviewBase_Impl(
-    Window* pParent, WinBits nStyle)
+    vcl::Window* pParent, WinBits nStyle)
     : Window(pParent, nStyle)
     , pMetaFile()
 {
@@ -66,7 +66,7 @@ Size SfxPreviewBase_Impl::GetOptimalSize() const
 }
 
 void SfxPreviewWin_Impl::ImpPaint(
-    const Rectangle&, GDIMetaFile* pFile, Window* pWindow )
+    const Rectangle&, GDIMetaFile* pFile, vcl::Window* pWindow )
 {
     pWindow->SetLineColor();
     Color aLightGrayCol( COL_LIGHTGRAY );
@@ -115,7 +115,7 @@ void SfxPreviewWin_Impl::Paint( const Rectangle& rRect )
     ImpPaint( rRect, pMetaFile.get(), this );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxPreviewWin(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxPreviewWin(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new SfxPreviewWin_Impl(pParent, 0);
 }
@@ -216,7 +216,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update)
 
         if ( !xDocShell.Is() )
         {
-            Window *pParent = Application::GetDefDialogParent();
+            vcl::Window *pParent = Application::GetDefDialogParent();
             Application::SetDefDialogParent( pAntiImpl );
             SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,pAntiImpl);
             SfxApplication *pSfxApp = SfxGetpApp();
@@ -444,7 +444,7 @@ SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl()
     rExtra = m_pMoreBt->get_expanded() ? OUString("Y") : OUString("N");
 }
 
-SfxNewFileDialog::SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags)
+SfxNewFileDialog::SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags)
     : SfxModalDialog(pParent, "LoadTemplateDialog",
         "sfx/ui/loadtemplatedialog.ui")
 {
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index e1cb06382263..330f6b9e1384 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -289,7 +289,7 @@ void SfxObjectShell::UpdateTime_Impl(
 
 SfxDocumentInfoDialog* SfxObjectShell::CreateDocumentInfoDialog
 (
-    Window*             pParent,
+    vcl::Window*             pParent,
     const SfxItemSet&   rSet
 )
 {
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 7939e4246a86..4b99eee87211 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1752,9 +1752,9 @@ bool SfxObjectShell::AdjustMacroMode( const OUString& /*rScriptType*/, bool bSup
     return pImp->aMacroMode.adjustMacroMode( xInteraction );
 }
 
-Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium )
+vcl::Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium )
 {
-    Window* pWindow = 0;
+    vcl::Window* pWindow = 0;
     SfxItemSet* pSet = pLoadingMedium ? pLoadingMedium->GetItemSet() : GetMedium()->GetItemSet();
     SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, false );
     if ( pUnoItem )
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 41f05b33117c..c75880a250eb 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2950,7 +2950,7 @@ sal_uInt16 SfxObjectShell::GetHiddenInformationState( sal_uInt16 nStates )
     return nState;
 }
 
-sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent )
+sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent )
 {
     sal_Int16 nRet = RET_YES;
     sal_uInt16 nResId = sal_uInt16();
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 51ce5b185bea..b68a09d0086b 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -45,11 +45,11 @@ using namespace ::com::sun::star;
 
 namespace {
 
-class PluginWindow_Impl : public Window
+class PluginWindow_Impl : public vcl::Window
 {
 public:
     uno::Reference < awt::XWindow > xWindow;
-    PluginWindow_Impl( Window* pParent )
+    PluginWindow_Impl( vcl::Window* pParent )
      : Window( pParent, WB_CLIPCHILDREN )
      {}
 
@@ -151,7 +151,7 @@ throw( uno::RuntimeException, std::exception )
 
     if ( SvtMiscOptions().IsPluginsEnabled() )
     {
-        Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+        vcl::Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
         PluginWindow_Impl* pWin = new PluginWindow_Impl( pParent );
         pWin->SetSizePixel( pParent->GetOutputSizePixel() );
         pWin->SetBackground();
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index 94f8658056d1..3718e57922af 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -27,7 +27,7 @@
 namespace sfx2
 {
 
-QueryTemplateBox::QueryTemplateBox( Window* pParent, const OUString& rMessage ) :
+QueryTemplateBox::QueryTemplateBox( vcl::Window* pParent, const OUString& rMessage ) :
     MessBox ( pParent, 0, Application::GetDisplayName(), rMessage )
 {
     SetImage( QueryBox::GetStandardImage() );
diff --git a/sfx2/source/doc/querytemplate.hxx b/sfx2/source/doc/querytemplate.hxx
index e2d229b791f5..8c7411d5db39 100644
--- a/sfx2/source/doc/querytemplate.hxx
+++ b/sfx2/source/doc/querytemplate.hxx
@@ -27,7 +27,7 @@ namespace sfx2
     class QueryTemplateBox : public MessBox
     {
     public:
-        QueryTemplateBox( Window* pParent, const OUString& rMessage );
+        QueryTemplateBox( vcl::Window* pParent, const OUString& rMessage );
     };
 
 } // end of namespace sfx2
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 8defb3e522f1..9975213bcd08 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -348,7 +348,7 @@ class SfxOwnFramesLocker
 {
     Sequence< Reference< frame::XFrame > > m_aLockedFrames;
 
-    Window* GetVCLWindow( const Reference< frame::XFrame >& xFrame );
+    vcl::Window* GetVCLWindow( const Reference< frame::XFrame >& xFrame );
 public:
     SfxOwnFramesLocker( SfxObjectShell* ObjechShell );
     ~SfxOwnFramesLocker();
@@ -370,7 +370,7 @@ SfxOwnFramesLocker::SfxOwnFramesLocker( SfxObjectShell* pObjectShell )
         {
             // get vcl window related to the frame and lock it if it is still not locked
             Reference< frame::XFrame > xFrame = rSfxFrame.GetFrameInterface();
-            Window* pWindow = GetVCLWindow( xFrame );
+            vcl::Window* pWindow = GetVCLWindow( xFrame );
             if ( !pWindow )
                 throw RuntimeException();
 
@@ -403,9 +403,9 @@ SfxOwnFramesLocker::~SfxOwnFramesLocker()
     UnlockFrames();
 }
 
-Window* SfxOwnFramesLocker::GetVCLWindow( const Reference< frame::XFrame >& xFrame )
+vcl::Window* SfxOwnFramesLocker::GetVCLWindow( const Reference< frame::XFrame >& xFrame )
 {
-    Window* pWindow = NULL;
+    vcl::Window* pWindow = NULL;
 
     if ( xFrame.is() )
     {
@@ -426,7 +426,7 @@ void SfxOwnFramesLocker::UnlockFrames()
             if ( m_aLockedFrames[nInd].is() )
             {
                 // get vcl window related to the frame and unlock it
-                Window* pWindow = GetVCLWindow( m_aLockedFrames[nInd] );
+                vcl::Window* pWindow = GetVCLWindow( m_aLockedFrames[nInd] );
                 if ( !pWindow )
                     throw RuntimeException();
 
@@ -3651,7 +3651,7 @@ void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Siz
     SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false );
     if ( pViewFrm && m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && !pViewFrm->GetFrame().IsInPlace() )
     {
-        Window* pWindow = VCLUnoHelper::GetWindow( pViewFrm->GetFrame().GetFrameInterface()->getContainerWindow() );
+        vcl::Window* pWindow = VCLUnoHelper::GetWindow( pViewFrm->GetFrame().GetFrameInterface()->getContainerWindow() );
         Size aWinSize = pWindow->GetSizePixel();
         awt::Size aCurrent = getVisualAreaSize( nAspect );
         Size aDiff( aSize.Width-aCurrent.Width, aSize.Height-aCurrent.Height );
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 2f9f9b5d1886..ba10d497e736 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -174,7 +174,7 @@ static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const ThumbnailV
     return pItem1->mnId > pItem2->mnId;
 }
 
-SfxTemplateManagerDlg::SfxTemplateManagerDlg(Window *parent)
+SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
     : ModelessDialog(parent, "TemplateDialog", "sfx/ui/templatedlg.ui"),
       maSelTemplates(cmpSelectionItems),
       maSelFolders(cmpSelectionItems),