diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-25 20:15:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-26 07:19:41 +0000 |
| commit | ba91f894cc135ee4ea3a9ba945fb32e27eba2638 (patch) | |
| tree | 00a54fcefedd6cae7570b3b2abaa41aa7a1e6191 | |
| parent | cbe78f817da8db78d226b3ad2b1a10d0c2dcf188 (diff) | |
Convert METRICFIELD to scoped enum
Change-Id: I283d578071af549c0f8f50de728859b6715e47b5
Reviewed-on: https://gerrit.libreoffice.org/25463
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | include/tools/rc.h | 11 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/control/field.cxx | 8 |
3 files changed, 15 insertions, 10 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index b1fd2c081e56..8b6d5ea67daa 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -105,9 +105,14 @@ namespace o3tl { #define NUMERICFIELD_LAST 0x02 #define NUMERICFIELD_SPINSIZE 0x04 -#define METRICFIELD_FIRST 0x01 -#define METRICFIELD_LAST 0x02 -#define METRICFIELD_SPINSIZE 0x04 +enum class RscMetricFieldFlags { + First = 0x01, + Last = 0x02, + SpinSize = 0x04 +}; +namespace o3tl { + template<> struct typed_flags<RscMetricFieldFlags> : is_typed_flags<RscMetricFieldFlags, 0x07> {}; +} // For "ToolBoxItem" resources: #define RSC_TOOLBOXITEM_ID 0x0001 diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index adff90201de7..20e05a5bab82 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -916,13 +916,13 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper ) // initialize variables nId = aNmTb.Put( "First", VARNAME ); pClassMetricField->SetVariable( nId, &aIdLong, nullptr, - 0, METRICFIELD_FIRST ); + 0, (sal_uInt32)RscMetricFieldFlags::First ); nId = aNmTb.Put( "Last", VARNAME ); pClassMetricField->SetVariable( nId, &aIdLong, nullptr, - 0, METRICFIELD_LAST ); + 0, (sal_uInt32)RscMetricFieldFlags::Last ); nId = aNmTb.Put( "SpinSize", VARNAME ); pClassMetricField->SetVariable( nId, &aIdLong, nullptr, - 0, METRICFIELD_SPINSIZE ); + 0, (sal_uInt32)RscMetricFieldFlags::SpinSize ); return pClassMetricField; } diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 4ae94361f07a..40c2fffc9d25 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1647,15 +1647,15 @@ void MetricField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); MetricFormatter::ImplLoadRes( ResId( static_cast<RSHEADER_TYPE *>(GetClassRes()), *rResId.GetResMgr() ) ); - sal_uLong nMask = ReadLongRes(); + RscMetricFieldFlags nMask = (RscMetricFieldFlags)ReadLongRes(); - if ( METRICFIELD_FIRST & nMask ) + if ( RscMetricFieldFlags::First & nMask ) mnFirst = ReadLongRes(); - if ( METRICFIELD_LAST & nMask ) + if ( RscMetricFieldFlags::Last & nMask ) mnLast = ReadLongRes(); - if ( METRICFIELD_SPINSIZE & nMask ) + if ( RscMetricFieldFlags::SpinSize & nMask ) mnSpinSize = ReadLongRes(); Reformat(); |