convert WINDOW_POSSIZE constants to scoped enum

Change-Id: Id85137ffc7309a66b04132d588d289db136117b9

13 files changed, 66 insertions, 66 deletions

diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index bceba393ec53..8a5bca2a608b 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -536,7 +536,7 @@ public:
     void            StartFloat( bool bStartTracking );
 
     virtual void    setPosSizePixel( long nX, long nY,
-                                     long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE;
+                                     long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) SAL_OVERRIDE;
     void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE
                         { FloatingWindow::SetPosSizePixel( rNewPos, rNewSize ); }
 
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 1cd46dd5d6ad..d2f128a9f7ce 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1159,7 +1159,7 @@ void PushButton::ImplSetDefButton( bool bSet )
         ImplGetButtonState() &= ~DrawButtonFlags::Default;
     }
     if( bSetPos )
-        setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL );
+        setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), PosSizeFlags::All );
 
     Invalidate();
 }
@@ -3463,7 +3463,7 @@ void CheckBox::GetFocus()
         aPos.Move(-1,-1);
         aSize.Height() += 2;
         aSize.Width() += 2;
-        setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL );
+        setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), PosSizeFlags::All );
         Invalidate();
     }
     else
@@ -3494,7 +3494,7 @@ void CheckBox::LoseFocus()
         aPos.Move(1,1);
         aSize.Height() -= 2;
         aSize.Width() -= 2;
-        setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL );
+        setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), PosSizeFlags::All );
         Invalidate();
     }
 }
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 399127408eba..dde32dfa3fa2 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -537,18 +537,18 @@ sal_uInt16 ComboBox::GetDropDownLineCount() const
 }
 
 void ComboBox::setPosSizePixel( long nX, long nY, long nWidth, long nHeight,
-                                sal_uInt16 nFlags )
+                                PosSizeFlags nFlags )
 {
-    if( IsDropDownBox() && ( nFlags & WINDOW_POSSIZE_SIZE ) )
+    if( IsDropDownBox() && ( nFlags & PosSizeFlags::Size ) )
     {
         Size aPrefSz = mpFloatWin->GetPrefSize();
-        if ( ( nFlags & WINDOW_POSSIZE_HEIGHT ) && ( nHeight >= 2*mnDDHeight ) )
+        if ( ( nFlags & PosSizeFlags::Height ) && ( nHeight >= 2*mnDDHeight ) )
             aPrefSz.Height() = nHeight-mnDDHeight;
-        if ( nFlags & WINDOW_POSSIZE_WIDTH )
+        if ( nFlags & PosSizeFlags::Width )
             aPrefSz.Width() = nWidth;
         mpFloatWin->SetPrefSize( aPrefSz );
 
-        if ( IsAutoSizeEnabled() && ! (nFlags & WINDOW_POSSIZE_DROPDOWN) )
+        if ( IsAutoSizeEnabled() && ! (nFlags & PosSizeFlags::Dropdown) )
             nHeight = mnDDHeight;
     }
 
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 0407eedd6660..e9c4f92f2eb7 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3036,21 +3036,21 @@ bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt )
     return FloatingWindow::PreNotify( rNEvt );
 }
 
-void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
+void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags )
 {
     FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
 
     // Fix #60890# ( MBA ): to be able to resize the Listbox even in its open state
     // after a call to Resize(), we adjust its position if necessary
-    if ( IsReallyVisible() && ( nFlags & WINDOW_POSSIZE_HEIGHT ) )
+    if ( IsReallyVisible() && ( nFlags & PosSizeFlags::Height ) )
     {
         Point aPos = GetParent()->GetPosPixel();
         aPos = GetParent()->GetParent()->OutputToScreenPixel( aPos );
 
-        if ( nFlags & WINDOW_POSSIZE_X )
+        if ( nFlags & PosSizeFlags::X )
             aPos.X() = nX;
 
-        if ( nFlags & WINDOW_POSSIZE_Y )
+        if ( nFlags & PosSizeFlags::Y )
             aPos.Y() = nY;
 
         sal_uInt16 nIndex;
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 58d9c1341dac..4fbc24e5495d 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -605,18 +605,18 @@ sal_uInt16 ListBox::GetDropDownLineCount() const
     return mnLineCount;
 }
 
-void ListBox::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
+void ListBox::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags )
 {
-    if( IsDropDownBox() && ( nFlags & WINDOW_POSSIZE_SIZE ) )
+    if( IsDropDownBox() && ( nFlags & PosSizeFlags::Size ) )
     {
         Size aPrefSz = mpFloatWin->GetPrefSize();
-        if ( ( nFlags & WINDOW_POSSIZE_HEIGHT ) && ( nHeight >= 2*mnDDHeight ) )
+        if ( ( nFlags & PosSizeFlags::Height ) && ( nHeight >= 2*mnDDHeight ) )
             aPrefSz.Height() = nHeight-mnDDHeight;
-        if ( nFlags & WINDOW_POSSIZE_WIDTH )
+        if ( nFlags & PosSizeFlags::Width )
             aPrefSz.Width() = nWidth;
         mpFloatWin->SetPrefSize( aPrefSz );
 
-        if ( IsAutoSizeEnabled() && ! (nFlags & WINDOW_POSSIZE_DROPDOWN) )
+        if ( IsAutoSizeEnabled() && ! (nFlags & PosSizeFlags::Dropdown) )
             nHeight = mnDDHeight;
     }
 
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 55d1c9f29511..406dbe2b2372 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -854,10 +854,10 @@ bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track
                     // no move (only resize) if position did not change
                     if( aOldPos != aNewRect.TopLeft() )
                         pBorderWindow->setPosSizePixel( aNewRect.Left(), aNewRect.Top(),
-                                                    aNewRect.GetWidth(), aNewRect.GetHeight(), WINDOW_POSSIZE_POSSIZE );
+                                                    aNewRect.GetWidth(), aNewRect.GetHeight(), PosSizeFlags::PosSize );
                     else
                         pBorderWindow->setPosSizePixel( aNewRect.Left(), aNewRect.Top(),
-                                                    aNewRect.GetWidth(), aNewRect.GetHeight(), WINDOW_POSSIZE_SIZE );
+                                                    aNewRect.GetWidth(), aNewRect.GetHeight(), PosSizeFlags::Size );
 
                     pBorderWindow->ImplUpdateAll();
                     pBorderWindow->ImplGetFrameWindow()->ImplUpdateAll();
@@ -1959,8 +1959,8 @@ void ImplBorderWindow::Resize()
                                               nTopBorder,
                                               aSize.Width()-nLeftBorder-nRightBorder,
                                               nMenuHeight,
-                                              WINDOW_POSSIZE_POS |
-                                              WINDOW_POSSIZE_WIDTH | WINDOW_POSSIZE_HEIGHT );
+                                              PosSizeFlags::Pos |
+                                              PosSizeFlags::Width | PosSizeFlags::Height );
         }
 
         GetBorder( pClientWindow->mpWindowImpl->mnLeftBorder, pClientWindow->mpWindowImpl->mnTopBorder,
@@ -1969,8 +1969,8 @@ void ImplBorderWindow::Resize()
                                           pClientWindow->mpWindowImpl->mnTopBorder,
                                           aSize.Width()-pClientWindow->mpWindowImpl->mnLeftBorder-pClientWindow->mpWindowImpl->mnRightBorder,
                                           aSize.Height()-pClientWindow->mpWindowImpl->mnTopBorder-pClientWindow->mpWindowImpl->mnBottomBorder,
-                                          WINDOW_POSSIZE_X | WINDOW_POSSIZE_Y |
-                                          WINDOW_POSSIZE_WIDTH | WINDOW_POSSIZE_HEIGHT );
+                                          PosSizeFlags::X | PosSizeFlags::Y |
+                                          PosSizeFlags::Width | PosSizeFlags::Height );
     }
 
     // UpdateView
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 38111425583e..52708dd7e865 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -253,7 +253,7 @@ void ImplDockFloatWin2::Resize()
     {
         FloatingWindow::Resize();
         Size aSize( GetSizePixel() );
-        mpDockWin->GetWindow()->ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(), WINDOW_POSSIZE_POSSIZE ); // TODO: is this needed ???
+        mpDockWin->GetWindow()->ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(), PosSizeFlags::PosSize ); // TODO: is this needed ???
     }
 }
 
