diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-08 08:25:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-09 07:56:05 +0000 |
| commit | b55b7a057f19521ad88fc6a274fcf071b798eb3e (patch) | |
| tree | 5a8f9a6d7752cb0ae551072d7f6da865a7c256b9 /rsc | |
| parent | 1edcad0daca7f00559fe7cf100438e105623b3eb (diff) | |
convert SFX_SLOT_INFO to scoped enum
Change-Id: Ib640fc2cfce23bf8ce92ec1549034078123c06aa
Reviewed-on: https://gerrit.libreoffice.org/24752
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscclass.hxx | 4 | ||||
| -rw-r--r-- | rsc/inc/rsctop.hxx | 5 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/res/rscclass.cxx | 10 | ||||
| -rw-r--r-- | rsc/source/res/rsctop.cxx | 11 |
5 files changed, 32 insertions, 2 deletions
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index 976423056f2c..870a0ee6efdf 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -68,6 +68,10 @@ public: Atom nDataBaseName ) override; ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, + RSCVAR nVarType, SfxSlotInfo nMask, + Atom nDataBaseName ) override; + ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, + RSCINST * pDflt, RSCVAR nVarType, sal_uInt32 nMask, Atom nDataBaseName ) override; virtual void EnumVariables( void * pData, VarEnumCallbackProc ) override; diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index 1c3c739411a2..59e4e077f686 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -87,6 +87,11 @@ public: Atom nDataBaseName = InvalidAtom ); virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, + RSCINST * pDflt, + RSCVAR nVarType, SfxSlotInfo nMask, + Atom nDataBaseName = InvalidAtom ); + + virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt = nullptr, RSCVAR nVarType = 0, sal_uInt32 nMask = 0, Atom nDataBaseName = InvalidAtom ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 0582b764be35..e11f08aa4339 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -1367,10 +1367,10 @@ RscTop * RscTypCont::InitClassSfxSlotInfo( RscTop * pSuper ) nId = aNmTb.Put( "SlotName", VARNAME ); pClassSfxSlotInfo->SetVariable( nId, &aLangString, nullptr, 0, - RSC_SFX_SLOT_INFO_SLOTNAME ); + SfxSlotInfo::SlotName ); nId = aNmTb.Put( "HelpText", VARNAME ); pClassSfxSlotInfo->SetVariable( nId, &aLangString, nullptr, 0, - RSC_SFX_SLOT_INFO_HELPTEXT ); + SfxSlotInfo::HelpText ); return pClassSfxSlotInfo; } diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 5447270e649e..27500f60cf4a 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -288,6 +288,16 @@ ERRTYPE RscClass::SetVariable( Atom nVarName, return SetVariable(nVarName, pClass, pDflt, nVarType, (sal_uInt32)nMask, nDataBaseName); } +ERRTYPE RscClass::SetVariable( Atom nVarName, + RscTop * pClass, + RSCINST * pDflt, + RSCVAR nVarType, + SfxSlotInfo nMask, + Atom nDataBaseName) +{ + return SetVariable(nVarName, pClass, pDflt, nVarType, (sal_uInt32)nMask, nDataBaseName); +} + void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc ) { sal_uInt32 i; diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index 210e7c3f258a..04cc8a6358cf 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.cxx @@ -113,6 +113,17 @@ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, return ERR_UNKNOWN_METHOD; } +ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, + RSCINST * pDflt, RSCVAR nVarType, SfxSlotInfo nMask, + Atom nDataBaseName ) +{ + if( pSuperClass ) + return pSuperClass->SetVariable( nVarName, pClass, pDflt, + nVarType, nMask, nDataBaseName ); + else + return ERR_UNKNOWN_METHOD; +} + void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc ) { if( pSuperClass ) |