summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-15 13:55:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-18 13:16:23 +0200
commit7d14555ef7e867c5b1a0e195e3ef056885697c59 (patch)
treeaf39963caf1328d41756e4463a2a39019448026d /sd/inc
parent0083b33650c2f584ceff6eeaf9ef6993bfe0ae9b (diff)
convert SvxDateFormat to scoped enum
And simplify the code in sd/headerfooterdlg, no need for the complex encoding of date and time when we can just index into a static array. Change-Id: I677400bf1f956c81eba665b71dbda9183b63f55c Reviewed-on: https://gerrit.libreoffice.org/42346 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/sdpage.hxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 800cb24d7661..9e7c178437aa 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -28,6 +28,7 @@
#include <list>
#include <memory>
#include <vector>
+#include <editeng/flditem.hxx>
#include <svx/svdobj.hxx>
#include <svx/fmpage.hxx>
#include <xmloff/autolayout.hxx>
@@ -71,7 +72,8 @@ namespace sd {
bool mbDateTimeVisible;
bool mbDateTimeIsFixed;
OUString maDateTimeText;
- int meDateTimeFormat;
+ SvxDateFormat meDateFormat;
+ SvxTimeFormat meTimeFormat;
HeaderFooterSettings();