[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/inc sw/source

[Heiko Tietze (via logerrit)]

 sw/inc/flddat.hxx                 |    2 +-
 sw/source/uibase/fldui/fldmgr.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1a7db8daf9da33133c49e803cb1b834d9351bf59
Author:     Heiko Tietze <heiko.tie...@documentfoundation.org>
AuthorDate: Thu Jan 5 13:36:13 2023 +0000
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Fri Jan 6 12:13:59 2023 +0000

    Revert "Relates tdf#139141 - Make variable date/time field the default"
    
    This reverts commit b2c81dad3a0b72d305f1c6967ee4a8069ae11b45.
    
    Reason for revert: tdf#152871
    
    Change-Id: I56f42b4ce104dbb96d8fda1bc71af727fa46d536
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145007
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
    (cherry picked from commit d7514d34b67626ba0b7d1dc0e9acbdfc635fe0ac)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145117

diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 6c452072e926..39c00f68a235 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -30,8 +30,8 @@ namespace tools { class Time; }
 
 enum SwDateSubFormat
 {
-    DATE_VAR,
     DATE_FIX,
+    DATE_VAR
 };
 
 class SAL_DLLPUBLIC_RTTI SwDateTimeFieldType final : public SwValueFieldType
diff --git a/sw/source/uibase/fldui/fldmgr.cxx 
b/sw/source/uibase/fldui/fldmgr.cxx
index ec544bca99ac..a3158584a6e3 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -157,14 +157,14 @@ const TranslateId FMT_AUTHOR_ARY[] =
 
 const TranslateId FLD_DATE_ARY[] =
 {
-    FLD_DATE_STD,
     FLD_DATE_FIX,
+    FLD_DATE_STD,
 };
 
 const TranslateId FLD_TIME_ARY[] =
 {
-    FLD_TIME_STD,
     FLD_TIME_FIX,
+    FLD_TIME_STD
 };
 
 const TranslateId FMT_NUM_ARY[] =