@@ -429,7 +429,7 @@ void DockingManager::RemoveWindow( const vcl::Window *pWindow )
 
 void DockingManager::SetPosSizePixel( vcl::Window *pWindow, long nX, long nY,
                                     long nWidth, long nHeight,
-                                    sal_uInt16 nFlags )
+                                    PosSizeFlags nFlags )
 {
     ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow );
     if( pWrapper )
@@ -1318,7 +1318,7 @@ void ImplDockingWindowWrapper::SetFloatStyle( WinBits nStyle )
 
 void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight,
-                                     sal_uInt16 nFlags )
+                                     PosSizeFlags nFlags )
 {
     if ( mpFloatWin )
         mpFloatWin->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 2c4704d8b6fb..e76b1c629809 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -216,7 +216,7 @@ void ImplDockFloatWin::Resize()
 {
     FloatingWindow::Resize();
     Size aSize( GetSizePixel() );
-    mpDockWin->ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(), WINDOW_POSSIZE_POSSIZE );
+    mpDockWin->ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(), PosSizeFlags::PosSize );
 }
 
 void ImplDockFloatWin::TitleButtonClick( TitleButton nButton )
@@ -916,7 +916,7 @@ WinBits DockingWindow::GetFloatStyle() const
 
 void DockingWindow::setPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight,
-                                     sal_uInt16 nFlags )
+                                     PosSizeFlags nFlags )
 {
     ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this );
     if (pWrapper)
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 1898d66104ff..fc266f2c61f3 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -208,7 +208,7 @@ void MenuBarWindow::SetMenu( MenuBar* pMen )
 
 void MenuBarWindow::SetHeight(long nHeight)
 {
-    setPosSizePixel(0, 0, 0, nHeight, WINDOW_POSSIZE_HEIGHT);
+    setPosSizePixel(0, 0, 0, nHeight, PosSizeFlags::Height);
 }
 
 void MenuBarWindow::ShowButtons( bool bClose, bool bFloat, bool bHide )
@@ -1013,7 +1013,7 @@ void MenuBarWindow::LayoutChanged()
     {
         nHeight = 0;
     }
-    setPosSizePixel(0, 0, 0, nHeight, WINDOW_POSSIZE_HEIGHT);
+    setPosSizePixel(0, 0, 0, nHeight, PosSizeFlags::Height);
     GetParent()->Resize();
     Invalidate();
     Resize();
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index a85fe4a0ca1e..d348e2b15e84 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -748,15 +748,15 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
     }
     else
     {
-        sal_uInt16 nPosSize = 0;
+        PosSizeFlags nPosSize = PosSizeFlags::NONE;
         if ( nValidMask & WINDOWSTATE_MASK_X )
-            nPosSize |= WINDOW_POSSIZE_X;
+            nPosSize |= PosSizeFlags::X;
         if ( nValidMask & WINDOWSTATE_MASK_Y )
-            nPosSize |= WINDOW_POSSIZE_Y;
+            nPosSize |= PosSizeFlags::Y;
         if ( nValidMask & WINDOWSTATE_MASK_WIDTH )
-            nPosSize |= WINDOW_POSSIZE_WIDTH;
+            nPosSize |= PosSizeFlags::Width;
         if ( nValidMask & WINDOWSTATE_MASK_HEIGHT )
-            nPosSize |= WINDOW_POSSIZE_HEIGHT;
+            nPosSize |= PosSizeFlags::Height;
 
         if( IsRollUp() )
             RollDown();
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 47e9912bfc73..1080cb8eb421 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -95,14 +95,14 @@ void TabDialog::ImplPosControls()
             long    nViewOffY = 0;
             long    nViewWidth = 0;
             long    nViewHeight = 0;
-            sal_uInt16  nViewPosFlags = WINDOW_POSSIZE_POS;
+            PosSizeFlags nViewPosFlags = PosSizeFlags::Pos;
             Size    aViewSize = mpViewWindow->GetSizePixel();
             if (  meViewAlign == WINDOWALIGN_TOP )
             {
                 nViewOffX       = aTabOffset.X();
                 nViewOffY       = nOffY+IMPL_DIALOG_OFFSET;
                 nViewWidth      = aTabSize.Width();
-                nViewPosFlags  |= WINDOW_POSSIZE_WIDTH;
+                nViewPosFlags  |= PosSizeFlags::Width;
                 aTabOffset.Y() += aViewSize.Height()+IMPL_DIALOG_OFFSET;
                 aDlgSize.Height() += aViewSize.Height()+IMPL_DIALOG_OFFSET;
             }
@@ -111,7 +111,7 @@ void TabDialog::ImplPosControls()
                 nViewOffX       = aTabOffset.X();
                 nViewOffY       = aTabOffset.Y()+aTabSize.Height()+IMPL_DIALOG_OFFSET;
                 nViewWidth      = aTabSize.Width();
-                nViewPosFlags  |= WINDOW_POSSIZE_WIDTH;
+                nViewPosFlags  |= PosSizeFlags::Width;
                 aDlgSize.Height() += aViewSize.Height()+IMPL_DIALOG_OFFSET;
             }
             else if (  meViewAlign == WINDOWALIGN_RIGHT )
