[Libreoffice-commits] core.git: include/vcl vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/toolkit/field.hxx |    2 +-
 vcl/source/control/field2.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cc45d748e241ea96fd0c81154e3dd49f9fc58357
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Mar 6 17:10:31 2023 +0000
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Mar 7 06:59:52 2023 +0000

    eFormat modified inside GetDateArea, but change not propogated to the caller
    
    regression from:
    
    commit 6e7e19d9c300dbdd279789b09f94781e946fad52
    Date:   Wed Jul 15 12:10:32 2020 +0100
    
        weld DateControl
    
    Change-Id: I74bc01383f04fd4e54a45058fbbc3bc082eef0e5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148359
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index 10f9cc3b571d..c127f91ccbb4 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -423,7 +423,7 @@ protected:
 public:
     static OUString         FormatDate(const Date& rNewDate, 
ExtDateFieldFormat eFormat, const LocaleDataWrapper& rLocaleData, const 
Formatter::StaticFormatter& rStaticFormatter);
     static bool             TextToDate(const OUString& rStr, Date& rTime, 
ExtDateFieldFormat eFormat, const LocaleDataWrapper& rLocaleDataWrapper, const 
CalendarWrapper& rCalendarWrapper);
-    static int              GetDateArea(ExtDateFieldFormat eFormat, 
std::u16string_view rText, int nCursor, const LocaleDataWrapper& 
rLocaleDataWrapper);
+    static int              GetDateArea(ExtDateFieldFormat& eFormat, 
std::u16string_view rText, int nCursor, const LocaleDataWrapper& 
rLocaleDataWrapper);
 
     virtual                 ~DateFormatter() override;
 
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index bc84c381d3b7..be02536ef513 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1618,7 +1618,7 @@ bool DateFormatter::ImplAllowMalformedInput() const
     return !IsEnforceValidValue();
 }
 
-int DateFormatter::GetDateArea(ExtDateFieldFormat eFormat, std::u16string_view 
rText, int nCursor, const LocaleDataWrapper& rLocaleDataWrapper)
+int DateFormatter::GetDateArea(ExtDateFieldFormat& eFormat, 
std::u16string_view rText, int nCursor, const LocaleDataWrapper& 
rLocaleDataWrapper)
 {
     sal_Int8 nDateArea = 0;