fdo#84938: replace TIB_ constants with enum

Change-Id: I435ce2331fb49e7ce9fe97bdfddfaef706759a84
Reviewed-on: https://gerrit.libreoffice.org/12023
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 14 insertions, 14 deletions

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 05b443c726d6..3eef6a97548a 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2391,7 +2391,7 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamil
         case SFX_STYLE_FAMILY_PSEUDO:   sHelpId = ".uno:ListStyle"; break;
         default: OSL_FAIL("unknown StyleFamily"); break;
     }
-    m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), 0, 0);
+    m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), ToolBoxItemBits::NONE, 0);
     m_aActionTbL.SetHelpId( nId, sHelpId );
 }
 
@@ -2401,7 +2401,7 @@ void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
 {
     m_aActionTbR.HideItem(SID_STYLE_UPDATE_BY_EXAMPLE);
     m_aActionTbR.SetItemBits( SID_STYLE_NEW_BY_EXAMPLE,
-            TIB_DROPDOWNONLY|m_aActionTbR.GetItemBits( SID_STYLE_NEW_BY_EXAMPLE ));
+            ToolBoxItemBits::DROPDOWNONLY|m_aActionTbR.GetItemBits( SID_STYLE_NEW_BY_EXAMPLE ));
 }
 
 
@@ -2652,7 +2652,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
 {
     const sal_uInt16 nEntry = pBox->GetCurItemId();
     if(nEntry != SID_STYLE_NEW_BY_EXAMPLE ||
-            TIB_DROPDOWN != (pBox->GetItemBits(nEntry)&TIB_DROPDOWN))
+            ToolBoxItemBits::DROPDOWN != (pBox->GetItemBits(nEntry)&ToolBoxItemBits::DROPDOWN))
         ActionSelect(nEntry);
     return 0;
 }
@@ -2661,7 +2661,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
 {
     const sal_uInt16 nEntry = pBox->GetCurItemId();
     if(nEntry == SID_STYLE_NEW_BY_EXAMPLE &&
-            TIB_DROPDOWN == (pBox->GetItemBits(nEntry)&TIB_DROPDOWN))
+            ToolBoxItemBits::DROPDOWN == (pBox->GetItemBits(nEntry)&ToolBoxItemBits::DROPDOWN))
     {
         //create a popup menu in Writer
         boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 3d5c8e2baf61..02f0601667cc 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -244,7 +244,7 @@ namespace sfx2
         // Add the menu before the closer button.
         const sal_uInt16 nItemCount( m_aToolbox.GetItemCount() );
         const sal_uInt16 nItemId( nItemCount + 1 );
-        m_aToolbox.InsertItem( nItemId, i_rItemText, TIB_DROPDOWNONLY, nItemCount > 0 ? nItemCount - 1 : TOOLBOX_APPEND );
+        m_aToolbox.InsertItem( nItemId, i_rItemText, ToolBoxItemBits::DROPDOWNONLY, nItemCount > 0 ? nItemCount - 1 : TOOLBOX_APPEND );
         m_aToolbox.SetHelpId( nItemId, i_nHelpId );
         m_aToolbox.SetClickHdl( i_rCallback );
         m_aToolbox.SetDropdownClickHdl( i_rCallback );
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index bdd2b27e8856..ca1d508ce570 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -224,9 +224,9 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
     mpTemplateBar->SetButtonType(BUTTON_SYMBOLTEXT);
 
     // Set toolbox button bits
-    mpViewBar->SetItemBits(mpViewBar->GetItemId(VIEWBAR_REPOSITORY), TIB_DROPDOWNONLY);
-    mpActionBar->SetItemBits(mpActionBar->GetItemId(ACTIONBAR_ACTION), TIB_DROPDOWNONLY);
-    mpTemplateBar->SetItemBits(mpTemplateBar->GetItemId(TEMPLATEBAR_MOVE), TIB_DROPDOWNONLY);
+    mpViewBar->SetItemBits(mpViewBar->GetItemId(VIEWBAR_REPOSITORY), ToolBoxItemBits::DROPDOWNONLY);
+    mpActionBar->SetItemBits(mpActionBar->GetItemId(ACTIONBAR_ACTION), ToolBoxItemBits::DROPDOWNONLY);
+    mpTemplateBar->SetItemBits(mpTemplateBar->GetItemId(TEMPLATEBAR_MOVE), ToolBoxItemBits::DROPDOWNONLY);
 
     // Set toolbox handlers
     mpViewBar->SetClickHdl(LINK(this,SfxTemplateManagerDlg,TBXViewHdl));
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 9544b388f677..e3db0a2f3612 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -910,8 +910,8 @@ void SfxToolBoxControl::StateChanged
     // enabled/disabled-Flag correcting the lump sum
     pImpl->pBox->EnableItem( GetId(), eState != SfxItemState::DISABLED );
 
-    sal_uInt16 nItemBits = pImpl->pBox->GetItemBits( GetId() );
-    nItemBits &= ~TIB_CHECKABLE;
+    ToolBoxItemBits nItemBits = pImpl->pBox->GetItemBits( GetId() );
+    nItemBits &= ~ToolBoxItemBits::CHECKABLE;
     ::TriState eTri = TRISTATE_FALSE;
     switch ( eState )
     {
@@ -923,7 +923,7 @@ void SfxToolBoxControl::StateChanged
                 // BoolItem for checking
                 if ( static_cast<const SfxBoolItem*>(pState)->GetValue() )
                     eTri = TRISTATE_TRUE;
-                nItemBits |= TIB_CHECKABLE;
+                nItemBits |= ToolBoxItemBits::CHECKABLE;
             }
             else if ( pState->ISA(SfxEnumItemInterface) &&
                 static_cast<const SfxEnumItemInterface *>(pState)->HasBoolValue())
@@ -931,7 +931,7 @@ void SfxToolBoxControl::StateChanged
                 // EnumItem is handled as Bool
                 if ( static_cast<const SfxEnumItemInterface *>(pState)->GetBoolValue() )
                     eTri = TRISTATE_TRUE;
-                nItemBits |= TIB_CHECKABLE;
+                nItemBits |= ToolBoxItemBits::CHECKABLE;
             }
             else if ( pImpl->bShowString && pState->ISA(SfxStringItem) )
                 pImpl->pBox->SetItemText(nId, static_cast<const SfxStringItem*>(pState)->GetValue() );
@@ -941,7 +941,7 @@ void SfxToolBoxControl::StateChanged
         case SfxItemState::DONTCARE:
         {
             eTri = TRISTATE_INDET;
-            nItemBits |= TIB_CHECKABLE;
+            nItemBits |= ToolBoxItemBits::CHECKABLE;
         }
         break;
 
@@ -1389,7 +1389,7 @@ void SfxPopupWindow::Delete()
 SfxRecentFilesToolBoxControl::SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox )
     : SfxToolBoxControl( nSlotId, nId, rBox )
 {
-    rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | TIB_DROPDOWN);
+    rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | ToolBoxItemBits::DROPDOWN);
 }
 
 SfxRecentFilesToolBoxControl::~SfxRecentFilesToolBoxControl()