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 /sd/source/ui/dlg/headerfooterdlg.cxx | |
| 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 'sd/source/ui/dlg/headerfooterdlg.cxx')
| -rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index c6eb9cd55e10..922aa47c027f 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -100,14 +100,14 @@ int const nDateTimeFormats[nDateTimeFormatsCount] = SVXDATEFORMAT_E, SVXDATEFORMAT_F, - SVXDATEFORMAT_A | (SVXTIMEFORMAT_24_HM << 4), - SVXDATEFORMAT_A | (SVXTIMEFORMAT_12_HM << 4), + SVXDATEFORMAT_A | (static_cast<int>(SvxTimeFormat::HH24_MM) << 4), + SVXDATEFORMAT_A | (static_cast<int>(SvxTimeFormat::HH12_MM) << 4), - (SVXTIMEFORMAT_24_HM << 4), - (SVXTIMEFORMAT_24_HMS <<4), + static_cast<int>(SvxTimeFormat::HH24_MM) << 4, + static_cast<int>(SvxTimeFormat::HH24_MM_SS) << 4, - (SVXTIMEFORMAT_12_HM << 4 ), - (SVXTIMEFORMAT_12_HMS << 4 ) + static_cast<int>(SvxTimeFormat::HH12_MM) << 4, + static_cast<int>(SvxTimeFormat::HH12_MM_SS) << 4 }; class HeaderFooterTabPage : public TabPage |