[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - svl/source

[Libreoffice Gerrit user]

 svl/source/numbers/zforlist.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 11936b405094cf4a4b1c95b8cbf8e1f2c2bcad05
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Mon Aug 20 16:56:29 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 21 12:56:52 2018 +0200

    One more "do not reorder date particles", tdf#113889 tdf#119013 follow-up
    
    commit 5b8007afdb97d416ee7c22bf9226e927d61e9bd3
    CommitDate: Thu Aug 16 18:54:31 2018 +0200
    
        Resolves: tdf#119013 do not over-aggressively reorder date particles
    
    negated logic from bForExcelExport to bConvertDateOrder. This
    somehow slipped through in that commit.
    
    Change-Id: Ibe7e7f7dc669292f38136ceeced1ead120641a20
    Reviewed-on: https://gerrit.libreoffice.org/59330
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 0281aa380a20672d55d1d672fd4a43bdcb6c224d)
    Reviewed-on: https://gerrit.libreoffice.org/59340
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index f3af3ac13418..9d4a630df51b 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -820,7 +820,7 @@ OUString SvNumberFormatter::GetFormatStringForExcel( sal_uInt32 nKey, const NfKe
                 SvNumFormatType nType = SvNumFormatType::DEFINED;
                 sal_uInt32 nTempKey;
                 OUString aTemp( pEntry->GetFormatstring());
-                rTempFormatter.PutandConvertEntry( aTemp, nCheckPos, nType, nTempKey, nLang, LANGUAGE_ENGLISH_US, true);
+                rTempFormatter.PutandConvertEntry( aTemp, nCheckPos, nType, nTempKey, nLang, LANGUAGE_ENGLISH_US, false);
                 SAL_WARN_IF( nCheckPos != 0, "svl.numbers",
                         "SvNumberFormatter::GetFormatStringForExcel - format code not convertible");
                 if (nTempKey != NUMBERFORMAT_ENTRY_NOT_FOUND)