sd/source/ui/unoidl/unopage.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit f8e408f03039e8bbaa70158a8fae200927bc4b67 Author: Noel Grandin <[email protected]> AuthorDate: Fri Jul 27 21:20:13 2018 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Jul 29 23:07:07 2018 +0200 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 <[email protected]> (cherry picked from commit 93baa280670367ef6246d837080706f2c80eab0b) Reviewed-on: https://gerrit.libreoffice.org/58289 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; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
