fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

5 files changed, 11 insertions, 11 deletions

diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 87aa9c4b0689..689709125aee 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -379,8 +379,8 @@ void DictionaryList::Resize()
 }
 
 void DictionaryList::init(const Reference< linguistic2::XConversionDictionary>& xDictionary,
-    Window *pED_Term, Window *pED_Mapping, ListBox *pLB_Property,
-    Window *pFT_Term, Window *pFT_Mapping, Window *pFT_Property)
+    vcl::Window *pED_Term, vcl::Window *pED_Mapping, ListBox *pLB_Property,
+    vcl::Window *pFT_Term, vcl::Window *pFT_Mapping, vcl::Window *pFT_Property)
 {
     SetStyle( WB_VSCROLL | WB_TABSTOP );
     SetSelectionMode( SINGLE_SELECTION );
@@ -428,7 +428,7 @@ void ChineseDictionaryDialog::initDictionaryControl(DictionaryList *pList,
         m_pFT_Term, m_pFT_Mapping, m_pFT_Property);
 }
 
-ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
+ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent )
     : ModalDialog(pParent, "ChineseDictionaryDialog",
          "svx/ui/chinesedictionary.ui")
     , m_nTextConversionOptions(i18n::TextConversionOption::NONE)
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index b088bb07196d..97cef0a2ff33 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -63,8 +63,8 @@ public:
     DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits);
 
     void init(const css::uno::Reference< css::linguistic2::XConversionDictionary>& xDictionary,
-        Window *pED_Term, Window *pED_Mapping, ListBox *pLB_Property,
-        Window *pFT_Term, Window *pFT_Mapping, Window *pFT_Property);
+        vcl::Window *pED_Term, vcl::Window *pED_Mapping, ListBox *pLB_Property,
+        vcl::Window *pFT_Term, vcl::Window *pFT_Mapping, vcl::Window *pFT_Property);
 
     void deleteAll();
     void refillFromDictionary( sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ );
@@ -99,8 +99,8 @@ public:
     css::uno::Reference<css::linguistic2::XConversionDictionary>  m_xDictionary;
 
 private:
-    Window*     m_pED_Term;
-    Window*     m_pED_Mapping;
+    vcl::Window*     m_pED_Term;
+    vcl::Window*     m_pED_Mapping;
     ListBox*    m_pLB_Property;
 
     std::vector< DictionaryEntry* > m_aToBeDeleted;
@@ -111,7 +111,7 @@ private:
 class ChineseDictionaryDialog : public ModalDialog
 {
 public:
-    ChineseDictionaryDialog( Window* pParent );
+    ChineseDictionaryDialog( vcl::Window* pParent );
     virtual ~ChineseDictionaryDialog();
 
     //this method should be called once before calling execute
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 16baa1947b72..1b8645595bd4 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -129,7 +129,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc
 
         if( !m_pDialog )
         {
-            Window* pParent = NULL;
+            vcl::Window* pParent = NULL;
             if( m_xParentWindow.is() )
             {
                 VCLXWindow* pImplementation = VCLXWindow::GetImplementation(m_xParentWindow);
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index adf98f688268..8dec51d66809 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -34,7 +34,7 @@ namespace textconversiondlgs
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
+ChineseTranslationDialog::ChineseTranslationDialog( vcl::Window* pParent )
     : ModalDialog(pParent, "ChineseConversionDialog", "svx/ui/chineseconversiondialog.ui")
     , m_pDictionaryDialog(0)
 {
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index 03342a604aaa..5e1f0909d9f2 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -37,7 +37,7 @@ class ChineseDictionaryDialog;
 class ChineseTranslationDialog : public ModalDialog
 {
 public:
-    ChineseTranslationDialog( Window* pParent );
+    ChineseTranslationDialog( vcl::Window* pParent );
     virtual ~ChineseTranslationDialog();
 
     void getSettings( bool& rbDirectionToSimplified