[Libreoffice-commits] core.git: svl/source

DaeHyun Sung (via logerrit) logerrit at kemper.freedesktop.org
Tue Feb 4 15:04:11 UTC 2020


 svl/source/numbers/zformat.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7ffd38fc54dda2d2c84eab19c40efcbac7fb0bff
Author:     DaeHyun Sung <sungdh86+git at gmail.com>
AuthorDate: Wed Jan 29 23:39:25 2020 +0900
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Tue Feb 4 16:03:31 2020 +0100

    show Korean Dangi Calendar format  tdf#125446
    
    show Korean Dangi Calendar format
    Ref1: MSDN - Calendar IDs
    5 : CAL_KOREA
     https://docs.microsoft.com/en-us/windows/desktop/Intl/calendar-identifiers
    
    Ref2: stackoverflow
    https://stackoverflow.com/questions/54134729/what-does-the-130000-in-excel-locale-code-130000-mean
    
    Change-Id: Ia1f367bfd5c13f29054064d89be847bbf249c0d0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87689
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 0a8f23f0bfeb..81b20c92bfbb 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -503,7 +503,13 @@ OUString SvNumberformat::ImpObtainCalendarAndNumerals( OUStringBuffer& rString,
                 nLang = maLocale.meLanguage = LANGUAGE_JAPANESE;
             }
             break;
-        case 0x05 : // unknown calendar
+        case 0x05 : // Korean Dangi calendar
+            sCalendar = "[~dangi]";
+            // Only Korean language support dangi calendar
+            if ( nLocaleLang != LANGUAGE_KOREAN )
+            {
+                nLang = maLocale.meLanguage = LANGUAGE_KOREAN;
+            }
             break;
         case 0x06 : // Hijri calendar
         case 0x17 : // same?


More information about the Libreoffice-commits mailing list