@@ -119,7 +119,7 @@ void TabDialog::ImplPosControls()
                 nViewOffX       = aTabOffset.X()+aTabSize.Width()+IMPL_DIALOG_OFFSET;
                 nViewOffY       = aTabOffset.Y();
                 nViewHeight     = aTabSize.Height();
-                nViewPosFlags  |= WINDOW_POSSIZE_HEIGHT;
+                nViewPosFlags  |= PosSizeFlags::Height;
                 aDlgSize.Width() += aViewSize.Width()+IMPL_DIALOG_OFFSET;
                 nBtnEx          = aViewSize.Width()+IMPL_DIALOG_OFFSET;
             }
@@ -128,7 +128,7 @@ void TabDialog::ImplPosControls()
                 nViewOffX       = IMPL_DIALOG_OFFSET;
                 nViewOffY       = aTabOffset.Y();
                 nViewHeight     = aTabSize.Height();
-                nViewPosFlags  |= WINDOW_POSSIZE_HEIGHT;
+                nViewPosFlags  |= PosSizeFlags::Height;
                 aTabOffset.X() += aViewSize.Width()+IMPL_DIALOG_OFFSET;
                 aDlgSize.Width() += aViewSize.Width()+IMPL_DIALOG_OFFSET;
                 nBtnEx          = aViewSize.Width()+IMPL_DIALOG_OFFSET;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 4e99263e2bf7..b9ea0e6ba56a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1537,7 +1537,7 @@ void Window::ImplUpdateSysObjPos()
 }
 
 void Window::ImplPosSizeWindow( long nX, long nY,
-                                long nWidth, long nHeight, sal_uInt16 nFlags )
+                                long nWidth, long nHeight, PosSizeFlags nFlags )
 {
     bool    bNewPos         = false;
     bool    bNewSize        = false;
@@ -1567,12 +1567,12 @@ void Window::ImplPosSizeWindow( long nX, long nY,
     }
 
     bool bnXRecycled = false; // avoid duplicate mirroring in RTL case
-    if ( nFlags & WINDOW_POSSIZE_WIDTH )
+    if ( nFlags & PosSizeFlags::Width )
     {
-        if(!( nFlags & WINDOW_POSSIZE_X ))
+        if(!( nFlags & PosSizeFlags::X ))
         {
             nX = mpWindowImpl->mnX;
-            nFlags |= WINDOW_POSSIZE_X;
+            nFlags |= PosSizeFlags::X;
             bnXRecycled = true; // we're using a mnX which was already mirrored in RTL case
         }
 
@@ -1585,7 +1585,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
             bCopyBits = false;
         }
     }
