diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-06 14:37:23 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-08 12:15:51 +0100 |
| commit | 9e0770ea7e0cf094add54ad64bc9ff825d24bbe1 (patch) | |
| tree | e897291e44ecb11ca44ba5e5ebefe03ac536862f /sw/source/uibase/uno | |
| parent | Adapt LibreLogo.py to Python 3.7 re.sub change (diff) | |
| download | core-9e0770ea7e0cf094add54ad64bc9ff825d24bbe1.tar.gz core-9e0770ea7e0cf094add54ad64bc9ff825d24bbe1.zip | |
Convert FieldUnit to scoped enum
Change-Id: Id2df31daa596a18c79af5fc6ea162deb6e24d5af
Reviewed-on: https://gerrit.libreoffice.org/62958
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/uibase/uno')
| -rw-r--r-- | sw/source/uibase/uno/unomod.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 00399ac9ca45..a7a60ad2faec 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -524,9 +524,9 @@ SwXViewSettings::SwXViewSettings(SwView* pVw) , mpConstViewOption(nullptr) , bObjectValid(true) , mbApplyZoom(false) - , eHRulerUnit(FUNIT_CM) + , eHRulerUnit(FieldUnit::CM) , mbApplyHRulerMetric(false) - , eVRulerUnit(FUNIT_CM) + , eVRulerUnit(FieldUnit::CM) , mbApplyVRulerMetric(false) { // This property only exists if we have a view (ie, not at the module ) @@ -732,13 +732,13 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c { sal_uInt16 nUnit; if( rValue >>= nUnit ) - switch( nUnit ) + switch (static_cast<FieldUnit>(nUnit)) { - case FUNIT_MM: - case FUNIT_CM: - case FUNIT_POINT: - case FUNIT_PICA: - case FUNIT_INCH: + case FieldUnit::MM: + case FieldUnit::CM: + case FieldUnit::POINT: + case FieldUnit::PICA: + case FieldUnit::INCH: if( rInfo.mnHandle == HANDLE_VIEWSET_HORI_RULER_METRIC ) { eHRulerUnit = static_cast<FieldUnit>(nUnit); |