diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-03-06 17:10:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-03-07 13:17:47 +0000 |
| commit | 36ed3cff62624b30e7cccdd0a4941c4bcb3a3ba6 (patch) | |
| tree | 607287c9c90b791a15540732309ba4a4d12894cb | |
| parent | b19e0a6676b800b9d3c362c722913f1362113006 (diff) | |
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/+/148322
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/vcl/toolkit/field.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/field2.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx index 836e59591850..086a9d5f1b63 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 d3649ee4fa7c..b7a5c22469d1 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; |