-    if ( nFlags & WINDOW_POSSIZE_HEIGHT )
+    if ( nFlags & PosSizeFlags::Height )
     {
         if ( nHeight < 0 )
             nHeight = 0;
@@ -1597,7 +1597,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
         }
     }
 
-    if ( nFlags & WINDOW_POSSIZE_X )
+    if ( nFlags & PosSizeFlags::X )
     {
         long nOrgX = nX;
         // --- RTL ---  (compare the screen coordinates)
@@ -1652,7 +1652,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
             bNewPos = true;
         }
     }
-    if ( nFlags & WINDOW_POSSIZE_Y )
+    if ( nFlags & PosSizeFlags::Y )
     {
         // check maPos as well, as it could have been changed for client windows (ImplCallMove())
         if ( nY != mpWindowImpl->mnY || nY != mpWindowImpl->maPos.Y() )
@@ -1686,8 +1686,8 @@ void Window::ImplPosSizeWindow( long nX, long nY,
                                                mpWindowImpl->mpClientWindow->mpWindowImpl->mnTopBorder,
                                                mnOutWidth-mpWindowImpl->mpClientWindow->mpWindowImpl->mnLeftBorder-mpWindowImpl->mpClientWindow->mpWindowImpl->mnRightBorder,
                                                mnOutHeight-mpWindowImpl->mpClientWindow->mpWindowImpl->mnTopBorder-mpWindowImpl->mpClientWindow->mpWindowImpl->mnBottomBorder,
-                                               WINDOW_POSSIZE_X | WINDOW_POSSIZE_Y |
-                                               WINDOW_POSSIZE_WIDTH | WINDOW_POSSIZE_HEIGHT );
+                                               PosSizeFlags::X | PosSizeFlags::Y |
+                                               PosSizeFlags::Width | PosSizeFlags::Height );
             // If we have a client window, then this is the position
             // of the Application's floating windows
             mpWindowImpl->mpClientWindow->mpWindowImpl->maPos = mpWindowImpl->maPos;
