Convert RSC_TOOLBOXITEM to scoped enum

Change-Id: Ic90b6950016417d5f57963ab69fd20905a943bb7
Reviewed-on: https://gerrit.libreoffice.org/25683
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

3 files changed, 12 insertions, 29 deletions

diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 58a1b56e29ce..99f75011d891 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -206,9 +206,7 @@ class RscTypCont
 
     RscTop *    InitClassDockingWindow( RscTop * pSuper,
                                         RscEnum * pMapUnit );
-    RscTop *    InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap,
-                                      RscTop * pClassImage,
-                                      RscEnum * pTriState );
+    RscTop *    InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap );
     RscTop *    InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem );
     RscTop *    InitClassSfxStyleFamilyItem( RscTop * pSuper,
                                              RscTop * pClassBitmap,
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index a23761d7157b..7182b34e71b8 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -933,9 +933,7 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
 }
 
 RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
-                                           RscTop * pClassBitmap,
-                                           RscTop * pClassImage,
-                                           RscEnum * pTriState )
+                                           RscTop * pClassBitmap )
 {
     Atom        nId;
     RscTop *    pClassToolBoxItem;
@@ -948,7 +946,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
     // initialize variables
     nId = aNmTb.Put( "Identifier", VARNAME );
     pClassToolBoxItem->SetVariable( nId, &aIdNoZeroUShort, nullptr, 0,
-                                    RSC_TOOLBOXITEM_ID );
+                                    (sal_uInt32)RscToolboxItemFlags::Id );
     {
         RscEnum   * pEnum;
 
@@ -961,7 +959,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
         // add variable
         nId = aNmTb.Put( "Type", VARNAME );
         pClassToolBoxItem->SetVariable( nId, pEnum, nullptr, 0,
-                                  RSC_TOOLBOXITEM_TYPE  );
+                                  (sal_uInt32)RscToolboxItemFlags::Type  );
     }
     {
         RscFlag *   pFlag;
@@ -988,7 +986,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
         l_nVarId = aNmTb.Put( "_ToolBoxItemFlags", VARNAME );
         pClassToolBoxItem->SetVariable( l_nVarId, pFlag, nullptr,
                                      VAR_HIDDEN | VAR_NOENUM,
-                                     RSC_TOOLBOXITEM_STATUS );
+                                     (sal_uInt32)RscToolboxItemFlags::Status );
 
         // add client variables
         aBaseLst.push_back(
@@ -1029,35 +1027,23 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
     }
     nId = aNmTb.Put( "HelpID", VARNAME );
     pClassToolBoxItem->SetVariable( nId, &aStringLiteral, nullptr, 0,
-                                    RSC_TOOLBOXITEM_HELPID  );
+                                    (sal_uInt32)RscToolboxItemFlags::HelpId  );
     nId = aNmTb.Put( "Text", VARNAME );
     pClassToolBoxItem->SetVariable( nId, &aLangString, nullptr, 0,
-                                    RSC_TOOLBOXITEM_TEXT );
-    nId = aNmTb.Put( "HelpText", VARNAME );
-    pClassToolBoxItem->SetVariable( nId, &aLangString, nullptr, 0,
-                                    RSC_TOOLBOXITEM_HELPTEXT );
+                                    (sal_uInt32)RscToolboxItemFlags::Text );
     nId = aNmTb.Put( "ItemBitmap", VARNAME );
     pClassToolBoxItem->SetVariable( nId, pClassBitmap, nullptr, 0,
-                                    RSC_TOOLBOXITEM_BITMAP );
-    nId = aNmTb.Put( "ItemImage", VARNAME );
-    pClassToolBoxItem->SetVariable( nId, pClassImage, nullptr, 0,
-                                    RSC_TOOLBOXITEM_IMAGE );
+                                    (sal_uInt32)RscToolboxItemFlags::Bitmap );
     nId = aNmTb.Put( "Disable", VARNAME );
     pClassToolBoxItem->SetVariable( nId, &aBool, nullptr, 0,
-                                    RSC_TOOLBOXITEM_DISABLE );
+                                    (sal_uInt32)RscToolboxItemFlags::Disable );
 
-    nId = aNmTb.Put( "State", VARNAME );
-    pClassToolBoxItem->SetVariable( nId, pTriState, nullptr, 0,
-                                    RSC_TOOLBOXITEM_STATE );
-    nId = aNmTb.Put( "Hide", VARNAME );
-    pClassToolBoxItem->SetVariable( nId, &aBool, nullptr, 0,
-                                    RSC_TOOLBOXITEM_HIDE );
     nId = aNmTb.Put( "Hide", VARNAME );
     pClassToolBoxItem->SetVariable( nId, &aBool, nullptr, 0,
-                                    RSC_TOOLBOXITEM_HIDE );
+                                    (sal_uInt32)RscToolboxItemFlags::Hide );
     nId = aNmTb.Put( "Command", VARNAME );
     pClassToolBoxItem->SetVariable( nId, &aString, nullptr, 0,
-                                    RSC_TOOLBOXITEM_COMMAND );
+                                    (sal_uInt32)RscToolboxItemFlags::Command );
 
     return pClassToolBoxItem;
 }
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index c24e7572a0fa..9860c4b739b6 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -413,8 +413,7 @@ void RscTypCont::Init()
     RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
     pRoot->Insert( pClassDockingWindow );
 
-    RscTop* pClassToolBoxItem = InitClassToolBoxItem( pClassMgr, pClassBitmap,
-                                              pClassImage, pTriState );
+    RscTop* pClassToolBoxItem = InitClassToolBoxItem( pClassMgr, pClassBitmap );
     pRoot->Insert( pClassToolBoxItem );
 
     RscTop* pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem );