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

[Eike Rathke (via logerrit)]

 xmloff/source/style/xmlnumfe.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1d0b2ae1423142f3688de00d9938917329e958af
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Thu Mar 11 16:55:14 2021 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Fri Mar 12 11:16:19 2021 +0100

    ODF save: write explicit "gregorian" calendar, not empty if default
    
    Other implementations may have different opinions about default
    calendars and the context here is to switch to Gregorian.
    
    Change-Id: I14a27826e627f890911adaf01935c58b43ad766a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112354
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 24c0524a4239..1392c4e0f2f7 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -1651,12 +1651,12 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                         // Calendar attribute for E and EE and R is set in
                         // first loop. If set and not an explicit calendar and
                         // YY or YYYY is encountered, switch temporarily to
-                        // Gregorian, i.e. empty calendar name.
+                        // Gregorian.
                         bool bLong = ( nElemType == NF_KEY_YYYY || nElemType == NF_KEY_EEC ||
                                             nElemType == NF_KEY_R );
                         WriteYearElement_Impl(
                                 ((bImplicitOtherCalendar && !bExplicitCalendar
-                                  && (nElemType == NF_KEY_YY || nElemType == NF_KEY_YYYY)) ? OUString() : aCalendar),
+                                  && (nElemType == NF_KEY_YY || nElemType == NF_KEY_YYYY)) ? "gregorian" : aCalendar),
                                 (bSystemDate ? bLongSysDate : bLong));
                         bAnyContent = true;
                     }