diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2018-07-27 21:20:13 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-08-10 10:56:57 +0200 |
commit | 23325908c592bf8db74ad44f1f456e5ff5c794c8 (patch) | |
tree | 0dd273cd66092f2506920c92a7c8a770bcdc47fd /sd | |
parent | 8300bbf30c5a53bdb462f1d2ed9049e1c0ce9cdc (diff) |
tdf#118948 - Date format in Impress header/footer is lost when saving
regression from
commit 7d14555ef7e867c5b1a0e195e3ef056885697c59
convert SvxDateFormat to scoped enum
Change-Id: I9d365c710a20054e249433f54635068f713afa72
Reviewed-on: https://gerrit.libreoffice.org/58202
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 93baa280670367ef6246d837080706f2c80eab0b)
Reviewed-on: https://gerrit.libreoffice.org/58291
(cherry picked from commit 34f6ad89ed195c45f4cb5e26b4129bb0087d5452)
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 532d10dbb569..95b1e0e4f4b1 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1292,7 +1292,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) case WID_PAGE_DATETIMEFORMAT: { auto const & rSettings = GetPage()->getHeaderFooterSettings(); - sal_Int32 x = static_cast<sal_Int32>(rSettings.meDateFormat) & (static_cast<sal_Int32>(rSettings.meTimeFormat) << 4); + sal_Int32 x = static_cast<sal_Int32>(rSettings.meDateFormat) | (static_cast<sal_Int32>(rSettings.meTimeFormat) << 4); aAny <<= x; } break; |