convert SWIB constants to scoped enum

Change-Id: If64368f22e748cc646a726cb962e60ad29a66df9
Reviewed-on: https://gerrit.libreoffice.org/15840
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit cf991bf352d64021e872ab1f8d82cb0f3cea37f3)

3 files changed, 13 insertions, 14 deletions

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 33b717d691dd..c5df153d4029 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2763,15 +2763,15 @@ void SfxHelpWindow_Impl::MakeLayout()
     if ( bIndex )
     {
         pIndexWin->Show();
-        InsertItem( COLSET_ID, 100, SPLITWINDOW_APPEND, SPLITSET_ID, SWIB_PERCENTSIZE | SWIB_COLSET );
-        InsertItem( INDEXWIN_ID, pIndexWin, nIndexSize, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE );
-        InsertItem( TEXTWIN_ID, pTextWin, nTextSize, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE );
+        InsertItem( COLSET_ID, 100, SPLITWINDOW_APPEND, SPLITSET_ID, SplitWindowItemFlags::PercentSize | SplitWindowItemFlags::ColSet );
+        InsertItem( INDEXWIN_ID, pIndexWin, nIndexSize, SPLITWINDOW_APPEND, COLSET_ID, SplitWindowItemFlags::PercentSize );
+        InsertItem( TEXTWIN_ID, pTextWin, nTextSize, SPLITWINDOW_APPEND, COLSET_ID, SplitWindowItemFlags::PercentSize );
     }
     else
     {
         pIndexWin->Hide();
-        InsertItem( COLSET_ID, 100, SPLITWINDOW_APPEND, SPLITSET_ID, SWIB_PERCENTSIZE | SWIB_COLSET );
-        InsertItem( TEXTWIN_ID, pTextWin, 100, SPLITWINDOW_APPEND, 1, SWIB_PERCENTSIZE );
+        InsertItem( COLSET_ID, 100, SPLITWINDOW_APPEND, SPLITSET_ID, SplitWindowItemFlags::PercentSize | SplitWindowItemFlags::ColSet );
+        InsertItem( TEXTWIN_ID, pTextWin, 100, SPLITWINDOW_APPEND, 1, SplitWindowItemFlags::PercentSize );
     }
 }
 
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 811baf6dc5a4..8d8c31fb6087 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1769,10 +1769,9 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
 }
 
 
-sal_uInt16 SfxDockingWindow::GetWinBits_Impl() const
+SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl() const
 {
-    sal_uInt16 nBits = 0;
-    return nBits;
+    return SplitWindowItemFlags::NONE;
 }
 
 
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index fb56c2891897..8dc5303a5572 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -423,7 +423,7 @@ void SfxSplitWindow::Split()
         if ( rD.pWin )
         {
             const sal_uInt16 nId = rD.nType;
-            const long nSize    = GetItemSize( nId, SWIB_FIXED );
+            const long nSize    = GetItemSize( nId, SplitWindowItemFlags::Fixed );
             const long nSetSize = GetItemSize( GetSet( nId ) );
             Size aSize;
 
@@ -682,7 +682,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
 {
     SfxDockingWindow* pDockWin = pDock->pWin;
 
-    sal_uInt16 nItemBits = pDockWin->GetWinBits_Impl();
+    SplitWindowItemFlags nItemBits = pDockWin->GetWinBits_Impl();
 
     long nWinSize, nSetSize;
     if ( IsHorizontal() )
@@ -713,9 +713,9 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
         }
 
         // Create a new nLine:th line
-        sal_uInt16 nBits = nItemBits;
+        SplitWindowItemFlags nBits = nItemBits;
         if ( GetAlign() == WINDOWALIGN_TOP || GetAlign() == WINDOWALIGN_BOTTOM )
-            nBits |= SWIB_COLSET;
+            nBits |= SplitWindowItemFlags::ColSet;
         InsertItem( nId, nSetSize, nLine, 0, nBits );
     }
 
@@ -723,7 +723,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
     // "percentage" share since the SV then does the re-sizing as expected,
     // "pixel" actually only makes sense if also items with percentage or
     // relative sizes are present.
-    nItemBits |= SWIB_PERCENTSIZE;
+    nItemBits |= SplitWindowItemFlags::PercentSize;
     bLocked = true;
     sal_uInt16 nSet = GetItemId( nLine );
     InsertItem( pDockWin->GetType(), pDockWin, nWinSize, nPos, nSet, nItemBits );
@@ -786,7 +786,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
             if ( rD.pWin )
             {
                 const sal_uInt16 nId = rD.nType;
-                const long nSize    = GetItemSize( nId, SWIB_FIXED );
+                const long nSize    = GetItemSize( nId, SplitWindowItemFlags::Fixed );
                 aNewOrgSizes.push_back( std::pair< sal_uInt16, long >( nId, nSize ) );
             }
         }