diff options
| author | baltasarq <baltasarq@gmail.com> | 2016-03-01 13:14:39 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-02 12:42:24 +0000 |
| commit | d9dacecd9068f8ba2be8b92cdd881dbb17a59cfb (patch) | |
| tree | d11182861518872cbe25ee8121089b89cfd65388 /basic/source/inc | |
| parent | 87629f39bbae1ad774d588c50d030bff0ba8d8a2 (diff) | |
tdf#84938 Change average enum for scoped enum
This is a [partial] patch for tdf#84938, involving the substitution of an average enum for a scoped one.
Change-Id: I4b3a19914d30a14dec2640355ba392b943e1ddd7
Reviewed-on: https://gerrit.libreoffice.org/22808
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'basic/source/inc')
| -rw-r--r-- | basic/source/inc/runtime.hxx | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index e3fabf3e0bad..5c082ee55c32 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -48,12 +48,11 @@ class SbiDllMgr; class SvNumberFormatter; // time/date functions enum class SbiImageFlags; -enum ForType -{ - FOR_TO, - FOR_EACH_ARRAY, - FOR_EACH_COLLECTION, - FOR_EACH_XENUMERATION +enum class ForType { + To, + EachArray, + EachCollection, + EachXEnumeration }; struct SbiForStack { // for/next stack: @@ -63,7 +62,7 @@ struct SbiForStack { // for/next stack: SbxVariableRef refInc; // increment expression // For each support - ForType eForType; + ForType eForType; sal_Int32 nCurCollectionIndex; sal_Int32* pArrayCurIndices; sal_Int32* pArrayLowerBounds; @@ -72,12 +71,13 @@ struct SbiForStack { // for/next stack: SbiForStack() : pNext(nullptr) - , eForType(FOR_TO) + , eForType(ForType::To) , nCurCollectionIndex(0) , pArrayCurIndices(nullptr) , pArrayLowerBounds(nullptr) , pArrayUpperBounds(nullptr) {} + ~SbiForStack() { delete[] pArrayCurIndices; @@ -86,13 +86,14 @@ struct SbiForStack { // for/next stack: } }; +#define MAXRECURSION 500 + struct SbiGosubStack { // GOSUB-Stack: SbiGosubStack* pNext; // Chain - const sal_uInt8* pCode; // Return-Pointer - sal_uInt16 nStartForLvl; // #118235: For Level in moment of gosub + const sal_uInt8* pCode; // Return-Pointer + sal_uInt16 nStartForLvl; // #118235: For Level in moment of gosub }; -#define MAXRECURSION 500 #define Sb_ATTR_READONLY 0x0001 #define Sb_ATTR_HIDDEN 0x0002 |