Kaydet (Commit) 23325908 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Andras Timar

tdf#118948 - Date format in Impress header/footer is lost when saving

regression from
    commit 7d14555e
    convert SvxDateFormat to scoped enum

Change-Id: I9d365c710a20054e249433f54635068f713afa72
Reviewed-on: https://gerrit.libreoffice.org/58202
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 93baa280)
Reviewed-on: https://gerrit.libreoffice.org/58291
(cherry picked from commit 34f6ad89)
üst 8300bbf3
...@@ -1292,7 +1292,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) ...@@ -1292,7 +1292,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
case WID_PAGE_DATETIMEFORMAT: case WID_PAGE_DATETIMEFORMAT:
{ {
auto const & rSettings = GetPage()->getHeaderFooterSettings(); 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; aAny <<= x;
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment