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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 44cfc48ad089..7ca7d765ec6a 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1670,17 +1670,22 @@ OUString DrawingML::GetFieldValue( const css::uno::Reference< css::text::XTextRa { sal_Int32 nNumFmt = -1; rXPropSet->getPropertyValue(UNO_TC_PROP_NUMFORMAT) >>= nNumFmt; - switch(nNumFmt) + switch(static_cast<SvxTimeFormat>(nNumFmt)) { - case SVXTIMEFORMAT_STANDARD: - case SVXTIMEFORMAT_24_HMS: aFieldValue = "datetime11"; // 13:49:38 - break; - case SVXTIMEFORMAT_24_HM: aFieldValue = "datetime10"; // 13:49 - break; - case SVXTIMEFORMAT_12_HM: aFieldValue = "datetime12"; // 01:49 PM - break; - case SVXTIMEFORMAT_12_HMS: aFieldValue = "datetime13"; // 01:49:38 PM - break; + case SvxTimeFormat::Standard: + case SvxTimeFormat::HH24_MM_SS: + aFieldValue = "datetime11"; // 13:49:38 + break; + case SvxTimeFormat::HH24_MM: + aFieldValue = "datetime10"; // 13:49 + break; + case SvxTimeFormat::HH12_MM: + aFieldValue = "datetime12"; // 01:49 PM + break; + case SvxTimeFormat::HH12_MM_SS: + aFieldValue = "datetime13"; // 01:49:38 PM + break; + default: break; } } else if(aFieldKind == "ExtFile") |