convert HIB_ constants to scoped enum

Change-Id: I6fa3ecde4a1c5f9c7e6e1dcd22250cba065933e3

9 files changed, 42 insertions, 42 deletions

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index d6345be31a3d..bfe416952d7d 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -51,7 +51,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent)
 
     OUStringBuffer sHeader;
     sHeader.append('\t').append(sProfile).append('\t').append(sDirectory);
-    m_pCertPathList->InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT );
+    m_pCertPathList->InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HeaderBarItemBits::LEFT );
     m_pCertPathList->SetCheckButtonHdl( LINK( this, CertPathDialog, CheckHdl_Impl ) );
 
     m_pAddBtn->SetClickHdl( LINK( this, CertPathDialog, AddHdl_Impl ) );
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 9b50fdc1cf31..c99defce27d0 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -139,11 +139,11 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
     aSz.Width() = TAB_WIDTH1;
     rBar.InsertItem( ITEMID_TYPE, aTypeText,
                             LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(),
-                            HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
+                            HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW );
     aSz.Width() = TAB_WIDTH2;
     rBar.InsertItem( ITEMID_PATH, aPathText,
                             LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(),
-                            HIB_LEFT | HIB_VCENTER );
+                            HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER );
 
     static long aTabs[] = {3, 0, TAB_WIDTH1, TAB_WIDTH1 + TAB_WIDTH2 };
     Size aHeadSize = rBar.GetSizePixel();
@@ -243,13 +243,13 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet )
 
         if ( bUp )
         {
-            nBits &= ~HIB_UPARROW;
-            nBits |= HIB_DOWNARROW;
+            nBits &= ~HeaderBarItemBits::UPARROW;
+            nBits |= HeaderBarItemBits::DOWNARROW;
         }
         else
         {
-            nBits &= ~HIB_DOWNARROW;
-            nBits |= HIB_UPARROW;
+            nBits &= ~HeaderBarItemBits::DOWNARROW;
+            nBits |= HeaderBarItemBits::UPARROW;
         }
         rBar.SetItemBits( ITEMID_TYPE, nBits );
         HeaderSelect_Impl( &rBar );
@@ -262,7 +262,7 @@ void DbRegistrationOptionsPage::FillUserData()
 
     OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";";
     HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE );
-    bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
+    bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW );
     aUserData += (bUp ? OUString("1") : OUString("0"));
     SetUserData( aUserData );
 }
@@ -314,19 +314,19 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
         return 0;
 
     HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE);
-    bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
+    bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW );
     SvSortMode eMode = SortAscending;
 
     if ( bUp )
     {
-        nBits &= ~HIB_UPARROW;
-        nBits |= HIB_DOWNARROW;
+        nBits &= ~HeaderBarItemBits::UPARROW;
+        nBits |= HeaderBarItemBits::DOWNARROW;
         eMode = SortDescending;
     }
     else
     {
-        nBits &= ~HIB_DOWNARROW;
-        nBits |= HIB_UPARROW;
+        nBits &= ~HeaderBarItemBits::DOWNARROW;
+        nBits |= HeaderBarItemBits::UPARROW;
     }
     pBar->SetItemBits( ITEMID_TYPE, nBits );
     SvTreeList* pModel = pPathBox->GetModel();
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index f4f6f1821cc7..a71e0bee28d8 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -80,8 +80,8 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
     m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear());
 
     HeaderBar &rBar = m_pCheckLB->GetTheHeaderBar();
-    HeaderBarItemBits nBits = rBar.GetItemBits(1) | HIB_FIXEDPOS | HIB_FIXED;
-    nBits &= ~HIB_CLICKABLE;
+    HeaderBarItemBits nBits = rBar.GetItemBits(1) | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED;
+    nBits &= ~HeaderBarItemBits::CLICKABLE;
     rBar.SetItemBits(1, nBits);
     rBar.SetItemBits(2, nBits);
 
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index d7166442270b..ae9b3be32c3b 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -900,11 +900,11 @@ void ColorConfigCtrl_Impl::InitHeaderBar(const OUString &rOn, const OUString &rU
     const OUString &rColorSetting, const OUString &rPreview)
 {
     // filling
-    const WinBits nHeadBits = HIB_VCENTER | HIB_FIXED | HIB_FIXEDPOS;
-    m_pHeaderHB->InsertItem(1, rOn, 0, nHeadBits | HIB_CENTER);
-    m_pHeaderHB->InsertItem(2, rUIElems, 0, nHeadBits | HIB_LEFT);
-    m_pHeaderHB->InsertItem(3, rColorSetting, 0, nHeadBits | HIB_LEFT);
-    m_pHeaderHB->InsertItem(4, rPreview, 0, nHeadBits | HIB_LEFT);
+    const HeaderBarItemBits nHeadBits = HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXED | HeaderBarItemBits::FIXEDPOS;
+    m_pHeaderHB->InsertItem(1, rOn, 0, nHeadBits | HeaderBarItemBits::CENTER);
+    m_pHeaderHB->InsertItem(2, rUIElems, 0, nHeadBits | HeaderBarItemBits::LEFT);
+    m_pHeaderHB->InsertItem(3, rColorSetting, 0, nHeadBits | HeaderBarItemBits::LEFT);
+    m_pHeaderHB->InsertItem(4, rPreview, 0, nHeadBits | HeaderBarItemBits::LEFT);
     m_pHeaderHB->set_height_request(GetTextHeight() + 6);
 }
 
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 46051ce08c8e..ab49d9dd8adc 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -156,7 +156,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet
 
     OUString sHeader = sHeader1 + "\t" + sHeader2 + "\t";
     m_pCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND,
