diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-28 14:38:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 08:08:40 +0000 |
| commit | 284ca1a5840c5fcbf4f9d1eff02ae607cdc2c222 (patch) | |
| tree | 347ac766d6efbb07d4b53ae465d13be5be94541f /rsc | |
| parent | aa0b05f1856c1be670208f7c9cbc8d8830b1e349 (diff) | |
Convert RSC_TOOLBOX to scoped enum
and drop unused (in .src files) constants
Change-Id: I1ef085d128893dc3234592e248451f248efb08ba
Reviewed-on: https://gerrit.libreoffice.org/25581
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 3 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 23 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 3 |
3 files changed, 7 insertions, 22 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 1fbbb1850881..f137e4aa6077 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -210,8 +210,7 @@ class RscTypCont RscTop * InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassImage, RscEnum * pTriState ); - RscTop * InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem, - RscTop * pClassImageList ); + RscTop * InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem ); RscTop * InitClassSfxStyleFamilyItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassImage, diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index ae3b865b481a..73b58cab67ea 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -1065,8 +1065,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, } RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, - RscTop * pClassToolBoxItem, - RscTop * pClassImageList ) + RscTop * pClassToolBoxItem ) { Atom nId; RscTop * pClassToolBox; @@ -1089,7 +1088,7 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, // add variable nId = aNmTb.Put( "ButtonType", VARNAME ); pClassToolBox->SetVariable( nId, pEnum, nullptr, 0, - RSC_TOOLBOX_BUTTONTYPE ); + (sal_uInt32)RscToolboxFlags::ButtonType ); } { RscEnum * pEnum; @@ -1103,23 +1102,11 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, // add variable nId = aNmTb.Put( "Align", VARNAME ); pClassToolBox->SetVariable( nId, pEnum, nullptr, 0, - RSC_TOOLBOX_ALIGN ); + (sal_uInt32)RscToolboxFlags::Align ); } nId = aNmTb.Put( "LineCount", VARNAME ); pClassToolBox->SetVariable( nId, &aIdNoZeroUShort, nullptr, 0, - RSC_TOOLBOX_LINECOUNT ); - nId = aNmTb.Put( "FloatingLines", VARNAME ); - pClassToolBox->SetVariable( nId, &aUShort, nullptr, 0, - RSC_TOOLBOX_FLOATLINES ); - nId = aNmTb.Put( "Customize", VARNAME ); - pClassToolBox->SetVariable( nId, &aBool, nullptr, 0, - RSC_TOOLBOX_CUSTOMIZE ); - nId = aNmTb.Put( "MenuStrings", VARNAME ); - pClassToolBox->SetVariable( nId, &aBool, nullptr, 0, - RSC_TOOLBOX_MENUSTRINGS ); - nId = aNmTb.Put( "ItemImageList", VARNAME ); - pClassToolBox->SetVariable( nId, pClassImageList, nullptr, 0, - RSC_TOOLBOX_ITEMIMAGELIST ); + (sal_uInt32)RscToolboxFlags::LineCount ); { RscLangArray* pLA; RscCont * pCont; @@ -1135,7 +1122,7 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, ); nId = aNmTb.Put( "ItemList", VARNAME ); pClassToolBox->SetVariable( nId, pLA, nullptr, 0, - RSC_TOOLBOX_ITEMLIST ); + (sal_uInt32)RscToolboxFlags::ItemList ); } INS_WINBIT(pClassToolBox,Scroll) INS_WINBIT(pClassToolBox,LineSpacing) diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index eb02f71f26f3..c24e7572a0fa 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -417,8 +417,7 @@ void RscTypCont::Init() pClassImage, pTriState ); pRoot->Insert( pClassToolBoxItem ); - RscTop* pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem, - pClassImageList ); + RscTop* pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem ); pRoot->Insert( pClassToolBox ); // initialize class |