diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2018-07-27 21:20:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-29 23:07:07 +0200 |
| commit | f8e408f03039e8bbaa70158a8fae200927bc4b67 (patch) | |
| tree | 0da88dfc1fda2eaad6a5c8c7c56f4df2ad304de0 /sd | |
| parent | 082c736bca22ee3c3fb86c7d68cc875eaa6bde38 (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/58289
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 657a23ddc7ce..2e9f5dd128d1 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1280,7 +1280,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; |