From f66661c166244f9828e7a383539aa763507e45ef Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 15 Sep 2017 11:32:16 +0200 Subject: 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 Reviewed-by: Noel Grandin --- include/editeng/flditem.hxx | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'include/editeng') 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(); } -- cgit