@@ -2831,14 +2831,14 @@ void Window::SetActivateMode( sal_uInt16 nMode )
 }
 
 void Window::setPosSizePixel( long nX, long nY,
-                              long nWidth, long nHeight, sal_uInt16 nFlags )
+                              long nWidth, long nHeight, PosSizeFlags nFlags )
 {
 
     bool bHasValidSize = !mpWindowImpl->mbDefSize;
 
-    if ( nFlags & WINDOW_POSSIZE_POS )
+    if ( nFlags & PosSizeFlags::Pos )
         mpWindowImpl->mbDefPos = false;
-    if ( nFlags & WINDOW_POSSIZE_SIZE )
+    if ( nFlags & PosSizeFlags::Size )
         mpWindowImpl->mbDefSize = false;
 
     // The top BorderWindow is the window which is to be positioned
@@ -2853,19 +2853,19 @@ void Window::setPosSizePixel( long nX, long nY,
         // as the position of the border ! (due to limitations of several UNIX window managers)
         long nOldWidth  = pWindow->mnOutWidth;
 
-        if ( !(nFlags & WINDOW_POSSIZE_WIDTH) )
+        if ( !(nFlags & PosSizeFlags::Width) )
             nWidth = pWindow->mnOutWidth;
-        if ( !(nFlags & WINDOW_POSSIZE_HEIGHT) )
+        if ( !(nFlags & PosSizeFlags::Height) )
             nHeight = pWindow->mnOutHeight;
 
         sal_uInt16 nSysFlags=0;
         vcl::Window *pParent = GetParent();
 
-        if( nFlags & WINDOW_POSSIZE_WIDTH )
+        if( nFlags & PosSizeFlags::Width )
             nSysFlags |= SAL_FRAME_POSSIZE_WIDTH;
-        if( nFlags & WINDOW_POSSIZE_HEIGHT )
+        if( nFlags & PosSizeFlags::Height )
             nSysFlags |= SAL_FRAME_POSSIZE_HEIGHT;
-        if( nFlags & WINDOW_POSSIZE_X )
+        if( nFlags & PosSizeFlags::X )
         {
             nSysFlags |= SAL_FRAME_POSSIZE_X;
             if( pParent && (pWindow->GetStyle() & WB_SYSTEMCHILDWINDOW) )
@@ -2881,7 +2881,7 @@ void Window::setPosSizePixel( long nX, long nY,
                 nX = aRect.Left();
             }
         }
-        if( !(nFlags & WINDOW_POSSIZE_X) && bHasValidSize && pWindow->mpWindowImpl->mpFrame->maGeometry.nWidth )
+        if( !(nFlags & PosSizeFlags::X) && bHasValidSize && pWindow->mpWindowImpl->mpFrame->maGeometry.nWidth )
         {
             // --- RTL ---  make sure the old right aligned position is not changed
             //              system windows will always grow to the right
@@ -2895,15 +2895,15 @@ void Window::setPosSizePixel( long nX, long nY,
                         myWidth = mpWindowImpl->mpFrame->GetUnmirroredGeometry().nWidth;
                     if( !myWidth )
                         myWidth = nWidth;
-                    nFlags |= WINDOW_POSSIZE_X;
+                    nFlags |= PosSizeFlags::X;
                     nSysFlags |= SAL_FRAME_POSSIZE_X;
                     nX = mpWindowImpl->mpFrame->GetUnmirroredGeometry().nX - pParent->mpWindowImpl->mpFrame->GetUnmirroredGeometry().nX -
                         mpWindowImpl->mpFrame->GetUnmirroredGeometry().nLeftDecoration;
                     nX = pParent->mpWindowImpl->mpFrame->GetUnmirroredGeometry().nX - mpWindowImpl->mpFrame->GetUnmirroredGeometry().nLeftDecoration +
                         pParent->mpWindowImpl->mpFrame->GetUnmirroredGeometry().nWidth - myWidth - 1 - mpWindowImpl->mpFrame->GetUnmirroredGeometry().nX;
-                    if(!(nFlags & WINDOW_POSSIZE_Y))
+                    if(!(nFlags & PosSizeFlags::Y))
                     {
-                        nFlags |= WINDOW_POSSIZE_Y;
+                        nFlags |= PosSizeFlags::Y;
                         nSysFlags |= SAL_FRAME_POSSIZE_Y;
                         nY = mpWindowImpl->mpFrame->GetUnmirroredGeometry().nY - pWindow->GetParent()->mpWindowImpl->mpFrame->GetUnmirroredGeometry().nY -
                             mpWindowImpl->mpFrame->GetUnmirroredGeometry().nTopDecoration;
@@ -2911,7 +2911,7 @@ void Window::setPosSizePixel( long nX, long nY,
                 }
             }
         }
-        if( nFlags & WINDOW_POSSIZE_Y )
+        if( nFlags & PosSizeFlags::Y )
         {
             nSysFlags |= SAL_FRAME_POSSIZE_Y;
             if( pParent && (pWindow->GetStyle() & WB_SYSTEMCHILDWINDOW) )
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index fc52397a2bc8..c38a2b25f8d7 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1411,20 +1411,20 @@ VCLXWindow* Window::GetWindowPeer() const
 
 void Window::SetPosPixel( const Point& rNewPos )
 {
-    setPosSizePixel( rNewPos.X(), rNewPos.Y(), 0, 0, WINDOW_POSSIZE_POS );
+    setPosSizePixel( rNewPos.X(), rNewPos.Y(), 0, 0, PosSizeFlags::Pos );
 }
 
 void Window::SetSizePixel( const Size& rNewSize )
 {
     setPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(),
-                     WINDOW_POSSIZE_SIZE );
+                     PosSizeFlags::Size );
 }
 
 void Window::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
 {
     setPosSizePixel( rNewPos.X(), rNewPos.Y(),
                      rNewSize.Width(), rNewSize.Height(),
-                     WINDOW_POSSIZE_POSSIZE );
+                     PosSizeFlags::PosSize );
 }
 
 void Window::SetOutputSizePixel( const Size& rNewSize )