diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 11:32:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-16 14:44:19 +0200 |
| commit | f66661c166244f9828e7a383539aa763507e45ef (patch) | |
| tree | 834d3e86eae8ee1bd0f5ff79f9bf63c2005beec3 /include/editeng | |
| parent | 2ba9f793c7e80a3bed9aceb3281d55ddc7957f85 (diff) | |
convert SvxTimeFormat to scoped enum
and make the numerators look more like our internal formatting codes
Change-Id: I3b3d448cec913e72c7ffb6cc3e7754241af36d93
Reviewed-on: https://gerrit.libreoffice.org/42345
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/flditem.hxx | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index feacfafe25c4..addb6974493e 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -244,19 +244,20 @@ enum class SvxTimeType { Fix, Var }; -enum SvxTimeFormat { SVXTIMEFORMAT_APPDEFAULT = 0, // Set as in App - SVXTIMEFORMAT_SYSTEM, // Set as in System - SVXTIMEFORMAT_STANDARD, - SVXTIMEFORMAT_24_HM, // 13:49 - SVXTIMEFORMAT_24_HMS, // 13:49:38 - SVXTIMEFORMAT_24_HMSH, // 13:49:38.78 - SVXTIMEFORMAT_12_HM, // 01:49 - SVXTIMEFORMAT_12_HMS, // 01:49:38 - SVXTIMEFORMAT_12_HMSH, // 01:49:38.78 - SVXTIMEFORMAT_AM_HM, // 01:49 PM - SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM - SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM - }; +enum class SvxTimeFormat { + AppDefault = 0, // Set as in App + System, // Set as in System + Standard, + HH24_MM, // 13:49 + HH24_MM_SS, // 13:49:38 + HH24_MM_SS_00, // 13:49:38.78 + HH12_MM, // 01:49 + HH12_MM_SS, // 01:49:38 + HH12_MM_SS_00, // 01:49:38.78 + HH12_MM_AMPM, // 01:49 PM + HH12_MM_SS_AMPM, // 01:49:38 PM + HH12_MM_SS_00_AMPM // 01:49:38.78 PM +}; class EDITENG_DLLPUBLIC SvxExtTimeField : public SvxFieldData { @@ -270,7 +271,7 @@ public: SvxExtTimeField(); explicit SvxExtTimeField( const tools::Time& rTime, SvxTimeType eType, - SvxTimeFormat eFormat = SVXTIMEFORMAT_STANDARD ); + SvxTimeFormat eFormat = SvxTimeFormat::Standard ); sal_Int64 GetFixTime() const { return m_nFixTime; } void SetFixTime( const tools::Time& rTime ) { m_nFixTime = rTime.GetTime(); } |