diff options
| author | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2023-10-17 11:15:58 +0200 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2023-10-23 15:42:38 +0200 |
| commit | fa569930a0968cdeba4441e19a68e7d78aa25cb4 (patch) | |
| tree | 60bfd747db3ef2b62d520000cd6b68e4e8eddf11 /sw/source | |
| parent | 4d0e2203d1ccceb4a742b02c267e613b50ca9370 (diff) | |
Revert "Resolves tdf#139141 - Make variable date/time field the default"
This reverts commit e37f06f534ac864f9fe8cd20b07a85c36e697d41.
and ui test from Ia1a2387e137f8a672a24056b13234d4275a77ca4
Reason for revert: tdf#157337; macros rely on fix field values
Change-Id: I7a638330aac9b71432556454c0104479fcd05b4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158041
Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/fldui/flddok.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/fldui/fldmgr.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index f669fa7b92b2..a195ed026ec0 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -241,9 +241,9 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, weld::TreeView&, void) case SwFieldTypesEnum::Date: case SwFieldTypesEnum::Time: m_xSelectionLB->append(sId, aLst[i]); - if (static_cast<SwDateTimeField*>(GetCurField())->IsFixed() && i) + if (static_cast<SwDateTimeField*>(GetCurField())->IsFixed() && !i) m_xSelectionLB->select_id(sId); - if (!static_cast<SwDateTimeField*>(GetCurField())->IsFixed() && !i) + if (!static_cast<SwDateTimeField*>(GetCurField())->IsFixed() && i) m_xSelectionLB->select_id(sId); break; case SwFieldTypesEnum::ExtendedUser: diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index c61c9c26cba5..3b69fb63739d 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -161,14 +161,14 @@ const TranslateId FMT_AUTHOR_ARY[] = const TranslateId FLD_DATE_ARY[] = { + FLD_DATE_FIX, FLD_DATE_STD, - FLD_DATE_FIX }; const TranslateId FLD_TIME_ARY[] = { - FLD_TIME_STD, - FLD_TIME_FIX + FLD_TIME_FIX, + FLD_TIME_STD }; const TranslateId FMT_NUM_ARY[] = |