Convert WindowType to scoped enum

Change-Id: I85cfe02f28729e13f2c0dd3d91cd89e6f3e3b6a9
Reviewed-on: https://gerrit.libreoffice.org/34219
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 9 insertions, 10 deletions

diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 162264f88aa6..ed62e566d250 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -90,7 +90,7 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent(  )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     vcl::Window *pTabPage = getNonLayoutParent(&mrPixelCtl);
-    if (!pTabPage || WINDOW_TABPAGE != pTabPage->GetType())
+    if (!pTabPage || WindowType::TABPAGE != pTabPage->GetType())
         return uno::Reference< XAccessible >();
     else
         return pTabPage->GetAccessible();
@@ -101,7 +101,7 @@ sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent(  )
     ::osl::MutexGuard   aGuard( m_aMutex );
     sal_uInt16 nIdx = 0;
     vcl::Window *pTabPage = getNonLayoutParent(&mrPixelCtl);
-    if (!pTabPage || WINDOW_TABPAGE != pTabPage->GetType())
+    if (!pTabPage || WindowType::TABPAGE != pTabPage->GetType())
         return -1;
     sal_uInt16 nChildren = pTabPage->GetChildCount();
     for(nIdx = 0; nIdx < nChildren; nIdx++)
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 42bde26b4155..c6283bac516a 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -270,7 +270,7 @@ void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt )
             SetActualRP( eRP );
 
             vcl::Window *pTabPage = getNonLayoutParent(this);
-            if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType())
+            if (pTabPage && WindowType::TABPAGE == pTabPage->GetType())
                 static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, eRP );
         }
     }
@@ -355,7 +355,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
             SetActualRP( eNewRP );
 
             vcl::Window *pTabPage = getNonLayoutParent(this);
-            if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType())
+            if (pTabPage && WindowType::TABPAGE == pTabPage->GetType())
                 static_cast<SvxTabPage*>(pTabPage)->PointChanged(this, eRP);
 
             SetFocusRect();
@@ -671,7 +671,7 @@ void SvxRectCtl::SetState( CTL_STATE nState )
     Invalidate();
 
     vcl::Window *pTabPage = getNonLayoutParent(this);
-    if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType())
+    if (pTabPage && WindowType::TABPAGE == pTabPage->GetType())
         static_cast<SvxTabPage*>(pTabPage)->PointChanged(this, eRP);
 }
 
@@ -792,7 +792,7 @@ long SvxPixelCtl::ShowPosition( const Point &pt)
     Invalidate(Rectangle(Point(0,0),aRectSize));
 
     vcl::Window *pTabPage = getNonLayoutParent(this);
-    if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType())
+    if (pTabPage && WindowType::TABPAGE == pTabPage->GetType())
         static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, RectPoint::MM ); // RectPoint ist dummy
 
     return GetFocusPosIndex();
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 80245dcd9bf2..4f02866ec33a 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -85,7 +85,7 @@ void PanelLayout::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, P
     bool bIsLayoutEnabled = isLayoutEnabled(this);
     vcl::Window *pChild = GetWindow(GetWindowType::FirstChild);
 
-    if (bIsLayoutEnabled && pChild->GetType() == WINDOW_SCROLLWINDOW)
+    if (bIsLayoutEnabled && pChild->GetType() == WindowType::SCROLLWINDOW)
     {
         WinBits nStyle = pChild->GetStyle();
         if (nStyle & (WB_AUTOHSCROLL | WB_HSCROLL))
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx
index cde72ac18c96..65955445e602 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -124,7 +124,7 @@ void SvxColorValueSet::Resize()
 {
     vcl::Window *pParent = GetParent();
     //don't do this for the drop down color palettes
-    if (pParent && pParent->GetType() != WINDOW_FLOATINGWINDOW)
+    if (pParent && pParent->GetType() != WindowType::FLOATINGWINDOW)
         layoutToGivenHeight(GetOutputSizePixel().Height(), GetItemCount());
     ValueSet::Resize();
 }
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index dce2e51c909e..3b1a33daf093 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -80,8 +80,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged(
     {
         ToolBox& rTbx = GetToolBox();
         vcl::Window* pParent = rTbx.GetParent();
-        WindowType nWinType = pParent->GetType();
-        if(WINDOW_FLOATINGWINDOW == nWinType)
+        if(WindowType::FLOATINGWINDOW == pParent->GetType())
         {
             Size aSize(rTbx.CalcWindowSizePixel());
             rTbx.SetPosSizePixel( Point(), aSize );