-                    HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED );
+                    HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED );
 
     m_pCheckLB->SetStyle( m_pCheckLB->GetStyle()|WB_HSCROLL| WB_VSCROLL );
 }
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 03fe25b2b1bf..3ad13eb797ba 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -172,7 +172,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet&
         .append("\t").append(get<FixedText>("version")->GetText())
         .append("\t").append(get<FixedText>("features")->GetText())
         .append("\t");
-    m_pJavaList->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT);
+    m_pJavaList->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HeaderBarItemBits::LEFT);
     m_pJavaList->setColSizes();
 
     m_pJavaEnableCB->SetClickHdl( LINK( this, SvxJavaOptionsPage, EnableHdl_Impl ) );
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 1c7df8c7c879..e6703b08738d 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -78,7 +78,7 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     HeaderBar &rBlBar = mpBlackList->GetTheHeaderBar();
     HeaderBar &rWiBar = mpWhiteList->GetTheHeaderBar();
 
-    WinBits nHBits = HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE;
+    HeaderBarItemBits nHBits = HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE;
     rBlBar.InsertItem( 1, mpOS->GetText(),         0, nHBits );
     rBlBar.InsertItem( 2, mpOSVersion->GetText(),  0, nHBits );
     rBlBar.InsertItem( 3, mpVendor->GetText(),     0, nHBits );
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index d4a16d775699..53363402f7d6 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -222,10 +222,10 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
     rBar.InsertItem( ITEMID_TYPE, get<FixedText>("type")->GetText(),
                             0,
-                            HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
+                            HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW );
     rBar.InsertItem( ITEMID_PATH, get<FixedText>("path")->GetText(),
                             0,
-                            HIB_LEFT | HIB_VCENTER );
+                            HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER );
 
     long nWidth1 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_TYPE));
     long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_PATH));
@@ -354,13 +354,13 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
 
         if ( bUp )
         {
-            nBits &= ~HIB_UPARROW;
-            nBits |= HIB_DOWNARROW;
+            nBits &= ~HeaderBarItemBits::UPARROW;
+            nBits |= HeaderBarItemBits::DOWNARROW;
         }
         else
         {
-            nBits &= ~HIB_DOWNARROW;
-            nBits |= HIB_UPARROW;
+            nBits &= ~HeaderBarItemBits::DOWNARROW;
+            nBits |= HeaderBarItemBits::UPARROW;
         }
         rBar.SetItemBits( ITEMID_TYPE, nBits );
         HeaderSelect_Impl( &rBar );
@@ -377,7 +377,7 @@ void SvxPathTabPage::FillUserData()
 
     OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";";
     HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE );
-    bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
+    bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW );
     aUserData += bUp ? OUString("1") : OUString("0");
     SetUserData( aUserData );
 }
@@ -639,19 +639,19 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar )
         return 0;
 
     HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE);
-    bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
+    bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW );
     SvSortMode eMode = SortAscending;
 
     if ( bUp )
     {
-        nBits &= ~HIB_UPARROW;
-        nBits |= HIB_DOWNARROW;
+        nBits &= ~HeaderBarItemBits::UPARROW;
+        nBits |= HeaderBarItemBits::DOWNARROW;
         eMode = SortDescending;
     }
     else
     {
-        nBits &= ~HIB_DOWNARROW;
-        nBits |= HIB_UPARROW;
+        nBits &= ~HeaderBarItemBits::DOWNARROW;
+        nBits |= HeaderBarItemBits::UPARROW;
     }
     pBar->SetItemBits( ITEMID_TYPE, nBits );
     SvTreeList* pModel = pPathBox->GetModel();
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 42fe55bf150e..b5c61bf88397 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -55,19 +55,19 @@ void PasswordTable::Resort( bool bForced )
     if ( 0 == nColumn || bForced ) // only the first column is sorted
     {
         HeaderBarItemBits nBits = GetTheHeaderBar().GetItemBits(1);
-        bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
+        bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW );
         SvSortMode eMode = SortAscending;
 
         if ( bUp )
         {
-            nBits &= ~HIB_UPARROW;
-            nBits |= HIB_DOWNARROW;
+            nBits &= ~HeaderBarItemBits::UPARROW;
+            nBits |= HeaderBarItemBits::DOWNARROW;
             eMode = SortDescending;
         }
         else
         {
-            nBits &= ~HIB_DOWNARROW;
-            nBits |= HIB_UPARROW;
+            nBits &= ~HeaderBarItemBits::DOWNARROW;
+            nBits |= HeaderBarItemBits::UPARROW;
         }
         GetTheHeaderBar().SetItemBits( 1, nBits );
         SvTreeList* pListModel = GetModel();
@@ -116,9 +116,9 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent)
     long aStaticTabs[]= { 2, 0, 0 };
     m_pPasswordsLB->SetTabs( aStaticTabs );
     m_pPasswordsLB->InsertHeaderItem( 1, get<FixedText>("website")->GetText(),
-        HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS | HIB_CLICKABLE | HIB_UPARROW );
+        HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW );
     m_pPasswordsLB->InsertHeaderItem( 2, get<FixedText>("username")->GetText(),
-        HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS );
+        HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS );
     pPasswordsLBContainer->set_height_request(m_pPasswordsLB->GetTextHeight()*8);
 
     m_pPasswordsLB->SetHeaderBarClickHdl( LINK( this, WebConnectionInfoDialog, HeaderBarClickedHdl ) );